Merge branch 'develop' into wip/db/14142-ydoc-websocket

Author: 4e6

CHANGELOG.md

@@ -7,12 +7,14 @@
   Table.input components.
 - [Text widgets have a fixed maximum size in collapsed mode][14775]
 - [Fixed uploading corrupted projects to the cloud storage][14805]
+- [Drive is now a separate panel instead of tab.][14807]
 - [Fixed <kbd>Ctrl</kbd>-clicking enso:// links][14820]
 
 [14590]: https://github.com/enso-org/enso/pull/14590
 [14678]: https://github.com/enso-org/enso/pull/14678
 [14775]: https://github.com/enso-org/enso/pull/14775
 [14805]: https://github.com/enso-org/enso/pull/14805
+[14807]: https://github.com/enso-org/enso/pull/14807
 [14820]: https://github.com/enso-org/enso/pull/14820
 
 #### Enso Standard Library

app/common/src/utilities/uniqueString.ts

@@ -4,7 +4,7 @@
 let counter = Number(new Date()) >>> 2
 
 /** Returns a new, mostly unique string. */
-export function uniqueString(): string {
+export function uniqueString(minLength?: number): string {
   counter += 1
-  return counter.toString()
+  return counter.toString().padStart(minLength ?? 0, 'a')
 }

app/electron-client/playwright.config.ts

@@ -15,6 +15,6 @@ export default defineConfig({
   },
   use: {
     actionTimeout: 5000,
-    viewport: { width: 1380, height: 900 },
+    viewport: { width: 1780, height: 1000 },
   },
 })

app/electron-client/src/index.ts

@@ -48,8 +48,8 @@ import { getUrlToOpen, handleOpenUrl, registerAssociations } from './urlAssociat
 
 type Electron = typeof import('electron')
 
-const DEFAULT_WINDOW_WIDTH = 1380
-const DEFAULT_WINDOW_HEIGHT = 900
+const DEFAULT_WINDOW_WIDTH = 1780
+const DEFAULT_WINDOW_HEIGHT = 1000
 
 /** Convert path to proper `file://` URL. */
 function pathToURL(path: string): URL {

app/electron-client/tests/electronTest.ts

@@ -159,10 +159,6 @@ export async function closeWelcome(page: Page) {
  * @returns Locator for the newest project
  */
 export async function getNewestProject(page: Page): Promise<Locator> {
-  // Returning back to the data catalog
-  const dataCatalogTab = page.getByRole('tab', { name: 'Data Catalog' })
-  await dataCatalogTab.click()
-
   await expect(page.getByTestId('drive-view')).toBeVisible({ timeout: LOADING_TIMEOUT })
   const projectsLocator = page.getByTestId('drive-view').getByText(/New Project \d+/)
   await expect(projectsLocator).not.toHaveCount(0)

app/electron-client/tests/gettingStarted.spec.ts

@@ -284,7 +284,7 @@ test('Exercise 2', async ({ page }) => {
     await visualizeData(page)
 
     // Move cross_tab a bit down for more clearance
-    const crossTab = page.getByText('cross_tab')
+    const crossTab = page.getByText('cross_tab', { exact: true })
     await crossTab.dragTo(crossTab, { targetPosition: { x: 0, y: 200 }, force: true })
   })
 

app/electron-client/tests/localWorkflow.spec.ts

@@ -179,7 +179,6 @@ test('Local Workflow', async ({ page, app, projectsDir }) => {
   await expect(page.getByTitle('Project Name')).toHaveText('Test Project')
 
   // Check that the name is changed also in drive
-  await page.getByRole('tab', { name: 'Data Catalog' }).click()
   await expect(page.getByTestId('asset-row-name')).toHaveCount(2)
   await expect(page.getByTestId('asset-row-name')).toHaveText(['Samples', 'Test Project'])
 })

app/gui/integration-test/actions/DrivePageActions.ts

@@ -72,12 +72,6 @@ function locateCategoryButton(page: Page, category: string): Locator {
     .getByRole('button', { name: category, exact: true })
 }
 
-/** Find an asset panel. */
-function locateRightPanel(page: Page) {
-  // This has no identifying features.
-  return page.getByTestId('right-panel').locator('visible=true')
-}
-
 /** Actions for the "drive" page. */
 export default class DrivePageActions<Context = object> extends PageActions<Context> {
   /** Actions for navigating to another page. */
@@ -421,27 +415,6 @@ export default class DrivePageActions<Context = object> extends PageActions<Cont
     })
   }
 
-  /** Show the properties tab of the Asset Panel. */
-  togglePropertiesAssetPanel() {
-    return this.step('Toggle properties asset panel', async (page) => {
-      await page.getByRole('tab', { name: 'Properties' }).click()
-    })
-  }
-
-  /** Show the description tab of the Asset Panel. */
-  toggleDescriptionAssetPanel() {
-    return this.step('Toggle description asset panel', async (page) => {
-      await page.getByRole('tab', { name: 'Description' }).click()
-    })
-  }
-
-  /** Show the Docs tab of the Asset Panel. */
-  toggleDocsAssetPanel() {
-    return this.step('Toggle docs asset panel', async (page) => {
-      await page.getByRole('tab', { name: 'Documentation' }).click()
-    })
-  }
-
   /** Interact with the container element of the assets table. */
   withAssetsTable(
     callback: (input: Locator, context: Context, page: Page) => Promise<void> | void,
@@ -451,13 +424,6 @@ export default class DrivePageActions<Context = object> extends PageActions<Cont
     })
   }
 
