enso-org · mergify · Mar 4, 2025 · Jan 20, 2025 · Mar 4, 2025 · Mar 4, 2025
@@ -8,7 +8,6 @@ import EditorPageActions from './EditorPageActions'
 import { goToPageActions, type GoToPageActions } from './goToPageActions'
 import NewDataLinkModalActions from './NewDataLinkModalActions'
 import PageActions from './PageActions'
-import StartModalActions from './StartModalActions'
 
 const ASSET_ROW_SAFE_POSITION = { x: 150, y: 16 }
 
@@ -368,20 +367,6 @@ export default class DrivePageActions<Context> extends PageActions<Context> {
     }
   }
 
-  /** Open the "start" modal. */
-  openStartModal() {
-    return this.step('Open "start" modal', (page) =>
-      page.getByText(TEXT.startWithATemplate).click(),
-    ).into(StartModalActions<Context>)
-  }
-
-  /** Expect the "start" modal to be visible. */
-  expectStartModal() {
-    return this.into(StartModalActions<Context>).withStartModal(async (startModal) => {
-      await expect(startModal).toBeVisible()
-    })
-  }
-
   /** Clear trash. */
   clearTrash() {
     return this.step('Clear trash', async (page) => {

@@ -17,7 +17,6 @@ import {
 import DrivePageActions from './DrivePageActions'
 import LATEST_GITHUB_RELEASES from './latestGithubReleases.json' with { type: 'json' }
 import LoginPageActions from './LoginPageActions'
-import StartModalActions from './StartModalActions'
 
 /** An example password that does not meet validation requirements. */
 export const INVALID_PASSWORD = 'password'
@@ -156,18 +155,15 @@ export function mockAll({ page, setupAPI }: MockParams) {
     })
 }
 
+export interface MockAllAndLoginParams extends MockParams {}
+
 /** Set up all mocks, and log in with dummy credentials. */
-export function mockAllAndLogin({ page, setupAPI }: MockParams) {
+export function mockAllAndLogin({ page, setupAPI }: MockAllAndLoginParams) {
   const actions = mockAll({ page, setupAPI })
+
   return actions
     .step('Login', (page) => login({ page }))
     .step('Wait for dashboard to load', waitForDashboardToLoad)
-    .step('Check if start modal is shown', async (page) => {
-      // @ts-expect-error This is the only place in which the private member `.context`
-      // should be accessed.
-      const context = actions.context
-      await new StartModalActions(page, context).close()
-    })
     .into(DrivePageActions<Context>)
 }
 

@@ -19,13 +19,6 @@ function locateAssetPanelDescription(page: Page) {
   return locateAssetPanel(page).getByTestId('asset-panel-description')
 }
 
-/** Find asset permissions in an asset panel. */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function locateAssetPanelPermissions(page: Page) {
-  // This has no identifying features.
-  return locateAssetPanel(page).getByTestId('asset-panel-permissions').getByRole('button')
-}
-
 /** An example description for the asset selected in the asset panel. */
 const DESCRIPTION = 'foo bar'
 /** An example owner username for the asset selected in the asset panel. */

@@ -24,8 +24,6 @@ test('create folder', ({ page }) =>
 test('create project', ({ page }) =>
   mockAllAndLogin({ page })
     .newEmptyProject()
-    // FIXME[sb]: https://github.com/enso-org/cloud-v2/issues/1615
-    // Uncomment once cloud execution in the browser is re-enabled.
     .waitForEditorToLoad()
     .goToPage.drive()
     .driveTable.withRows((rows) => expect(rows).toHaveCount(1)))

@@ -83,11 +83,6 @@ test('clear trash', ({ page }) =>
     .clearTrash()
     .driveTable.expectTrashPlaceholderRow()
     .goToCategory.cloud()
-    .expectStartModal()
-    .withStartModal(async (startModal) => {
-      await expect(startModal).toBeVisible()
-    })
-    .close()
     .driveTable.withRows(async (rows) => {
       await expect(rows).toHaveCount(0)
     }))
@@ -20,8 +20,6 @@ test.use({ storageState: { cookies: [], origins: [] } })
 test('login and logout', ({ page }) =>
   mockAll({ page })
     .login()
-    .expectStartModal()
-    .close()
     .withDriveView(async (driveView) => {
       await expect(driveView).toBeVisible()
     })

@@ -13,10 +13,12 @@ import * as textProvider from '#/providers/TextProvider'
 import * as ariaComponents from '#/components/AriaComponents'
 import * as result from '#/components/Result'
 
+import { Button, Text, type SvgUseIcon } from '#/components/AriaComponents'
 import { useEventCallback } from '#/hooks/eventCallbackHooks'
 import * as errorUtils from '#/utilities/error'
 import { OfflineError } from '#/utilities/HttpClient'
 import type { FallbackProps } from 'react-error-boundary'
+import { Icon } from './Icon'
 import SvgMask from './SvgMask'
 
 // =====================
@@ -201,4 +203,35 @@ export function ErrorDisplay(props: ErrorDisplayProps): React.JSX.Element {
   return <>{render ?? defaultRender}</>
 }
 
+/** Props for an {@link InlineErrorDisplay}. */
+export interface InlineErrorDisplayProps extends Omit<ErrorDisplayProps, 'status' | 'subtitle'> {}
+
+/** Displays an error inline. */
+export function InlineErrorDisplay(props: InlineErrorDisplayProps) {
+  const { error, resetErrorBoundary, onBeforeFallbackShown, title, resetQueries = () => {} } = props
+
+  const { getText } = textProvider.useText()
+
+  const render = onBeforeFallbackShown?.({ error, resetErrorBoundary, resetQueries })
+
+  const onReset = useEventCallback(() => {
+    resetErrorBoundary()
+  })
+
+  const finalTitle = title ?? getText('somethingWentWrong')
+  const finalIcon: SvgUseIcon = 'error'
+
+  const defaultRender = (
+    <div className="flex items-center gap-1">
+      <Icon icon={finalIcon} />
+      <Text>{finalTitle}</Text>
+      <Button variant="outline" size="xsmall" onPress={onReset} className="ml-3">
+        {getText('tryAgain')}
+      </Button>
+    </div>
+  )
+
+  return <>{render ?? defaultRender}</>
+}
+
 export { useErrorBoundary, withErrorBoundary } from 'react-error-boundary'
@@ -204,7 +204,6 @@ function DriveAssetsView(props: DriveAssetsViewProps) {
               query={query}
               setQuery={setQuery}
               category={category}
-              rootDirectoryId={rootDirectoryId}
             />
 
             {status === 'offline' ?