fix(compass-preferences): ensure cloud preferences are correctly set in storage COMPASS-10775 (#8176)

Author: mabaasit

packages/compass-preferences-model/src/preferences.spec.ts

@@ -33,14 +33,7 @@ const setupPreferences = async (
   return preferences;
 };
 
-const GLOBAL_PREFERENCES_SOURCES = [
-  'cli',
-  'global',
-  'hardcoded',
-  'atlasCloudUser',
-  'atlasCloudProject',
-  'atlasCloudOrg',
-] as const;
+const GLOBAL_PREFERENCES_SOURCES = ['cli', 'global', 'hardcoded'] as const;
 
 describe('Preferences class', function () {
   let tmpdir: string;
@@ -324,4 +317,43 @@ describe('Preferences class', function () {
       );
     });
   }
+
+  it('sets preferences source correctly', async function () {
+    const preferences = await setupPreferences(tmpdir, {
+      cli: {
+        enableMaps: true,
+      },
+      global: {
+        trackUsageStatistics: true,
+      },
+      hardcoded: {
+        networkTraffic: false,
+        enableGenAIFeatures: false,
+      },
+      atlasCloudOrg: {
+        enableGenAIFeaturesAtlasOrg: true,
+      },
+      atlasCloudProject: {
+        enableRollingIndexes: true,
+      },
+      atlasCloudUser: {
+        readOnly: true,
+      },
+    });
+    const states = preferences.getPreferenceStates();
+
+    expect(states).to.have.a.property('enableMaps', 'set-cli');
+    expect(states).to.have.a.property('trackUsageStatistics', 'set-global');
+    expect(states).to.have.a.property('networkTraffic', 'hardcoded');
+    expect(states).to.have.a.property('enableGenAIFeatures', 'hardcoded');
+    expect(states).to.have.a.property(
+      'enableGenAIFeaturesAtlasOrg',
+      'set-cloud-org'
+    );
+    expect(states).to.have.a.property(
+      'enableRollingIndexes',
+      'set-cloud-project'
+    );
+    expect(states).to.have.a.property('readOnly', 'set-cloud-user');
+  });
 });

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

@@ -195,9 +195,6 @@ export class Preferences {
       ...this._getUserPreferenceValues(),
       ...this._globalPreferences.cli,
       ...this._globalPreferences.global,
-      ...this._globalPreferences.atlasCloudUser,
-      ...this._globalPreferences.atlasCloudProject,
-      ...this._globalPreferences.atlasCloudOrg,
       ...this._globalPreferences.hardcoded,
     };
   }

packages/compass-web/src/preferences.spec.tsx

@@ -170,7 +170,12 @@ describe('compass-web preferences', function () {
       } = await getPreferencesFromCloudApi(PROJECT_ID);
 
       const preferences = new CompassWebPreferencesAccess(
-        { ...DEFAULT_COMPASS_WEB_PREFERENCES, ...atlasCloudUserPreferences },
+        {
+          ...DEFAULT_COMPASS_WEB_PREFERENCES,
+          ...atlasCloudUserPreferences,
+          ...atlasCloudProjectPreferences,
+          ...atlasCloudOrgPreferences,
+        },
         {
           atlasCloudUser: atlasCloudUserPreferences,
           atlasCloudProject: atlasCloudProjectPreferences,
@@ -204,35 +209,6 @@ describe('compass-web preferences', function () {
       expect(atlasCloudOrgPreferences).to.not.have.property('nonExistentFlag');
     });
 
-    it('if default value differs from cloud value, it should be overridden by cloud value', async function () {
-      fetchStub.resolves(
-        fakeResponse({
-          ...apiResponse,
-          featureFlags: {
-            ...apiResponse.featureFlags,
-            enableGenAIFeaturesAtlasProject: true,
-          },
-        })
-      );
-      const {
-        atlasCloudProjectPreferences,
-        atlasCloudUserPreferences,
-        atlasCloudOrgPreferences,
-      } = await getPreferencesFromCloudApi(PROJECT_ID);
-
-      const preferences = new CompassWebPreferencesAccess(
-        {
-          enableGenAIFeaturesAtlasProject: false, // Default
-        },
-        {
-          atlasCloudProject: atlasCloudProjectPreferences,
-          atlasCloudUser: atlasCloudUserPreferences,
-          atlasCloudOrg: atlasCloudOrgPreferences,
-        }
-      ).getPreferences();
-      expect(preferences.enableGenAIFeaturesAtlasProject).to.equal(true);
-    });
-
     it('throws when the request is not ok', async function () {
       fetchStub.resolves(fakeResponse({}, false));
 

packages/compass-web/src/preferences.tsx

@@ -186,6 +186,8 @@ async function _fetchAndCachePreferences(
       {
         ...DEFAULT_COMPASS_WEB_PREFERENCES,
         ...atlasCloudUserPreferences,
+        ...atlasCloudProjectPreferences,
+        ...atlasCloudOrgPreferences,
       },
       {
         atlasCloudUser: atlasCloudUserPreferences,