More ViewModel cleanup (#116)

src/Common/DataAccessUtilityBase.ts

@@ -27,6 +27,8 @@ import { RequestOptions } from "@azure/cosmos/dist-esm";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
 import { Platform, config } from "../Config";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
+import DocumentId from "../Explorer/Tree/DocumentId";
+import ConflictId from "../Explorer/Tree/ConflictId";
 
 export function getCommonQueryOptions(options: FeedOptions): any {
   const storedItemPerPageSetting: number = LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage);
@@ -169,7 +171,7 @@ export function executeStoredProcedure(
   );
 }
 
-export function readDocument(collection: ViewModels.CollectionBase, documentId: ViewModels.DocumentId): Q.Promise<any> {
+export function readDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   const partitionKey = documentId.partitionKeyValue;
 
   return Q(
@@ -182,7 +184,7 @@ export function readDocument(collection: ViewModels.CollectionBase, documentId:
   );
 }
 
-export function getPartitionKeyHeaderForConflict(conflictId: ViewModels.ConflictId): Object {
+export function getPartitionKeyHeaderForConflict(conflictId: ConflictId): Object {
   const partitionKeyDefinition: DataModels.PartitionKey = conflictId.partitionKey;
   const partitionKeyValue: any = conflictId.partitionKeyValue;
 
@@ -220,7 +222,7 @@ export function updateCollection(
 
 export function updateDocument(
   collection: ViewModels.CollectionBase,
-  documentId: ViewModels.DocumentId,
+  documentId: DocumentId,
   newDocument: any
 ): Q.Promise<any> {
   const partitionKey = documentId.partitionKeyValue;
@@ -347,10 +349,7 @@ export function createTrigger(
   );
 }
 
-export function deleteDocument(
-  collection: ViewModels.CollectionBase,
-  documentId: ViewModels.DocumentId
-): Q.Promise<any> {
+export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   const partitionKey = documentId.partitionKeyValue;
 
   return Q(
@@ -364,7 +363,7 @@ export function deleteDocument(
 
 export function deleteConflict(
   collection: ViewModels.CollectionBase,
-  conflictId: ViewModels.ConflictId,
+  conflictId: ConflictId,
   options: any = {}
 ): Q.Promise<any> {
   options.partitionKey = options.partitionKey || getPartitionKeyHeaderForConflict(conflictId);

src/Common/DocumentClientUtilityBase.ts

@@ -13,6 +13,8 @@ import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
 import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
+import ConflictId from "../Explorer/Tree/ConflictId";
+import DocumentId from "../Explorer/Tree/DocumentId";
 
 // TODO: Log all promise resolutions and errors with verbosity levels
 export function queryDocuments(
@@ -236,7 +238,7 @@ export function queryDocumentsPage(
   return deferred.promise;
 }
 
-export function readDocument(collection: ViewModels.CollectionBase, documentId: ViewModels.DocumentId): Q.Promise<any> {
+export function readDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
   const id = NotificationConsoleUtils.logConsoleMessage(
@@ -303,7 +305,7 @@ export function updateCollection(
 
 export function updateDocument(
   collection: ViewModels.CollectionBase,
-  documentId: ViewModels.DocumentId,
+  documentId: DocumentId,
   newDocument: any
 ): Q.Promise<any> {
   var deferred = Q.defer<any>();
@@ -658,10 +660,7 @@ export function createTrigger(
   return deferred.promise;
 }
 
-export function deleteDocument(
-  collection: ViewModels.CollectionBase,
-  documentId: ViewModels.DocumentId
-): Q.Promise<any> {
+export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
   const id = NotificationConsoleUtils.logConsoleMessage(
@@ -696,7 +695,7 @@ export function deleteDocument(
 
 export function deleteConflict(
   collection: ViewModels.CollectionBase,
-  conflictId: ViewModels.ConflictId,
+  conflictId: ConflictId,
   options?: any
 ): Q.Promise<any> {
   var deferred = Q.defer<any>();

src/Common/MongoProxyClient.test.ts

@@ -7,10 +7,12 @@ import {
   updateDocument
 } from "./MongoProxyClient";
 import { AuthType } from "../AuthType";
-import { Collection, DatabaseAccount, DocumentId } from "../Contracts/ViewModels";
+import { Collection } from "../Contracts/ViewModels";
 import { config } from "../Config";
 import { CosmosClient } from "./CosmosClient";
 import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
+import DocumentId from "../Explorer/Tree/DocumentId";
+import { DatabaseAccount } from "../Contracts/DataModels";
 jest.mock("../ResourceProvider/ResourceProviderClient.ts");
 
 const databaseId = "testDB";

src/Common/MongoProxyClient.ts

@@ -1,7 +1,6 @@
 import * as Constants from "../Common/Constants";
 import * as DataExplorerConstants from "../Common/Constants";
 import * as DataModels from "../Contracts/DataModels";
-import * as ViewModels from "../Contracts/ViewModels";
 import EnvironmentUtility from "./EnvironmentUtility";
 import queryString from "querystring";
 import { AddDbUtilities } from "../Shared/AddDatabaseUtility";
@@ -17,6 +16,7 @@ import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
 import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
 import { MinimalQueryIterator } from "./IteratorUtilities";
+import DocumentId from "../Explorer/Tree/DocumentId";
 
 const defaultHeaders = {
   [HttpHeaders.apiType]: ApiType.MongoDB.toString(),
@@ -123,7 +123,7 @@ export function queryDocuments(
 export function readDocument(
   databaseId: string,
   collection: Collection,
-  documentId: ViewModels.DocumentId
+  documentId: DocumentId
 ): Promise<DataModels.DocumentId> {
   const databaseAccount = CosmosClient.databaseAccount();
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
@@ -205,7 +205,7 @@ export function createDocument(
 export function updateDocument(
   databaseId: string,
   collection: Collection,
-  documentId: ViewModels.DocumentId,
+  documentId: DocumentId,
   documentContent: unknown
 ): Promise<DataModels.DocumentId> {
   const databaseAccount = CosmosClient.databaseAccount();
@@ -246,11 +246,7 @@ export function updateDocument(
     });
 }
 
-export function deleteDocument(
-  databaseId: string,
-  collection: Collection,
-  documentId: ViewModels.DocumentId
-): Promise<void> {
+export function deleteDocument(databaseId: string, collection: Collection, documentId: DocumentId): Promise<void> {
   const databaseAccount = CosmosClient.databaseAccount();
   const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
   const idComponents = documentId.self.split("/");
@@ -385,7 +381,7 @@ export function createMongoCollectionWithARM(
   return _createMongoCollectionWithARM(armEndpoint, params, additionalOptions);
 }
 
-export function getEndpoint(databaseAccount: ViewModels.DatabaseAccount): string {
+export function getEndpoint(databaseAccount: DataModels.DatabaseAccount): string {
   const serverId = window.dataExplorer.serverId();
   const extensionEndpoint = window.dataExplorer.extensionEndpoint();
   let url = config.MONGO_BACKEND_ENDPOINT

src/Common/NotificationsClientBase.ts

@@ -6,7 +6,7 @@ import * as ViewModels from "../Contracts/ViewModels";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { CosmosClient } from "./CosmosClient";
 
-export class NotificationsClientBase implements ViewModels.NotificationsClient {
+export class NotificationsClientBase {
   private _extensionEndpoint: string;
   private _notificationsApiSuffix: string;
 
@@ -16,7 +16,7 @@ export class NotificationsClientBase implements ViewModels.NotificationsClient {
 
   public fetchNotifications(): Q.Promise<DataModels.Notification[]> {
     const deferred: Q.Deferred<DataModels.Notification[]> = Q.defer<DataModels.Notification[]>();
-    const databaseAccount: ViewModels.DatabaseAccount = CosmosClient.databaseAccount();
+    const databaseAccount = CosmosClient.databaseAccount();
     const subscriptionId: string = CosmosClient.subscriptionId();
     const resourceGroup: string = CosmosClient.resourceGroup();
     const url: string = `${this._extensionEndpoint}${this._notificationsApiSuffix}?accountName=${databaseAccount.name}&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;

src/Common/QueriesClient.ts

@@ -18,8 +18,9 @@ import {
   queryDocumentsPage,
   deleteDocument
 } from "./DocumentClientUtilityBase";
+import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
 
-export class QueriesClient implements ViewModels.QueriesClient {
+export class QueriesClient {
   private static readonly PartitionKey: DataModels.PartitionKey = {
     paths: [`/${SavedQueries.PartitionKeyProperty}`],
     kind: BackendDefaults.partitionKeyKind,
@@ -216,11 +217,11 @@ export class QueriesClient implements ViewModels.QueriesClient {
       `Deleting query ${query.queryName}`
     );
     query.id = query.queryName;
-    const documentId: ViewModels.DocumentId = new DocumentId(
+    const documentId = new DocumentId(
       {
         partitionKey: QueriesClient.PartitionKey,
         partitionKeyProperty: "id"
-      } as ViewModels.DocumentsTab,
+      } as DocumentsTab,
       query,
       query.queryName
     ); // TODO: Remove DocumentId's dependency on DocumentsTab
@@ -248,7 +249,7 @@ export class QueriesClient implements ViewModels.QueriesClient {
   }
 
   public getResourceId(): string {
-    const databaseAccount: ViewModels.DatabaseAccount = CosmosClient.databaseAccount();
+    const databaseAccount = CosmosClient.databaseAccount();
     const databaseAccountName: string = (databaseAccount && databaseAccount.name) || "";
     const subscriptionId: string = CosmosClient.subscriptionId() || "";
     const resourceGroup: string = CosmosClient.resourceGroup() || "";