clean up

Author: mabaasit

packages/collection-model/lib/model.js

@@ -239,22 +239,17 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
     if (!shouldFetch(this.status, force)) {
       return;
     }
-    // When trying to fetch collectionStats for a namespace whose db does not exist,
-    // the server throws an error. This happens because we show dbs/collections to
-    // the user from their roles/privileges. So, if the database does not exist, we
-    // skip fetching collectionStats for the namespace.
-    const dbExists = !getParentByType(this, 'Database').is_non_existant;
     try {
       const newStatus = this.status === 'initial' ? 'fetching' : 'refreshing';
       this.set({ status: newStatus });
       const [collStats, collectionInfo] = await Promise.all([
-        dbExists ? dataService.collectionStats(this.database, this.name) : null,
+        dataService.collectionStats(this.database, this.name),
         fetchInfo ? dataService.collectionInfo(this.database, this.name) : null,
       ]);
       this.set({
         status: 'ready',
         statusError: null,
-        ...(collStats && collStats),
+        ...collStats,
         ...(collectionInfo && pickCollectionInfo(collectionInfo)),
       });
     } catch (err) {

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

@@ -1149,11 +1149,15 @@ class DataServiceImpl extends WithLogContext implements DataService {
       );
     } catch (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 (
+        // We ignore errors for fetching collStats when requesting on an
+        // unsupported collection type: either a view or a ADF
         message.includes('not valid for Data Lake') ||
-        message.includes('is a view, not a collection')
+        message.includes('is a view, not a collection') ||
+        // When trying to fetch collectionStats for a namespace whose db does not exist,
+        // the server throws an error. This happens because we show dbs/collections to
+        // the user from their roles/privileges.
+        message.includes(`Database [${databaseName}] not found`)
       ) {
         return this._buildCollectionStats(databaseName, collectionName, {});
       }

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

@@ -82,7 +82,7 @@ const CollectionsList: React.FunctionComponent<{
 }) => {
   return (
     <div className={pageContainerStyles}>
-      <ItemsGrid<CollectionProps>
+      <ItemsGrid
         namespace={namespace}
         items={collections}
         itemType="collection"