cleanup

Author: ncarbon

package-lock.json

@@ -48,18 +48,21 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "dependencies": {
+    "@mongodb-js/compass-app-registry": "^9.4.18",
     "@mongodb-js/compass-app-stores": "^7.55.0",
     "@mongodb-js/compass-components": "^1.47.0",
     "@mongodb-js/compass-connections": "^1.69.0",
     "@mongodb-js/compass-logging": "^1.7.10",
+    "@mongodb-js/compass-schema": "^6.70.0",
     "@mongodb-js/compass-telemetry": "^1.12.0",
     "@mongodb-js/compass-workspaces": "^0.50.0",
     "@mongodb-js/connection-info": "^0.17.0",
     "@mongodb-js/mongodb-constants": "^0.12.2",
     "compass-preferences-model": "^2.49.0",
-    "@mongodb-js/compass-app-registry": "^9.4.18",
+    "hadron-document": "^8.9.4",
     "mongodb-collection-model": "^5.31.0",
     "mongodb-ns": "^2.4.2",
+    "mongodb-schema": "^12.6.2",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",

packages/compass-collection/package.json

@@ -1,7 +1,7 @@
 import type { Reducer, AnyAction, Action } from 'redux';
 import {
   analyzeDocuments,
-  SchemaParseOptions,
+  type SchemaParseOptions,
   type Schema,
 } from 'mongodb-schema';
 
@@ -13,10 +13,9 @@ import type { CollectionSubtab } from '@mongodb-js/compass-workspaces';
 import type { DataService } from '@mongodb-js/compass-connections/provider';
 import type { experimentationServiceLocator } from '@mongodb-js/compass-telemetry/provider';
 import { calculateSchemaMetadata } from '@mongodb-js/compass-schema';
-import type { Logger } from '@mongodb-js/compass-logging/provider';
+import { type Logger, mongoLogId } from '@mongodb-js/compass-logging/provider';
 import { type PreferencesAccess } from 'compass-preferences-model/provider';
 import { isInternalFieldPath } from 'hadron-document';
-import { mongoLogId } from '@mongodb-js/compass-logging';
 import toNS from 'mongodb-ns';
 
 const DEFAULT_SAMPLE_SIZE = 100;
@@ -190,7 +189,9 @@ export const selectTab = (
   };
 };
 
-export const analyzeCollectionSchema = (): CollectionThunkAction<void> => {
+export const analyzeCollectionSchema = (): CollectionThunkAction<
+  Promise<void>
+> => {
   return async (
     dispatch,
     getState,

packages/compass-collection/src/modules/collection-tab.ts

@@ -12,7 +12,7 @@ import type { connectionInfoRefLocator } from '@mongodb-js/compass-connections/p
 import { createNoopLogger } from '@mongodb-js/compass-logging/provider';
 import { ReadOnlyPreferenceAccess } from 'compass-preferences-model/provider';
 import { ExperimentTestName } from '@mongodb-js/compass-telemetry/provider';
-import { CollectionMetadata } from 'mongodb-collection-model';
+import { type CollectionMetadata } from 'mongodb-collection-model';
 
 const defaultMetadata = {
   namespace: 'test.foo',
@@ -61,7 +61,7 @@ describe('Collection Tab Content store', function () {
   const localAppRegistry = sandbox.spy(new AppRegistry());
   const analyzeCollectionSchemaStub = sandbox
     .stub(collectionTabModule, 'analyzeCollectionSchema')
-    .returns(() => async () => {});
+    .returns(async () => {});
   const dataService = {} as any;
   let store: ReturnType<typeof activatePlugin>['store'];
   let deactivate: ReturnType<typeof activatePlugin>['deactivate'];
@@ -81,8 +81,7 @@ describe('Collection Tab Content store', function () {
       enableGenAIFeaturesAtlasOrg: true,
       cloudFeatureRolloutAccess: { GEN_AI_COMPASS: true },
     }),
-    collectionMetadata: Partial<CollectionMetadata> = defaultMetadata,
-    analysisAbortControllerRef: { current?: AbortController } = {}
+    collectionMetadata: Partial<CollectionMetadata> = defaultMetadata
   ) => {
     const mockCollection = {
       _id: collectionMetadata.namespace,

packages/compass-collection/src/stores/collection-tab.spec.ts

@@ -143,7 +143,7 @@ export function activatePlugin(
 
     if (!metadata.isReadonly && !metadata.isTimeSeries) {
       // TODO: Consider checking experiment variant
-      store.dispatch(analyzeCollectionSchema());
+      void store.dispatch(analyzeCollectionSchema());
     }
   });