expose only shouldFetchDbAndCollStats from instanceModel

Author: paula-stacho

packages/collection-model/lib/model.js

@@ -254,14 +254,16 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
       return;
     }
 
-    const instanceModel = getParentByType(this, 'Instance');
-    const { enableDbAndCollStats } = instanceModel.preferences.getPreferences();
+    const shouldFetchDbAndCollStats = getParentByType(
+      this,
+      'Instance'
+    ).shouldFetchDbAndCollStats;
 
     try {
       const newStatus = this.status === 'initial' ? 'fetching' : 'refreshing';
       this.set({ status: newStatus });
       const [collStats, collectionInfo] = await Promise.all([
-        enableDbAndCollStats
+        shouldFetchDbAndCollStats
           ? dataService.collectionStats(this.database, this.name)
           : null,
         fetchInfo ? dataService.collectionInfo(this.database, this.name) : null,

packages/database-model/lib/model.js

@@ -139,15 +139,16 @@ const DatabaseModel = AmpersandModel.extend(
      * @returns {Promise<void>}
      */
     async fetch({ dataService, force = false }) {
-      const instanceModel = getParentByType(this, 'Instance');
-      const { enableDbAndCollStats } =
-        instanceModel.preferences.getPreferences();
+      const shouldFetchDbAndCollStats = getParentByType(
+        this,
+        'Instance'
+      ).shouldFetchDbAndCollStats;
 
       if (!shouldFetch(this.status, force)) {
         return;
       }
 
-      if (!enableDbAndCollStats) {
+      if (!shouldFetchDbAndCollStats) {
         this.set({ status: 'ready' });
         return;
       }

packages/databases-collections-list/src/index.spec.tsx

@@ -266,15 +266,15 @@ describe('databases and collections list', function () {
       });
 
       expect(screen.queryByText(/Storage size/)).not.to.exist;
-      // expect(screen.queryByText('1.50 kB')).not.to.exist;
-      // expect(screen.queryByText(/Documents/)).not.to.exist;
-      // expect(screen.queryByText('10')).not.to.exist;
-      // expect(screen.queryByText(/Avg. document size/)).not.to.exist;
-      // expect(screen.queryByText('150.00 B')).not.to.exist;
-      // expect(screen.queryByText(/Indexes/)).not.to.exist;
-      // expect(screen.queryByText('15')).not.to.exist;
-      // expect(screen.queryByText(/Total index size/)).not.to.exist;
-      // expect(screen.queryByText('16.00 B')).not.to.exist;
+      expect(screen.queryByText('1.50 kB')).not.to.exist;
+      expect(screen.queryByText(/Documents/)).not.to.exist;
+      expect(screen.queryByText('10')).not.to.exist;
+      expect(screen.queryByText(/Avg. document size/)).not.to.exist;
+      expect(screen.queryByText('150.00 B')).not.to.exist;
+      expect(screen.queryByText(/Indexes/)).not.to.exist;
+      expect(screen.queryByText('15')).not.to.exist;
+      expect(screen.queryByText(/Total index size/)).not.to.exist;
+      expect(screen.queryByText('16.00 B')).not.to.exist;
     });
   });
 });

packages/instance-model/lib/model.js

@@ -135,9 +135,23 @@ const InstanceModel = AmpersandModel.extend(
       isSearchIndexesSupported: 'boolean',
       atlasVersion: { type: 'string', default: '' },
       csfleMode: { type: 'string', default: 'unavailable' },
+      shouldFetchDbAndCollStats: { type: 'boolean', default: false },
     },
     initialize: function ({ preferences, ...props }) {
-      this.preferences = preferences;
+      // Initialize the property directly from preferences
+      this.set({
+        shouldFetchDbAndCollStats:
+          preferences.getPreferences().enableDbAndCollStats,
+      });
+
+      // Listen to preference changes using the preferences API
+      this._preferenceUnsubscribe = preferences.onPreferenceValueChanged(
+        'enableDbAndCollStats',
+        (value) => {
+          this.set({ shouldFetchDbAndCollStats: value });
+        }
+      );
+
       AmpersandModel.prototype.initialize.call(this, props);
     },
     derived: {
@@ -387,6 +401,10 @@ const InstanceModel = AmpersandModel.extend(
     },
 
     removeAllListeners() {
+      // Clean up preference listeners
+      if (this._preferenceUnsubscribe) {
+        this._preferenceUnsubscribe();
+      }
       InstanceModel.removeAllListeners(this);
     },
 

packages/instance-model/test/index.test.js

@@ -1,15 +1,34 @@
 'use strict';
 const { expect } = require('chai');
 const { MongoDBInstance } = require('../');
+const {
+  createSandboxFromDefaultPreferences,
+} = require('compass-preferences-model');
 
 describe('mongodb-instance-model', function () {
+  let preferences;
+
+  beforeEach(async function () {
+    preferences = await createSandboxFromDefaultPreferences();
+  });
+
   it('should be in initial state when created', function () {
-    const instance = new MongoDBInstance({ _id: 'abc' });
+    const instance = new MongoDBInstance({ _id: 'abc', preferences });
     expect(instance).to.have.property('status', 'initial');
     expect(instance.build.toJSON()).to.be.an('object').that.is.empty;
     expect(instance.host.toJSON()).to.be.an('object').that.is.empty;
   });
 
+  it('should answer shouldFetchDbAndCollStats based on preferences', async function () {
+    const instance = new MongoDBInstance({ _id: 'abc', preferences });
+
+    await preferences.savePreferences({ enableDbAndCollStats: true });
+    expect(instance.shouldFetchDbAndCollStats).to.equal(true);
+
+    await preferences.savePreferences({ enableDbAndCollStats: false });
+    expect(instance.shouldFetchDbAndCollStats).to.equal(false);
+  });
+
   context('with mocked dataService', function () {
     const dataService = {
       instance() {
@@ -24,7 +43,7 @@ describe('mongodb-instance-model', function () {
     };
 
     it('should fetch and populate instance info when fetch called', async function () {
-      const instance = new MongoDBInstance({ _id: 'abc' });
+      const instance = new MongoDBInstance({ _id: 'abc', preferences });
 
       await instance.fetch({ dataService });
 
@@ -61,6 +80,7 @@ describe('mongodb-instance-model', function () {
         _id: 'foo',
         hostname: 'foo.com',
         port: 1234,
+        preferences,
         topologyDescription: getTopologyDescription(),
       });