refactor

Author: syn-zhu

packages/compass-web/src/entrypoint.tsx

@@ -84,7 +84,9 @@ const WithAtlasProviders: React.FC = ({ children }) => {
 
 type CompassWorkspaceProps = Pick<
   React.ComponentProps<typeof WorkspacesPlugin>,
-  'initialWorkspaceTabs' | 'onActiveWorkspaceTabChange'
+  | 'initialWorkspaceTabs'
+  | 'onActiveWorkspaceTabChange'
+  | 'savedWorkspacesPromise'
 > &
   Pick<
     React.ComponentProps<typeof CompassSidebarPlugin>,
@@ -140,6 +142,13 @@ type CompassWebProps = {
    */
   initialPreferences?: Partial<AllPreferences>;
 
+  /**
+   * Optional promise that resolves with saved workspaces state from a
+   * previous session. If provided, compass-web will restore tabs from that
+   * state on first render.
+   */
+  savedWorkspacesPromise?: Promise<OpenWorkspaceOptions[] | null>;
+
   /**
    * Callback prop called every time any code inside Compass logs something
    */
@@ -173,6 +182,7 @@ function CompassWorkspace({
   initialWorkspaceTabs,
   onActiveWorkspaceTabChange,
   onOpenConnectViaModal,
+  savedWorkspacesPromise,
 }: CompassWorkspaceProps) {
   return (
     <WorkspacesProvider
@@ -203,10 +213,8 @@ function CompassWorkspace({
           data-testid="compass-web-connected"
           className={connectedContainerStyles}
         >
-          {/* TODO: only show this after user confirms the confirmation screen*/}
           <WorkspacesPlugin
-            //TODO:
-            // savedWorkspacesPromise={savedTabs}
+            savedWorkspacesPromise={savedWorkspacesPromise}
             initialWorkspaceTabs={initialWorkspaceTabs}
             openOnEmptyWorkspace={{ type: 'Welcome' }}
             onActiveWorkspaceTabChange={onActiveWorkspaceTabChange}
@@ -269,6 +277,7 @@ const CompassWeb = ({
   darkMode,
   initialAutoconnectId,
   initialWorkspace,
+  savedWorkspacesPromise,
   onActiveWorkspaceTabChange,
   initialPreferences,
   onLog,
@@ -425,6 +434,9 @@ const CompassWeb = ({
                                   initialWorkspaceTabs={
                                     initialWorkspaceTabsRef.current
                                   }
+                                  savedWorkspacesPromise={
+                                    savedWorkspacesPromise
+                                  }
                                   onActiveWorkspaceTabChange={
                                     onActiveWorkspaceTabChange
                                   }

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useSelector } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import {
   DrawerAnchor,
   ErrorBoundary,
@@ -124,10 +124,11 @@ const CompassWorkspaces: React.FunctionComponent<CompassWorkspacesProps> = ({
 
   const connectionActions = useConnectionActions();
   const { getConnectionById } = useConnectionsListRef();
+  const savedWorkspacesPromiseRef = useRef(savedWorkspacesPromise);
 
   useEffect(() => {
-    if (savedWorkspacesPromise) {
-      savedWorkspacesPromise.then(
+    if (savedWorkspacesPromiseRef.current) {
+      savedWorkspacesPromiseRef.current.then(
         (res) => {
           if (res !== null) {
             showConfirmation({
@@ -179,17 +180,19 @@ const CompassWorkspaces: React.FunctionComponent<CompassWorkspacesProps> = ({
           log.error(
             mongoLogId(1_001_000_361),
             'Workspaces',
-            'Failed to restore tabs from previous session',
+            'Failed to load saved workspaces from previous session',
             { error: err }
           );
         }
       );
     }
   }, [
-    savedWorkspacesPromise,
+    savedWorkspacesPromiseRef,
     onRestoreTabs,
     connectionActions,
     getConnectionById,
+    log,
+    mongoLogId,
   ]);
 
   const workspaceTabs = useMemo(() => {