-  /** Interact with the Asset Panel. */
-  withRightPanel(callback: LocatorCallback<Context>) {
-    return this.step('Interact with right panel', async (page, context) => {
-      await callback(locateRightPanel(page), context)
-    })
-  }
-
   /** Open the Data Link creation modal by clicking on the Data Link icon. */
   openDataLinkModal() {
     return this.step('Open "new data link" modal', (page) =>

app/gui/integration-test/actions/EditorPageActions.ts

@@ -229,7 +229,7 @@ export default class EditorPageActions<Context = object> extends PageActions<Con
       // TODO: Automatically find graph background region that is safe to click,
       // or somehow ensure that the dispatched click event performs
       // Current value chosen just so it worked for existing tests.
-      await page.mouse.click(250, 300)
+      await page.mouse.click(700, 300)
       await this.expectNodeCount(0, '.selected')
     })
   }

app/gui/integration-test/actions/PageActions.ts

@@ -1,8 +1,15 @@
 /** @file Actions common to all pages. */
-import BaseActions, { type BaseActionsClass } from './BaseActions'
+import { expect, type Page } from 'integration-test/base'
+import BaseActions, { type BaseActionsClass, type LocatorCallback } from './BaseActions'
 import { openUserMenuAction } from './openUserMenuAction'
 import { userMenuActions } from './userMenuActions'
 
+/** Find right panel. */
+function locateRightPanel(page: Page) {
+  // This has no identifying features.
+  return page.getByTestId('right-panel').locator('visible=true')
+}
+
 /** Actions common to all pages. */
 export default class PageActions<
   Context,
@@ -17,4 +24,39 @@ export default class PageActions<
   openUserMenu() {
     return openUserMenuAction(this.step.bind(this))
   }
+
+  /** Show the properties tab of the Right Panel. */
+  togglePropertiesAssetPanel() {
+    return this.step('Toggle properties asset panel', async (page) => {
+      await page.getByRole('tab', { name: 'Properties' }).click()
+    })
+  }
+
+  /** Show the description tab of the Right Panel. */
+  toggleDescriptionAssetPanel() {
+    return this.step('Toggle description asset panel', async (page) => {
+      await page.getByRole('tab', { name: 'Description' }).click()
+    })
+  }
+
+  /** Expect Documentation Panel to be visible. */
+  expectDocsPanel() {
+    return this.step('Docs panel is opened', async (page) => {
+      await expect(page.locator('.DocumentationEditor')).toBeVisible()
+    })
+  }
+
+  /** Show the Docs tab of the Right Panel. */
+  toggleDocsAssetPanel() {
+    return this.step('Toggle docs asset panel', async (page) => {
+      await page.getByRole('tab', { name: 'Documentation' }).click()
+    })
+  }
+
+  /** Interact with the Right Panel. */
+  withRightPanel(callback: LocatorCallback<Context>) {
+    return this.step('Interact with right panel', async (page, context) => {
+      await callback(locateRightPanel(page), context)
+    })
+  }
 }