ef

Author: syn-zhu

packages/compass-web/src/entrypoint.tsx

@@ -204,6 +204,8 @@ function CompassWorkspace({
           className={connectedContainerStyles}
         >
           <WorkspacesPlugin
+            //TODO:
+            // savedWorkspacesPromise={savedTabs}
             initialWorkspaceTabs={initialWorkspaceTabs}
             openOnEmptyWorkspace={{ type: 'Welcome' }}
             onActiveWorkspaceTabChange={onActiveWorkspaceTabChange}

packages/compass-workspaces/src/components/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { css, cx, palette, useDarkMode } from '@mongodb-js/compass-components';
 import type { CollectionTabInfo } from '../stores/workspaces';
 import {
@@ -54,6 +54,8 @@ type WorkspacesWithSidebarProps = {
    * actions from service locator context
    */
   renderModals?: () => React.ReactElement | null;
+
+  savedWorkspacesPromise?: Promise<any>;
 };
 
 const containerLightThemeStyles = css({
@@ -84,6 +86,31 @@ const sidebarStyles = css({
   minHeight: 0,
 });
 
+// function usePromise(promise) {
+//   const [state, setState] = useState({
+//     data: null,
+//     error: null,
+//     loading: true
+//   });
+
+//   useEffect(() => {
+//     if (!promise) return;
+
+//     setState({ data: null, error: null, loading: true });
+
+//     promise
+//       .then(data => {
+//         // Only update if this is still the current promise
+//         setState({ data, error: null, loading: false });
+//       })
+//       .catch(error => {
+//         setState({ data: null, error, loading: false });
+//       });
+//   }, [promise]);
+
+//   return state;
+// }
+
 const WorkspacesWithSidebar: React.FunctionComponent<
   WorkspacesWithSidebarProps
 > = ({
@@ -94,12 +121,22 @@ const WorkspacesWithSidebar: React.FunctionComponent<
   renderSidebar,
   renderModals,
 }) => {
+  console.log('Loadaweswsf');
   const darkMode = useDarkMode();
   const onChange = useRef(onActiveWorkspaceTabChange);
   onChange.current = onActiveWorkspaceTabChange;
   useEffect(() => {
     onChange.current(activeTab, activeTabCollectionInfo);
   }, [activeTab, activeTabCollectionInfo]);
+
+  console.log('Loadawef');
+
+  // const { data: savedTabs, loading, error } = usePromise(savedWorkspacesPromise);
+  // if (loading) return <div>Loading...</div>;
+  // if (error) return <div>Error: {error.message}</div>;
+
+  // console.log("Loaded saved tabs in workspace with sidebar", savedTabs);
+
   return (
     <WorkspacesServiceProvider>
       <div

packages/compass-workspaces/src/index.ts

@@ -16,15 +16,12 @@ import workspacesReducer, {
   connectionDisconnected,
   updateDatabaseInfo,
   updateCollectionInfo,
+  loadAndRestoreWorkspaceState,
 } from './stores/workspaces';
 import Workspaces from './components';
 import { applyMiddleware, createStore } from 'redux';
 import thunk from 'redux-thunk';
-import {
-  workspacesStateChangeMiddleware,
-  loadWorkspaceStateFromUserData,
-  convertSavedStateToInitialTabs,
-} from './stores/workspaces-middleware';
+import { workspacesStateChangeMiddleware } from './stores/workspaces-middleware';
 import type { MongoDBInstance } from '@mongodb-js/compass-app-stores/provider';
 import { mongoDBInstancesManagerLocator } from '@mongodb-js/compass-app-stores/provider';
 import type Collection from 'mongodb-collection-model';
@@ -80,38 +77,6 @@ export function configureStore(
   return store;
 }
 
-/**
- * Configures the store with optional state restoration from UserData
- */
-export async function configureStoreWithStateRestoration(
-  initialWorkspaceTabs: OpenWorkspaceOptions[] | undefined | null,
-  services: WorkspacesServices,
-  restoreFromUserData = false
-) {
-  let tabsToUse = initialWorkspaceTabs;
-
-  // If restoration is enabled and no initial tabs provided, try to restore from UserData
-  if (
-    restoreFromUserData &&
-    (!initialWorkspaceTabs || initialWorkspaceTabs.length === 0)
-  ) {
-    try {
-      const savedState = await loadWorkspaceStateFromUserData();
-      if (savedState && savedState.tabs.length > 0) {
-        // Convert saved state back to initial tabs format
-        tabsToUse = convertSavedStateToInitialTabs(
-          savedState
-        ) as OpenWorkspaceOptions[];
-      }
-    } catch (error) {
-      services.logger?.debug('Workspace State Restoration', { error });
-      // Continue with original initialWorkspaceTabs (empty or provided)
-    }
-  }
-
-  return configureStore(tabsToUse, services);
-}
-
 export function activateWorkspacePlugin(
   {
     initialWorkspaceTabs,
@@ -281,6 +246,8 @@ const WorkspacesPlugin = registerCompassPlugin(
 
 export default WorkspacesPlugin;
 export { WorkspacesProvider } from './components/workspaces-provider';
+export { loadAndRestoreWorkspaceState } from './stores/workspaces';
+export { loadWorkspaceStateFromUserData } from './stores/workspaces-middleware';
 export type { OpenWorkspaceOptions, CollectionTabInfo };
 export type {
   WelcomeWorkspace,

packages/compass-workspaces/src/stores/workspaces-middleware.ts

@@ -25,6 +25,7 @@ export const workspacesStateChangeMiddleware: Middleware<
   Record<string, never>,
   WorkspacesState
 > = (store) => (next) => (action: AnyAction) => {
+  console.log('WOKRSPEF');
   const prevState = store.getState();
   const result = next(action);
   const nextState = store.getState();
@@ -153,6 +154,7 @@ export async function loadWorkspaceStateFromUserData(): Promise<WorkspacesStateD
     const savedState = await workspacesUserData.readOne('current-workspace', {
       ignoreErrors: true,
     });
+    console.log('Loaded saved state', savedState);
     return savedState || null;
   } catch (error) {
     // eslint-disable-next-line no-console

packages/compass/src/app/components/workspace.tsx

@@ -9,6 +9,8 @@ import type {
   CollectionTabInfo,
 } from '@mongodb-js/compass-workspaces';
 
+import loadWorkspaceStateFromUserData from '@mongodb-js/compass-workspaces';
+
 import WorkspacesPlugin, {
   WorkspacesProvider,
 } from '@mongodb-js/compass-workspaces';
@@ -115,6 +117,7 @@ export default function Workspace({
               <CompassAssistantDrawer />
             </>
           )}
+          savedWorkspacesPromise={loadWorkspaceStateFromUserData()}
         ></WorkspacesPlugin>
       </CollectionTabsProvider>
     </WorkspacesProvider>