store preferencesAccess in the instance model

Author: paula-stacho

packages/collection-model/index.d.ts

@@ -1,4 +1,3 @@
-import type { PreferencesAccess } from 'compass-preferences-model';
 import type { DataService } from 'mongodb-data-service';
 
 type CollectionMetadata = {
@@ -70,13 +69,13 @@ interface CollectionProps {
   pipeline: unknown[];
   validation: unknown;
   is_capped?: boolean;
-  document_count?: number;
-  document_size?: number;
-  avg_document_size?: number;
-  storage_size?: number;
-  free_storage_size?: number;
-  index_count?: number;
-  index_size?: number;
+  document_count: number | undefined;
+  document_size: number | undefined;
+  avg_document_size: number | undefined;
+  storage_size: number | undefined;
+  free_storage_size: number | undefined;
+  index_count: number | undefined;
+  index_size: number | undefined;
   isTimeSeries: boolean;
   isView: boolean;
   /** Only relevant for a view and identifies collection/view from which this view was created. */
@@ -97,13 +96,11 @@ type CollectionDataService = Pick<
 interface Collection extends CollectionProps {
   fetch(opts: {
     dataService: CollectionDataService;
-    preferences: PreferencesAccess;
     fetchInfo?: boolean;
     force?: boolean;
   }): Promise<void>;
   fetchMetadata(opts: {
     dataService: CollectionDataService;
-    preferences: PreferencesAccess;
   }): Promise<CollectionMetadata>;
   on(evt: string, fn: (...args: any) => void);
   off(evt: string, fn: (...args: any) => void);

packages/collection-model/lib/model.js

@@ -244,19 +244,24 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
   /**
    * @param {{
    *    dataService: import('mongodb-data-service').DataService,
-   *    preferences: import('compass-preferences-model').PreferencesAccess,
    *    fetchInfo: boolean,
    *    force: boolean
    * }} options
    * @returns
    */
-  async fetch({ dataService, fetchInfo = true, preferences, force = false }) {
+  async fetch({ dataService, fetchInfo = true, force = false }) {
     if (!shouldFetch(this.status, force)) {
       console.log('[collection-model]', 'not should fetch', this.status, force);
       return;
     }
 
-    const { enableDbAndCollStats } = preferences.getPreferences();
+    const instanceModel = getParentByType(this, 'Instance');
+    console.log(
+      'PREFERENCES in COLL',
+      instanceModel.preferences,
+      instanceModel
+    );
+    const { enableDbAndCollStats } = instanceModel.preferences.getPreferences();
 
     try {
       console.log('[collection-model]', 'starting');
@@ -296,12 +301,11 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
    * that events like open-in-new-tab, select-namespace, edit-view require
    * @param {{
    *    dataService: import('mongodb-data-service').DataService,
-   *    preferences: import('compass-preferences-model').PreferencesAccess,
    * }} options
    */
-  async fetchMetadata({ dataService, preferences }) {
+  async fetchMetadata({ dataService }) {
     try {
-      await this.fetch({ dataService, preferences });
+      await this.fetch({ dataService });
     } catch (e) {
       if (e.name !== 'MongoServerError') {
         throw e;

packages/compass-app-stores/src/provider.tsx

@@ -20,7 +20,6 @@ import { MongoDBInstancesManager } from './instances-manager';
 import toNS from 'mongodb-ns';
 import type Collection from 'mongodb-collection-model';
 import type Database from 'mongodb-database-model';
-import { usePreferences } from 'compass-preferences-model/provider';
 
 export {
   MongoDBInstancesManagerEvents,
@@ -131,7 +130,6 @@ export const NamespaceProvider = createServiceProvider(
     const ns = useMemo(() => {
       return toNS(namespace);
     }, [namespace]);
-    const preferences = usePreferences(['enableDbAndCollStats']);
     const [namespaceModel, setNamespaceModel] = useState<
       Database | Collection | null
     >(() => {
@@ -168,7 +166,7 @@ export const NamespaceProvider = createServiceProvider(
           return;
         }
 
-        await db.fetchCollections({ dataService, preferences }).catch(() => {
+        await db.fetchCollections({ dataService }).catch(() => {
           // See above
         });
         const coll = db.collections.get(ns.ns);
@@ -192,7 +190,6 @@ export const NamespaceProvider = createServiceProvider(
       ns.collection,
       ns.database,
       ns.ns,
-      preferences,
     ]);
 
     if (!namespaceModel) {

packages/compass-app-stores/src/stores/instance-store.ts

@@ -72,7 +72,7 @@ export function createInstancesStore(
       await instance.fetchDatabases({ dataService });
       await Promise.all(
         instance.databases.map((db) => {
-          return db.fetchCollections({ dataService, preferences });
+          return db.fetchCollections({ dataService });
         })
       );
     } catch (error) {
@@ -159,7 +159,7 @@ export function createInstancesStore(
       await instance.fetchDatabases({ dataService, force: true });
       await Promise.allSettled(
         instance.databases.map((db) =>
-          db.fetchCollections({ dataService, preferences, force: true })
+          db.fetchCollections({ dataService, force: true })
         )
       );
     } catch (err: any) {
@@ -192,8 +192,8 @@ export function createInstancesStore(
       console.log('Refresh Namespace Stats');
       // We don't care if this fails
       await Promise.allSettled([
-        db?.fetch({ dataService, preferences, force: true }),
-        coll?.fetch({ dataService, preferences, force: true }),
+        db?.fetch({ dataService, force: true }),
+        coll?.fetch({ dataService, force: true }),
       ]);
     } catch (error) {
       log.warn(
@@ -239,11 +239,10 @@ export function createInstancesStore(
       // collection model updates
       console.log('Maybe add and refresh');
       await db
-        .fetch({ dataService, preferences, force: true })
+        .fetch({ dataService, force: true })
         .then(() => {
           return coll?.fetch({
             dataService,
-            preferences,
             force: true,
             // We only need to fetch info in case of new collection being created
             fetchInfo: newCollection,
@@ -298,6 +297,7 @@ export function createInstancesStore(
       topologyDescription: getTopologyDescription(
         dataService.getLastSeenTopology()
       ),
+      preferences,
     };
     const instance = instancesManager.createMongoDBInstanceForConnection(
       instanceConnectionId,
@@ -347,7 +347,7 @@ export function createInstancesStore(
           connections.getDataServiceForConnection(connectionId);
         void instance.databases
           .get(databaseId)
-          ?.fetchCollections({ dataService, preferences });
+          ?.fetchCollections({ dataService });
       } catch (error) {
         log.warn(
           mongoLogId(1_001_000_323),
@@ -445,11 +445,9 @@ export function createInstancesStore(
           db.collections.remove(coll);
           MongoDBInstance.removeAllListeners(coll);
           // Update db stats to account for db stats affected by collection stats
-          void db
-            ?.fetch({ dataService, preferences, force: true })
-            .catch(() => {
-              // noop, we ignore stats fetching failures
-            });
+          void db?.fetch({ dataService, force: true }).catch(() => {
+            // noop, we ignore stats fetching failures
+          });
         }
       } catch (error) {
         log.warn(
@@ -544,7 +542,7 @@ export function createInstancesStore(
         void instance.databases
           .get(database)
           ?.collections.get(namespace, '_id')
-          ?.fetch({ dataService, preferences, force: true });
+          ?.fetch({ dataService, force: true });
       } catch (error) {
         log.warn(
           mongoLogId(1_001_000_321),

packages/compass-collection/src/index.ts

@@ -9,7 +9,6 @@ import {
 import { collectionModelLocator } from '@mongodb-js/compass-app-stores/provider';
 import type { WorkspaceComponent } from '@mongodb-js/compass-workspaces';
 import { workspacesServiceLocator } from '@mongodb-js/compass-workspaces/provider';
-import { preferencesLocator } from 'compass-preferences-model/provider';
 
 export const CollectionTabPlugin = registerHadronPlugin(
   {
@@ -21,7 +20,6 @@ export const CollectionTabPlugin = registerHadronPlugin(
     dataService: dataServiceLocator as DataServiceLocator<keyof DataService>,
     collection: collectionModelLocator,
     workspaces: workspacesServiceLocator,
-    preferences: preferencesLocator,
   }
 );
 

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

@@ -32,7 +32,6 @@ export type CollectionTabServices = {
   collection: Collection;
   localAppRegistry: AppRegistry;
   workspaces: ReturnType<typeof workspacesServiceLocator>;
-  preferences: PreferencesAccess;
 };
 
 export function activatePlugin(
@@ -45,7 +44,6 @@ export function activatePlugin(
     collection: collectionModel,
     localAppRegistry,
     workspaces,
-    preferences,
   } = services;
 
   if (!collectionModel) {
@@ -87,11 +85,9 @@ export function activatePlugin(
     store.dispatch(selectTab('Schema'));
   });
 
-  void collectionModel
-    .fetchMetadata({ dataService, preferences })
-    .then((metadata) => {
-      store.dispatch(collectionMetadataFetched(metadata));
-    });
+  void collectionModel.fetchMetadata({ dataService }).then((metadata) => {
+    store.dispatch(collectionMetadataFetched(metadata));
+  });
 
   return {
     store,

packages/compass-indexes/src/modules/regular-indexes.ts

@@ -424,11 +424,9 @@ const fetchIndexes = (
         // changed, the tab header also gets updated. The check against the
         // total is a bit of an optimisation so that we don't also poll the
         // collection stats.
-        collection
-          .fetch({ dataService, preferences, force: true })
-          .catch(() => {
-            /* ignore */
-          });
+        collection.fetch({ dataService, force: true }).catch(() => {
+          /* ignore */
+        });
       }
     } catch (err) {
       dispatch(fetchIndexesFailed((err as Error).message));

packages/compass-saved-aggregations-queries/src/stores/open-item.ts

@@ -600,11 +600,7 @@ export const openSelectedItem =
 
 export const databaseSelected =
   (database: string): SavedQueryAggregationThunkAction<Promise<void>> =>
-  async (
-    dispatch,
-    getState,
-    { instancesManager, connections, preferencesAccess: preferences }
-  ) => {
+  async (dispatch, getState, { instancesManager, connections }) => {
     const {
       openItem: { selectedDatabase, selectedConnection },
     } = getState();
@@ -631,7 +627,7 @@ export const databaseSelected =
         throw new Error('Database not found');
       }
 
-      await db.fetchCollections({ dataService, preferences });
+      await db.fetchCollections({ dataService });
       // Check with the the current value in case db was re-selected while we
       // were fetching
       if (database === getState().openItem.selectedDatabase) {

packages/compass-workspaces/src/stores/workspaces.ts

@@ -728,7 +728,7 @@ const fetchCollectionInfo = (
       });
 
       if (coll) {
-        await coll.fetch({ dataService, preferences });
+        await coll.fetch({ dataService });
         const info = {
           isTimeSeries: coll.isTimeSeries,
           isReadonly: coll.readonly ?? coll.isView,
@@ -764,7 +764,7 @@ const fetchDatabaseInfo = (
   return async (
     dispatch,
     getState,
-    { connections, instancesManager, logger, preferences }
+    { connections, instancesManager, logger }
   ) => {
     const { databaseInfo } = getState();
     const namespaceId = `${workspaceOptions.connectionId}.${workspaceOptions.namespace}`;
@@ -784,7 +784,7 @@ const fetchDatabaseInfo = (
       const db = instance.databases.get(workspaceOptions.namespace);
       if (db) {
         console.log('DB FETCH');
-        await db.fetch({ dataService, preferences });
+        await db.fetch({ dataService });
         const info = {
           isNonExistent: db.is_non_existent,
         };

packages/database-model/index.d.ts

@@ -9,32 +9,26 @@ interface DatabaseProps {
   statusError: string | null;
   collectionsStatus: 'initial' | 'fetching' | 'refreshing' | 'ready' | 'error';
   collectionsStatusError: string | null;
-  collection_count?: number;
-  document_count?: number;
-  storage_size?: number;
-  data_size?: number;
-  index_count?: number;
-  index_size?: number;
+  collection_count: number | undefined;
+  document_count: number | undefined;
+  storage_size: number | undefined;
+  data_size: number | undefined;
+  index_count: number | undefined;
+  index_size: number | undefined;
   collectionsLength: number;
   collections: CollectionCollection;
   is_non_existent: boolean;
 }
 
 interface Database extends DatabaseProps {
-  fetch(opts: {
-    dataService: DataService;
-    preferences: PreferenceAccess;
-    force?: boolean;
-  }): Promise<void>;
+  fetch(opts: { dataService: DataService; force?: boolean }): Promise<void>;
   fetchCollections(opts: {
     dataService: DataService;
-    preferences: PreferenceAccess;
     fetchInfo?: boolean;
     force?: boolean;
   }): Promise<void>;
   fetchCollectionsDetails(opts: {
     dataService: DataService;
-    preferences: PreferenceAccess;
     nameOnly?: boolean;
     force?: boolean;
   }): Promise<void>;