Merge remote-tracking branch 'origin/main' into electron-32

Author: addaleax

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Wed, Oct 23, 2024 at 11:59 AM
+Generated on Wed, Oct 23, 2024 at 04:31 PM
 
 ## Table of Contents
 

package-lock.json

@@ -64,7 +64,7 @@
     "@leafygreen-ui/search-input": "^2.1.5",
     "@leafygreen-ui/segmented-control": "^8.2.10",
     "@leafygreen-ui/select": "^11.2.2",
-    "@leafygreen-ui/table": "^12.6.1",
+    "@leafygreen-ui/table": "^12.7.0",
     "@leafygreen-ui/tabs": "^11.1.13",
     "@leafygreen-ui/text-area": "^8.1.2",
     "@leafygreen-ui/text-input": "^12.1.26",
@@ -76,6 +76,7 @@
     "@react-aria/interactions": "^3.9.1",
     "@react-aria/utils": "^3.13.1",
     "@react-aria/visually-hidden": "^3.3.1",
+    "@tanstack/table-core": "^8.14.0",
     "bson": "^6.8.0",
     "focus-trap-react": "^9.0.2",
     "hadron-document": "^8.6.4",

packages/compass-components/package.json

@@ -53,7 +53,10 @@ import {
   TableBody,
   flexRender,
   useLeafyGreenTable,
+  getFilteredRowModel,
 } from '@leafygreen-ui/table';
+import type { Row as LgTableRowType } from '@tanstack/table-core'; // TODO(COMPASS-8437): import from LG
+
 export type {
   LGColumnDef,
   HeaderGroup,
@@ -172,4 +175,6 @@ export {
   InfoSprinkle,
   flexRender,
   useLeafyGreenTable,
+  getFilteredRowModel,
+  type LgTableRowType,
 };

packages/compass-components/src/components/leafygreen.tsx

@@ -1,23 +1,11 @@
-import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
-import retryWithBackoff from '../retry-with-backoff';
-import * as Selectors from '../selectors';
 
 export async function closeShell(
   browser: CompassBrowser,
   connectionName: string
 ): Promise<void> {
-  if (TEST_MULTIPLE_CONNECTIONS) {
-    await browser.closeWorkspaceTab({
-      connectionName,
-      type: 'Shell',
-    });
-  } else {
-    await retryWithBackoff(async function () {
-      const shellContentElement = await browser.$(Selectors.ShellContent);
-      if (await shellContentElement.isDisplayed()) {
-        await browser.clickVisible(Selectors.ShellExpandButton);
-      }
-    });
-  }
+  await browser.closeWorkspaceTab({
+    connectionName,
+    type: 'Shell',
+  });
 }

packages/compass-e2e-tests/helpers/commands/close-shell.ts

@@ -1,4 +1,3 @@
-import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
 import type { WorkspaceTabSelectorOptions } from '../selectors';
@@ -119,16 +118,13 @@ async function waitUntilActiveCollectionTab(
 ) {
   const options: WorkspaceTabSelectorOptions = {
     type: 'Collection',
+    connectionName,
     namespace: `${dbName}.${collectionName}`,
     active: true,
   };
-  // Only add the connectionName for multiple connections because for some
-  // reason this sometimes flakes in single connections even though the tab is
-  // definitely there in the screenshot.
-  if (TEST_MULTIPLE_CONNECTIONS) {
-    options.connectionName = connectionName;
-  }
+
   await browser.$(Selectors.workspaceTab(options)).waitForDisplayed();
+
   if (tabName) {
     await waitUntilActiveCollectionSubTab(browser, tabName);
   }