Merge branch 'main' into COMPASS-8275-setup-global-writes-plugin

mongodb-js · Sep 25, 2024 · c6b53f4 · c6b53f4
2 parents 22ff79f + 9d33a70
commit c6b53f4
Show file tree

Hide file tree

Showing 29 changed files with 1,009 additions and 408 deletions.
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Mon Sep 23 2024.
+This document was automatically generated on Tue Sep 24 2024.
 
 ## List of dependencies
 

diff --git a/docs/tracking-plan.md b/docs/tracking-plan.md
@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Mon, Sep 23, 2024 at 01:02 PM
+Generated on Tue, Sep 24, 2024 at 03:03 PM
 
 ## Table of Contents
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-components/src/components/item-action-controls.tsx b/packages/compass-components/src/components/item-action-controls.tsx
@@ -504,6 +504,7 @@ export function DropdownMenuButton<Action extends string>({
   buttonProps,
   iconSize = ItemActionButtonSize.Default,
   'data-testid': dataTestId,
+  hideOnNarrow = true,
 }: {
   actions: MenuAction<Action>[];
   onAction(actionName: Action): void;
@@ -514,6 +515,7 @@ export function DropdownMenuButton<Action extends string>({
   'data-testid'?: string;
   buttonText: string;
   buttonProps: ButtonProps;
+  hideOnNarrow?: boolean;
 }) {
   // this ref is used by the Menu component to calculate the height and position
   // of the menu, and by us to give back the focus to the trigger when the menu
@@ -567,7 +569,9 @@ export function DropdownMenuButton<Action extends string>({
             rightGlyph={<Icon glyph={'CaretDown'} />}
             title={buttonText}
           >
-            <span className={hiddenOnNarrowStyles}>{buttonText}</span>
+            <span className={hideOnNarrow ? hiddenOnNarrowStyles : undefined}>
+              {buttonText}
+            </span>
             {children}
           </Button>
         );

diff --git a/packages/compass-crud/src/stores/crud-store.ts b/packages/compass-crud/src/stores/crud-store.ts
@@ -2064,10 +2064,6 @@ export function activateDocumentsPlugin(
     }
   });
 
-  on(localAppRegistry, 'refresh-collection-stats', () => {
-    void collection.fetch({ dataService, force: true });
-  });
-
   if (!options.noRefreshOnConfigure) {
     queueMicrotask(() => {
       void store.refreshDocuments();

diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -48,7 +48,6 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/atlas-service": "^0.28.2",
     "@mongodb-js/eslint-config-compass": "^1.1.7",
     "@mongodb-js/mocha-config-compass": "^1.4.2",
     "@mongodb-js/prettier-config-compass": "^1.0.2",
@@ -61,14 +60,14 @@
     "electron-mocha": "^12.2.0",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",
-    "mongodb-ns": "^2.4.2",
     "nyc": "^15.1.0",
     "react-dom": "^17.0.2",
     "sinon": "^9.2.3",
     "typescript": "^5.0.4",
     "xvfb-maybe": "^0.2.1"
   },
   "dependencies": {
+    "@mongodb-js/atlas-service": "^0.28.3",
     "@mongodb-js/compass-app-stores": "^7.28.0",
     "@mongodb-js/compass-components": "^1.29.4",
     "@mongodb-js/compass-connections": "^1.42.0",
@@ -88,6 +87,7 @@
     "mongodb-collection-model": "^5.23.3",
     "mongodb-data-service": "^22.23.3",
     "mongodb-query-parser": "^4.2.3",
+    "mongodb-ns": "^2.4.2",
     "numeral": "^2.0.6",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",

diff --git a/packages/compass-indexes/src/components/indexes-table/indexes-table.tsx b/packages/compass-indexes/src/components/indexes-table/indexes-table.tsx
@@ -18,7 +18,6 @@ import {
 import type {
   LGColumnDef,
   LGTableDataType,
-  HeaderGroup,
   LeafyGreenTableCell,
   LeafyGreenTableRow,
   SortingState,
@@ -76,6 +75,7 @@ const tableHeadDarkModeStyles = css({
 });
 
 const tableHeadCellStyles = css({
+  whiteSpace: 'nowrap',
   '> div': {
     // Push the sort button to the right of the head cell.
     justifyContent: 'space-between',
@@ -126,7 +126,7 @@ export function IndexesTable<T>({
           isSticky
           className={cx(tableHeadStyles, darkMode && tableHeadDarkModeStyles)}
         >
-          {table.getHeaderGroups().map((headerGroup: HeaderGroup<T>) => (
+          {table.getHeaderGroups().map((headerGroup) => (
             <HeaderRow key={headerGroup.id}>
               {headerGroup.headers.map((header) => {
                 return (

diff --git a/packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.spec.tsx b/packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.spec.tsx
@@ -37,7 +37,7 @@ describe('IndexesToolbar Component', function () {
           isWritable={true}
           writeStateDescription={undefined}
           onRefreshIndexes={() => {}}
-          isAtlasSearchSupported={false}
+          isSearchIndexesSupported={false}
           isRefreshing={false}
           onIndexViewChanged={() => {}}
           onCreateRegularIndexClick={() => {}}
@@ -75,7 +75,7 @@ describe('IndexesToolbar Component', function () {
             showInsights: true,
           });
 
-          renderIndexesToolbar({ isAtlasSearchSupported: true });
+          renderIndexesToolbar({ isSearchIndexesSupported: true });
         });
 
         it('should render the create index dropdown button enabled', async function () {
@@ -100,7 +100,7 @@ describe('IndexesToolbar Component', function () {
             showInsights: true,
           });
 
-          renderIndexesToolbar({ isAtlasSearchSupported: false });
+          renderIndexesToolbar({ isSearchIndexesSupported: false });
         });
 
         it('should render the create index button only', function () {
@@ -198,7 +198,7 @@ describe('IndexesToolbar Component', function () {
       it('calls onCreateRegularIndexClick when index button is clicked', function () {
         const onCreateRegularIndexClickSpy = sinon.spy();
         renderIndexesToolbar({
-          isAtlasSearchSupported: true,
+          isSearchIndexesSupported: true,
           onCreateRegularIndexClick: onCreateRegularIndexClickSpy,
         });
 
@@ -221,7 +221,7 @@ describe('IndexesToolbar Component', function () {
       it('calls onCreateSearchIndexClick when index button is clicked', function () {
         const onCreateSearchIndexClickSpy = sinon.spy();
         renderIndexesToolbar({
-          isAtlasSearchSupported: true,
+          isSearchIndexesSupported: true,
           onCreateSearchIndexClick: onCreateSearchIndexClickSpy,
         });
 
@@ -308,7 +308,7 @@ describe('IndexesToolbar Component', function () {
 
     it('when it supports search management, it changes tab view', function () {
       renderIndexesToolbar({
-        isAtlasSearchSupported: true,
+        isSearchIndexesSupported: true,
         onIndexViewChanged: onChangeViewCallback,
       });
       const segmentControl = screen.getByText('Search Indexes');
@@ -320,7 +320,7 @@ describe('IndexesToolbar Component', function () {
 
     it('when it does not support search management, it renders tab as disabled', function () {
       renderIndexesToolbar({
-        isAtlasSearchSupported: false,
+        isSearchIndexesSupported: false,
         onIndexViewChanged: onChangeViewCallback,
       });
       const segmentControl = screen.getByText('Search Indexes');

diff --git a/packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.tsx b/packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.tsx
@@ -21,10 +21,7 @@ import {
 } from '@mongodb-js/compass-components';
 
 import type { RootState } from '../../modules';
-import {
-  SearchIndexesStatuses,
-  createSearchIndexOpened,
-} from '../../modules/search-indexes';
+import { createSearchIndexOpened } from '../../modules/search-indexes';
 import { createIndexOpened } from '../../modules/create-index';
 import type { IndexView } from '../../modules/index-view';
 import { indexViewChanged } from '../../modules/index-view';
@@ -61,7 +58,7 @@ type IndexesToolbarProps = {
   onCreateRegularIndexClick: () => void;
   onCreateSearchIndexClick: () => void;
   writeStateDescription?: string;
-  isAtlasSearchSupported: boolean;
+  isSearchIndexesSupported: boolean;
   // via withPreferences:
   readOnly?: boolean;
 };
@@ -76,7 +73,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
   isRefreshing,
   writeStateDescription,
   hasTooManyIndexes,
-  isAtlasSearchSupported,
+  isSearchIndexesSupported,
   onRefreshIndexes,
   onIndexViewChanged,
   readOnly, // preferences readOnly.
@@ -106,7 +103,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
                   <div className={createIndexButtonContainerStyles}>
                     <CreateIndexButton
                       isSearchManagementActive={isSearchManagementActive}
-                      isAtlasSearchSupported={isAtlasSearchSupported}
+                      isSearchIndexesSupported={isSearchIndexesSupported}
                       isWritable={isWritable}
                       onCreateRegularIndexClick={onCreateRegularIndexClick}
                       onCreateSearchIndexClick={onCreateSearchIndexClick}
@@ -147,7 +144,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
                 >
                   Indexes
                 </SegmentedControlOption>
-                {!isAtlasSearchSupported && (
+                {!isSearchIndexesSupported && (
                   <Tooltip
                     align="top"
                     justify="middle"
@@ -174,7 +171,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
                     </p>
                   </Tooltip>
                 )}
-                {isAtlasSearchSupported && (
+                {isSearchIndexesSupported && (
                   <SegmentedControlOption
                     data-testid="search-indexes-tab"
                     value="search-indexes"
@@ -200,7 +197,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
 
 type CreateIndexButtonProps = {
   isSearchManagementActive: boolean;
-  isAtlasSearchSupported: boolean;
+  isSearchIndexesSupported: boolean;
   isWritable: boolean;
   onCreateRegularIndexClick: () => void;
   onCreateSearchIndexClick: () => void;
@@ -212,7 +209,7 @@ export const CreateIndexButton: React.FunctionComponent<
   CreateIndexButtonProps
 > = ({
   isSearchManagementActive,
-  isAtlasSearchSupported,
+  isSearchIndexesSupported,
   isWritable,
   onCreateRegularIndexClick,
   onCreateSearchIndexClick,
@@ -229,7 +226,7 @@ export const CreateIndexButton: React.FunctionComponent<
     [onCreateRegularIndexClick, onCreateSearchIndexClick]
   );
 
-  if (isAtlasSearchSupported && isSearchManagementActive) {
+  if (isSearchIndexesSupported && isSearchManagementActive) {
     return (
       <DropdownMenuButton
         data-testid="multiple-index-types-creation-dropdown"
@@ -244,6 +241,7 @@ export const CreateIndexButton: React.FunctionComponent<
           { action: 'createSearchIndex', label: 'Search Index' },
         ]}
         onAction={onActionDispatch}
+        hideOnNarrow={false}
       />
     );
   }
@@ -264,18 +262,19 @@ export const CreateIndexButton: React.FunctionComponent<
 const mapState = ({
   isWritable,
   isReadonlyView,
+  isSearchIndexesSupported,
   description,
   serverVersion,
   searchIndexes,
   indexView,
 }: RootState) => ({
   isWritable,
   isReadonlyView,
+  isSearchIndexesSupported,
   writeStateDescription: description,
   indexView,
   serverVersion,
-  isAtlasSearchSupported:
-    searchIndexes.status !== SearchIndexesStatuses.NOT_AVAILABLE,
+  searchIndexes,
 });
 
 const mapDispatch = {