ef

Author: syn-zhu

packages/compass-workspaces/README-state-persistence.md

@@ -86,30 +86,29 @@ 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;
-// }
+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) => {
+        setState({ data, error: null, loading: false });
+      })
+      .catch((error) => {
+        setState({ data: null, error, loading: false });
+      });
+  }, [promise]);
+
+  return state;
+}
 
 const WorkspacesWithSidebar: React.FunctionComponent<
   WorkspacesWithSidebarProps
@@ -120,6 +119,7 @@ const WorkspacesWithSidebar: React.FunctionComponent<
   onActiveWorkspaceTabChange,
   renderSidebar,
   renderModals,
+  savedWorkspacesPromise,
 }) => {
   console.log('Loadaweswsf');
   const darkMode = useDarkMode();
@@ -131,11 +131,16 @@ const WorkspacesWithSidebar: React.FunctionComponent<
 
   console.log('Loadawef');
 
-  // const { data: savedTabs, loading, error } = usePromise(savedWorkspacesPromise);
-  // if (loading) return <div>Loading...</div>;
-  // if (error) return <div>Error: {error.message}</div>;
+  const {
+    data: savedTabs,
+    loading,
+    error,
+  } = usePromise(savedWorkspacesPromise);
+  // TODO: test these
+  if (loading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
 
-  // console.log("Loaded saved tabs in workspace with sidebar", savedTabs);
+  console.log('Loaded saved tabs in workspace with sidebar', savedTabs);
 
   return (
     <WorkspacesServiceProvider>

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

@@ -16,7 +16,6 @@ import workspacesReducer, {
   connectionDisconnected,
   updateDatabaseInfo,
   updateCollectionInfo,
-  loadAndRestoreWorkspaceState,
 } from './stores/workspaces';
 import Workspaces from './components';
 import { applyMiddleware, createStore } from 'redux';
@@ -246,7 +245,6 @@ 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 {

packages/compass-workspaces/src/index.ts

@@ -9,7 +9,7 @@ import type {
   CollectionTabInfo,
 } from '@mongodb-js/compass-workspaces';
 
-import loadWorkspaceStateFromUserData from '@mongodb-js/compass-workspaces';
+import { loadWorkspaceStateFromUserData } from '@mongodb-js/compass-workspaces';
 
 import WorkspacesPlugin, {
   WorkspacesProvider,