Refactor code that uses the _rid and _self of a database or collection (#267)

2025-12-19 08:51:24 +00:00 · 2020-10-13 13:29:39 -07:00
parent cfb9a0b321
commit d525afa142
26 changed files with 159 additions and 226 deletions
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -239,7 +239,9 @@ export default class Collection implements ViewModels.Collection {
      this.expandCollection();
    }
    this.container.onUpdateTabsButtons([]);
-    this.container.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.rid === this.rid);
+    this.container.tabsManager.refreshActiveTab(
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
+    );
  }

  public collapseCollection() {
@@ -290,7 +292,7 @@ export default class Collection implements ViewModels.Collection {

    const documentsTabs: DocumentsTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Documents,
-      tab => tab.collection && tab.collection.rid === this.rid
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
    ) as DocumentsTab[];
    let documentsTab: DocumentsTab = documentsTabs && documentsTabs[0];

@@ -312,8 +314,6 @@ export default class Collection implements ViewModels.Collection {
        documentIds: ko.observableArray<DocumentId>([]),
        tabKind: ViewModels.CollectionTabKind.Documents,
        title: "Items",
-
-        selfLink: this.self,
        isActive: ko.observable<boolean>(false),
        collection: this,
        node: this,
@@ -341,7 +341,7 @@ export default class Collection implements ViewModels.Collection {

    const conflictsTabs: ConflictsTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Conflicts,
-      tab => tab.collection && tab.collection.rid === this.rid
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
    ) as ConflictsTab[];
    let conflictsTab: ConflictsTab = conflictsTabs && conflictsTabs[0];

@@ -363,8 +363,6 @@ export default class Collection implements ViewModels.Collection {
        conflictIds: ko.observableArray<ConflictId>([]),
        tabKind: ViewModels.CollectionTabKind.Conflicts,
        title: "Conflicts",
-
-        selfLink: this.self,
        isActive: ko.observable<boolean>(false),
        collection: this,
        node: this,
@@ -398,7 +396,7 @@ export default class Collection implements ViewModels.Collection {

    const queryTablesTabs: QueryTablesTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.QueryTables,
-      tab => tab.collection && tab.collection.rid === this.rid
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
    ) as QueryTablesTab[];
    let queryTablesTab: QueryTablesTab = queryTablesTabs && queryTablesTabs[0];

@@ -427,7 +425,6 @@ export default class Collection implements ViewModels.Collection {
        collection: this,

        node: this,
-        selfLink: this.self,
        hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/entities`,
        isActive: ko.observable(false),
        onLoadStartKey: startKey,
@@ -452,7 +449,7 @@ export default class Collection implements ViewModels.Collection {

    const graphTabs: GraphTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Graph,
-      tab => tab.collection && tab.collection.rid === this.rid
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
    ) as GraphTab[];
    let graphTab: GraphTab = graphTabs && graphTabs[0];

@@ -478,7 +475,6 @@ export default class Collection implements ViewModels.Collection {
        tabPath: "",

        collection: this,
-        selfLink: this.self,
        masterKey: userContext.masterKey || "",
        collectionPartitionKeyProperty: this.partitionKeyProperty,
        hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/graphs`,
@@ -508,7 +504,7 @@ export default class Collection implements ViewModels.Collection {

    const mongoDocumentsTabs: MongoDocumentsTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Documents,
-      tab => tab.collection && tab.collection.rid === this.rid
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
    ) as MongoDocumentsTab[];
    let mongoDocumentsTab: MongoDocumentsTab = mongoDocumentsTabs && mongoDocumentsTabs[0];

@@ -535,7 +531,6 @@ export default class Collection implements ViewModels.Collection {
        collection: this,

        node: this,
-        selfLink: this.self,
        hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoDocuments`,
        isActive: ko.observable(false),
        onLoadStartKey: startKey,
@@ -561,7 +556,7 @@ export default class Collection implements ViewModels.Collection {
    const tabTitle = !this.offer() ? "Settings" : "Scale & Settings";
    const pendingNotificationsPromise: Q.Promise<DataModels.Notification> = this._getPendingThroughputSplitNotification();
    const matchingTabs = this.container.tabsManager.getTabs(ViewModels.CollectionTabKind.Settings, tab => {
-      return tab.collection && tab.collection.rid === this.rid;
+      return tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id();
    });

    const traceStartData = {
@@ -579,7 +574,6 @@ export default class Collection implements ViewModels.Collection {
      tabPath: "",
      collection: this,
      node: this,
-      selfLink: this.self,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/settings`,
      isActive: ko.observable(false),
      onUpdateTabsButtons: this.container.onUpdateTabsButtons
@@ -672,7 +666,6 @@ export default class Collection implements ViewModels.Collection {
      tabPath: "",
      collection: this,
      node: this,
-      selfLink: this.self,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/query`,
      isActive: ko.observable(false),
      queryText: queryText,
@@ -704,7 +697,6 @@ export default class Collection implements ViewModels.Collection {
      tabPath: "",
      collection: this,
      node: this,
-      selfLink: this.self,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoQuery`,
      isActive: ko.observable(false),
      partitionKey: collection.partitionKey,
@@ -735,7 +727,6 @@ export default class Collection implements ViewModels.Collection {
      title: title,
      tabPath: "",
      collection: this,
-      selfLink: this.self,
      masterKey: userContext.masterKey || "",
      collectionPartitionKeyProperty: this.partitionKeyProperty,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/graphs`,
@@ -759,7 +750,6 @@ export default class Collection implements ViewModels.Collection {
      collection: this,
      node: this,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoShell`,
-      selfLink: this.self,
      isActive: ko.observable(false),
      onUpdateTabsButtons: this.container.onUpdateTabsButtons
    });
@@ -822,7 +812,9 @@ export default class Collection implements ViewModels.Collection {
    } else {
      this.expandStoredProcedures();
    }
-    this.container.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.rid === this.rid);
+    this.container.tabsManager.refreshActiveTab(
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
+    );
  }

  public expandStoredProcedures() {
@@ -879,7 +871,9 @@ export default class Collection implements ViewModels.Collection {
    } else {
      this.expandUserDefinedFunctions();
    }
-    this.container.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.rid === this.rid);
+    this.container.tabsManager.refreshActiveTab(
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
+    );
  }

  public expandUserDefinedFunctions() {
@@ -936,7 +930,9 @@ export default class Collection implements ViewModels.Collection {
    } else {
      this.expandTriggers();
    }
-    this.container.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.rid === this.rid);
+    this.container.tabsManager.refreshActiveTab(
+      tab => tab.collection && tab.collection.databaseId === this.databaseId && tab.collection.id() === this.id()
+    );
  }

  public expandTriggers() {
@@ -1029,26 +1025,6 @@ export default class Collection implements ViewModels.Collection {
    this.uploadFiles(event.originalEvent.dataTransfer.files);
  }

-  public isCollectionNodeSelected(): boolean {
-    return (
-      this.isSubNodeSelected(ViewModels.CollectionTabKind.Query) ||
-      (!this.isCollectionExpanded() &&
-        this.container.selectedNode &&
-        this.container.selectedNode() &&
-        this.container.selectedNode().rid === this.rid &&
-        this.container.selectedNode().nodeKind === "Collection")
-    );
-  }
-
-  public isSubNodeSelected(nodeKind: ViewModels.CollectionTabKind): boolean {
-    return (
-      this.container.selectedNode &&
-      this.container.selectedNode() &&
-      this.container.selectedNode().rid === this.rid &&
-      this.selectedSubnodeKind() === nodeKind
-    );
-  }
-
  public onDeleteCollectionContextMenuClick(source: ViewModels.Collection, event: MouseEvent | KeyboardEvent) {
    this.container.deleteCollectionConfirmationPane.open();
  }
@@ -1284,10 +1260,6 @@ export default class Collection implements ViewModels.Collection {
    });
  }

