Fix creating local projects (#10371)

- Fix enso-org/cloud-v2#1331 # Important Notes None
enso-org · Jun 25, 2024 · 2638ba8 · 2638ba8
1 parent f6c79e8
commit 2638ba8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 60 deletions.
diff --git a/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectIcon.tsx b/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectIcon.tsx
@@ -108,11 +108,10 @@ export default function ProjectIcon(props: ProjectIconProps) {
     [user, setItem]
   )
   const [spinnerState, setSpinnerState] = React.useState(spinner.SpinnerState.initial)
-  const [shouldOpenWhenReady, setShouldOpenWhenReady] = React.useState(false)
+  const shouldOpenWhenReadyRef = React.useRef(false)
   const [isRunningInBackground, setIsRunningInBackground] = React.useState(
     item.projectState.executeAsync ?? false
   )
-  const [shouldSwitchPage, setShouldSwitchPage] = React.useState(false)
   const doAbortOpeningRef = React.useRef(() => {})
   const doOpenEditorRef = React.useRef(doOpenEditor)
   doOpenEditorRef.current = doOpenEditor
@@ -131,36 +130,38 @@ export default function ProjectIcon(props: ProjectIconProps) {
   const getProjectDetailsMutate = getProjectDetailsMutation.mutateAsync
 
   const openEditorMutation = reactQuery.useMutation({
-    mutationKey: ['openEditor', item.id],
+    mutationKey: ['openEditor'],
     networkMode: 'always',
-    mutationFn: async () => {
+    mutationFn: async (item2: backendModule.ProjectAsset) => {
       const abortController = new AbortController()
       doAbortOpeningRef.current = () => {
         abortController.abort()
       }
-      const projectPromise = openProjectMutate([
-        item.id,
-        { executeAsync: false, parentId: item.parentId, cognitoCredentials: session },
-        item.title,
-      ]).then(() =>
-        waitUntilProjectIsReadyMutation.mutateAsync([
-          item.id,
-          item.parentId,
-          item.title,
-          abortController.signal,
+      const projectPromise = openProjectMutation
+        .mutateAsync([
+          item2.id,
+          { executeAsync: false, parentId: item2.parentId, cognitoCredentials: session },
+          item2.title,
         ])
-      )
+        .then(() =>
+          waitUntilProjectIsReadyMutation.mutateAsync([
+            item2.id,
+            item2.parentId,
+            item2.title,
+            abortController.signal,
+          ])
+        )
       setProjectStartupInfo({
         project: projectPromise,
-        projectAsset: item,
+        projectAsset: item2,
         setProjectAsset: setItem,
         backendType: backend.type,
         accessToken: session?.accessToken ?? null,
       })
       await projectPromise
       if (!abortController.signal.aborted) {
         setState(backendModule.ProjectState.opened)
-        if (shouldOpenWhenReady) {
+        if (shouldOpenWhenReadyRef.current) {
           doOpenEditor()
         }
       }
@@ -174,7 +175,7 @@ export default function ProjectIcon(props: ProjectIconProps) {
         try {
           if (!shouldRunInBackground) {
             setState(backendModule.ProjectState.openInProgress)
-            openEditorMutate()
+            openEditorMutate(item)
           } else {
             setState(backendModule.ProjectState.opened)
             await openProjectMutate([
@@ -225,14 +226,17 @@ export default function ProjectIcon(props: ProjectIconProps) {
       case AssetEventType.openProject: {
         if (event.id !== item.id) {
           if (!event.runInBackground && !isRunningInBackground) {
-            setShouldOpenWhenReady(false)
+            shouldOpenWhenReadyRef.current = false
             if (!isOtherUserUsingProject && backendModule.IS_OPENING_OR_OPENED[state]) {
               doAbortOpeningRef.current()
               void closeProject()
             }
           }
         } else {
-          if (backendModule.IS_OPENING_OR_OPENED[state]) {
+          if (
+            backendModule.IS_OPENING_OR_OPENED[state] &&
+            state !== backendModule.ProjectState.placeholder
+          ) {
             const projectPromise = waitUntilProjectIsReadyMutation.mutateAsync([
               item.id,
               item.parentId,
@@ -245,12 +249,11 @@ export default function ProjectIcon(props: ProjectIconProps) {
               backendType: backend.type,
               accessToken: session?.accessToken ?? null,
             })
-            if (!isRunningInBackground && event.shouldAutomaticallySwitchPage) {
+            if (!isRunningInBackground) {
               doOpenEditor()
             }
           } else {
-            setShouldOpenWhenReady(!event.runInBackground)
-            setShouldSwitchPage(event.shouldAutomaticallySwitchPage)
+            shouldOpenWhenReadyRef.current = !event.runInBackground
             setIsRunningInBackground(event.runInBackground)
             void openProject(event.runInBackground)
           }
@@ -259,7 +262,7 @@ export default function ProjectIcon(props: ProjectIconProps) {
       }
       case AssetEventType.closeProject: {
         if (event.id === item.id) {
-          setShouldOpenWhenReady(false)
+          shouldOpenWhenReadyRef.current = false
           void closeProject()
         }
         break
@@ -273,20 +276,11 @@ export default function ProjectIcon(props: ProjectIconProps) {
     }
   })
 
-  React.useEffect(() => {
-    if (state === backendModule.ProjectState.opened) {
-      if (shouldOpenWhenReady) {
-        doOpenEditorRef.current()
-        setShouldOpenWhenReady(false)
-      }
-    }
-  }, [shouldOpenWhenReady, shouldSwitchPage, state])
-
   const closeProject = async () => {
     if (!isRunningInBackground) {
       doCloseEditor(item.id)
     }
-    setShouldOpenWhenReady(false)
+    shouldOpenWhenReadyRef.current = false
     setState(backendModule.ProjectState.closing)
     await closeProjectMutation.mutateAsync([item.id, item.title])
     setState(backendModule.ProjectState.closed)
@@ -310,7 +304,6 @@ export default function ProjectIcon(props: ProjectIconProps) {
             dispatchAssetEvent({
               type: AssetEventType.openProject,
               id: item.id,
-              shouldAutomaticallySwitchPage: true,
               runInBackground: false,
             })
           }}

diff --git a/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx
@@ -178,7 +178,6 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
               dispatchAssetEvent({
                 type: AssetEventType.openProject,
                 id: createdProject.projectId,
-                shouldAutomaticallySwitchPage: true,
                 runInBackground: false,
               })
             } catch (error) {
@@ -302,7 +301,6 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
           dispatchAssetEvent({
             type: AssetEventType.openProject,
             id: asset.id,
-            shouldAutomaticallySwitchPage: true,
             runInBackground: false,
           })
         }

diff --git a/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts b/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts
@@ -96,7 +96,6 @@ export interface AssetNewSecretEvent extends AssetBaseEvent<AssetEventType.newSe
 /** A signal to open the specified project. */
 export interface AssetOpenProjectEvent extends AssetBaseEvent<AssetEventType.openProject> {
   readonly id: backend.ProjectId
-  readonly shouldAutomaticallySwitchPage: boolean
   readonly runInBackground: boolean
 }
 

diff --git a/app/ide-desktop/lib/dashboard/src/layouts/AssetContextMenu.tsx b/app/ide-desktop/lib/dashboard/src/layouts/AssetContextMenu.tsx
@@ -159,7 +159,6 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
                 dispatchAssetEvent({
                   type: AssetEventType.openProject,
                   id: asset.id,
-                  shouldAutomaticallySwitchPage: true,
                   runInBackground: false,
                 })
               }}
@@ -174,7 +173,6 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
               dispatchAssetEvent({
                 type: AssetEventType.openProject,
                 id: asset.id,
-                shouldAutomaticallySwitchPage: false,
                 runInBackground: true,
               })
             }}

diff --git a/app/ide-desktop/lib/dashboard/src/layouts/AssetsTable.tsx b/app/ide-desktop/lib/dashboard/src/layouts/AssetsTable.tsx
@@ -883,7 +883,6 @@ export default function AssetsTable(props: AssetsTableProps) {
           dispatchAssetEvent({
             type: AssetEventType.openProject,
             id: projectToLoad.id,
-            shouldAutomaticallySwitchPage: true,
             runInBackground: false,
           })
         })
@@ -964,7 +963,6 @@ export default function AssetsTable(props: AssetsTableProps) {
               dispatchAssetEvent({
                 type: AssetEventType.openProject,
                 id: projectToLoad.id,
-                shouldAutomaticallySwitchPage: true,
                 runInBackground: false,
               })
             })
@@ -1219,7 +1217,6 @@ export default function AssetsTable(props: AssetsTableProps) {
                   type: AssetEventType.openProject,
                   id: item.item.id,
                   runInBackground: false,
-                  shouldAutomaticallySwitchPage: true,
                 })
                 break
               }

diff --git a/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts b/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts
@@ -315,23 +315,21 @@ export default class LocalBackend extends Backend {
     title: string | null
   ): Promise<void> {
     const { id } = extractTypeAndId(projectId)
-    if (!this.projectManager.projects.has(id)) {
-      try {
-        await this.projectManager.openProject({
-          projectId: id,
-          missingComponentAction: projectManager.MissingComponentAction.install,
-          ...(body?.parentId != null
-            ? { projectsDirectory: extractTypeAndId(body.parentId).id }
-            : {}),
-        })
-        return
-      } catch (error) {
-        throw new Error(
-          `Could not open project ${title != null ? `'${title}'` : `with ID '${projectId}'`}: ${
-            errorModule.tryGetMessage(error) ?? 'unknown error'
-          }.`
-        )
-      }
+    try {
+      await this.projectManager.openProject({
+        projectId: id,
+        missingComponentAction: projectManager.MissingComponentAction.install,
+        ...(body?.parentId != null
+          ? { projectsDirectory: extractTypeAndId(body.parentId).id }
+          : {}),
+      })
+      return
+    } catch (error) {
+      throw new Error(
+        `Could not open project ${title != null ? `'${title}'` : `with ID '${projectId}'`}: ${
+          errorModule.tryGetMessage(error) ?? 'unknown error'
+        }.`
+      )
     }
   }