fix: merge stats change to branch

Author: myang1220

packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.spec.tsx

@@ -44,6 +44,7 @@ describe('IndexesToolbar Component', function () {
           onCreateSearchIndexClick={() => {}}
           namespace=""
           showAtlasSearchLink={false}
+          serverVersion={'8.0.11'}
           {...props}
         />
       </PreferencesProvider>

packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.tsx

@@ -21,6 +21,7 @@ import {
   SegmentedControlOption,
 } from '@mongodb-js/compass-components';
 import { useConnectionInfo } from '@mongodb-js/compass-connections/provider';
+import semver from 'semver';
 
 import type { RootState } from '../../modules';
 import { createSearchIndexOpened } from '../../modules/search-indexes';
@@ -53,6 +54,19 @@ const createIndexButtonContainerStyles = css({
   width: 'fit-content',
 });
 
+const MIN_SEARCH_INDEX_MANAGEMENT_SERVER_VERSION = '6.0.7';
+
+const serverSupportsSearchIndexManagement = (serverVersion: string) => {
+  try {
+    return semver.gte(
+      serverVersion,
+      MIN_SEARCH_INDEX_MANAGEMENT_SERVER_VERSION
+    );
+  } catch {
+    return false;
+  }
+};
+
 type IndexesToolbarProps = {
   namespace: string;
   indexView: IndexView;
@@ -62,6 +76,7 @@ type IndexesToolbarProps = {
   isRefreshing: boolean;
   onRefreshIndexes: () => void;
   onIndexViewChanged: (newView: IndexView) => void;
+  serverVersion: string;
   // connected:
   isReadonlyView: boolean;
   isWritable: boolean;
@@ -88,6 +103,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
   isSearchIndexesSupported,
   onRefreshIndexes,
   onIndexViewChanged,
+  serverVersion,
   readOnly, // preferences readOnly.
 }) => {
   const isSearchManagementActive = usePreference('enableAtlasSearchIndexes');
@@ -188,16 +204,27 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
                       </SegmentedControlOption>
                     }
                   >
-                    <p>
-                      Atlas Search index management in Compass is only available
-                      for Atlas local deployments and clusters running MongoDB
-                      6.0.7 or newer.
-                    </p>
-                    <p>
-                      For clusters running an earlier version of MongoDB, you
-                      can manage your Atlas Search indexes from the Atlas web
-                      Ul, with the CLI, or with the Administration API.
-                    </p>
+                    {serverSupportsSearchIndexManagement(serverVersion) ? (
+                      <p>
+                        Unable to fetch search indexes. This can occur when your
+                        cluster does not support search indexes or the request
+                        to list search indexes failed.
+                      </p>
+                    ) : (
+                      <>
+                        <p>
+                          Atlas Search index management in Compass is only
+                          available for Atlas local deployments and clusters
+                          running MongoDB 6.0.7 or newer.
+                        </p>
+                        <p>
+                          For clusters running an earlier version of MongoDB,
+                          you can manage your Atlas Search indexes from the
+                          Atlas web Ul, with the CLI, or with the Administration
+                          API.
+                        </p>
+                      </>
+                    )}
                   </Tooltip>
                 )}
                 {isSearchIndexesSupported && (

packages/compass-preferences-model/src/user-storage.ts

@@ -78,8 +78,4 @@ export class UserStorageImpl implements UserStorage {
     await this.userData.write(user.id, user);
     return this.getUser(user.id);
   }
-
-  private getFileName(id: string) {
-    return `${id}.json`;
-  }
 }

packages/compass-saved-aggregations-queries/src/index.spec.tsx

@@ -227,9 +227,11 @@ describe('AggregationsAndQueriesAndUpdatemanyList', function () {
       queryStorageLoadAllStub = sandbox
         .stub(queryStorage, 'loadAll')
         .resolves(queries.map((item) => item.query));
-      sandbox
-        .stub(pipelineStorage, 'loadAll')
-        .resolves(pipelines.map((item) => item.aggregation));
+      sandbox.stub(pipelineStorage, 'loadAll').resolves(
+        pipelines.map((item) => {
+          return { ...item.aggregation, lastModified: new Date() };
+        })
+      );
 
       renderPlugin();
 

packages/compass-user-data/src/index.ts

@@ -1,3 +1,3 @@
-export type { Stats, ReadAllResult, ReadAllWithStatsResult } from './user-data';
+export type { ReadAllResult } from './user-data';
 export { type IUserData, FileUserData, AtlasUserData } from './user-data';
 export { z } from 'zod';

packages/compass-user-data/src/user-data.spec.ts

@@ -1,5 +1,4 @@
 import fs from 'fs/promises';
-import { Stats } from 'fs';
 import os from 'os';
 import path from 'path';
 import { expect } from 'chai';
@@ -119,39 +118,6 @@ describe('user-data', function () {
       expect(result.data).to.have.lengthOf(0);
       expect(result.errors).to.have.lengthOf(2);
     });
-
-    it('returns file stats', async function () {
-      await Promise.all(
-        [
-          ['data1.json', JSON.stringify({ name: 'VSCode' })],
-          ['data2.json', JSON.stringify({ name: 'Mongosh' })],
-        ].map(([filepath, data]) => writeFileToStorage(filepath, data))
-      );
-
-      const { data } = await getUserData().readAllWithStats({
-        ignoreErrors: true,
-      });
-
-      {
-        const vscodeData = data.find((x) => x[0].name === 'VSCode');
-        expect(vscodeData?.[0]).to.deep.equal({
-          name: 'VSCode',
-          hasDarkMode: true,
-          hasWebSupport: false,
-        });
-        expect(vscodeData?.[1]).to.be.instanceOf(Stats);
-      }
-
-      {
-        const mongoshData = data.find((x) => x[0].name === 'Mongosh');
-        expect(mongoshData?.[0]).to.deep.equal({
-          name: 'Mongosh',
-          hasDarkMode: true,
-          hasWebSupport: false,
-        });
-        expect(mongoshData?.[1]).to.be.instanceOf(Stats);
-      }
-    });
   });
 
   context('UserData.readOne', function () {
@@ -296,27 +262,6 @@ describe('user-data', function () {
         company: 'MongoDB',
       });
     });
-
-    it('return file stats', async function () {
-      await writeFileToStorage(
-        'data.json',
-        JSON.stringify({
-          name: 'Mongosh',
-          company: 'MongoDB',
-        })
-      );
-
-      const [data, stats] = await getUserData().readOneWithStats('data', {
-        ignoreErrors: false,
-      });
-
-      expect(data).to.deep.equal({
-        name: 'Mongosh',
-        hasDarkMode: true,
-        hasWebSupport: false,
-      });
-      expect(stats).to.be.instanceOf(Stats);
-    });
   });
 
   context('UserData.write', function () {