fix(data-service): ignore errors when fetching collStats in adf; always fetch collInfo COMPASS-7307 (#4963)

* fix(data-service): ignore collStats errors for adf

* fix(instance-model): fix collInfo when expanding database in the sidenav

Author: gribnoysup

packages/collection-model/lib/model.js

@@ -334,7 +334,7 @@ const CollectionCollection = AmpersandCollection.extend(
      * @param {{ dataService: import('mongodb-data-service').DataService }} dataService
      * @returns {Promise<void>}
      */
-    async fetch({ dataService, fetchInfo = true }) {
+    async fetch({ dataService }) {
       const databaseName = getParentByType(this, 'Database')?.getId();
 
       if (!databaseName) {
@@ -354,7 +354,11 @@ const CollectionCollection = AmpersandCollection.extend(
       const collections = await dataService.listCollections(
         databaseName,
         {},
-        { nameOnly: !fetchInfo, privileges: instanceModel.auth.privileges }
+        {
+          // Always fetch collections with info
+          nameOnly: false,
+          privileges: instanceModel.auth.privileges,
+        }
       );
 
       this.set(
@@ -370,7 +374,7 @@ const CollectionCollection = AmpersandCollection.extend(
             return {
               _id,
               type,
-              ...(fetchInfo && pickCollectionInfo(rest)),
+              ...pickCollectionInfo(rest),
             };
           })
       );

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

@@ -1006,10 +1006,16 @@ class DataServiceImpl extends WithLogContext implements DataService {
         collStats[0]
       );
     } catch (error) {
-      if (!(error as Error).message.includes('is a view, not a collection')) {
-        throw error;
+      const message = (error as Error).message;
+      // We ignore errors for fetching collStats when requesting on an
+      // unsupported collection type: either a view or a ADF
+      if (
+        message.includes('not valid for Data Lake') ||
+        message.includes('is a view, not a collection')
+      ) {
+        return this._buildCollectionStats(databaseName, collectionName, {});
       }
-      return this._buildCollectionStats(databaseName, collectionName, {});
+      throw error;
     }
   }
 

packages/database-model/lib/model.js

@@ -153,7 +153,7 @@ const DatabaseModel = AmpersandModel.extend(
      * @param {{ dataService: import('mongodb-data-service').DataService }} dataService
      * @returns {Promise<void>}
      */
-    async fetchCollections({ dataService, fetchInfo = false, force = false }) {
+    async fetchCollections({ dataService, force = false }) {
       if (!shouldFetch(this.collectionsStatus, force)) {
         return;
       }
@@ -162,7 +162,7 @@ const DatabaseModel = AmpersandModel.extend(
         const newStatus =
           this.collectionsStatus === 'initial' ? 'fetching' : 'refreshing';
         this.set({ collectionsStatus: newStatus });
-        await this.collections.fetch({ dataService, fetchInfo, force });
+        await this.collections.fetch({ dataService, force });
         this.set({ collectionsStatus: 'ready', collectionsStatusError: null });
       } catch (err) {
         this.set({
@@ -180,7 +180,6 @@ const DatabaseModel = AmpersandModel.extend(
     }) {
       await this.fetchCollections({
         dataService,
-        fetchInfo: !nameOnly,
         force,
       });
 
@@ -192,7 +191,12 @@ const DatabaseModel = AmpersandModel.extend(
       // the allSettled call here
       await Promise.allSettled(
         this.collections.map((coll) => {
-          return coll.fetch({ dataService, fetchInfo: false, force });
+          return coll.fetch({
+            dataService,
+            // We already fetched it with fetchCollections
+            fetchInfo: false,
+            force
+          });
         })
       );
     },

packages/instance-model/lib/model.js

@@ -285,7 +285,6 @@ const InstanceModel = AmpersandModel.extend(
       fetchDatabases = false,
       fetchDbStats = false,
       fetchCollections = false,
-      fetchCollInfo = false,
       fetchCollStats = false,
     }) {
       this.set({
@@ -310,7 +309,6 @@ const InstanceModel = AmpersandModel.extend(
             if (shouldRefresh(db.collectionsStatus, fetchCollections)) {
               return db.fetchCollections({
                 dataService,
-                fetchInfo: fetchCollInfo,
                 force: true,
               });
             }
@@ -330,10 +328,8 @@ const InstanceModel = AmpersandModel.extend(
                   if (shouldRefresh(coll.status, fetchCollStats)) {
                     return coll.fetch({
                       dataService,
-                      // When fetchCollInfo is true, we skip fetching collection
-                      // info returned by listCollections command as we already
-                      // did that in the previous step
-                      fetchInfo: !fetchCollInfo,
+                      // We already fetched it with fetchCollections
+                      fetchInfo: false,
                       force: true,
                     });
                   }