-  protected _getOfferForCollection(offers: DataModels.Offer[], collection: DataModels.Collection): DataModels.Offer {
-    return _.find(offers, (offer: DataModels.Offer) => offer.resource.indexOf(collection._rid) >= 0);
-  }
-
  /**
   * Top-level method that will open the correct tab type depending on account API
   */
--- a/src/Explorer/Tree/Database.ts
+++ b/src/Explorer/Tree/Database.ts
@@ -57,7 +57,7 @@ export default class Database implements ViewModels.Database {
    const pendingNotificationsPromise: Q.Promise<DataModels.Notification> = this._getPendingThroughputSplitNotification();
    const matchingTabs = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.DatabaseSettings,
-      tab => tab.rid === this.rid
+      tab => tab.node?.id() === this.id()
    );
    let settingsTab: DatabaseSettingsTab = matchingTabs && (matchingTabs[0] as DatabaseSettingsTab);
    if (!settingsTab) {
@@ -79,7 +79,6 @@ export default class Database implements ViewModels.Database {
            rid: this.rid,
            database: this,
            hashLocation: `${Constants.HashRoutePrefixes.databasesWithId(this.id())}/settings`,
-            selfLink: this.self,
            isActive: ko.observable(false),
            onLoadStartKey: startKey,
            onUpdateTabsButtons: this.container.onUpdateTabsButtons
@@ -128,8 +127,8 @@ export default class Database implements ViewModels.Database {
      !this.isDatabaseExpanded() &&
      this.container.selectedNode &&
      this.container.selectedNode() &&
-      this.container.selectedNode().rid === this.rid &&
-      this.container.selectedNode().nodeKind === "Database"
+      this.container.selectedNode().nodeKind === "Database" &&
+      this.container.selectedNode().id() === this.id()
    );
  }

@@ -266,7 +265,7 @@ export default class Database implements ViewModels.Database {
      (collection: DataModels.Collection) => {
        const collectionExists = _.some(
          this.collections(),
-          (existingCollection: Collection) => existingCollection.rid === collection._rid
+          (existingCollection: Collection) => existingCollection.id() === collection.id
        );
        return !collectionExists;
      }
@@ -276,7 +275,7 @@ export default class Database implements ViewModels.Database {
    ko.utils.arrayForEach(this.collections(), (collection: Collection) => {
      const collectionPresentInUpdatedList = _.some(
        updatedCollectionsList,
-        (coll: DataModels.Collection) => coll._rid === collection.rid
+        (coll: DataModels.Collection) => coll.id === collection.id()
      );
      if (!collectionPresentInUpdatedList) {
        collectionsToDelete.push(collection);
@@ -302,7 +301,7 @@ export default class Database implements ViewModels.Database {
    const collectionsToKeep: Collection[] = [];

    ko.utils.arrayForEach(this.collections(), (collection: Collection) => {
-      const shouldRemoveCollection = _.some(collectionsToRemove, (coll: Collection) => coll.rid === collection.rid);
+      const shouldRemoveCollection = _.some(collectionsToRemove, (coll: Collection) => coll.id() === collection.id());
      if (!shouldRemoveCollection) {
        collectionsToKeep.push(collection);
      }
--- a/src/Explorer/Tree/ResourceTokenCollection.ts
+++ b/src/Explorer/Tree/ResourceTokenCollection.ts
@@ -94,7 +94,6 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas
      tabPath: "",
      collection: this,
      node: this,
-      selfLink: this.self,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/query`,
      isActive: ko.observable(false),
      queryText: queryText,
@@ -121,7 +120,9 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas

    const documentsTabs: DocumentsTab[] = this.container.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Documents,
-      (tab: TabsBase) => tab.collection && tab.collection.rid === this.rid
+      (tab: TabsBase) =>
+        tab.collection?.id() === this.id() &&
+        (tab.collection as ViewModels.CollectionBase).databaseId === this.databaseId
    ) as DocumentsTab[];
    let documentsTab: DocumentsTab = documentsTabs && documentsTabs[0];

@@ -143,7 +144,6 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas
        documentIds: ko.observableArray<DocumentId>([]),
        tabKind: ViewModels.CollectionTabKind.Documents,
        title: "Items",
-        selfLink: this.self,
        isActive: ko.observable<boolean>(false),
        collection: this,
        node: this,
--- a/src/Explorer/Tree/ResourceTreeAdapter.test.ts
+++ b/src/Explorer/Tree/ResourceTreeAdapter.test.ts
@@ -51,11 +51,11 @@ describe("ResourceTreeAdapter", () => {
      explorer.selectedNode(({
        nodeKind: "Database",
        rid: "dbrid",
-        id: ko.observable<string>("id"),
+        id: ko.observable<string>("dbid"),
        selectedSubnodeKind: ko.observable<ViewModels.CollectionTabKind>(subNodeKind)
      } as unknown) as ViewModels.TreeNode);
      const resourceTreeAdapter = new ResourceTreeAdapter(explorer);
-      const isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("dbrid", "Database", [
+      const isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("dbid", undefined, [
        ViewModels.CollectionTabKind.Documents
      ]);
      expect(isDataNodeSelected).toBeTruthy();
@@ -70,11 +70,12 @@ describe("ResourceTreeAdapter", () => {
      explorer.selectedNode(({
        nodeKind: "Collection",
        rid: "collrid",
-        id: ko.observable<string>("id"),
+        databaseId: "dbid",
+        id: ko.observable<string>("collid"),
        selectedSubnodeKind: ko.observable<ViewModels.CollectionTabKind>(subNodeKind)
      } as unknown) as ViewModels.TreeNode);
      const resourceTreeAdapter = new ResourceTreeAdapter(explorer);
-      let isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("collrid", "Collection", [subNodeKind]);
+      let isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("dbid", "collid", [subNodeKind]);
      expect(isDataNodeSelected).toBeTruthy();

      subNodeKind = ViewModels.CollectionTabKind.Graph;
@@ -84,10 +85,11 @@ describe("ResourceTreeAdapter", () => {
      explorer.selectedNode(({
        nodeKind: "Collection",
        rid: "collrid",
-        id: ko.observable<string>("id"),
+        databaseId: "dbid",
+        id: ko.observable<string>("collid"),
        selectedSubnodeKind: ko.observable<ViewModels.CollectionTabKind>(subNodeKind)
      } as unknown) as ViewModels.TreeNode);
-      isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("collrid", "Collection", [subNodeKind]);
+      isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("dbid", "collid", [subNodeKind]);
      expect(isDataNodeSelected).toBeTruthy();
    });

@@ -96,14 +98,15 @@ describe("ResourceTreeAdapter", () => {
      explorer.selectedNode(({
        nodeKind: "Collection",
        rid: "collrid",
-        id: ko.observable<string>("id"),
+        databaseId: "dbid",
+        id: ko.observable<string>("collid"),
        selectedSubnodeKind: ko.observable<ViewModels.CollectionTabKind>(ViewModels.CollectionTabKind.Documents)
      } as unknown) as ViewModels.TreeNode);
      explorer.tabsManager.activeTab({
        tabKind: ViewModels.CollectionTabKind.Documents
      } as TabsBase);
      const resourceTreeAdapter = new ResourceTreeAdapter(explorer);
-      const isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("collrid", "Collection", [
+      const isDataNodeSelected = resourceTreeAdapter.isDataNodeSelected("dbid", "collid", [
        ViewModels.CollectionTabKind.Settings
      ]);
      expect(isDataNodeSelected).toBeFalsy();
--- a/src/Explorer/Tree/ResourceTreeAdapter.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx
@@ -195,7 +195,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
        isExpanded: false,
        className: "databaseHeader",
        children: [],
-        isSelected: () => this.isDataNodeSelected(database.rid, "Database", undefined),
+        isSelected: () => this.isDataNodeSelected(database.id()),
        contextMenu: ResourceTreeContextMenuButtonFactory.createDatabaseContextMenu(this.container),
        onClick: async isExpanded => {
          // Rewritten version of expandCollapseDatabase():
@@ -210,9 +210,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
          databaseNode.isLoading = false;
          database.selectDatabase();
          this.container.onUpdateTabsButtons([]);
-          this.container.tabsManager.refreshActiveTab(
-            (tab: TabsBase) => tab.collection && tab.collection.getDatabase().rid === database.rid
-          );
+          this.container.tabsManager.refreshActiveTab((tab: TabsBase) => tab.collection?.databaseId === database.id());
        },
        onContextMenuOpen: () => this.container.selectedNode(database)
      };
@@ -221,7 +219,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
        databaseNode.children.push({
          label: "Scale",
          isSelected: () =>
-            this.isDataNodeSelected(database.rid, "Database", [ViewModels.CollectionTabKind.DatabaseSettings]),
+            this.isDataNodeSelected(database.id(), undefined, [ViewModels.CollectionTabKind.DatabaseSettings]),
          onClick: database.onSettingsClick.bind(database)
        });
      }
@@ -268,11 +266,14 @@ export class ResourceTreeAdapter implements ReactAdapter {
          type: MostRecentActivity.Type.OpenCollection,
          title: collection.id(),
          description: "Data",
-          data: collection.rid
+          data: {
+            databaseId: collection.databaseId,
+            collectionId: collection.id()
+          }
        });
      },
      isSelected: () =>
-        this.isDataNodeSelected(collection.rid, "Collection", [
+        this.isDataNodeSelected(collection.databaseId, collection.id(), [
          ViewModels.CollectionTabKind.Documents,
          ViewModels.CollectionTabKind.Graph
        ]),
@@ -282,7 +283,8 @@ export class ResourceTreeAdapter implements ReactAdapter {
    children.push({
      label: database.isDatabaseShared() || this.container.isServerlessEnabled() ? "Settings" : "Scale & Settings",
      onClick: collection.onSettingsClick.bind(collection),
-      isSelected: () => this.isDataNodeSelected(collection.rid, "Collection", [ViewModels.CollectionTabKind.Settings])
+      isSelected: () =>
+        this.isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Settings])
    });

    if (ResourceTreeAdapter.showScriptNodes(this.container)) {
@@ -305,7 +307,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
        label: "Conflicts",
        onClick: collection.onConflictsClick.bind(collection),
        isSelected: () =>
-          this.isDataNodeSelected(collection.rid, "Collection", [ViewModels.CollectionTabKind.Conflicts])
+          this.isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Conflicts])
      });
    }

@@ -321,7 +323,8 @@ export class ResourceTreeAdapter implements ReactAdapter {
        this.container.selectedNode(collection);
        this.container.onUpdateTabsButtons([]);
        this.container.tabsManager.refreshActiveTab(
-          (tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
        );
      },
      onExpanded: () => {
@@ -331,7 +334,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
          collection.loadTriggers();
        }
      },
-      isSelected: () => this.isDataNodeSelected(collection.rid, "Collection", undefined),
+      isSelected: () => this.isDataNodeSelected(collection.databaseId, collection.id()),
      onContextMenuOpen: () => this.container.selectedNode(collection)
    };
  }
@@ -343,13 +346,16 @@ export class ResourceTreeAdapter implements ReactAdapter {
        label: sp.id(),
        onClick: sp.open.bind(sp),
        isSelected: () =>
-          this.isDataNodeSelected(collection.rid, "Collection", [ViewModels.CollectionTabKind.StoredProcedures]),
+          this.isDataNodeSelected(collection.databaseId, collection.id(), [
+            ViewModels.CollectionTabKind.StoredProcedures
+          ]),
        contextMenu: ResourceTreeContextMenuButtonFactory.createStoreProcedureContextMenuItems(this.container, sp)
      })),
      onClick: () => {
        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.StoredProcedures);
        this.container.tabsManager.refreshActiveTab(
-          (tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
        );
      }
    };
@@ -362,13 +368,16 @@ export class ResourceTreeAdapter implements ReactAdapter {
        label: udf.id(),
        onClick: udf.open.bind(udf),
        isSelected: () =>
-          this.isDataNodeSelected(collection.rid, "Collection", [ViewModels.CollectionTabKind.UserDefinedFunctions]),
+          this.isDataNodeSelected(collection.databaseId, collection.id(), [
+            ViewModels.CollectionTabKind.UserDefinedFunctions
+          ]),
        contextMenu: ResourceTreeContextMenuButtonFactory.createUserDefinedFunctionContextMenuItems(this.container, udf)
      })),
      onClick: () => {
        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.UserDefinedFunctions);
        this.container.tabsManager.refreshActiveTab(
-          (tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
        );
      }
    };
@@ -381,13 +390,14 @@ export class ResourceTreeAdapter implements ReactAdapter {
        label: trigger.id(),
        onClick: trigger.open.bind(trigger),
        isSelected: () =>
-          this.isDataNodeSelected(collection.rid, "Collection", [ViewModels.CollectionTabKind.Triggers]),
+          this.isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Triggers]),
        contextMenu: ResourceTreeContextMenuButtonFactory.createTriggerContextMenuItems(this.container, trigger)
      })),
      onClick: () => {
        collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Triggers);
        this.container.tabsManager.refreshActiveTab(
-          (tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid
+          (tab: TabsBase) =>
+            tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
        );
      }
    };
@@ -741,35 +751,42 @@ export class ResourceTreeAdapter implements ReactAdapter {

  /**
   * public for testing purposes
-   * @param rid
-   * @param nodeKind
+   * @param databaseId
+   * @param collectionId
   * @param subnodeKinds
   */
-  public isDataNodeSelected(rid: string, nodeKind: string, subnodeKinds: ViewModels.CollectionTabKind[]): boolean {
+  public isDataNodeSelected(
+    databaseId: string,
+    collectionId?: string,
+    subnodeKinds?: ViewModels.CollectionTabKind[]
+  ): boolean {
    if (!this.container.selectedNode || !this.container.selectedNode()) {
      return false;
    }
    const selectedNode = this.container.selectedNode();
+    const isNodeSelected = collectionId
+      ? (selectedNode as ViewModels.Collection).databaseId === databaseId && selectedNode.id() === collectionId
+      : selectedNode.id() === databaseId;
+
+    if (!isNodeSelected) {
+      return false;
+    }

    if (subnodeKinds === undefined || !Array.isArray(subnodeKinds)) {
-      return selectedNode.rid === rid && selectedNode.nodeKind === nodeKind;
-    } else {
-      const activeTab = this.container.tabsManager.activeTab();
-      let selectedSubnodeKind;
-      if (nodeKind === "Database" && (selectedNode as ViewModels.Database).selectedSubnodeKind) {
-        selectedSubnodeKind = (selectedNode as ViewModels.Database).selectedSubnodeKind();
-      } else if (nodeKind === "Collection" && (selectedNode as ViewModels.Collection).selectedSubnodeKind) {
-        selectedSubnodeKind = (selectedNode as ViewModels.Collection).selectedSubnodeKind();
-      }
-
-      return (
-        activeTab &&
-        subnodeKinds.includes(activeTab.tabKind) &&
-        selectedNode.rid === rid &&
-        selectedSubnodeKind !== undefined &&
-        subnodeKinds.includes(selectedSubnodeKind)
-      );
+      return true;
    }
+
+    const activeTab = this.container.tabsManager.activeTab();
+    const selectedSubnodeKind = collectionId
+      ? (selectedNode as ViewModels.Collection).selectedSubnodeKind()
+      : (selectedNode as ViewModels.Database).selectedSubnodeKind();
+
+    return (
+      activeTab &&
+      subnodeKinds.includes(activeTab.tabKind) &&
+      selectedSubnodeKind !== undefined &&
+      subnodeKinds.includes(selectedSubnodeKind)
+    );
  }

  // ***************  watch all nested ko's inside database
--- a/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
@@ -48,10 +48,14 @@ export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
          type: MostRecentActivity.Type.OpenCollection,
          title: collection.id(),
          description: "Data",
-          data: collection.rid
+          data: {
+            databaseId: collection.databaseId,
+            collectionId: collection.id()
+          }
        });
      },
-      isSelected: () => this.isDataNodeSelected(collection.rid, "Collection", ViewModels.CollectionTabKind.Documents)
+      isSelected: () =>
+        this.isDataNodeSelected(collection.databaseId, collection.id(), ViewModels.CollectionTabKind.Documents)
    });

    const collectionNode: TreeNode = {
@@ -64,9 +68,11 @@ export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
        // Rewritten version of expandCollapseCollection
        this.container.selectedNode(collection);
        this.container.onUpdateTabsButtons([]);
-        this.container.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.rid === collection.rid);
+        this.container.tabsManager.refreshActiveTab(
+          tab => tab.collection?.id() === collection.id() && tab.collection.databaseId === collection.databaseId
+        );
      },
-      isSelected: () => this.isDataNodeSelected(collection.rid, "Collection", undefined)
+      isSelected: () => this.isDataNodeSelected(collection.databaseId, collection.id())
    };

    return {
@@ -76,31 +82,33 @@ export class ResourceTreeAdapterForResourceToken implements ReactAdapter {
    };
  }

-  private isDataNodeSelected(rid: string, nodeKind: string, subnodeKind: ViewModels.CollectionTabKind): boolean {
+  public isDataNodeSelected(
+    databaseId: string,
+    collectionId?: string,
+    subnodeKind?: ViewModels.CollectionTabKind
+  ): boolean {
    if (!this.container.selectedNode || !this.container.selectedNode()) {
      return false;
    }
    const selectedNode = this.container.selectedNode();
+    const isNodeSelected = collectionId
+      ? (selectedNode as ViewModels.Collection).databaseId === databaseId && selectedNode.id() === collectionId
+      : selectedNode.id() === databaseId;

-    if (subnodeKind) {
-      return selectedNode.rid === rid && selectedNode.nodeKind === nodeKind;
-    } else {
-      const activeTab = this.container.tabsManager.activeTab();
-      let selectedSubnodeKind;
-      if (nodeKind === "Database" && (selectedNode as ViewModels.Database).selectedSubnodeKind) {
-        selectedSubnodeKind = (selectedNode as ViewModels.Database).selectedSubnodeKind();
-      } else if (nodeKind === "Collection" && (selectedNode as ViewModels.Collection).selectedSubnodeKind) {
-        selectedSubnodeKind = (selectedNode as ViewModels.Collection).selectedSubnodeKind();
-      }
-
-      return (
-        activeTab &&
-        activeTab.tabKind === subnodeKind &&
-        selectedNode.rid === rid &&
-        selectedSubnodeKind !== undefined &&
-        selectedSubnodeKind === subnodeKind
-      );
+    if (!isNodeSelected) {
+      return false;
    }
+
+    if (!subnodeKind) {
+      return true;
+    }
+
+    const activeTab = this.container.tabsManager.activeTab();
+    const selectedSubnodeKind = collectionId
+      ? (selectedNode as ViewModels.Collection).selectedSubnodeKind()
+      : (selectedNode as ViewModels.Database).selectedSubnodeKind();
+
+    return activeTab && activeTab.tabKind === subnodeKind && selectedSubnodeKind === subnodeKind;
  }

  public triggerRender() {
--- a/src/Explorer/Tree/StoredProcedure.ts
+++ b/src/Explorer/Tree/StoredProcedure.ts
@@ -74,7 +74,6 @@ export default class StoredProcedure {
      collection: source,
      node: source,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/sproc`,
-      selfLink: "",
      isActive: ko.observable(false),
      onUpdateTabsButtons: source.container.onUpdateTabsButtons
    });
@@ -123,7 +122,6 @@ export default class StoredProcedure {
          this.collection.databaseId,
          this.collection.id()
        )}/sprocs/${this.id()}`,
-        selfLink: this.self,
        isActive: ko.observable(false),
        onUpdateTabsButtons: this.container.onUpdateTabsButtons
      });
--- a/src/Explorer/Tree/Trigger.ts
+++ b/src/Explorer/Tree/Trigger.ts
@@ -59,7 +59,6 @@ export default class Trigger {
      collection: source,
      node: source,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/trigger`,
-      selfLink: "",
      isActive: ko.observable(false),
      onUpdateTabsButtons: source.container.onUpdateTabsButtons
    });
@@ -100,7 +99,6 @@ export default class Trigger {
          this.collection.databaseId,
          this.collection.id()
        )}/triggers/${this.id()}`,
-        selfLink: "",
        isActive: ko.observable(false),
        onUpdateTabsButtons: this.container.onUpdateTabsButtons
      });
--- a/src/Explorer/Tree/UserDefinedFunction.ts
+++ b/src/Explorer/Tree/UserDefinedFunction.ts
@@ -44,7 +44,6 @@ export default class UserDefinedFunction {
      collection: source,
      node: source,
      hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/udf`,
-      selfLink: "",
      isActive: ko.observable(false),
      onUpdateTabsButtons: source.container.onUpdateTabsButtons
    });
@@ -83,7 +82,6 @@ export default class UserDefinedFunction {
          this.collection.databaseId,
          this.collection.id()
        )}/udfs/${this.id()}`,
-        selfLink: "",
        isActive: ko.observable(false),
        onUpdateTabsButtons: this.container.onUpdateTabsButtons
      });