fix(storage): import path jit (#4700)

Author: mabaasit

packages/compass-connections/src/components/connections.tsx

@@ -29,8 +29,6 @@ const { log, mongoLogId } = createLoggerAndTelemetry(
   'mongodb-compass:connections:connections'
 );
 
-const { basepath } = getStoragePaths() ?? {};
-
 type ConnectFn = typeof connect;
 
 export type { ConnectFn };
@@ -63,7 +61,7 @@ function Connections({
   appRegistry,
   onConnected,
   isConnected,
-  connectionStorage = new ConnectionStorage(basepath),
+  connectionStorage = new ConnectionStorage(getStoragePaths()?.basepath),
   appName,
   getAutoConnectInfo,
   connectFn = connect,

packages/compass-import-export/src/utils/get-user-data-file-path.ts

@@ -1,11 +1,13 @@
 import path from 'path';
 import { getStoragePaths } from '@mongodb-js/compass-utils';
-const { appName, basepath } = getStoragePaths() || {};
 
 export function getUserDataFolderPath() {
+  const { appName, basepath } = getStoragePaths() || {};
   if (appName === undefined || basepath === undefined) {
     throw new Error('cannot access user data folder path');
   }
-
+  // Todo: https://jira.mongodb.org/browse/COMPASS-7080
+  // We should directly call getStoragePaths wherever this function is called.
+  // It creates nested folder with appName as folder name.
   return path.join(basepath, appName);
 }

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

@@ -11,7 +11,6 @@ import type { ParsedGlobalPreferencesResult } from './global-config';
 
 import { getStoragePaths } from '@mongodb-js/compass-utils';
 import type { PreferencesAccess } from '.';
-const { basepath } = getStoragePaths() || {};
 
 let preferencesSingleton: Preferences | undefined;
 
@@ -23,7 +22,7 @@ export async function setupPreferences(
   }
 
   const preferences = (preferencesSingleton = new Preferences(
-    basepath,
+    getStoragePaths()?.basepath,
     globalPreferences
   ));
 

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

@@ -3,14 +3,12 @@ import type { ParsedGlobalPreferencesResult } from '.';
 import { setupPreferences } from './setup-preferences';
 import { UserStorage } from './storage';
 import { getStoragePaths } from '@mongodb-js/compass-utils';
-const { basepath } = getStoragePaths() || {};
-
-const userStorage = new UserStorage(basepath);
 
 export async function setupPreferencesAndUser(
   globalPreferences: ParsedGlobalPreferencesResult
 ): Promise<void> {
   await setupPreferences(globalPreferences);
+  const userStorage = new UserStorage(getStoragePaths()?.basepath);
   const user = await userStorage.getOrCreate(getActiveUserId());
   // update user id (telemetryAnonymousId) in preferences if new user was created.
   await preferences.savePreferences({ telemetryAnonymousId: user.id });
@@ -25,6 +23,7 @@ function getActiveUserId() {
 }
 
 export async function getActiveUser() {
+  const userStorage = new UserStorage(getStoragePaths()?.basepath);
   return userStorage.getUser(getActiveUserId());
 }
 

packages/compass-query-bar/src/stores/query-bar-store.ts

@@ -27,8 +27,6 @@ import {
 import { getStoragePaths } from '@mongodb-js/compass-utils';
 import { AtlasService } from '@mongodb-js/atlas-service/renderer';
 
-const { basepath } = getStoragePaths() || {};
-
 // Partial of DataService that mms shares with Compass.
 type QueryBarDataService = Pick<DataService, 'sample' | 'getConnectionString'>;
 
@@ -83,11 +81,11 @@ function createStore(options: Partial<QueryBarStoreOptions> = {}) {
     dataProvider,
     atlasService = new AtlasService(),
     recentQueryStorage = new RecentQueryStorage(
-      options.basepath ?? basepath,
+      options.basepath ?? getStoragePaths()?.basepath,
       namespace
     ),
     favoriteQueryStorage = new FavoriteQueryStorage(
-      options.basepath ?? basepath,
+      options.basepath ?? getStoragePaths()?.basepath,
       namespace
     ),
   } = options;

packages/compass-saved-aggregations-queries/src/stores/index.ts

@@ -17,9 +17,10 @@ import { FavoriteQueryStorage } from '@mongodb-js/compass-query-bar';
 import { PipelineStorage } from '@mongodb-js/compass-aggregations';
 import { getStoragePaths } from '@mongodb-js/compass-utils';
 
-const { basepath } = getStoragePaths() ?? {};
 // Exporting so that they can be stubed/spied in tests
-export const queryStorage = new FavoriteQueryStorage(basepath);
+export const queryStorage = new FavoriteQueryStorage(
+  getStoragePaths()?.basepath
+);
 export const pipelineStorage = new PipelineStorage();
 
 const _store = createStore(

packages/compass-shell/src/modules/get-user-data-file-path.js

@@ -1,9 +1,12 @@
 const path = require('path');
 const { getStoragePaths } = require('@mongodb-js/compass-utils');
-const { appName, basepath } = getStoragePaths() || {};
 
 export function getUserDataFilePath(filename) {
+  const { appName, basepath } = getStoragePaths() || {};
   if (appName === undefined || basepath === undefined) return;
 
+  // Todo: https://jira.mongodb.org/browse/COMPASS-7080
+  // We should directly call getStoragePaths wherever this function is called.
+  // It creates nested folder with appName as folder name.
   return path.join(basepath, appName, filename);
 }

packages/compass-sidebar/src/modules/connection-info.js

@@ -4,8 +4,6 @@ import { getStoragePaths } from '@mongodb-js/compass-utils';
 
 const { debug } = createLoggerAndTelemetry('COMPASS-SIDEBAR');
 
-const { basepath } = getStoragePaths() ?? {};
-
 /**
  * Change connection action name.
  */
@@ -25,7 +23,7 @@ export const INITIAL_STATE = {
       connectionString: 'mongodb://localhost:27017',
     },
   },
-  connectionStorage: new ConnectionStorage(basepath),
+  connectionStorage: new ConnectionStorage(getStoragePaths()?.basepath),
 };
 
 async function saveConnectionInfo(connectionInfo, connectionStorage) {

packages/connection-storage/src/import-export-connection.ts

@@ -8,8 +8,6 @@ import { Decrypter, Encrypter } from './encrypt';
 import createLoggerAndTelemetry from '@mongodb-js/compass-logging';
 import { getStoragePaths } from '@mongodb-js/compass-utils';
 
-const { basepath } = getStoragePaths() ?? {};
-
 const { log, mongoLogId, track } = createLoggerAndTelemetry(
   'COMPASS-CONNECTION-IMPORT-EXPORT'
 );
@@ -40,7 +38,8 @@ export async function exportConnections(
   options: ExportConnectionOptions = {}
 ): Promise<string> {
   const {
-    loadConnections = async () => new ConnectionStorage(basepath).loadAll(),
+    loadConnections = async () =>
+      new ConnectionStorage(getStoragePaths()?.basepath).loadAll(),
     filter = (info) => info.favorite?.name,
     passphrase = '',
     removeSecrets = false,
@@ -109,7 +108,7 @@ class CompassImportError extends Error {
 async function saveConnectionsToDefaultStorage(
   connections: ConnectionInfo[]
 ): Promise<void> {
-  const storage = new ConnectionStorage(basepath);
+  const storage = new ConnectionStorage(getStoragePaths()?.basepath);
   await Promise.all(connections.map((conn) => storage.save(conn)));
 }