Fix play button on local backend (#7688)

If the user does not have sufficient permissions to open the project, the project no longer shows the play button. However, this does not work on the local backend because the local backend lacks permissions completely. # Important Notes None
enso-org · Aug 29, 2023 · b69fa51 · b69fa51
1 parent c558dec
commit b69fa51
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 17 deletions.
diff --git a/app/ide-desktop/lib/assets/arrow_up.svg b/app/ide-desktop/lib/assets/arrow_up.svg
diff --git a/...de-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx b/...de-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx
@@ -66,14 +66,17 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
         permission => permission.user.user_email === organization?.email
     )
     const managesThisAsset =
+        backend.type === backendModule.BackendType.local ||
         self?.permission === backendModule.PermissionAction.own ||
         self?.permission === backendModule.PermissionAction.admin
     const isRunningProject =
         asset.type === backendModule.AssetType.project &&
         backendModule.DOES_PROJECT_STATE_INDICATE_VM_EXISTS[asset.projectState.type]
     const canExecute =
-        self?.permission != null && backendModule.PERMISSION_ACTION_CAN_EXECUTE[self.permission]
+        backend.type === backendModule.BackendType.local ||
+        (self?.permission != null && backendModule.PERMISSION_ACTION_CAN_EXECUTE[self.permission])
     const isOtherUserUsingProject =
+        backend.type !== backendModule.BackendType.local &&
         backendModule.assetIsProject(asset) &&
         asset.projectState.opened_by != null &&
         asset.projectState.opened_by !== organization?.email
@@ -215,7 +218,7 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
                     />
                 )}
                 <ContextMenuSeparator hidden={hidden} />
-                {managesThisAsset && (
+                {managesThisAsset && self != null && (
                     <MenuEntry
                         hidden={hidden}
                         action={shortcuts.KeyboardAction.share}
@@ -237,15 +240,20 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
                         }}
                     />
                 )}
-                <MenuEntry
-                    hidden={hidden}
-                    disabled
-                    action={shortcuts.KeyboardAction.label}
-                    doAction={() => {
-                        // No backend support yet.
-                    }}
-                />
-                <ContextMenuSeparator hidden={hidden} />
+                {backend.type !== backendModule.BackendType.local && (
+                    <MenuEntry
+                        hidden={hidden}
+                        disabled
+                        action={shortcuts.KeyboardAction.label}
+                        doAction={() => {
+                            // No backend support yet.
+                        }}
+                    />
+                )}
+                {((managesThisAsset && self != null) ||
+                    backend.type !== backendModule.BackendType.local) && (
+                    <ContextMenuSeparator hidden={hidden} />
+                )}
                 <MenuEntry
                     hidden={hidden}
                     disabled

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectIcon.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectIcon.tsx
@@ -2,6 +2,7 @@
 import * as React from 'react'
 import * as toast from 'react-toastify'
 
+import ArrowUpIcon from 'enso-assets/arrow_up.svg'
 import PlayIcon from 'enso-assets/play.svg'
 import StopIcon from 'enso-assets/stop.svg'
 
@@ -119,7 +120,9 @@ export default function ProjectIcon(props: ProjectIconProps) {
         React.useState<AbortController | null>(null)
     const [closeProjectAbortController, setCloseProjectAbortController] =
         React.useState<AbortController | null>(null)
-    const isOtherUserUsingProject = item.projectState.opened_by !== organization?.email
+    const isOtherUserUsingProject =
+        backend.type !== backendModule.BackendType.local &&
+        item.projectState.opened_by !== organization?.email
 
     const openProject = React.useCallback(async () => {
         closeProjectAbortController?.abort()
@@ -355,7 +358,7 @@ export default function ProjectIcon(props: ProjectIconProps) {
             )
         case backendModule.ProjectState.opened:
             return (
-                <>
+                <div>
                     <button
                         disabled={isOtherUserUsingProject}
                         {...(isOtherUserUsingProject
@@ -371,9 +374,21 @@ export default function ProjectIcon(props: ProjectIconProps) {
                         <div className="relative h-0">
                             <Spinner size={24} state={spinnerState} />
                         </div>
-                        <SvgMask src={StopIcon} />
+                        <SvgMask style={ICON_STYLE} src={StopIcon} />
                     </button>
-                </>
+                    {!isOtherUserUsingProject && (
+                        <button
+                            className="w-6 h-6"
+                            onClick={clickEvent => {
+                                clickEvent.stopPropagation()
+                                unsetModal()
+                                openIde(true)
+                            }}
+                        >
+                            <SvgMask style={ICON_STYLE} src={ArrowUpIcon} />
+                        </button>
+                    )}
+                </div>
             )
     }
 }
diff --git a/...e-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx b/...e-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
@@ -64,8 +64,9 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
         null
     const isRunning = backendModule.DOES_PROJECT_STATE_INDICATE_VM_EXISTS[asset.projectState.type]
     const canExecute =
-        ownPermission != null &&
-        backendModule.PERMISSION_ACTION_CAN_EXECUTE[ownPermission.permission]
+        backend.type === backendModule.BackendType.local ||
+        (ownPermission != null &&
+            backendModule.PERMISSION_ACTION_CAN_EXECUTE[ownPermission.permission])
     const isOtherUserUsingProject = asset.projectState.opened_by !== organization?.email
 
     const doRename = async (newName: string) => {