workspaceid atom

Author: sawka

frontend/app/store/contextmenu.ts

@@ -74,11 +74,11 @@ class ContextMenuModel {
         this.activeOpts = opts;
         const electronMenuItems = this._convertAndRegisterMenu(menu);
 
-        const workspace = globalStore.get(atoms.workspace);
+        const workspaceId = globalStore.get(atoms.workspaceId);
         let oid: string;
 
-        if (workspace != null) {
-            oid = workspace.oid;
+        if (workspaceId != null) {
+            oid = workspaceId;
         } else {
             oid = globalStore.get(atoms.builderId);
         }

frontend/app/store/global-atoms.ts

@@ -43,12 +43,16 @@ function initGlobalAtoms(initOpts: GlobalInitOptions) {
         console.log("failed to initialize zoomFactorAtom", e);
     }
 
-    const workspaceAtom: Atom<Workspace> = atom((get) => {
+    const workspaceIdAtom: Atom<string> = atom((get) => {
         const windowData = WOS.getObjectValue<WaveWindow>(WOS.makeORef("window", get(windowIdAtom)), get);
-        if (windowData == null) {
+        return windowData?.workspaceid ?? null;
+    });
+    const workspaceAtom: Atom<Workspace> = atom((get) => {
+        const workspaceId = get(workspaceIdAtom);
+        if (workspaceId == null) {
             return null;
         }
-        return WOS.getObjectValue(WOS.makeORef("workspace", windowData.workspaceid), get);
+        return WOS.getObjectValue(WOS.makeORef("workspace", workspaceId), get);
     });
     const fullConfigAtom = atom(null) as PrimitiveAtom<FullConfigType>;
     const waveaiModeConfigAtom = atom(null) as PrimitiveAtom<Record<string, AIModeConfigType>>;
@@ -123,6 +127,7 @@ function initGlobalAtoms(initOpts: GlobalInitOptions) {
         builderId: builderIdAtom,
         builderAppId: builderAppIdAtom,
         uiContext: uiContextAtom,
+        workspaceId: workspaceIdAtom,
         workspace: workspaceAtom,
         fullConfigAtom,
         waveaiModeConfigAtom,

frontend/app/store/keymodel.ts

@@ -129,11 +129,11 @@ function getStaticTabBlockCount(): number {
 }
 
 function simpleCloseStaticTab() {
-    const ws = globalStore.get(atoms.workspace);
+    const workspaceId = globalStore.get(atoms.workspaceId);
     const tabId = globalStore.get(atoms.staticTabId);
     const confirmClose = globalStore.get(getSettingsKeyAtom("tab:confirmclose")) ?? false;
     getApi()
-        .closeTab(ws.oid, tabId, confirmClose)
+        .closeTab(workspaceId, tabId, confirmClose)
         .then((didClose) => {
             if (didClose) {
                 deleteLayoutModelForTab(tabId);

frontend/app/workspace/widgets.tsx

@@ -30,7 +30,7 @@ export type WidgetsEnv = WaveEnvSubset<{
     };
     atoms: {
         fullConfigAtom: WaveEnv["atoms"]["fullConfigAtom"];
-        workspace: WaveEnv["atoms"]["workspace"];
+        workspaceId: WaveEnv["atoms"]["workspaceId"];
         hasCustomAIPresetsAtom: WaveEnv["atoms"]["hasCustomAIPresetsAtom"];
     };
     createBlock: WaveEnv["createBlock"];
@@ -348,7 +348,7 @@ SettingsFloatingWindow.displayName = "SettingsFloatingWindow";
 const Widgets = memo(() => {
     const env = useWaveEnv<WidgetsEnv>();
     const fullConfig = useAtomValue(env.atoms.fullConfigAtom);
-    const workspace = useAtomValue(env.atoms.workspace);
+    const workspaceId = useAtomValue(env.atoms.workspaceId);
     const hasCustomAIPresets = useAtomValue(env.atoms.hasCustomAIPresetsAtom);
     const [mode, setMode] = useState<"normal" | "compact" | "supercompact">("normal");
     const containerRef = useRef<HTMLDivElement>(null);
@@ -361,7 +361,7 @@ const Widgets = memo(() => {
             if (!hasCustomAIPresets && key === "defwidget@ai") {
                 return false;
             }
-            return shouldIncludeWidgetForWorkspace(widget, workspace?.oid);
+            return shouldIncludeWidgetForWorkspace(widget, workspaceId);
         })
     );
     const widgets = sortByDisplayOrder(filteredWidgets);

frontend/preview/mock/mockwaveenv.ts

@@ -88,9 +88,10 @@ function makeMockSettingsKeyAtom(
 }
 
 function makeMockGlobalAtoms(
-    settingsOverrides?: Partial<SettingsType>,
-    atomOverrides?: Partial<GlobalAtomsType>,
-    tabId?: string
+    settingsOverrides: Partial<SettingsType>,
+    atomOverrides: Partial<GlobalAtomsType>,
+    tabId: string,
+    getWaveObjectAtom: <T extends WaveObj>(oref: string) => PrimitiveAtom<T>
 ): GlobalAtomsType {
     let fullConfig = DefaultFullConfig;
     if (settingsOverrides) {
@@ -101,11 +102,20 @@ function makeMockGlobalAtoms(
     }
     const fullConfigAtom = atom(fullConfig) as PrimitiveAtom<FullConfigType>;
     const settingsAtom = atom((get) => get(fullConfigAtom)?.settings ?? {}) as Atom<SettingsType>;
+    const workspaceIdAtom: Atom<string> = atomOverrides?.workspaceId ?? (atom(null as string) as Atom<string>);
+    const workspaceAtom: Atom<Workspace> = atom((get) => {
+        const wsId = get(workspaceIdAtom);
+        if (wsId == null) {
+            return null;
+        }
+        return get(getWaveObjectAtom<Workspace>("workspace:" + wsId));
+    });
     const defaults: GlobalAtomsType = {
         builderId: atom(""),
         builderAppId: atom("") as any,
         uiContext: atom({ windowid: "", activetabid: tabId ?? "" } as UIContext),
-        workspace: atom(null as Workspace),
+        workspaceId: workspaceIdAtom,
+        workspace: workspaceAtom,
         fullConfigAtom,
         waveaiModeConfigAtom: atom({}) as any,
         settingsAtom,
@@ -125,7 +135,11 @@ function makeMockGlobalAtoms(
     if (!atomOverrides) {
         return defaults;
     }
-    return { ...defaults, ...atomOverrides };
+    const merged = { ...defaults, ...atomOverrides };
+    if (!atomOverrides.workspace) {
+        merged.workspace = workspaceAtom;
+    }
+    return merged;
 }
 
 type MockWosFns = {
@@ -221,7 +235,14 @@ export function makeMockWaveEnv(mockEnv?: MockEnv): MockWaveEnv {
     const waveObjectDerivedAtomCache = new Map<string, Atom<any>>();
     const blockMetaKeyAtomCache = new Map<string, Atom<any>>();
     const connConfigKeyAtomCache = new Map<string, Atom<any>>();
-    const atoms = makeMockGlobalAtoms(overrides.settings, overrides.atoms, overrides.tabId);
+    const getWaveObjectAtom = <T extends WaveObj>(oref: string): PrimitiveAtom<T> => {
+        if (!waveObjectValueAtomCache.has(oref)) {
+            const obj = (overrides.mockWaveObjs?.[oref] ?? null) as T;
+            waveObjectValueAtomCache.set(oref, atom(obj) as PrimitiveAtom<T>);
+        }
+        return waveObjectValueAtomCache.get(oref) as PrimitiveAtom<T>;
+    };
+    const atoms = makeMockGlobalAtoms(overrides.settings, overrides.atoms, overrides.tabId, getWaveObjectAtom);
     const localHostDisplayNameAtom = atom<string>((get) => {
         const configValue = get(atoms.settingsAtom)?.["conn:localhostdisplayname"];
         if (configValue != null) {
@@ -230,13 +251,7 @@ export function makeMockWaveEnv(mockEnv?: MockEnv): MockWaveEnv {
         return "user@localhost";
     });
     const mockWosFns: MockWosFns = {
-        getWaveObjectAtom: <T extends WaveObj>(oref: string) => {
-            if (!waveObjectValueAtomCache.has(oref)) {
-                const obj = (overrides.mockWaveObjs?.[oref] ?? null) as T;
-                waveObjectValueAtomCache.set(oref, atom(obj) as PrimitiveAtom<T>);
-            }
-            return waveObjectValueAtomCache.get(oref) as PrimitiveAtom<T>;
-        },
+        getWaveObjectAtom,
         mockSetWaveObj: <T extends WaveObj>(oref: string, obj: T) => {
             if (!waveObjectValueAtomCache.has(oref)) {
                 waveObjectValueAtomCache.set(oref, atom(null as WaveObj));

frontend/preview/preview.tsx

@@ -95,6 +95,7 @@ function PreviewRoot() {
             atoms: {
                 uiContext: atom({ windowid: PreviewWindowId, activetabid: PreviewTabId } as UIContext),
                 staticTabId: atom(PreviewTabId),
+                workspaceId: atom(PreviewWorkspaceId),
             },
         })
     );
@@ -143,6 +144,7 @@ function PreviewApp() {
 
 const PreviewTabId = crypto.randomUUID();
 const PreviewWindowId = crypto.randomUUID();
+const PreviewWorkspaceId = crypto.randomUUID();
 const PreviewClientId = crypto.randomUUID();
 
 function initPreview() {

frontend/preview/previews/widgets.preview.tsx

@@ -7,7 +7,6 @@ import { atom, useAtom } from "jotai";
 import { useRef } from "react";
 import { applyMockEnvOverrides } from "../mock/mockwaveenv";
 
-const workspaceAtom = atom<Workspace>(null as Workspace);
 const resizableHeightAtom = atom(250);
 
 function makeMockApp(name: string, icon: string, iconcolor: string): AppInfo {
@@ -91,7 +90,6 @@ function makeWidgetsEnv(baseEnv: WaveEnv, isDev: boolean, hasCustomAIPresets: bo
         rpc: { ListAllAppsCommand: () => Promise.resolve(apps ?? []) },
         atoms: {
             fullConfigAtom,
-            workspace: workspaceAtom,
             hasCustomAIPresetsAtom: atom(hasCustomAIPresets),
         },
     });

frontend/types/custom.d.ts

@@ -11,7 +11,8 @@ declare global {
         builderId: jotai.Atom<string>; // readonly (for builder mode)
         builderAppId: jotai.PrimitiveAtom<string>; // app being edited in builder mode
         uiContext: jotai.Atom<UIContext>; // driven from windowId, tabId
-        workspace: jotai.Atom<Workspace>; // driven from WOS
+        workspaceId: jotai.Atom<string>; // derived from window WOS object
+        workspace: jotai.Atom<Workspace>; // driven from workspaceId via WOS
         fullConfigAtom: jotai.PrimitiveAtom<FullConfigType>; // driven from WOS, settings -- updated via WebSocket
         waveaiModeConfigAtom: jotai.PrimitiveAtom<Record<string, AIModeConfigType>>; // resolved AI mode configs -- updated via WebSocket
         settingsAtom: jotai.Atom<SettingsType>; // derrived from fullConfig