react to changes

Author: mabaasit

packages/collection-model/lib/model.js

@@ -252,6 +252,16 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
         ...collStats,
         ...(collectionInfo && pickCollectionInfo(collectionInfo)),
       });
+      // If the collection is not unprovisioned `is_non_existent` anymore,
+      // let's update the parent database model to reflect the change.
+      // This happens when a user tries to insert first document into a
+      // collection that doesn't exist yet or creates a new collection 
+      // for an unprovisioned database.
+      if (!this.is_non_existent) {
+        getParentByType(this, 'Database').set({
+          is_non_existent: false,
+        });
+      }
     } catch (err) {
       this.set({ status: 'error', statusError: err.message });
       throw err;

packages/compass-workspaces/src/index.ts

@@ -15,6 +15,8 @@ import workspacesReducer, {
   getLocalAppRegistryForTab,
   cleanupLocalAppRegistries,
   connectionDisconnected,
+  updateDatabaseInfo,
+  updateCollectionInfo,
 } from './stores/workspaces';
 import Workspaces from './components';
 import { applyMiddleware, createStore } from 'redux';
@@ -89,12 +91,38 @@ export function activateWorkspacePlugin(
 
   addCleanup(cleanupLocalAppRegistries);
 
-  const setupInstanceListeners = (instance: MongoDBInstance) => {
+  const setupInstanceListeners = (
+    connectionId: string,
+    instance: MongoDBInstance
+  ) => {
     on(instance, 'change:collections._id', (collection: Collection) => {
       const { _id: from } = collection.previousAttributes();
       store.dispatch(collectionRenamed(from, collection.ns));
     });
 
+    on(instance, 'change:databases.is_non_existent', (database: Database) => {
+      const namespaceId = `${connectionId}.${database._id}`;
+      const databaseInfo = {
+        isNonExistent: database.is_non_existent,
+      };
+      store.dispatch(updateDatabaseInfo(namespaceId, databaseInfo));
+    });
+
+    on(
+      instance,
+      'change:collections.is_non_existent',
+      (collection: Collection) => {
+        const namespaceId = `${connectionId}.${collection._id}`;
+        const collectionInfo = {
+          isTimeSeries: collection.isTimeSeries,
+          isReadonly: collection.readonly ?? collection.isView,
+          sourceName: collection.sourceName,
+          isNonExistent: collection.is_non_existent,
+        };
+        store.dispatch(updateCollectionInfo(namespaceId, collectionInfo));
+      }
+    );
+
     on(instance, 'remove:collections', (collection: Collection) => {
       store.dispatch(collectionRemoved(collection.ns));
     });
@@ -104,9 +132,8 @@ export function activateWorkspacePlugin(
     });
   };
 
-  const existingInstances = instancesManager.listMongoDBInstances();
-  for (const instance of existingInstances.values()) {
-    setupInstanceListeners(instance);
+  for (const [connId, instance] of instancesManager.listMongoDBInstances()) {
+    setupInstanceListeners(connId, instance);
   }
 
   on(
@@ -116,7 +143,7 @@ export function activateWorkspacePlugin(
       connectionInfoId: ConnectionInfo['id'],
       instance: MongoDBInstance
     ) {
-      setupInstanceListeners(instance);
+      setupInstanceListeners(connectionInfoId, instance);
     }
   );
 

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

@@ -687,6 +687,15 @@ export type TabOptions = {
   newTab?: boolean;
 };
 
+export const updateCollectionInfo = (
+  namespaceId: string,
+  info: CollectionTabInfo
+): FetchCollectionInfoAction => ({
+  type: WorkspacesActions.FetchCollectionTabInfo,
+  namespaceId,
+  info,
+});
+
 const fetchCollectionInfo = (
   workspaceOptions: Extract<OpenWorkspaceOptions, { type: 'Collection' }>
 ): WorkspacesThunkAction<Promise<void>, FetchCollectionInfoAction> => {
@@ -719,16 +728,13 @@ const fetchCollectionInfo = (
 
       if (coll) {
         await coll.fetch({ dataService });
-        dispatch({
-          type: WorkspacesActions.FetchCollectionTabInfo,
-          namespaceId,
-          info: {
-            isTimeSeries: coll.isTimeSeries,
-            isReadonly: coll.readonly ?? coll.isView,
-            sourceName: coll.sourceName,
-            isNonExistent: coll.is_non_existent,
-          },
-        });
+        const info = {
+          isTimeSeries: coll.isTimeSeries,
+          isReadonly: coll.readonly ?? coll.isView,
+          sourceName: coll.sourceName,
+          isNonExistent: coll.is_non_existent,
+        };
+        dispatch(updateCollectionInfo(namespaceId, info));
       }
     } catch (err) {
       logger.debug(
@@ -742,6 +748,15 @@ const fetchCollectionInfo = (
   };
 };
 
+export const updateDatabaseInfo = (
+  namespaceId: string,
+  info: DatabaseTabInfo
+): FetchDatabaseInfoAction => ({
+  type: WorkspacesActions.FetchDatabaseTabInfo,
+  namespaceId,
+  info,
+});
+
 const fetchDatabaseInfo = (
   workspaceOptions: Extract<OpenWorkspaceOptions, { type: 'Collections' }>
 ): WorkspacesThunkAction<Promise<void>, FetchDatabaseInfoAction> => {
@@ -768,13 +783,10 @@ const fetchDatabaseInfo = (
       const db = instance.databases.get(workspaceOptions.namespace);
       if (db) {
         await db.fetch({ dataService });
-        dispatch({
-          type: WorkspacesActions.FetchDatabaseTabInfo,
-          namespaceId,
-          info: {
-            isNonExistent: db.is_non_existent,
-          },
-        });
+        const info = {
+          isNonExistent: db.is_non_existent,
+        };
+        dispatch(updateDatabaseInfo(namespaceId, info));
       }
     } catch (err) {
       logger.debug(

packages/data-service/src/data-service.ts

@@ -1175,7 +1175,13 @@ class DataServiceImpl extends WithLogContext implements DataService {
     collName: string
   ): Promise<ReturnType<typeof adaptCollectionInfo> | null> {
     const [collInfo] = await this._listCollections(dbName, { name: collName });
-    return adaptCollectionInfo({ db: dbName, ...collInfo }) ?? null;
+    return (
+      adaptCollectionInfo({
+        db: dbName,
+        ...collInfo,
+        is_non_existent: false,
+      }) ?? null
+    );
   }
 
   @op(mongoLogId(1_001_000_031))
@@ -1346,10 +1352,7 @@ class DataServiceImpl extends WithLogContext implements DataService {
       // if they were fetched successfully
       [...collectionsFromPrivileges, ...listedCollections],
       'name'
-    ).map(({ is_non_existent, ...coll }) => ({
-      is_non_existent,
-      ...adaptCollectionInfo({ db: databaseName, ...coll }),
-    }));
+    ).map((coll) => adaptCollectionInfo({ db: databaseName, ...coll }));
 
     return collections;
   }
@@ -1452,11 +1455,10 @@ class DataServiceImpl extends WithLogContext implements DataService {
       // if they were fetched successfully
       [...databasesFromRoles, ...databasesFromPrivileges, ...listedDatabases],
       'name'
-    ).map(({ name, is_non_existent, ...db }) => {
+    ).map(({ name, ...db }) => {
       return {
         _id: name,
         name,
-        is_non_existent,
         ...adaptDatabaseInfo(db),
       };
     });

packages/data-service/src/instance-detail-helper.ts

@@ -359,15 +359,17 @@ function adaptBuildInfo(rawBuildInfo: Partial<BuildInfo>) {
 }
 
 export function adaptDatabaseInfo(
-  databaseStats: Partial<DbStats> & Partial<DatabaseInfo>
-): Omit<DatabaseDetails, '_id' | 'collections' | 'name' | 'is_non_existent'> {
+  databaseStats: Partial<DbStats> &
+    Partial<DatabaseInfo> & { is_non_existent: boolean }
+): Omit<DatabaseDetails, '_id' | 'collections' | 'name'> {
   return {
     collection_count: databaseStats.collections ?? 0,
     document_count: databaseStats.objects ?? 0,
     index_count: databaseStats.indexes ?? 0,
     storage_size: databaseStats.storageSize ?? 0,
     data_size: databaseStats.dataSize ?? 0,
     index_size: databaseStats.indexSize ?? 0,
+    is_non_existent: databaseStats.is_non_existent,
   };
 }
 
@@ -377,10 +379,12 @@ export function adaptCollectionInfo({
   info,
   options,
   type,
-}: CollectionInfoNameOnly & Partial<CollectionInfo> & { db: string }): Omit<
-  CollectionDetails,
-  'is_non_existent'
-> {
+  is_non_existent,
+}: CollectionInfoNameOnly &
+  Partial<CollectionInfo> & {
+    db: string;
+    is_non_existent: boolean;
+  }): CollectionDetails {
   const ns = toNS(`${db}.${name}`);
   const {
     collection,
@@ -428,5 +432,6 @@ export function adaptCollectionInfo({
     validation: hasValidation
       ? { validator, validationAction, validationLevel }
       : null,
+    is_non_existent,
   };
 }