Remove deprecated calls to logConsoleMessage (#608)

Co-authored-by: Steve Faulkner <southpolesteve@gmail.com>

src/Explorer/Tables/TableDataClient.ts

@@ -1,25 +1,24 @@
+import { FeedOptions } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
-
-import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { AuthType } from "../../AuthType";
-import { ConsoleDataType } from "../../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import { FeedOptions } from "@azure/cosmos";
 import * as Constants from "../../Common/Constants";
-import * as Entities from "./Entities";
-import * as HeadersUtility from "../../Common/HeadersUtility";
-import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
-import * as TableConstants from "./Constants";
-import * as TableEntityProcessor from "./TableEntityProcessor";
-import * as ViewModels from "../../Contracts/ViewModels";
-import Explorer from "../Explorer";
-import { configContext } from "../../ConfigContext";
-import { handleError } from "../../Common/ErrorHandlingUtils";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { deleteDocument } from "../../Common/dataAccess/deleteDocument";
 import { queryDocuments } from "../../Common/dataAccess/queryDocuments";
 import { updateDocument } from "../../Common/dataAccess/updateDocument";
+import { handleError } from "../../Common/ErrorHandlingUtils";
+import * as HeadersUtility from "../../Common/HeadersUtility";
+import { configContext } from "../../ConfigContext";
+import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
+import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
+import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import Explorer from "../Explorer";
+import * as TableConstants from "./Constants";
+import * as Entities from "./Entities";
+import * as TableEntityProcessor from "./TableEntityProcessor";
 
 export interface CassandraTableKeys {
   partitionKeys: CassandraTableKey[];
@@ -144,10 +143,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     collection: ViewModels.Collection,
     entity: Entities.ITableEntity
   ): Q.Promise<Entities.ITableEntity> {
-    const notificationId = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      `Adding new row to table ${collection.id()}`
-    );
+    const clearInProgressMessage = logConsoleProgress(`Adding new row to table ${collection.id()}`);
     let properties = "(";
     let values = "(";
     for (let property in entity) {
@@ -171,7 +167,7 @@ export class CassandraAPIDataClient extends TableDataClient {
         (data: any) => {
           entity[TableConstants.EntityKeyNames.RowKey] = entity[this.getCassandraPartitionKeyProperty(collection)];
           entity[TableConstants.EntityKeyNames.RowKey]._ = entity[TableConstants.EntityKeyNames.RowKey]._.toString();
-          NotificationConsoleUtils.logConsoleInfo(`Successfully added new row to table ${collection.id()}`);
+          logConsoleInfo(`Successfully added new row to table ${collection.id()}`);
           deferred.resolve(entity);
         },
         (error) => {
@@ -179,9 +175,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           deferred.reject(error);
         }
       )
-      .finally(() => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(notificationId);
-      });
+      .finally(clearInProgressMessage);
     return deferred.promise;
   }
 
@@ -341,17 +335,11 @@ export class CassandraAPIDataClient extends TableDataClient {
     }
 
     const deferred: Q.Deferred<any> = Q.defer();
-    const notificationId = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      `Creating a new keyspace with query ${createKeyspaceQuery}`
-    );
+    const clearInProgressMessage = logConsoleProgress(`Creating a new keyspace with query ${createKeyspaceQuery}`);
     this.createOrDeleteQuery(cassandraEndpoint, resourceId, createKeyspaceQuery)
       .then(
         (data: any) => {
-          NotificationConsoleUtils.logConsoleMessage(
-            ConsoleDataType.Info,
-            `Successfully created a keyspace with query ${createKeyspaceQuery}`
-          );
+          logConsoleInfo(`Successfully created a keyspace with query ${createKeyspaceQuery}`);
           deferred.resolve();
         },
         (error) => {
@@ -363,9 +351,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           deferred.reject(error);
         }
       )
-      .finally(() => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(notificationId);
-      });
+      .finally(clearInProgressMessage);
 
     return deferred.promise.timeout(Constants.ClientDefaults.requestTimeoutMs);
   }
@@ -387,17 +373,11 @@ export class CassandraAPIDataClient extends TableDataClient {
     const deferred = Q.defer();
     createKeyspacePromise.then(
       () => {
-        const notificationId = NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.InProgress,
-          `Creating a new table with query ${createTableQuery}`
-        );
+        const clearInProgressMessage = logConsoleProgress(`Creating a new table with query ${createTableQuery}`);
         this.createOrDeleteQuery(cassandraEndpoint, resourceId, createTableQuery)
           .then(
             (data: any) => {
-              NotificationConsoleUtils.logConsoleMessage(
-                ConsoleDataType.Info,
-                `Successfully created a table with query ${createTableQuery}`
-              );
+              logConsoleInfo(`Successfully created a table with query ${createTableQuery}`);
               deferred.resolve();
             },
             (error) => {
@@ -405,9 +385,7 @@ export class CassandraAPIDataClient extends TableDataClient {
               deferred.reject(error);
             }
           )
-          .finally(() => {
-            NotificationConsoleUtils.clearInProgressMessageWithId(notificationId);
-          });
+          .finally(clearInProgressMessage);
       },
       (reason) => {
         deferred.reject(reason);
@@ -420,10 +398,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     if (!!collection.cassandraKeys) {
       return Q.resolve(collection.cassandraKeys);
     }
-    const notificationId = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      `Fetching keys for table ${collection.id()}`
-    );
+    const clearInProgressMessage = logConsoleProgress(`Fetching keys for table ${collection.id()}`);
     const authType = userContext.authType;
     const apiEndpoint: string =
       authType === AuthType.EncryptedToken
@@ -448,10 +423,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       .then(
         (data: CassandraTableKeys) => {
           collection.cassandraKeys = data;
-          NotificationConsoleUtils.logConsoleMessage(
-            ConsoleDataType.Info,
-            `Successfully fetched keys for table ${collection.id()}`
-          );
+          logConsoleInfo(`Successfully fetched keys for table ${collection.id()}`);
           deferred.resolve(data);
         },
         (error: any) => {
@@ -459,9 +431,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           deferred.reject(error);
         }
       )
-      .done(() => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(notificationId);
-      });
+      .done(clearInProgressMessage);
     return deferred.promise;
   }
 
@@ -469,10 +439,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     if (!!collection.cassandraSchema) {
       return Q.resolve(collection.cassandraSchema);
     }
-    const notificationId = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      `Fetching schema for table ${collection.id()}`
-    );
+    const clearInProgressMessage = logConsoleProgress(`Fetching schema for table ${collection.id()}`);
     const authType = userContext.authType;
     const apiEndpoint: string =
       authType === AuthType.EncryptedToken
@@ -497,10 +464,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       .then(
         (data: any) => {
           collection.cassandraSchema = data.columns;
-          NotificationConsoleUtils.logConsoleMessage(
-            ConsoleDataType.Info,
-            `Successfully fetched schema for table ${collection.id()}`
-          );
+          logConsoleInfo(`Successfully fetched schema for table ${collection.id()}`);
           deferred.resolve(data.columns);
         },
         (error: any) => {
@@ -508,9 +472,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           deferred.reject(error);
         }
       )
-      .done(() => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(notificationId);
-      });
+      .done(clearInProgressMessage);
     return deferred.promise;
   }