rename property

Author: mabaasit

packages/collection-model/index.d.ts

@@ -81,8 +81,8 @@ interface CollectionProps {
   /** Only relevant for a view and identifies collection/view from which this view was created. */
   sourceName: string | null;
   source: Collection;
-  properties: { id: string; options?: unknown }[];
-  ns_source: 'provisioned' | 'privileges';
+  properties: { id: string; options?: Record<string, unknown> }[];
+  is_non_existant: boolean;
 }
 
 type CollectionDataService = Pick<DataService, 'collectionStats' | 'collectionInfo' | 'listCollections' | 'isListSearchIndexesSupported'>;

packages/collection-model/lib/model.js

@@ -102,9 +102,9 @@ function pickCollectionInfo({
   validation,
   clustered,
   fle2,
-  ns_source,
+  is_non_existant,
 }) {
-  return { type, readonly, view_on, collation, pipeline, validation, clustered, fle2, ns_source };
+  return { type, readonly, view_on, collation, pipeline, validation, clustered, fle2, is_non_existant };
 }
 
 /**
@@ -125,7 +125,7 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
     statusError: { type: 'string', default: null },
 
     // Normalized values from collectionInfo command
-    ns_source: 'string',
+    is_non_existant: 'boolean',
     readonly: 'boolean',
     clustered: 'boolean',
     fle2: 'boolean',

packages/compass-connections-navigation/src/navigation-item-icon.tsx

@@ -5,7 +5,7 @@ import type { GlyphName } from '@mongodb-js/compass-components';
 import { WithStatusMarker } from './with-status-marker';
 import { isLocalhost } from 'mongodb-build-info';
 
-const UNPROVISIONED_NAMESPACE_TEXT =
+const NON_EXISTANT_NAMESPACE_TEXT =
   'You have privileges to this namespace, but it is not in your list of current namespaces';
 
 const tooltipTriggerStyles = css({
@@ -35,26 +35,26 @@ const IconWithTooltip = ({
 
 export const NavigationItemIcon = ({ item }: { item: SidebarTreeItem }) => {
   if (item.type === 'database') {
-    if (item.ns_source === 'provisioned') {
-      return <Icon glyph="Database" />;
+    if (item.isNonExistant) {
+      return (
+        <IconWithTooltip
+          text={NON_EXISTANT_NAMESPACE_TEXT}
+          glyph="EmptyDatabase"
+        />
+      );
     }
-    return (
-      <IconWithTooltip
-        text={UNPROVISIONED_NAMESPACE_TEXT}
-        glyph="EmptyDatabase"
-      />
-    );
+    return <Icon glyph="Database" />;
   }
   if (item.type === 'collection') {
-    if (item.ns_source === 'provisioned') {
-      return <Icon glyph="Folder" />;
+    if (item.isNonExistant) {
+      return (
+        <IconWithTooltip
+          text={NON_EXISTANT_NAMESPACE_TEXT}
+          glyph="EmptyFolder"
+        />
+      );
     }
-    return (
-      <IconWithTooltip
-        text={UNPROVISIONED_NAMESPACE_TEXT}
-        glyph="EmptyFolder"
-      />
-    );
+    return <Icon glyph="Folder" />;
   }
   if (item.type === 'view') {
     return <Icon glyph="Visibility" />;

packages/compass-connections-navigation/src/styled-navigation-item.tsx

@@ -35,8 +35,8 @@ export default function StyledNavigationItem({
     const isDisconnectedConnection =
       item.type === 'connection' && item.connectionStatus !== 'connected';
     const isNonExistantNamespace =
-      item.type === 'database' ||
-      (item.type === 'collection' && item.ns_source !== 'provisioned');
+      (item.type === 'database' || item.type === 'collection') &&
+      item.isNonExistant;
 
     if (colorCode && colorCode !== DefaultColorCode) {
       style['--item-bg-color'] = connectionColorToHex(colorCode);

packages/compass-connections-navigation/src/tree-data.ts

@@ -54,7 +54,7 @@ export type Database = {
   collectionsStatus: DatabaseOrCollectionStatus;
   collectionsLength: number;
   collections: Collection[];
-  ns_source: 'provisioned' | 'privileges' | 'roles';
+  isNonExistant: boolean;
 };
 
 type PlaceholderTreeItem = VirtualPlaceholderItem & {
@@ -68,7 +68,7 @@ export type Collection = {
   type: 'view' | 'collection' | 'timeseries';
   sourceName: string | null;
   pipeline: unknown[];
-  ns_source: 'provisioned' | 'privileges';
+  isNonExistant: boolean;
 };
 
 export type NotConnectedConnectionTreeItem = VirtualTreeItem & {
@@ -102,7 +102,7 @@ export type DatabaseTreeItem = VirtualTreeItem & {
   connectionId: string;
   dbName: string;
   hasWriteActionsDisabled: boolean;
-  ns_source: Database['ns_source'];
+  isNonExistant: boolean;
 };
 
 export type CollectionTreeItem = VirtualTreeItem & {
@@ -113,7 +113,7 @@ export type CollectionTreeItem = VirtualTreeItem & {
   connectionId: string;
   namespace: string;
   hasWriteActionsDisabled: boolean;
-  ns_source: Collection['ns_source'];
+  isNonExistant: boolean;
 };
 
 export type SidebarActionableItem =
@@ -249,7 +249,7 @@ const databaseToItems = ({
     collections,
     collectionsLength,
     collectionsStatus,
-    ns_source,
+    isNonExistant,
   },
   connectionId,
   expandedItems = {},
@@ -282,7 +282,7 @@ const databaseToItems = ({
     dbName: id,
     isExpandable: true,
     hasWriteActionsDisabled,
-    ns_source,
+    isNonExistant,
   };
 
   const sidebarData: SidebarTreeItem[] = [databaseTI];
@@ -310,20 +310,22 @@ const databaseToItems = ({
   }
 
   return sidebarData.concat(
-    collections.map(({ _id: id, name, type, ns_source }, collectionIndex) => ({
-      id: `${connectionId}.${id}`, // id is the namespace of the collection, so includes db as well
-      level: level + 1,
-      name,
-      type,
-      setSize: collectionsLength,
-      posInSet: collectionIndex + 1,
-      colorCode,
-      connectionId,
-      namespace: id,
-      hasWriteActionsDisabled,
-      isExpandable: false,
-      ns_source,
-    }))
+    collections.map(
+      ({ _id: id, name, type, isNonExistant }, collectionIndex) => ({
+        id: `${connectionId}.${id}`, // id is the namespace of the collection, so includes db as well
+        level: level + 1,
+        name,
+        type,
+        setSize: collectionsLength,
+        posInSet: collectionIndex + 1,
+        colorCode,
+        connectionId,
+        namespace: id,
+        hasWriteActionsDisabled,
+        isExpandable: false,
+        isNonExistant,
+      })
+    )
   );
 };
 

packages/compass-sidebar/src/modules/databases.ts

@@ -39,16 +39,21 @@ export type DatabasesAction =
   | FetchAllCollectionsAction
   | ExpandDatabaseAction;
 
-type DatabaseRaw = MongoDBInstance['databases'][number];
+export type InstanceDatabase = MongoDBInstance['databases'][number];
 
 export type Database = Pick<
-  DatabaseRaw,
-  '_id' | 'name' | 'collectionsStatus' | 'collectionsLength' | 'ns_source'
+  InstanceDatabase,
+  '_id' | 'name' | 'collectionsStatus' | 'collectionsLength'
 > & {
-  collections: Pick<
-    DatabaseRaw['collections'][number],
-    '_id' | 'name' | 'type' | 'sourceName' | 'pipeline' | 'ns_source'
-  >[];
+  isNonExistant: boolean;
+  collections: Array<
+    Pick<
+      InstanceDatabase['collections'][number],
+      '_id' | 'name' | 'type' | 'sourceName' | 'pipeline'
+    > & {
+      isNonExistant: boolean;
+    }
+  >;
 };
 export type AllDatabasesState = Record<
   ConnectionInfo['id'],

packages/compass-sidebar/src/modules/instance.ts

@@ -2,7 +2,7 @@ import type { MongoDBInstance } from 'mongodb-instance-model';
 import type { RootAction, SidebarThunkAction } from '.';
 import { type ConnectionInfo } from '@mongodb-js/connection-info';
 import throttle from 'lodash/throttle';
-import { type Database, changeDatabases } from './databases';
+import { type InstanceDatabase, changeDatabases } from './databases';
 import { changeConnectionOptions } from './connection-options';
 import { setIsPerformanceTabSupported } from './is-performance-tab-supported';
 import type { MongoServerError } from 'mongodb';
@@ -126,24 +126,24 @@ export const setupInstance =
       { leading: true, trailing: true }
     );
 
-    function getDatabaseInfo(db: Database) {
+    function getDatabaseInfo(db: InstanceDatabase) {
       return {
         _id: db._id,
         name: db.name,
         collectionsStatus: db.collectionsStatus,
         collectionsLength: db.collectionsLength,
-        ns_source: db.ns_source,
+        isNonExistant: db.is_non_existant,
       };
     }
 
-    function getCollectionInfo(coll: Database['collections'][number]) {
+    function getCollectionInfo(coll: InstanceDatabase['collections'][number]) {
       return {
         _id: coll._id,
         name: coll.name,
         type: coll.type,
         sourceName: coll.sourceName,
         pipeline: coll.pipeline,
-        ns_source: coll.ns_source,
+        isNonExistant: coll.is_non_existant,
       };
     }
 

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

@@ -142,7 +142,7 @@ type CompassWorkspacesProps = {
   ): void;
 };
 
-const notProvisionedStyles = css({
+const nonExistantStyles = css({
   color: palette.gray.base,
 });
 
@@ -232,7 +232,7 @@ const CompassWorkspaces: React.FunctionComponent<CompassWorkspacesProps> = ({
             getConnectionById(tab.connectionId)?.title || '';
           const database = tab.namespace;
           const namespaceId = `${tab.connectionId}.${database}`;
-          const { ns_source } = databaseInfo[namespaceId] ?? {};
+          const { isNonExistant } = databaseInfo[namespaceId] ?? {};
           return {
             id: tab.id,
             connectionName,
@@ -242,20 +242,19 @@ const CompassWorkspaces: React.FunctionComponent<CompassWorkspacesProps> = ({
               ['Connection', connectionName || ''],
               ['Database', database],
             ] as Tooltip,
-            iconGlyph:
-              ns_source !== 'provisioned' ? 'EmptyDatabase' : 'Database',
+            iconGlyph: isNonExistant ? 'EmptyDatabase' : 'Database',
             'data-namespace': tab.namespace,
             tabTheme: getThemeOf(tab.connectionId),
-            ...(ns_source !== 'provisioned' && {
-              className: notProvisionedStyles,
+            ...(isNonExistant && {
+              className: nonExistantStyles,
             }),
           } as const;
         }
         case 'Collection': {
           const { database, collection, ns } = toNS(tab.namespace);
           const namespaceId = `${tab.connectionId}.${ns}`;
           const info = collectionInfo[namespaceId] ?? {};
-          const { isTimeSeries, isReadonly, sourceName, ns_source } = info;
+          const { isTimeSeries, isReadonly, sourceName, isNonExistant } = info;
           const connectionName =
             getConnectionById(tab.connectionId)?.title || '';
           const collectionType = isTimeSeries
@@ -288,13 +287,13 @@ const CompassWorkspaces: React.FunctionComponent<CompassWorkspacesProps> = ({
                 ? 'Visibility'
                 : collectionType === 'timeseries'
                 ? 'TimeSeries'
-                : ns_source !== 'provisioned'
+                : isNonExistant
                 ? 'EmptyFolder'
                 : 'Folder',
             'data-namespace': ns,
             tabTheme: getThemeOf(tab.connectionId),
-            ...(ns_source !== 'provisioned' && {
-              className: notProvisionedStyles,
+            ...(isNonExistant && {
+              className: nonExistantStyles,
             }),
           } as const;
         }

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

@@ -101,11 +101,11 @@ export type CollectionTabInfo = {
   isTimeSeries: boolean;
   isReadonly: boolean;
   sourceName?: string | null;
-  ns_source: 'provisioned' | 'privileges';
+  isNonExistant: boolean;
 };
 
 export type DatabaseTabInfo = {
-  ns_source: 'provisioned' | 'privileges' | 'roles';
+  isNonExistant: boolean;
 };
 
 export type WorkspacesState = {
@@ -726,7 +726,7 @@ const fetchCollectionInfo = (
             isTimeSeries: coll.isTimeSeries,
             isReadonly: coll.readonly ?? coll.isView,
             sourceName: coll.sourceName,
-            ns_source: coll.ns_source,
+            isNonExistant: coll.is_non_existant,
           },
         });
       }
@@ -772,7 +772,7 @@ const fetchDatabaseInfo = (
           type: WorkspacesActions.FetchDatabaseTabInfo,
           namespaceId,
           info: {
-            ns_source: db.ns_source,
+            isNonExistant: db.is_non_existant,
           },
         });
       }