From 2b779ca1c4fe342e28e27b268bb565236f0619a6 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Sat, 23 Sep 2023 01:56:12 +1000
Subject: [PATCH 01/19] Fix table footer in firefox

---
 .../src/authentication/src/dashboard/components/assetsTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index 5794ce692210..d978d3dcd317 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -856,7 +856,7 @@ export default function AssetsTable(props: AssetsTableProps) {
                     AssetRowState,
                     backendModule.AssetId
                 >
-                    footer={<tfoot className="h-full"></tfoot>}
+                    footer={<tfoot className="h-full table-row"></tfoot>}
                     scrollContainerRef={scrollContainerRef}
                     headerRowRef={headerRowRef}
                     rowComponent={AssetRow}

From db72fa50a329af4262c9a543e51d845b434077a0 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Sat, 23 Sep 2023 02:19:56 +1000
Subject: [PATCH 02/19] Properly fix issue

---
 .../src/dashboard/components/assetsTable.tsx  |  1 -
 .../src/dashboard/components/table.tsx        | 35 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index d978d3dcd317..40191b4d8900 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -856,7 +856,6 @@ export default function AssetsTable(props: AssetsTableProps) {
                     AssetRowState,
                     backendModule.AssetId
                 >
-                    footer={<tfoot className="h-full table-row"></tfoot>}
                     scrollContainerRef={scrollContainerRef}
                     headerRowRef={headerRowRef}
                     rowComponent={AssetRow}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/table.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/table.tsx
index 2427c8e5d0ca..bf62393de851 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/table.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/table.tsx
@@ -50,7 +50,6 @@ interface InternalNoSelectedKeysProps {
 
 /** Props for a {@link Table}. */
 interface InternalTableProps<T, State = never, RowState = never, Key extends string = string> {
-    footer?: JSX.Element
     rowComponent?: (props: tableRow.TableRowProps<T, State, RowState, Key>) => JSX.Element | null
     scrollContainerRef?: React.RefObject<HTMLDivElement>
     headerRowRef?: React.RefObject<HTMLTableRowElement>
@@ -67,7 +66,7 @@ interface InternalTableProps<T, State = never, RowState = never, Key extends str
     className?: string
     onContextMenu: (
         selectedKeys: Set<Key>,
-        event: React.MouseEvent<HTMLTableElement>,
+        event: React.MouseEvent<HTMLDivElement>,
         setSelectedKeys: (items: Set<Key>) => void
     ) => void
 }
@@ -88,7 +87,6 @@ export default function Table<T, State = never, RowState = never, Key extends st
     props: TableProps<T, State, RowState, Key>
 ) {
     const {
-        footer,
         rowComponent: RowComponent = TableRow,
         scrollContainerRef,
         headerRowRef,
@@ -309,24 +307,25 @@ export default function Table<T, State = never, RowState = never, Key extends st
     )
 
     return (
-        <table
-            className="grow rounded-rows self-start table-fixed border-collapse"
+        <div
+            className="grow"
             onContextMenu={event => {
                 onContextMenu(selectedKeys, event, setSelectedKeys)
             }}
         >
-            <thead>{headerRow}</thead>
-            <tbody ref={bodyRef}>
-                {itemRows}
-                {placeholder && (
-                    <tr className="h-8 hidden first:table-row">
-                        <td colSpan={columns.length} className="bg-transparent">
-                            {placeholder}
-                        </td>
-                    </tr>
-                )}
-            </tbody>
-            {footer}
-        </table>
+            <table className="rounded-rows table-fixed border-collapse">
+                <thead>{headerRow}</thead>
+                <tbody ref={bodyRef}>
+                    {itemRows}
+                    {placeholder && (
+                        <tr className="h-8 hidden first:table-row">
+                            <td colSpan={columns.length} className="bg-transparent">
+                                {placeholder}
+                            </td>
+                        </tr>
+                    )}
+                </tbody>
+            </table>
+        </div>
     )
 }

From ed57194d6edac819661b21687edb8faf2995249f Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 08:18:13 +1000
Subject: [PATCH 03/19] Fix missing error when passing invalid
 `startup.project`

---
 .../src/dashboard/components/assetsTable.tsx  | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index 40191b4d8900..faab59ff723a 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -1,6 +1,5 @@
 /** @file Table displaying a list of projects. */
 import * as React from 'react'
-import * as toastify from 'react-toastify'
 
 import * as array from '../array'
 import * as assetEventModule from '../events/assetEvent'
@@ -22,7 +21,6 @@ import * as uniqueString from '../../uniqueString'
 
 import * as authProvider from '../../authentication/providers/auth'
 import * as backendProvider from '../../providers/backend'
-import * as loggerProvider from '../../providers/logger'
 import * as modalProvider from '../../providers/modal'
 
 import AssetRow from './assetRow'
@@ -189,11 +187,11 @@ export default function AssetsTable(props: AssetsTableProps) {
         isListingLocalDirectoryAndWillFail,
         isListingRemoteDirectoryAndWillFail,
     } = props
-    const logger = loggerProvider.useLogger()
     const { organization, user, accessToken } = authProvider.useNonPartialUserSession()
     const { backend } = backendProvider.useBackend()
     const { setModal } = modalProvider.useSetModal()
     const { localStorage } = localStorageProvider.useLocalStorage()
+    const toastAndLog = hooks.useToastAndLog()
     const [initialized, setInitialized] = React.useState(false)
     const [assetTree, setAssetTree] = React.useState<assetTreeNode.AssetTreeNode[]>([])
     const [isLoading, setIsLoading] = React.useState(true)
@@ -276,6 +274,7 @@ export default function AssetsTable(props: AssetsTableProps) {
 
     const overwriteAssets = React.useCallback(
         (newAssets: backendModule.AnyAsset[]) => {
+            setInitialized(true)
             setAssetTree(
                 newAssets.map(asset => ({
                     key: asset.id,
@@ -287,7 +286,8 @@ export default function AssetsTable(props: AssetsTableProps) {
             // The project name here might also be a string with project id, e.g. when opening
             // a project file from explorer on Windows.
             const isInitialProject = (asset: backendModule.AnyAsset) =>
-                asset.title === initialProjectName || asset.id === initialProjectName
+                asset.title === nameOfProjectToImmediatelyOpen ||
+                asset.id === nameOfProjectToImmediatelyOpen
             if (nameOfProjectToImmediatelyOpen != null) {
                 const projectToLoad = newAssets
                     .filter(backendModule.assetIsProject)
@@ -299,6 +299,8 @@ export default function AssetsTable(props: AssetsTableProps) {
                         shouldAutomaticallySwitchPage: true,
                         runInBackground: false,
                     })
+                } else {
+                    toastAndLog(`Could not find project '${nameOfProjectToImmediatelyOpen}'`)
                 }
                 setNameOfProjectToImmediatelyOpen(null)
             }
@@ -312,24 +314,12 @@ export default function AssetsTable(props: AssetsTableProps) {
                 }
                 return []
             })
-            if (!initialized) {
-                setInitialized(true)
-                if (initialProjectName != null) {
-                    if (!newAssets.some(isInitialProject)) {
-                        const errorMessage = `No project named '${initialProjectName}' was found.`
-                        toastify.toast.error(errorMessage)
-                        logger.error(`Error opening project on startup: ${errorMessage}`)
-                    }
-                }
-            }
         },
         [
-            initialized,
-            initialProjectName,
-            logger,
             nameOfProjectToImmediatelyOpen,
             /* should never change */ setNameOfProjectToImmediatelyOpen,
             /* should never change */ dispatchAssetEvent,
+            /* should never change */ toastAndLog,
         ]
     )
 
@@ -376,7 +366,6 @@ export default function AssetsTable(props: AssetsTableProps) {
     )
 
     React.useEffect(() => {
-        setInitialized(true)
         const savedExtraColumns = localStorage.get(localStorageModule.LocalStorageKey.extraColumns)
         if (savedExtraColumns != null) {
             setExtraColumns(new Set(savedExtraColumns))

From 110dc3d46d6b1235bb96dd21e9007926a9e62a59 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 08:31:28 +1000
Subject: [PATCH 04/19] Intercept "Enter" keypress when renaming projects;
 gracefully fail when `projectState` is missing

---
 .../components/directoryNameColumn.tsx        |  5 +++++
 .../components/projectNameColumn.tsx          | 21 ++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/directoryNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/directoryNameColumn.tsx
index af4cf5bd4a82..b29775799195 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/directoryNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/directoryNameColumn.tsx
@@ -132,6 +132,11 @@ export default function DirectoryNameColumn(props: DirectoryNameColumnProps) {
             onMouseLeave={() => {
                 setIsHovered(false)
             }}
+            onKeyDown={event => {
+                if (rowState.isEditingName && event.key === 'Enter') {
+                    event.stopPropagation()
+                }
+            }}
             onClick={event => {
                 if (
                     eventModule.isSingleClick(event) &&
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
index 7557fb98f273..46b75777dc08 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
@@ -63,15 +63,19 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
     const ownPermission =
         asset.permissions?.find(permission => permission.user.user_email === organization?.email) ??
         null
-    const isRunning = backendModule.DOES_PROJECT_STATE_INDICATE_VM_EXISTS[asset.projectState.type]
+    // This is a workaround for a temporary bad state in the backend causing the `projectState` key
+    // to be absent.
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    const projectState = asset.projectState ?? { type: backendModule.ProjectState.closed }
+    const isRunning = backendModule.DOES_PROJECT_STATE_INDICATE_VM_EXISTS[projectState.type]
     const canExecute =
         backend.type === backendModule.BackendType.local ||
         (ownPermission != null &&
             permissions.PERMISSION_ACTION_CAN_EXECUTE[ownPermission.permission])
     const isOtherUserUsingProject =
         backend.type !== backendModule.BackendType.local &&
-        asset.projectState.opened_by != null &&
-        asset.projectState.opened_by !== organization?.email
+        projectState.opened_by != null &&
+        projectState.opened_by !== organization?.email
 
     const doRename = async (newName: string) => {
         try {
@@ -122,7 +126,7 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
                             ...asset,
                             id: createdProject.projectId,
                             projectState: {
-                                ...asset.projectState,
+                                ...projectState,
                                 type: backendModule.ProjectState.placeholder,
                             },
                         })
@@ -224,6 +228,11 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
             className={`flex text-left items-center whitespace-nowrap rounded-l-full gap-1 px-1.5 py-1 min-w-max ${indent.indentClass(
                 item.depth
             )}`}
+            onKeyDown={event => {
+                if (rowState.isEditingName && event.key === 'Enter') {
+                    event.stopPropagation()
+                }
+            }}
             onClick={event => {
                 if (rowState.isEditingName || isOtherUserUsingProject) {
                     // The project should neither be edited nor opened in these cases.
@@ -260,7 +269,9 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
             ) : (
                 <ProjectIcon
                     keyProp={item.key}
-                    item={asset}
+                    // This is a workaround for a temporary bad state in the backend causing the
+                    // `projectState` key to be absent.
+                    item={{ ...asset, projectState }}
                     setItem={setAsset}
                     assetEvents={assetEvents}
                     doOpenManually={doOpenManually}

From fba8b13fc7370b4c8abe4a94ff56e67164cfe9c6 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 08:35:02 +1000
Subject: [PATCH 05/19] Intercept "Enter" keypress on other asset types just in
 case

---
 .../src/dashboard/components/fileNameColumn.tsx              | 5 +++++
 .../src/dashboard/components/secretNameColumn.tsx            | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/fileNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/fileNameColumn.tsx
index e2cb44f807ec..687e12491369 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/fileNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/fileNameColumn.tsx
@@ -105,6 +105,11 @@ export default function FileNameColumn(props: FileNameColumnProps) {
             className={`flex text-left items-center align-middle whitespace-nowrap rounded-l-full gap-1 px-1.5 py-1 min-w-max ${indent.indentClass(
                 item.depth
             )}`}
+            onKeyDown={event => {
+                if (rowState.isEditingName && event.key === 'Enter') {
+                    event.stopPropagation()
+                }
+            }}
             onClick={event => {
                 if (
                     eventModule.isSingleClick(event) &&
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/secretNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/secretNameColumn.tsx
index 2171ec518e93..027ae42f364b 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/secretNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/secretNameColumn.tsx
@@ -106,6 +106,11 @@ export default function SecretNameColumn(props: SecretNameColumnProps) {
             className={`flex text-left items-center whitespace-nowrap rounded-l-full gap-1 px-1.5 py-1 min-w-max ${indent.indentClass(
                 item.depth
             )}`}
+            onKeyDown={event => {
+                if (rowState.isEditingName && event.key === 'Enter') {
+                    event.stopPropagation()
+                }
+            }}
             onClick={event => {
                 if (
                     eventModule.isSingleClick(event) &&

From cecaac5d550c613603e576af5454cc88c37324f0 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 08:49:58 +1000
Subject: [PATCH 06/19] Avoid opening editor when `startup.project` is provided

---
 .../authentication/src/dashboard/components/dashboard.tsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index 6832ad706e6e..4e32ed669124 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -109,6 +109,7 @@ export default function Dashboard(props: DashboardProps) {
         let currentBackend = backend
         if (
             supportsLocalBackend &&
+            initialProjectName == null &&
             session.type !== authProvider.UserSessionType.offline &&
             localStorage.get(localStorageModule.LocalStorageKey.backendType) ===
                 backendModule.BackendType.local
@@ -122,7 +123,11 @@ export default function Dashboard(props: DashboardProps) {
         const savedProjectStartupInfo = localStorage.get(
             localStorageModule.LocalStorageKey.projectStartupInfo
         )
-        if (savedProjectStartupInfo != null) {
+        if (initialProjectName != null) {
+            if (page === pageSwitcher.Page.editor) {
+                setPage(pageSwitcher.Page.drive)
+            }
+        } else if (savedProjectStartupInfo != null) {
             if (savedProjectStartupInfo.backendType === backendModule.BackendType.remote) {
                 if (session.accessToken != null) {
                     if (

From 82347da26868ed424060a4e7a405faedbb68a0cb Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 21:05:50 +1000
Subject: [PATCH 07/19] Restore ability to upload from right clicking
 non-directory assets

---
 .../src/dashboard/assetTreeNode.ts            | 11 ++-
 .../dashboard/components/assetContextMenu.tsx | 22 +++--
 .../src/dashboard/components/assetsTable.tsx  | 92 ++++++++++++++++---
 3 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/assetTreeNode.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/assetTreeNode.ts
index c93b656b7bef..3806cc4f0dbc 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/assetTreeNode.ts
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/assetTreeNode.ts
@@ -9,11 +9,16 @@ import * as backendModule from './backend'
 
 /** A node in the drive's item tree. */
 export interface AssetTreeNode {
-    /** The original id of the asset (the placeholder id for new assets). This must never change. */
+    /** The id of the asset (or the placeholder id for new assets). This must never change. */
     key: backendModule.AssetId
     /** The actual asset. This MAY change if this is initially a placeholder item, but rows MAY
      * keep updated values within the row itself as well. */
     item: backendModule.AnyAsset
+    /** The id of the asset's parent directory (or the placeholder id for new assets).
+     * This must never change. */
+    directoryKey: backendModule.AssetId | null
+    /** The actual id of the asset's parent directory (or the placeholder id for new assets). */
+    directoryId: backendModule.DirectoryId | null
     /** This is `null` if the asset is not a directory asset, OR if it is a collapsed directory
      * asset. */
     children: AssetTreeNode[] | null
@@ -113,11 +118,15 @@ export function assetTreePreorderTraversal(
 /** Creates an {@link AssetTreeNode} from a {@link backendModule.AnyAsset}. */
 export function assetTreeNodeFromAsset(
     asset: backendModule.AnyAsset,
+    directoryKey: backendModule.AssetId | null,
+    directoryId: backendModule.DirectoryId | null,
     depth: number
 ): AssetTreeNode {
     return {
         key: asset.id,
         item: asset,
+        directoryKey,
+        directoryId,
         children: null,
         depth,
     }
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx
index c54f47534336..66c03329c8d5 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetContextMenu.tsx
@@ -311,16 +311,20 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
                     }}
                 />
             </ContextMenu>
-            {asset.type === backendModule.AssetType.directory ? (
-                <GlobalContextMenu
-                    hidden={hidden}
-                    // This is SAFE, as this only exists when the item is a directory.
+            <GlobalContextMenu
+                hidden={hidden}
+                directoryKey={
+                    // This is SAFE, as both branches are guaranteed to be `DirectoryId`s
                     // eslint-disable-next-line no-restricted-syntax
-                    directoryKey={item.key as backendModule.DirectoryId}
-                    directoryId={asset.id}
-                    dispatchAssetListEvent={dispatchAssetListEvent}
-                />
-            ) : null}
+                    (asset.type === backendModule.AssetType.directory
+                        ? item.key
+                        : item.directoryKey) as backendModule.DirectoryId
+                }
+                directoryId={
+                    asset.type === backendModule.AssetType.directory ? asset.id : item.directoryId
+                }
+                dispatchAssetListEvent={dispatchAssetListEvent}
+            />
         </ContextMenus>
     )
 }
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index faab59ff723a..39f1ec70562b 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -74,12 +74,16 @@ const DIRECTORY_NAME_DEFAULT_PREFIX = 'New_Folder_'
 function insertChildrenIntoAssetTreeNodeArray(
     nodes: assetTreeNode.AssetTreeNode[],
     children: backendModule.AnyAsset[],
+    directoryKey: backendModule.AssetId | null,
+    directoryId: backendModule.DirectoryId | null,
     depth: number
 ) {
     const typeOrder = children[0] != null ? backendModule.ASSET_TYPE_ORDER[children[0].type] : 0
     return array.splicedBefore(
         nodes.filter(node => node.item.type !== backendModule.AssetType.specialEmpty),
-        children.map(asset => assetTreeNode.assetTreeNodeFromAsset(asset, depth)),
+        children.map(asset =>
+            assetTreeNode.assetTreeNodeFromAsset(asset, directoryKey, directoryId, depth)
+        ),
         innerItem => backendModule.ASSET_TYPE_ORDER[innerItem.item.type] >= typeOrder
     )
 }
@@ -88,7 +92,9 @@ function insertChildrenIntoAssetTreeNodeArray(
  * The list of children MUST be all of one specific asset type. */
 function insertAssetTreeNodeChildren(
     item: assetTreeNode.AssetTreeNode,
-    children: backendModule.AnyAsset[]
+    children: backendModule.AnyAsset[],
+    directoryKey: backendModule.AssetId | null,
+    directoryId: backendModule.DirectoryId | null
 ): assetTreeNode.AssetTreeNode {
     const newDepth = item.depth + 1
     return {
@@ -98,6 +104,8 @@ function insertAssetTreeNodeChildren(
                 node => node.item.type !== backendModule.AssetType.specialEmpty
             ),
             children,
+            directoryKey,
+            directoryId,
             newDepth
         ),
     }
@@ -206,6 +214,10 @@ export default function AssetsTable(props: AssetsTableProps) {
     const [, setQueuedAssetEvents] = React.useState<assetEventModule.AssetEvent[]>([])
     const [nameOfProjectToImmediatelyOpen, setNameOfProjectToImmediatelyOpen] =
         React.useState(initialProjectName)
+    const rootDirectoryId = React.useMemo(
+        () => backend.rootDirectoryId(organization),
+        [backend, organization]
+    )
     const nodeMap = React.useMemo(
         () =>
             new Map(
@@ -279,6 +291,8 @@ export default function AssetsTable(props: AssetsTableProps) {
                 newAssets.map(asset => ({
                     key: asset.id,
                     item: asset,
+                    directoryKey: null,
+                    directoryId: null,
                     children: null,
                     depth: 0,
                 }))
@@ -444,6 +458,8 @@ export default function AssetsTable(props: AssetsTableProps) {
                                   children: [
                                       assetTreeNode.assetTreeNodeFromAsset(
                                           backendModule.createSpecialLoadingAsset(directoryId),
+                                          key,
+                                          directoryId,
                                           item.depth + 1
                                       ),
                                   ],
@@ -483,6 +499,8 @@ export default function AssetsTable(props: AssetsTableProps) {
                                         child =>
                                             assetTreeNode.assetTreeNodeFromAsset(
                                                 child,
+                                                key,
+                                                directoryId,
                                                 item.depth + 1
                                             )
                                     )
@@ -496,6 +514,8 @@ export default function AssetsTable(props: AssetsTableProps) {
                                             ? [
                                                   assetTreeNode.assetTreeNodeFromAsset(
                                                       specialEmptyAsset,
+                                                      key,
+                                                      directoryId,
                                                       item.depth + 1
                                                   ),
                                               ]
@@ -552,7 +572,7 @@ export default function AssetsTable(props: AssetsTableProps) {
                     id: backendModule.DirectoryId(uniqueString.uniqueString()),
                     title,
                     modifiedAt: dateTime.toRfc3339(new Date()),
-                    parentId: event.parentId ?? backend.rootDirectoryId(organization),
+                    parentId: event.parentId ?? rootDirectoryId,
                     permissions: permissions.tryGetSingletonOwnerPermission(organization, user),
                     projectState: null,
                     type: backendModule.AssetType.directory,
@@ -566,11 +586,22 @@ export default function AssetsTable(props: AssetsTableProps) {
                 }
                 setAssetTree(oldAssetTree =>
                     event.parentKey == null
-                        ? insertChildrenIntoAssetTreeNodeArray(oldAssetTree, [placeholderItem], 0)
+                        ? insertChildrenIntoAssetTreeNodeArray(
+                              oldAssetTree,
+                              [placeholderItem],
+                              event.parentKey,
+                              event.parentId,
+                              0
+                          )
                         : assetTreeNode.assetTreeMap(oldAssetTree, item =>
                               item.key !== event.parentKey
                                   ? item
-                                  : insertAssetTreeNodeChildren(item, [placeholderItem])
+                                  : insertAssetTreeNodeChildren(
+                                        item,
+                                        [placeholderItem],
+                                        event.parentKey,
+                                        event.parentId
+                                    )
                           )
                 )
                 dispatchAssetEvent({
@@ -586,7 +617,7 @@ export default function AssetsTable(props: AssetsTableProps) {
                     id: dummyId,
                     title: projectName,
                     modifiedAt: dateTime.toRfc3339(new Date()),
-                    parentId: event.parentId ?? backend.rootDirectoryId(organization),
+                    parentId: event.parentId ?? rootDirectoryId,
                     permissions: permissions.tryGetSingletonOwnerPermission(organization, user),
                     projectState: {
                         type: backendModule.ProjectState.placeholder,
@@ -606,11 +637,22 @@ export default function AssetsTable(props: AssetsTableProps) {
                 }
                 setAssetTree(oldAssetTree =>
                     event.parentKey == null
-                        ? insertChildrenIntoAssetTreeNodeArray(oldAssetTree, [placeholderItem], 0)
+                        ? insertChildrenIntoAssetTreeNodeArray(
+                              oldAssetTree,
+                              [placeholderItem],
+                              event.parentKey,
+                              event.parentId,
+                              0
+                          )
                         : assetTreeNode.assetTreeMap(oldAssetTree, item =>
                               item.key !== event.parentKey
                                   ? item
-                                  : insertAssetTreeNodeChildren(item, [placeholderItem])
+                                  : insertAssetTreeNodeChildren(
+                                        item,
+                                        [placeholderItem],
+                                        event.parentKey,
+                                        event.parentId
+                                    )
                           )
                 )
                 dispatchAssetEvent({
@@ -623,7 +665,7 @@ export default function AssetsTable(props: AssetsTableProps) {
             }
             case assetListEventModule.AssetListEventType.uploadFiles: {
                 const reversedFiles = Array.from(event.files).reverse()
-                const parentId = event.parentId ?? backend.rootDirectoryId(organization)
+                const parentId = event.parentId ?? rootDirectoryId
                 const placeholderFiles = reversedFiles.filter(backendModule.fileIsNotProject).map(
                     (file): backendModule.FileAsset => ({
                         type: backendModule.AssetType.file,
@@ -665,17 +707,28 @@ export default function AssetsTable(props: AssetsTableProps) {
                               insertChildrenIntoAssetTreeNodeArray(
                                   oldAssetTree,
                                   placeholderFiles,
+                                  event.parentKey,
+                                  event.parentId,
                                   0
                               ),
                               placeholderProjects,
+                              event.parentKey,
+                              event.parentId,
                               0
                           )
                         : assetTreeNode.assetTreeMap(oldAssetTree, item =>
                               item.key !== event.parentKey
                                   ? item
                                   : insertAssetTreeNodeChildren(
-                                        insertAssetTreeNodeChildren(item, placeholderFiles),
-                                        placeholderProjects
+                                        insertAssetTreeNodeChildren(
+                                            item,
+                                            placeholderFiles,
+                                            event.parentKey,
+                                            event.parentId
+                                        ),
+                                        placeholderProjects,
+                                        event.parentKey,
+                                        event.parentId
                                     )
                           )
                 )
@@ -698,7 +751,7 @@ export default function AssetsTable(props: AssetsTableProps) {
                     id: backendModule.SecretId(uniqueString.uniqueString()),
                     title: event.name,
                     modifiedAt: dateTime.toRfc3339(new Date()),
-                    parentId: event.parentId ?? backend.rootDirectoryId(organization),
+                    parentId: event.parentId ?? rootDirectoryId,
                     permissions: permissions.tryGetSingletonOwnerPermission(organization, user),
                     projectState: null,
                     type: backendModule.AssetType.secret,
@@ -712,11 +765,22 @@ export default function AssetsTable(props: AssetsTableProps) {
                 }
                 setAssetTree(oldAssetTree =>
                     event.parentKey == null
-                        ? insertChildrenIntoAssetTreeNodeArray(oldAssetTree, [placeholderItem], 0)
+                        ? insertChildrenIntoAssetTreeNodeArray(
+                              oldAssetTree,
+                              [placeholderItem],
+                              event.parentKey,
+                              event.parentId,
+                              0
+                          )
                         : assetTreeNode.assetTreeMap(oldAssetTree, item =>
                               item.key !== event.parentKey
                                   ? item
-                                  : insertAssetTreeNodeChildren(item, [placeholderItem])
+                                  : insertAssetTreeNodeChildren(
+                                        item,
+                                        [placeholderItem],
+                                        event.parentKey,
+                                        event.parentId
+                                    )
                           )
                 )
                 dispatchAssetEvent({

From 2b1c5a9b81b782674e1be26580853b413c14d15e Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 21:17:26 +1000
Subject: [PATCH 08/19] Fix search bar width

---
 .../src/dashboard/components/driveBar.tsx     |  4 +++-
 .../src/dashboard/components/topBar.tsx       |  2 +-
 .../lib/dashboard/src/tailwind.css            | 23 ++++++++++++-------
 .../lib/dashboard/tailwind.config.ts          |  1 +
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/driveBar.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/driveBar.tsx
index d4f56b47fb95..448421c0fdb8 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/driveBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/driveBar.tsx
@@ -65,7 +65,9 @@ export default function DriveBar(props: DriveBarProps) {
                         doCreateProject(null)
                     }}
                 >
-                    <span className="font-semibold leading-5 h-6 py-px">New Project</span>
+                    <span className="font-semibold whitespace-nowrap leading-5 h-6 py-px">
+                        New Project
+                    </span>
                 </button>
                 <div className="flex items-center text-black-a50 bg-frame rounded-full gap-3 h-8 px-3">
                     {backend.type !== backendModule.BackendType.local && (
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
index 7753555cb589..5e6c7cbcc8bf 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
@@ -85,7 +85,7 @@ export default function TopBar(props: TopBarProps) {
             <div className="grow" />
             {page !== pageSwitcher.Page.editor && (
                 <>
-                    <div className="search-bar absolute flex items-center text-primary bg-frame rounded-full -translate-x-1/2 gap-2.5 left-1/2 h-8 w-98.25 px-2">
+                    <div className="search-bar absolute flex items-center text-primary bg-frame rounded-full -translate-x-1/2 gap-2.5 left-1/2 h-8 w-98.25 min-w-31.5 px-2">
                         <label htmlFor="search">
                             <img src={FindIcon} className="opacity-80" />
                         </label>
diff --git a/app/ide-desktop/lib/dashboard/src/tailwind.css b/app/ide-desktop/lib/dashboard/src/tailwind.css
index 27aa0f0e67e3..b31309fd10c2 100644
--- a/app/ide-desktop/lib/dashboard/src/tailwind.css
+++ b/app/ide-desktop/lib/dashboard/src/tailwind.css
@@ -144,14 +144,6 @@ body {
       background-color: rgba(255, 255, 255, 0.4);
     }
 
-    .search-bar.search-bar {
-      @media screen and (max-width: 59rem) {
-        position: unset;
-        transform: unset;
-        left: unset;
-      }
-    }
-
     .whatsnew-span-2.whatsnew-span-2 {
       @media screen and (max-width: 40.5625rem) {
         grid-column: span 1 / span 1;
@@ -164,3 +156,18 @@ body {
     pointer-events: none;
   }
 }
+
+.enso-dashboard .search-bar.search-bar {
+  @media screen and (max-width: 59rem) {
+    position: unset;
+    transform: unset;
+  }
+
+  @media screen and (min-width: 74rem) {
+    width: 33vw;
+
+    > input::placeholder {
+      text-align: center;
+    }
+  }
+}
diff --git a/app/ide-desktop/lib/dashboard/tailwind.config.ts b/app/ide-desktop/lib/dashboard/tailwind.config.ts
index a5b5348f4619..aedd2b597169 100644
--- a/app/ide-desktop/lib/dashboard/tailwind.config.ts
+++ b/app/ide-desktop/lib/dashboard/tailwind.config.ts
@@ -106,6 +106,7 @@ export const theme = {
             '10lh': '10lh',
         },
         minWidth: {
+            '31.5': '7.875rem',
             '33.25': '8.3125rem',
             '40': '10rem',
             '61.25': '15.3125rem',

From 46a6761546f3ee1eb40851e27d4d082c01b95ba5 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 22:09:56 +1000
Subject: [PATCH 09/19] Fix z-index on dashboard icons; blur top right menu
 bars; restore missing space

---
 .../authentication/src/dashboard/components/assetInfoBar.tsx    | 2 +-
 .../authentication/src/dashboard/components/contextMenus.tsx    | 2 +-
 .../src/authentication/src/dashboard/components/drive.tsx       | 2 +-
 .../src/authentication/src/dashboard/components/topBar.tsx      | 2 +-
 .../src/authentication/src/dashboard/components/userBar.tsx     | 2 +-
 .../src/authentication/src/dashboard/components/userMenu.tsx    | 2 +-
 app/ide-desktop/lib/dashboard/tailwind.config.ts                | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetInfoBar.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetInfoBar.tsx
index 3d382808eda4..3e6d5e77ea5f 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetInfoBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetInfoBar.tsx
@@ -17,7 +17,7 @@ export interface AssetInfoBarProps {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export default function AssetInfoBar(_props: AssetInfoBarProps) {
     return (
-        <div className="flex items-center shrink-0 bg-frame rounded-full gap-3 h-8 px-2 cursor-default pointer-events-auto">
+        <div className="flex items-center shrink-0 bg-frame backdrop-blur-3xl rounded-full gap-3 h-8 px-2 cursor-default pointer-events-auto">
             <Button
                 active={false}
                 disabled
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
index 8da3bc05ba4e..c13b14541e4e 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
@@ -33,7 +33,7 @@ export default function ContextMenus(props: ContextMenusProps) {
         <>{children}</>
     ) : (
         <Modal
-            className="absolute overflow-hidden bg-dim w-full h-full z-10"
+            className="absolute overflow-hidden bg-dim w-full h-full z-1"
             onContextMenu={innerEvent => {
                 innerEvent.preventDefault()
             }}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/drive.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/drive.tsx
index c572471c4443..99eae4b441f2 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/drive.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/drive.tsx
@@ -141,7 +141,7 @@ export default function Drive(props: DriveProps) {
     ) : isListingLocalDirectoryAndWillFail ? (
         <div className={`grow grid place-items-center mx-2 ${hidden ? 'hidden' : ''}`}>
             <div className="text-base text-center">
-                Could not connect to the Project Manager. Please try restarting
+                Could not connect to the Project Manager. Please try restarting{' '}
                 {common.PRODUCT_NAME}, or manually launching the Project Manager.
             </div>
         </div>
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
index 5e6c7cbcc8bf..2f7bba45a01e 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/topBar.tsx
@@ -74,7 +74,7 @@ export default function TopBar(props: TopBarProps) {
 
     return (
         <div
-            className={`relative flex ml-4.75 mr-2.25 h-8 gap-6 z-1 ${
+            className={`relative flex ml-4.75 mr-2.25 h-8 gap-6 z-3 ${
                 page !== pageSwitcher.Page.home ? 'mt-2.25' : 'my-2.25'
             }`}
         >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userBar.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userBar.tsx
index c397760e2e01..389d9b04cdfc 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userBar.tsx
@@ -57,7 +57,7 @@ export default function UserBar(props: UserBarProps) {
         setProjectAsset != null &&
         self != null
     return (
-        <div className="flex shrink-0 items-center bg-frame rounded-full gap-3 h-8 pl-2 pr-0.75 cursor-default pointer-events-auto">
+        <div className="flex shrink-0 items-center bg-frame backdrop-blur-3xl rounded-full gap-3 h-8 pl-2 pr-0.75 cursor-default pointer-events-auto">
             <Button
                 active={isHelpChatOpen}
                 image={ChatIcon}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
index 4bbb55a26fe3..1d199eb9885d 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
@@ -38,7 +38,7 @@ export default function UserMenu(props: UserMenuProps) {
     const canChangePassword = username != null ? !/^Github_|^Google_/.test(username) : false
 
     return (
-        <Modal className="absolute overflow-hidden bg-dim w-full h-full z-10">
+        <Modal className="absolute overflow-hidden bg-dim w-full h-full z-1">
             <div
                 className="absolute flex flex-col bg-frame-selected backdrop-blur-3xl rounded-2xl gap-3 right-2.25 top-2.25 w-51.5 px-2 py-2.25"
                 onClick={event => {
diff --git a/app/ide-desktop/lib/dashboard/tailwind.config.ts b/app/ide-desktop/lib/dashboard/tailwind.config.ts
index aedd2b597169..b590692e550b 100644
--- a/app/ide-desktop/lib/dashboard/tailwind.config.ts
+++ b/app/ide-desktop/lib/dashboard/tailwind.config.ts
@@ -118,6 +118,7 @@ export const theme = {
         },
         zIndex: {
             '1': '1',
+            '3': '3',
         },
         backdropBlur: {
             xs: '2px',

From 7d972cb13919e2e7f5cda14037b771dac57291b0 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 22:31:07 +1000
Subject: [PATCH 10/19] Fix `ide watch`

---
 app/ide-desktop/lib/client/watch.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/ide-desktop/lib/client/watch.ts b/app/ide-desktop/lib/client/watch.ts
index eaa4a0754ed1..dcce5893e581 100644
--- a/app/ide-desktop/lib/client/watch.ts
+++ b/app/ide-desktop/lib/client/watch.ts
@@ -86,7 +86,6 @@ const ALL_BUNDLES_READY = new Promise<Watches>((resolve, reject) => {
             },
         })
         dashboardOpts.outdir = path.resolve(IDE_DIR_PATH, 'assets')
-        dashboardOpts.write = false
         const dashboardBuilder = await esbuild.context(dashboardOpts)
         const dashboard = await dashboardBuilder.rebuild()
         console.log('Result of dashboard bundling: ', dashboard)

From 5bd9ef0c8d67b5242d793472bb9851c689bf0424 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 26 Sep 2023 22:58:34 +1000
Subject: [PATCH 11/19] Fix backend not restoring back to local

---
 .../src/authentication/src/dashboard/components/dashboard.tsx   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index 4e32ed669124..c68e2fa7a102 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -109,8 +109,6 @@ export default function Dashboard(props: DashboardProps) {
         let currentBackend = backend
         if (
             supportsLocalBackend &&
-            initialProjectName == null &&
-            session.type !== authProvider.UserSessionType.offline &&
             localStorage.get(localStorageModule.LocalStorageKey.backendType) ===
                 backendModule.BackendType.local
         ) {

From 66bc2c3fc291dea70a63d4bfdc3a1247fdb3d38d Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Wed, 27 Sep 2023 00:01:07 +1000
Subject: [PATCH 12/19] Fix restoring local projects from `localStorage`

---
 .../src/authentication/providers/auth.tsx     |  2 +-
 .../src/authentication/src/components/app.tsx |  2 +-
 .../src/dashboard/components/assetsTable.tsx  |  4 ++++
 .../src/dashboard/components/dashboard.tsx    | 23 ++++++++++++++-----
 .../src/dashboard/localBackend.ts             | 15 +-----------
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/providers/auth.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/providers/auth.tsx
index c278920aabe6..9e18406bd6c6 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/providers/auth.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/providers/auth.tsx
@@ -201,7 +201,7 @@ export function AuthProvider(props: AuthProviderProps) {
         setInitialized(true)
         setUserSession(OFFLINE_USER_SESSION)
         if (supportsLocalBackend) {
-            setBackendWithoutSavingType(new localBackend.LocalBackend(projectManagerUrl, null))
+            setBackendWithoutSavingType(new localBackend.LocalBackend(projectManagerUrl))
         } else {
             // Provide dummy headers to avoid errors. This `Backend` will never be called as
             // the entire UI will be disabled.
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/components/app.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/components/app.tsx
index c2d21624ab5c..3db571e9fbff 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/components/app.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/components/app.tsx
@@ -203,7 +203,7 @@ function AppRouter(props: AppProps) {
     const userSession = authService.cognito.userSession.bind(authService.cognito)
     const registerAuthEventListener = authService.registerAuthEventListener
     const initialBackend: backend.Backend = isAuthenticationDisabled
-        ? new localBackend.LocalBackend(projectManagerUrl, null)
+        ? new localBackend.LocalBackend(projectManagerUrl)
         : // This is safe, because the backend is always set by the authentication flow.
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           null!
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index 39f1ec70562b..7be1ebf5cc5c 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -284,6 +284,10 @@ export default function AssetsTable(props: AssetsTableProps) {
         }
     }, [loadingProjectManagerDidFail, backend.type])
 
+    React.useEffect(() => {
+        setNameOfProjectToImmediatelyOpen(initialProjectName)
+    }, [initialProjectName])
+
     const overwriteAssets = React.useCallback(
         (newAssets: backendModule.AnyAsset[]) => {
             setInitialized(true)
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index c68e2fa7a102..1960db7deb4f 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -112,10 +112,7 @@ export default function Dashboard(props: DashboardProps) {
             localStorage.get(localStorageModule.LocalStorageKey.backendType) ===
                 backendModule.BackendType.local
         ) {
-            currentBackend = new localBackend.LocalBackend(
-                projectManagerUrl,
-                localStorage.get(localStorageModule.LocalStorageKey.projectStartupInfo) ?? null
-            )
+            currentBackend = new localBackend.LocalBackend(projectManagerUrl)
             setBackend(currentBackend)
         }
         const savedProjectStartupInfo = localStorage.get(
@@ -174,7 +171,21 @@ export default function Dashboard(props: DashboardProps) {
                     }
                 }
             } else {
-                setProjectStartupInfo(savedProjectStartupInfo)
+                if (currentBackend.type !== backendModule.BackendType.local) {
+                    currentBackend = new localBackend.LocalBackend(projectManagerUrl)
+                }
+                void (async () => {
+                    await currentBackend.openProject(
+                        savedProjectStartupInfo.projectAsset.id,
+                        null,
+                        savedProjectStartupInfo.projectAsset.title
+                    )
+                    const project = await currentBackend.getProjectDetails(
+                        savedProjectStartupInfo.projectAsset.id,
+                        savedProjectStartupInfo.projectAsset.title
+                    )
+                    setProjectStartupInfo({ ...savedProjectStartupInfo, project })
+                })()
             }
         }
         // This MUST only run when the component is mounted.
@@ -275,7 +286,7 @@ export default function Dashboard(props: DashboardProps) {
             if (newBackendType !== backend.type) {
                 switch (newBackendType) {
                     case backendModule.BackendType.local:
-                        setBackend(new localBackend.LocalBackend(projectManagerUrl, null))
+                        setBackend(new localBackend.LocalBackend(projectManagerUrl))
                         break
                     case backendModule.BackendType.remote: {
                         const headers = new Headers()
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
index 793c10cfe6ee..3126c57b5e87 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
@@ -30,22 +30,9 @@ export class LocalBackend extends backend.Backend {
     private readonly projectManager: projectManager.ProjectManager
 
     /** Create a {@link LocalBackend}. */
-    constructor(
-        projectManagerUrl: string | null,
-        projectStartupInfo: backend.ProjectStartupInfo | null
-    ) {
+    constructor(projectManagerUrl: string | null) {
         super()
         this.projectManager = projectManager.ProjectManager.default(projectManagerUrl)
-        if (projectStartupInfo?.backendType === backend.BackendType.local) {
-            LocalBackend.currentlyOpenProjects.set(projectStartupInfo.project.projectId, {
-                projectName: projectManager.ProjectName(projectStartupInfo.project.name),
-                // The values are not important; fill with dummy values.
-                engineVersion: projectStartupInfo.project.engineVersion?.value ?? '',
-                projectNamespace: '',
-                languageServerBinaryAddress: { host: '', port: 0 },
-                languageServerJsonAddress: { host: '', port: 0 },
-            })
-        }
         if (IS_DEV_MODE) {
             // @ts-expect-error This exists only for debugging purposes. It does not have types
             // because it MUST NOT be used in this codebase.

From 4f933335487de36c85a4f15b6c582afc73dc1fe8 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Wed, 27 Sep 2023 21:17:08 +1000
Subject: [PATCH 13/19] Add background for page switcher icons

---
 .../src/dashboard/components/pageSwitcher.tsx               | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/pageSwitcher.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/pageSwitcher.tsx
index efb1e935c01b..ac21b5004dae 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/pageSwitcher.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/pageSwitcher.tsx
@@ -48,7 +48,11 @@ export interface PageSwitcherProps {
 export default function PageSwitcher(props: PageSwitcherProps) {
     const { page, setPage, isEditorDisabled } = props
     return (
-        <div className="flex items-center shrink-0 gap-4">
+        <div
+            className={`flex items-center rounded-full shrink-0 gap-4 ${
+                page === Page.editor ? 'bg-frame backdrop-blur-3xl px-3 -mx-3' : ''
+            }`}
+        >
             {PAGE_DATA.map(pageData => {
                 const isDisabled =
                     pageData.page === page || (pageData.page === Page.editor && isEditorDisabled)

From 2e73c2a0faad1b70074fd493f8a4897fbd4e6edc Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Wed, 27 Sep 2023 21:32:21 +1000
Subject: [PATCH 14/19] Use a different method to restore local project

---
 .../src/dashboard/components/dashboard.tsx    | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index 1960db7deb4f..08794c949a36 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -44,7 +44,12 @@ export interface DashboardProps {
 
 /** The component that contains the entire UI. */
 export default function Dashboard(props: DashboardProps) {
-    const { supportsLocalBackend, appRunner, initialProjectName, projectManagerUrl } = props
+    const {
+        supportsLocalBackend,
+        appRunner,
+        initialProjectName: rawInitialProjectName,
+        projectManagerUrl,
+    } = props
     const logger = loggerProvider.useLogger()
     const session = authProvider.useNonPartialUserSession()
     const { backend } = backendProvider.useBackend()
@@ -72,6 +77,8 @@ export default function Dashboard(props: DashboardProps) {
         hooks.useEvent<assetListEventModule.AssetListEvent>()
     const [assetEvents, dispatchAssetEvent] = hooks.useEvent<assetEventModule.AssetEvent>()
     const modalRef = React.useRef<modalProvider.Modal | null>(null)
+    // This MUST be a ref so that its value can be changed on the first tick.
+    const initialProjectNameRef = React.useRef(rawInitialProjectName)
 
     const isListingLocalDirectoryAndWillFail =
         backend.type === backendModule.BackendType.local && loadingProjectManagerDidFail
@@ -118,7 +125,7 @@ export default function Dashboard(props: DashboardProps) {
         const savedProjectStartupInfo = localStorage.get(
             localStorageModule.LocalStorageKey.projectStartupInfo
         )
-        if (initialProjectName != null) {
+        if (rawInitialProjectName != null) {
             if (page === pageSwitcher.Page.editor) {
                 setPage(pageSwitcher.Page.drive)
             }
@@ -171,21 +178,7 @@ export default function Dashboard(props: DashboardProps) {
                     }
                 }
             } else {
-                if (currentBackend.type !== backendModule.BackendType.local) {
-                    currentBackend = new localBackend.LocalBackend(projectManagerUrl)
-                }
-                void (async () => {
-                    await currentBackend.openProject(
-                        savedProjectStartupInfo.projectAsset.id,
-                        null,
-                        savedProjectStartupInfo.projectAsset.title
-                    )
-                    const project = await currentBackend.getProjectDetails(
-                        savedProjectStartupInfo.projectAsset.id,
-                        savedProjectStartupInfo.projectAsset.title
-                    )
-                    setProjectStartupInfo({ ...savedProjectStartupInfo, project })
-                })()
+                initialProjectNameRef.current = savedProjectStartupInfo.projectAsset.id
             }
         }
         // This MUST only run when the component is mounted.
@@ -395,7 +388,7 @@ export default function Dashboard(props: DashboardProps) {
                 <Drive
                     hidden={page !== pageSwitcher.Page.drive}
                     page={page}
-                    initialProjectName={initialProjectName}
+                    initialProjectName={initialProjectNameRef.current}
                     query={query}
                     projectStartupInfo={projectStartupInfo}
                     queuedAssetEvents={queuedAssetEvents}

From 73697dccdbefde74651c556f8392e2b8fb58f061 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Thu, 28 Sep 2023 22:29:47 +1000
Subject: [PATCH 15/19] Fix modal z-index

---
 .../authentication/src/dashboard/components/contextMenus.tsx | 2 +-
 .../src/dashboard/components/managePermissionsModal.tsx      | 2 +-
 .../src/authentication/src/dashboard/components/modal.tsx    | 5 ++---
 .../src/dashboard/components/permissionSelector.tsx          | 2 +-
 .../src/authentication/src/dashboard/components/userMenu.tsx | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
index c13b14541e4e..254eb4e96589 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/contextMenus.tsx
@@ -33,7 +33,7 @@ export default function ContextMenus(props: ContextMenusProps) {
         <>{children}</>
     ) : (
         <Modal
-            className="absolute overflow-hidden bg-dim w-full h-full z-1"
+            className="absolute overflow-hidden bg-dim w-full h-full"
             onContextMenu={innerEvent => {
                 innerEvent.preventDefault()
             }}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/managePermissionsModal.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/managePermissionsModal.tsx
index 8826e8c3e5cc..ff1593ec7068 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/managePermissionsModal.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/managePermissionsModal.tsx
@@ -235,7 +235,7 @@ export default function ManagePermissionsModal<
         return (
             <Modal
                 centered={eventTarget == null}
-                className="absolute overflow-hidden bg-dim w-full h-full top-0 left-0 z-1"
+                className="absolute overflow-hidden bg-dim w-full h-full top-0 left-0"
             >
                 <div
                     tabIndex={-1}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/modal.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/modal.tsx
index 980401b496f0..26a6464513df 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/modal.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/modal.tsx
@@ -28,9 +28,8 @@ export default function Modal(props: ModalProps) {
     return (
         <div
             style={style}
-            // This MUST still be z-10, unlike all other elements, because it MUST show above the
-            // IDE.
-            className={`inset-0 z-10 ${
+            // This MUST be z-3, unlike all other elements, because it MUST show above the IDE.
+            className={`inset-0 z-3 ${
                 centered ? 'fixed w-screen h-screen grid place-items-center' : ''
             } ${className ?? ''}`}
             onClick={
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/permissionSelector.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/permissionSelector.tsx
index c0c39ae0c40f..5448bc1e3918 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/permissionSelector.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/permissionSelector.tsx
@@ -94,7 +94,7 @@ export default function PermissionSelector(props: PermissionSelectorProps) {
                 : function Child() {
                       return (
                           <Modal
-                              className="fixed w-full h-full z-1"
+                              className="fixed w-full h-full"
                               onClick={() => {
                                   setTheChild(null)
                               }}
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
index 1d199eb9885d..34fa6d7c8141 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/userMenu.tsx
@@ -38,7 +38,7 @@ export default function UserMenu(props: UserMenuProps) {
     const canChangePassword = username != null ? !/^Github_|^Google_/.test(username) : false
 
     return (
-        <Modal className="absolute overflow-hidden bg-dim w-full h-full z-1">
+        <Modal className="absolute overflow-hidden bg-dim w-full h-full">
             <div
                 className="absolute flex flex-col bg-frame-selected backdrop-blur-3xl rounded-2xl gap-3 right-2.25 top-2.25 w-51.5 px-2 py-2.25"
                 onClick={event => {

From 52a62da3bb7f0d82828eaeee78e50955b5eb670e Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Thu, 28 Sep 2023 22:38:04 +1000
Subject: [PATCH 16/19] Remove responsive text size

---
 .../components/forgotPassword.tsx             | 13 ++++---------
 .../src/authentication/components/input.tsx   |  2 +-
 .../src/authentication/components/login.tsx   | 17 ++++++-----------
 .../components/registration.tsx               | 15 ++++++---------
 .../components/resetPassword.tsx              | 19 +++++++------------
 .../authentication/components/setUsername.tsx |  4 ++--
 .../components/changePasswordModal.tsx        |  4 ++--
 .../components/projectNameColumn.tsx          |  2 +-
 8 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/forgotPassword.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/forgotPassword.tsx
index 81f695e1e5b0..9241944eb6fb 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/forgotPassword.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/forgotPassword.tsx
@@ -26,13 +26,8 @@ export default function ForgotPassword() {
 
     return (
         <div className="min-h-screen flex flex-col items-center justify-center">
-            <div
-                className={
-                    'flex flex-col bg-white shadow-md px-4 sm:px-6 md:px-8 lg:px-10 py-8 rounded-md w-full ' +
-                    'max-w-md'
-                }
-            >
-                <div className="font-medium self-center text-xl sm:text-2xl uppercase text-gray-800">
+            <div className="flex flex-col bg-white shadow-md p-8 rounded-md w-full max-w-md">
+                <div className="font-medium self-center text-xl uppercase text-gray-800">
                     Forgot Your Password?
                 </div>
                 <div className="mt-10">
@@ -45,7 +40,7 @@ export default function ForgotPassword() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="email"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 E-Mail Address:
                             </label>
@@ -69,7 +64,7 @@ export default function ForgotPassword() {
                                 type="submit"
                                 className={
                                     'flex items-center justify-center focus:outline-none text-white text-sm ' +
-                                    'sm:text-base bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
+                                    'bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
                                     'duration-150 ease-in'
                                 }
                             >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/input.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/input.tsx
index 502c1c95cf15..56cf3eeb6761 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/input.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/input.tsx
@@ -95,7 +95,7 @@ export default function Input(props: InputProps) {
                       }
                     : onBlur
             }
-            className="text-sm sm:text-base placeholder-gray-500 pl-10 pr-4 rounded-lg border border-gray-400 w-full py-2 focus:outline-none focus:border-blue-400"
+            className="text-sm placeholder-gray-500 pl-10 pr-4 rounded-lg border border-gray-400 w-full py-2 focus:outline-none focus:border-blue-400"
         />
     )
 }
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/login.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/login.tsx
index dfc7d5f7c2cd..20a08d8cb859 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/login.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/login.tsx
@@ -44,13 +44,8 @@ export default function Login() {
 
     return (
         <div className="min-h-screen flex flex-col items-center justify-center">
-            <div
-                className={
-                    'flex flex-col bg-white shadow-md px-4 sm:px-6 md:px-8 lg:px-10 py-8 rounded-md ' +
-                    'w-full max-w-md'
-                }
-            >
-                <div className="font-medium self-center text-xl sm:text-2xl uppercase text-gray-800">
+            <div className="flex flex-col bg-white shadow-md p-8 rounded-md w-full max-w-md">
+                <div className="font-medium self-center text-xl uppercase text-gray-800">
                     Login To Your Account
                 </div>
                 <button
@@ -99,7 +94,7 @@ export default function Login() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="email"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 E-Mail Address:
                             </label>
@@ -124,7 +119,7 @@ export default function Login() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="password"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 Password:
                             </label>
@@ -152,7 +147,7 @@ export default function Login() {
                             <div className="flex ml-auto">
                                 <router.Link
                                     to={app.FORGOT_PASSWORD_PATH}
-                                    className="inline-flex text-xs sm:text-sm text-blue-500 hover:text-blue-700"
+                                    className="inline-flex text-xs text-blue-500 hover:text-blue-700"
                                 >
                                     Forgot Your Password?
                                 </router.Link>
@@ -164,7 +159,7 @@ export default function Login() {
                                 type="submit"
                                 className={
                                     'flex items-center justify-center focus:outline-none text-white ' +
-                                    'text-sm sm:text-base bg-blue-600 hover:bg-blue-700 rounded py-2 w-full ' +
+                                    'text-sm bg-blue-600 hover:bg-blue-700 rounded py-2 w-full ' +
                                     'transition duration-150 ease-in disabled:opacity-50'
                                 }
                             >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/registration.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/registration.tsx
index f8573f4dd097..4e1ccd4adb05 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/registration.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/registration.tsx
@@ -39,14 +39,14 @@ export default function Registration() {
     const { organizationId } = parseUrlSearchParams(location.search)
 
     return (
-        <div className="flex flex-col items-center justify-center min-h-screen px-4 py-8">
+        <div className="flex flex-col items-center justify-center min-h-screen p-8">
             <div
                 className={
                     'rounded-md bg-white w-full max-w-sm sm:max-w-md border border-gray-200 ' +
                     'shadow-md px-4 py-6 sm:p-8'
                 }
             >
-                <div className="font-medium self-center text-xl sm:text-2xl uppercase text-gray-800">
+                <div className="font-medium self-center text-xl uppercase text-gray-800">
                     Create new account
                 </div>
 
@@ -59,10 +59,7 @@ export default function Registration() {
                     }}
                 >
                     <div className="flex flex-col mb-4">
-                        <label
-                            htmlFor="email"
-                            className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
-                        >
+                        <label htmlFor="email" className="mb-1 text-xs tracking-wide text-gray-600">
                             E-Mail Address:
                         </label>
                         <div className="relative">
@@ -85,7 +82,7 @@ export default function Registration() {
                     <div className="flex flex-col mb-4">
                         <label
                             htmlFor="password"
-                            className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                            className="mb-1 text-xs tracking-wide text-gray-600"
                         >
                             Password:
                         </label>
@@ -111,7 +108,7 @@ export default function Registration() {
                     <div className="flex flex-col mb-4">
                         <label
                             htmlFor="password_confirmation"
-                            className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                            className="mb-1 text-xs tracking-wide text-gray-600"
                         >
                             Confirm Password:
                         </label>
@@ -140,7 +137,7 @@ export default function Registration() {
                             type="submit"
                             className={
                                 'flex items-center justify-center focus:outline-none text-white text-sm ' +
-                                'sm:text-base bg-indigo-600 hover:bg-indigo-700 rounded py-2 w-full transition ' +
+                                'bg-indigo-600 hover:bg-indigo-700 rounded py-2 w-full transition ' +
                                 'duration-150 ease-in disabled:opacity-50'
                             }
                         >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/resetPassword.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/resetPassword.tsx
index 14db678963fa..75609aeb3e31 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/resetPassword.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/resetPassword.tsx
@@ -54,13 +54,8 @@ export default function ResetPassword() {
 
     return (
         <div className="min-h-screen flex flex-col items-center justify-center">
-            <div
-                className={
-                    'flex flex-col bg-white shadow-md px-4 sm:px-6 md:px-8 lg:px-10 py-8 rounded-md w-full ' +
-                    'max-w-md'
-                }
-            >
-                <div className="font-medium self-center text-xl sm:text-2xl uppercase text-gray-800">
+            <div className={'flex flex-col bg-white shadow-md p-8 rounded-md w-full ' + 'max-w-md'}>
+                <div className="font-medium self-center text-xl uppercase text-gray-800">
                     Reset Your Password
                 </div>
                 <div className="mt-10">
@@ -73,7 +68,7 @@ export default function ResetPassword() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="email"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 E-Mail Address:
                             </label>
@@ -96,7 +91,7 @@ export default function ResetPassword() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="code"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 Confirmation Code:
                             </label>
@@ -119,7 +114,7 @@ export default function ResetPassword() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="new_password"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 New Password:
                             </label>
@@ -145,7 +140,7 @@ export default function ResetPassword() {
                         <div className="flex flex-col mb-6">
                             <label
                                 htmlFor="new_password_confirm"
-                                className="mb-1 text-xs sm:text-sm tracking-wide text-gray-600"
+                                className="mb-1 text-xs tracking-wide text-gray-600"
                             >
                                 Confirm New Password:
                             </label>
@@ -173,7 +168,7 @@ export default function ResetPassword() {
                                 type="submit"
                                 className={
                                     'flex items-center justify-center focus:outline-none text-white text-sm ' +
-                                    'sm:text-base bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
+                                    'bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
                                     'duration-150 ease-in'
                                 }
                             >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/setUsername.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/setUsername.tsx
index d55d7d273d3c..6de08c13b4c2 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/setUsername.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/authentication/components/setUsername.tsx
@@ -32,7 +32,7 @@ export default function SetUsername() {
                     'max-w-md'
                 }
             >
-                <div className="font-medium self-center text-xl sm:text-2xl uppercase text-gray-800">
+                <div className="font-medium self-center text-xl uppercase text-gray-800">
                     Set your username
                 </div>
                 <div className="mt-10">
@@ -64,7 +64,7 @@ export default function SetUsername() {
                                 type="submit"
                                 className={
                                     'flex items-center justify-center focus:outline-none text-white text-sm ' +
-                                    'sm:text-base bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
+                                    'bg-blue-600 hover:bg-blue-700 rounded py-2 w-full transition ' +
                                     'duration-150 ease-in'
                                 }
                             >
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/changePasswordModal.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/changePasswordModal.tsx
index 0d638cedbb4b..60471ed74edf 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/changePasswordModal.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/changePasswordModal.tsx
@@ -34,7 +34,7 @@ export default function ChangePasswordModal() {
                 onClick={event => {
                     event.stopPropagation()
                 }}
-                className="flex flex-col bg-frame-selected backdrop-blur-3xl rounded-2xl px-4 py-8 w-full max-w-md"
+                className="flex flex-col bg-frame-selected backdrop-blur-3xl rounded-2xl p-8 w-full max-w-md"
             >
                 <div className="self-center text-xl">Change Your Password</div>
                 <div className="mt-10">
@@ -69,7 +69,7 @@ export default function ChangePasswordModal() {
                                     error={validation.PASSWORD_ERROR}
                                     value={oldPassword}
                                     setValue={setOldPassword}
-                                    className="text-sm sm:text-base placeholder-gray-500 pl-10 pr-4 rounded-2xl w-full py-2 focus:outline-none focus:border-blue-400"
+                                    className="text-sm placeholder-gray-500 pl-10 pr-4 rounded-2xl w-full py-2 focus:outline-none focus:border-blue-400"
                                 />
                             </div>
                         </div>
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
index b2ef5c26630e..40df08070f7b 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/projectNameColumn.tsx
@@ -315,7 +315,7 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
                           inputTitle: validation.LOCAL_PROJECT_NAME_TITLE,
                       }
                     : {})}
-                className={`bg-transparent grow leading-170 h-6 px-2 py-px ${
+                className={`bg-transparent grow leading-170 h-6 py-px ${
                     rowState.isEditingName
                         ? 'cursor-text'
                         : canExecute && !isOtherUserUsingProject

From 16dd2160d9f0c17556121dcf84e464253965aabe Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Fri, 29 Sep 2023 19:23:41 +1000
Subject: [PATCH 17/19] Fix restoring local project when on cloud backend

---
 .../src/dashboard/components/dashboard.tsx    | 27 ++++++++++++++++---
 .../src/dashboard/localBackend.ts             | 11 ++++++--
 .../src/dashboard/remoteBackend.ts            |  2 +-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index 08794c949a36..a733b4836ac0 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -7,7 +7,7 @@ import * as assetListEventModule from '../events/assetListEvent'
 import * as backendModule from '../backend'
 import * as hooks from '../../hooks'
 import * as http from '../../http'
-import * as localBackend from '../localBackend'
+import * as localBackendModule from '../localBackend'
 import * as localStorageModule from '../localStorage'
 import * as projectManager from '../projectManager'
 import * as remoteBackendModule from '../remoteBackend'
@@ -119,7 +119,7 @@ export default function Dashboard(props: DashboardProps) {
             localStorage.get(localStorageModule.LocalStorageKey.backendType) ===
                 backendModule.BackendType.local
         ) {
-            currentBackend = new localBackend.LocalBackend(projectManagerUrl)
+            currentBackend = new localBackendModule.LocalBackend(projectManagerUrl)
             setBackend(currentBackend)
         }
         const savedProjectStartupInfo = localStorage.get(
@@ -178,7 +178,26 @@ export default function Dashboard(props: DashboardProps) {
                     }
                 }
             } else {
-                initialProjectNameRef.current = savedProjectStartupInfo.projectAsset.id
+                if (currentBackend.type === backendModule.BackendType.local) {
+                    initialProjectNameRef.current = savedProjectStartupInfo.projectAsset.id
+                } else {
+                    const localBackend = new localBackendModule.LocalBackend(projectManagerUrl)
+                    void (async () => {
+                        await localBackend.openProject(
+                            savedProjectStartupInfo.projectAsset.id,
+                            null,
+                            savedProjectStartupInfo.projectAsset.title
+                        )
+                        const project = await localBackend.getProjectDetails(
+                            savedProjectStartupInfo.projectAsset.id,
+                            savedProjectStartupInfo.projectAsset.title
+                        )
+                        setProjectStartupInfo({
+                            ...savedProjectStartupInfo,
+                            project,
+                        })
+                    })()
+                }
             }
         }
         // This MUST only run when the component is mounted.
@@ -279,7 +298,7 @@ export default function Dashboard(props: DashboardProps) {
             if (newBackendType !== backend.type) {
                 switch (newBackendType) {
                     case backendModule.BackendType.local:
-                        setBackend(new localBackend.LocalBackend(projectManagerUrl))
+                        setBackend(new localBackendModule.LocalBackend(projectManagerUrl))
                         break
                     case backendModule.BackendType.remote: {
                         const headers = new Headers()
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
index dc122ad38711..8ffb137ac3de 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/localBackend.ts
@@ -138,14 +138,21 @@ export class LocalBackend extends backend.Backend {
     /** Close the project identified by the given project ID.
      *
      * @throws An error if the JSON-RPC call fails. */
-    override async getProjectDetails(projectId: backend.ProjectId): Promise<backend.Project> {
+    override async getProjectDetails(
+        projectId: backend.ProjectId,
+        title: string | null
+    ): Promise<backend.Project> {
         const cachedProject = LocalBackend.currentlyOpenProjects.get(projectId)
         if (cachedProject == null) {
             const result = await this.projectManager.listProjects({})
             const project = result.projects.find(listedProject => listedProject.id === projectId)
             const engineVersion = project?.engineVersion
             if (project == null) {
-                throw new Error(`The project ID '${projectId}' is invalid.`)
+                throw new Error(
+                    `Could not get details of project ${
+                        title != null ? `'${title}'` : `with ID '${projectId}'`
+                    }.`
+                )
             } else if (engineVersion == null) {
                 throw new Error(`The project '${project.name}' does not have an engine version.`)
             } else {
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/remoteBackend.ts b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/remoteBackend.ts
index 536a58023bda..974f6c887fd1 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/remoteBackend.ts
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/remoteBackend.ts
@@ -765,7 +765,7 @@ export class RemoteBackend extends backendModule.Backend {
                 })
             )[0]?.number
             if (version == null) {
-                throw new Error(`No default ${versionType} version found.`)
+                return this.throw(`No default ${versionType} version found.`)
             } else {
                 const info: DefaultVersionInfo = {
                     version,

From f34861d7a88adc95574544de6610961777f933be Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Fri, 29 Sep 2023 20:11:17 +1000
Subject: [PATCH 18/19] Fix restoring local project on `ide build`

---
 .../src/dashboard/components/assetsTable.tsx  | 117 +++++++++++-------
 .../src/dashboard/components/dashboard.tsx    |   7 +-
 2 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
index 9df566b522d9..01b3a55bcdab 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/assetsTable.tsx
@@ -231,8 +231,7 @@ export default function AssetsTable(props: AssetsTableProps) {
     const scrollContainerRef = React.useRef<HTMLDivElement>(null)
     const headerRowRef = React.useRef<HTMLTableRowElement>(null)
     const [, setQueuedAssetEvents] = React.useState<assetEventModule.AssetEvent[]>([])
-    const [nameOfProjectToImmediatelyOpen, setNameOfProjectToImmediatelyOpen] =
-        React.useState(initialProjectName)
+    const [, setNameOfProjectToImmediatelyOpen] = React.useState(initialProjectName)
     const rootDirectoryId = React.useMemo(
         () => backend.rootDirectoryId(organization),
         [backend, organization]
@@ -304,56 +303,86 @@ export default function AssetsTable(props: AssetsTableProps) {
     }, [loadingProjectManagerDidFail, backend.type])
 
     React.useEffect(() => {
-        setNameOfProjectToImmediatelyOpen(initialProjectName)
-    }, [initialProjectName])
-
-    const overwriteAssets = React.useCallback(
-        (newAssets: backendModule.AnyAsset[]) => {
-            setInitialized(true)
-            setAssetTree(
-                newAssets.map(asset => ({
-                    key: asset.id,
-                    item: asset,
-                    directoryKey: null,
-                    directoryId: null,
-                    children: null,
-                    depth: 0,
-                }))
-            )
+        if (isLoading) {
+            setNameOfProjectToImmediatelyOpen(initialProjectName)
+        } else {
             // The project name here might also be a string with project id, e.g. when opening
             // a project file from explorer on Windows.
             const isInitialProject = (asset: backendModule.AnyAsset) =>
-                asset.title === nameOfProjectToImmediatelyOpen ||
-                asset.id === nameOfProjectToImmediatelyOpen
-            if (nameOfProjectToImmediatelyOpen != null) {
-                const projectToLoad = newAssets
-                    .filter(backendModule.assetIsProject)
-                    .find(isInitialProject)
-                if (projectToLoad != null) {
-                    dispatchAssetEvent({
-                        type: assetEventModule.AssetEventType.openProject,
-                        id: projectToLoad.id,
-                        shouldAutomaticallySwitchPage: true,
-                        runInBackground: false,
-                    })
-                } else {
-                    toastAndLog(`Could not find project '${nameOfProjectToImmediatelyOpen}'`)
-                }
-                setNameOfProjectToImmediatelyOpen(null)
+                asset.title === initialProjectName || asset.id === initialProjectName
+            const projectToLoad = assetTree
+                .map(node => node.item)
+                .filter(backendModule.assetIsProject)
+                .find(isInitialProject)
+            if (projectToLoad != null) {
+                dispatchAssetEvent({
+                    type: assetEventModule.AssetEventType.openProject,
+                    id: projectToLoad.id,
+                    shouldAutomaticallySwitchPage: true,
+                    runInBackground: false,
+                })
+            } else {
+                toastAndLog(`Could not find project '${initialProjectName}'`)
             }
-            setQueuedAssetEvents(oldQueuedAssetEvents => {
-                if (oldQueuedAssetEvents.length !== 0) {
-                    window.setTimeout(() => {
-                        for (const event of oldQueuedAssetEvents) {
-                            dispatchAssetEvent(event)
+        }
+        // This effect MUST only run when `initialProjectName` is changed.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [initialProjectName])
+
+    const overwriteAssets = React.useCallback(
+        (newAssets: backendModule.AnyAsset[]) => {
+            // This is required, otherwise we are using an outdated
+            // `nameOfProjectToImmediatelyOpen`.
+            setNameOfProjectToImmediatelyOpen(oldNameOfProjectToImmediatelyOpen => {
+                setTimeout(() => {
+                    setInitialized(true)
+                    setAssetTree(
+                        newAssets.map(asset => ({
+                            key: asset.id,
+                            item: asset,
+                            directoryKey: null,
+                            directoryId: null,
+                            children: null,
+                            depth: 0,
+                        }))
+                    )
+                    // The project name here might also be a string with project id, e.g.
+                    // when opening a project file from explorer on Windows.
+                    const isInitialProject = (asset: backendModule.AnyAsset) =>
+                        asset.title === oldNameOfProjectToImmediatelyOpen ||
+                        asset.id === oldNameOfProjectToImmediatelyOpen
+                    if (oldNameOfProjectToImmediatelyOpen != null) {
+                        const projectToLoad = newAssets
+                            .filter(backendModule.assetIsProject)
+                            .find(isInitialProject)
+                        if (projectToLoad != null) {
+                            dispatchAssetEvent({
+                                type: assetEventModule.AssetEventType.openProject,
+                                id: projectToLoad.id,
+                                shouldAutomaticallySwitchPage: true,
+                                runInBackground: false,
+                            })
+                        } else {
+                            toastAndLog(
+                                `Could not find project '${oldNameOfProjectToImmediatelyOpen}'`
+                            )
                         }
-                    }, 0)
-                }
-                return []
+                    }
+                    setQueuedAssetEvents(oldQueuedAssetEvents => {
+                        if (oldQueuedAssetEvents.length !== 0) {
+                            window.setTimeout(() => {
+                                for (const event of oldQueuedAssetEvents) {
+                                    dispatchAssetEvent(event)
+                                }
+                            }, 0)
+                        }
+                        return []
+                    })
+                }, 0)
+                return null
             })
         },
         [
-            nameOfProjectToImmediatelyOpen,
             /* should never change */ setNameOfProjectToImmediatelyOpen,
             /* should never change */ dispatchAssetEvent,
             /* should never change */ toastAndLog,
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
index a733b4836ac0..887f4bc48117 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
+++ b/app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/dashboard.tsx
@@ -77,8 +77,7 @@ export default function Dashboard(props: DashboardProps) {
         hooks.useEvent<assetListEventModule.AssetListEvent>()
     const [assetEvents, dispatchAssetEvent] = hooks.useEvent<assetEventModule.AssetEvent>()
     const modalRef = React.useRef<modalProvider.Modal | null>(null)
-    // This MUST be a ref so that its value can be changed on the first tick.
-    const initialProjectNameRef = React.useRef(rawInitialProjectName)
+    const [initialProjectName, setInitialProjectName] = React.useState(rawInitialProjectName)
 
     const isListingLocalDirectoryAndWillFail =
         backend.type === backendModule.BackendType.local && loadingProjectManagerDidFail
@@ -179,7 +178,7 @@ export default function Dashboard(props: DashboardProps) {
                 }
             } else {
                 if (currentBackend.type === backendModule.BackendType.local) {
-                    initialProjectNameRef.current = savedProjectStartupInfo.projectAsset.id
+                    setInitialProjectName(savedProjectStartupInfo.projectAsset.id)
                 } else {
                     const localBackend = new localBackendModule.LocalBackend(projectManagerUrl)
                     void (async () => {
@@ -407,7 +406,7 @@ export default function Dashboard(props: DashboardProps) {
                 <Drive
                     hidden={page !== pageSwitcher.Page.drive}
                     page={page}
-                    initialProjectName={initialProjectNameRef.current}
+                    initialProjectName={initialProjectName}
                     query={query}
                     projectStartupInfo={projectStartupInfo}
                     queuedAssetEvents={queuedAssetEvents}

From 9b9b4cdedb2b3d07eea7c06a16177c8bc9fd3bff Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Fri, 29 Sep 2023 22:33:03 +1000
Subject: [PATCH 19/19] Trigger CI