Removed comments from eslintignore file

.eslintignore

@@ -68,22 +68,18 @@ src/Explorer/Notebook/NotebookComponent/reducers.ts
 src/Explorer/Notebook/NotebookComponent/store.ts
 src/Explorer/Notebook/NotebookComponent/types.ts
 src/Explorer/Notebook/NotebookContainerClient.ts
-src/Explorer/Notebook/NotebookContentClient.ts
 src/Explorer/Notebook/NotebookContentItem.ts
-src/Explorer/Notebook/NotebookUtil.ts
-src/Explorer/OpenActionsStubs.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValueValidator.ts
 src/Explorer/SplashScreen/SplashScreen.test.ts
 src/Explorer/Tables/DataTable/CacheBase.ts
-src/Explorer/Tables/DataTable/DataTableBindingManager.ts
-src/Explorer/Tables/DataTable/DataTableBuilder.ts
 src/Explorer/Tables/DataTable/DataTableContextMenu.ts
 src/Explorer/Tables/DataTable/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
+src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
 src/Explorer/Tabs/ConflictsTab.ts

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -307,11 +307,18 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
 
 function createNewDatabase(container: Explorer): CommandButtonComponentProps {
   const label = "New " + getDatabaseName();
+  const newDatabaseButton = document.activeElement as HTMLElement;
+
   return {
     iconSrc: AddDatabaseIcon,
     iconAlt: label,
     onCommandClick: () =>
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
+      useSidePanel
+        .getState()
+        .openSidePanel(
+          "New " + getDatabaseName(),
+          <AddDatabasePanel explorer={container} buttonElement={newDatabaseButton} />
+        ),
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,

src/Explorer/Notebook/NotebookContentClient.ts

@@ -228,11 +228,12 @@ export class NotebookContentClient {
 
   public async readFileContent(filePath: string): Promise<string> {
     const xhr = await this.contentProvider.get(this.getServerConfig(), filePath, { content: 1 }).toPromise();
+    //eslint-disable-next-line
     const content = (xhr.response as any).content;
     if (!content) {
       throw new Error("No content read");
     }
-
+    //eslint-disable-next-line
     const format = (xhr.response as any).format;
     switch (format) {
       case "text":

src/Explorer/Notebook/NotebookUtil.ts

@@ -12,6 +12,7 @@ import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentI
 // Must match rx-jupyter' FileType
 export type FileType = "directory" | "file" | "notebook";
 // Utilities for notebooks
+//eslint-disable-next-line
 export class NotebookUtil {
   public static UntrustedNotebookRunHint = "Please trust notebook first before running any code cells";
 
@@ -190,6 +191,7 @@ export class NotebookUtil {
     subSnapshots: SnapshotFragment[],
     downloadFilename?: string
   ): Promise<{ imageSrc: string | undefined }> => {
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
       try {
         // target.scrollIntoView();
@@ -258,6 +260,7 @@ export class NotebookUtil {
     subSnapshots: SnapshotFragment[],
     downloadFilename?: string
   ): Promise<{ imageSrc?: string }> => {
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
       // target.scrollIntoView();
       try {

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -23,10 +23,12 @@ import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneFor
 
 export interface AddDatabasePaneProps {
   explorer: Explorer;
+  buttonElement?: HTMLElement;
 }
 
 export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   explorer: container,
+  buttonElement,
 }: AddDatabasePaneProps) => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   let throughput: number;
@@ -77,6 +79,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
       dataExplorerArea: Constants.Areas.ContextualPane,
     };
     TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
+    buttonElement.focus();
   }, []);
 
   const onSubmit = () => {

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -307,16 +307,23 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: () =>
-          useSidePanel
-            .getState()
-            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
+        onClick: () => this.openAddDatabasePanel(),
       });
     }
 
     return items;
   }
 
+  private openAddDatabasePanel() {
+    const newDatabaseButton = document.activeElement as HTMLElement;
+    useSidePanel
+      .getState()
+      .openSidePanel(
+        "New " + getDatabaseName(),
+        <AddDatabasePanel explorer={this.container} buttonElement={newDatabaseButton} />
+      );
+  }
+
   private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
     return {
       iconSrc: NotebookIcon,

src/Explorer/Tables/DataTable/DataTableBindingManager.ts

@@ -1,20 +1,18 @@
 import * as ko from "knockout";
 import * as _ from "underscore";
-
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import * as Constants from "../Constants";
-import * as ViewModels from "../../../Contracts/ViewModels";
+import * as Entities from "../Entities";
+import * as Utilities from "../Utilities";
 import * as DataTableBuilder from "./DataTableBuilder";
 import DataTableOperationManager from "./DataTableOperationManager";
 import * as DataTableOperations from "./DataTableOperations";
-import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import TableEntityListViewModel from "./TableEntityListViewModel";
-import * as Utilities from "../Utilities";
-import * as Entities from "../Entities";
 
 /**
  * Custom binding manager of datatable
  */
-var tableEntityListViewModelMap: {
+const tableEntityListViewModelMap: {
   [key: string]: {
     tableViewModel: TableEntityListViewModel;
     operationManager: DataTableOperationManager;
@@ -22,12 +20,13 @@ var tableEntityListViewModelMap: {
   };
 } = {};
 
-function bindDataTable(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
-  var tableEntityListViewModel = bindingContext.$data;
+//eslint-disable-next-line
+function bindDataTable(element: any, bindingContext: any) {
+  const tableEntityListViewModel = bindingContext.$data;
   tableEntityListViewModel.notifyColumnChanges = onTableColumnChange;
-  var $dataTable = $(element);
-  var queryTablesTab = bindingContext.$parent;
-  var operationManager = new DataTableOperationManager(
+  const $dataTable = $(element);
+  const queryTablesTab = bindingContext.$parent;
+  const operationManager = new DataTableOperationManager(
     $dataTable,
     tableEntityListViewModel,
     queryTablesTab.tableCommands
@@ -44,9 +43,9 @@ function bindDataTable(element: any, valueAccessor: any, allBindings: any, viewM
   operationManager.focusTable(); // Also selects the first row if needed.
 }
 
-function onTableColumnChange(enablePrompt: boolean = true, queryTablesTab: QueryTablesTab) {
-  var columnsFilter: boolean[] = null;
-  var tableEntityListViewModel = tableEntityListViewModelMap[queryTablesTab.tabId].tableViewModel;
+function onTableColumnChange(queryTablesTab: QueryTablesTab) {
+  const columnsFilter: boolean[] = null;
+  const tableEntityListViewModel = tableEntityListViewModelMap[queryTablesTab.tabId].tableViewModel;
   if (queryTablesTab.queryViewModel()) {
     queryTablesTab.queryViewModel().queryBuilderViewModel().updateColumnOptions();
   }
@@ -63,35 +62,36 @@ function createDataTable(
   startIndex: number,
   tableEntityListViewModel: TableEntityListViewModel,
   queryTablesTab: QueryTablesTab,
-  destroy: boolean = false,
+  destroy = false,
   columnsFilter: boolean[] = null
 ): void {
-  var $dataTable = tableEntityListViewModelMap[queryTablesTab.tabId].$dataTable;
+  const $dataTable = tableEntityListViewModelMap[queryTablesTab.tabId].$dataTable;
   if (destroy) {
     // Find currently displayed columns.
-    var currentColumns: string[] = tableEntityListViewModel.headers;
+    const currentColumns: string[] = tableEntityListViewModel.headers;
 
     // Calculate how many more columns need to added to the current table.
-    var columnsToAdd: number = _.difference(tableEntityListViewModel.headers, currentColumns).length;
+    const columnsToAdd: number = _.difference(tableEntityListViewModel.headers, currentColumns).length;
 
     // This is needed as current solution of adding column is more like a workaround
     // The official support for dynamically add column is not yet there
     // Please track github issue https://github.com/DataTables/DataTables/issues/273 for its offical support
-    for (var i = 0; i < columnsToAdd; i++) {
+    for (let i = 0; i < columnsToAdd; i++) {
       $(".dataTables_scrollHead table thead tr th").eq(0).after("<th></th>");
     }
     tableEntityListViewModel.table.destroy();
     $dataTable.empty();
   }
 
-  var jsonColTable = [];
+  const jsonColTable = [];
 
-  for (var i = 0; i < tableEntityListViewModel.headers.length; i++) {
+  for (let i = 0; i < tableEntityListViewModel.headers.length; i++) {
     jsonColTable.push({
       sTitle: tableEntityListViewModel.headers[i],
       data: tableEntityListViewModel.headers[i],
       aTargets: [i],
       mRender: bindColumn,
+      // eslint-disable-next-line no-extra-boolean-cast
       visible: !!columnsFilter ? columnsFilter[i] : true,
     });
   }
@@ -154,9 +154,10 @@ function createDataTable(
       table.setAttribute("summary", `Results for container ${tableEntityListViewModel.queryTablesTab.collection.id()}`);
     });
 }
-
-function bindColumn(data: any, type: string, full: any) {
-  var displayedValue: any = null;
+//eslint-disable-next-line
+function bindColumn(data: any) {
+  //eslint-disable-next-line
+  let displayedValue: any = null;
   if (data) {
     displayedValue = data._;
 
@@ -173,7 +174,7 @@ function bindColumn(data: any, type: string, full: any) {
   }
   return displayedValue;
 }
-
+//eslint-disable-next-line
 function getServerData(sSource: any, aoData: any, fnCallback: any, oSettings: any) {
   tableEntityListViewModelMap[oSettings.ajax].tableViewModel.renderNextPageAndupdateCache(
     sSource,
@@ -191,15 +192,15 @@ function bindClientId(nRow: Node, aData: Entities.ITableEntity) {
   $(nRow).attr(Constants.htmlAttributeNames.dataTableRowKeyAttr, aData.RowKey._);
   return nRow;
 }
-
-function selectionChanged(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
+//eslint-disable-next-line
+function selectionChanged(bindingContext: any) {
   $(".dataTable tr.selected").attr("tabindex", "-1").removeClass("selected");
 
   const selected =
     bindingContext && bindingContext.$data && bindingContext.$data.selected && bindingContext.$data.selected();
   selected &&
     selected.forEach((b: Entities.ITableEntity) => {
-      var sel = DataTableOperations.getRowSelector([
+      const sel = DataTableOperations.getRowSelector([
         {
           key: Constants.htmlAttributeNames.dataTableRowKeyAttr,
           value: b.RowKey && b.RowKey._ && b.RowKey._.toString(),
@@ -211,7 +212,7 @@ function selectionChanged(element: any, valueAccessor: any, allBindings: any, vi
   //selected = bindingContext.$data.selected();
 }
 
-function dataChanged(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
+function dataChanged() {
   // do nothing for now
 }
 
@@ -229,20 +230,21 @@ function updateTableScrollableRegionMetrics(): void {
  * Update the table's scrollable region height. So the pagination control is always shown at the bottom of the page.
  */
 function updateTableScrollableRegionHeight(): void {
-  $(".tab-pane").each(function (index, tabElement) {
+  $(".tab-pane").each((index, tabElement) => {
     if (!$(tabElement).hasClass("tableContainer")) {
       return;
     }
 
     // Add some padding to the table so it doesn't get too close to the container border.
-    var dataTablePaddingBottom = 10;
-    var bodyHeight = $(window).height();
-    var dataTablesScrollBodyPosY = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset().top;
-    var dataTablesInfoElem = $(tabElement).find(".dataTables_info");
-    var dataTablesPaginateElem = $(tabElement).find(".dataTables_paginate");
+    const dataTablePaddingBottom = 10;
+    const bodyHeight = $(window).height();
+    const dataTablesScrollBodyPosY = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset()
+      .top;
+    const dataTablesInfoElem = $(tabElement).find(".dataTables_info");
+    const dataTablesPaginateElem = $(tabElement).find(".dataTables_paginate");
     const notificationConsoleHeight = 32; /** Header height **/
 
-    var scrollHeight =
+    let scrollHeight =
       bodyHeight -
       dataTablesScrollBodyPosY -
       dataTablesPaginateElem.outerHeight(true) -
@@ -257,10 +259,10 @@ function updateTableScrollableRegionHeight(): void {
     // TODO This is a work around for setting the outerheight since we don't have access to the JQuery.outerheight(numberValue)
     // in the current version of JQuery we are using.  Ideally, we would upgrade JQuery and use this line instead:
     // $(Constants.htmlSelectors.dataTableScrollBodySelector).outerHeight(scrollHeight);
-    var element = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector)[0];
-    var style = getComputedStyle(element);
-    var actualHeight = parseInt(style.height);
-    var change = element.offsetHeight - scrollHeight;
+    const element = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector)[0];
+    const style = getComputedStyle(element);
+    const actualHeight = parseInt(style.height);
+    const change = element.offsetHeight - scrollHeight;
     $(tabElement)
       .find(Constants.htmlSelectors.dataTableScrollBodySelector)
       .height(actualHeight - change);
@@ -271,15 +273,15 @@ function updateTableScrollableRegionHeight(): void {
  * Update the table's scrollable region width to make efficient use of the remaining space.
  */
 function updateTableScrollableRegionWidth(): void {
-  $(".tab-pane").each(function (index, tabElement) {
+  $(".tab-pane").each((index, tabElement) => {
     if (!$(tabElement).hasClass("tableContainer")) {
       return;
     }
 
-    var bodyWidth = $(window).width();
-    var dataTablesScrollBodyPosLeft = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset()
+    const bodyWidth = $(window).width();
+    const dataTablesScrollBodyPosLeft = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset()
       .left;
-    var scrollWidth = bodyWidth - dataTablesScrollBodyPosLeft;
+    const scrollWidth = bodyWidth - dataTablesScrollBodyPosLeft;
 
     // jquery datatables automatically sets width:100% to both the header and the body when we use it's column autoWidth feature.
     // We work around that by setting the height for it's container instead.
@@ -288,9 +290,9 @@ function updateTableScrollableRegionWidth(): void {
 }
 
 function initializeEventHandlers(): void {
-  var $headers: JQuery = $(Constants.htmlSelectors.dataTableHeaderTypeSelector);
-  var $firstHeader: JQuery = $headers.first();
-  var firstIndex: string = $firstHeader.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
+  const $headers: JQuery = $(Constants.htmlSelectors.dataTableHeaderTypeSelector);
+  const $firstHeader: JQuery = $headers.first();
+  const firstIndex: string = $firstHeader.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
 
   $headers
     .on("keydown", (event: JQueryEventObject) => {
@@ -302,7 +304,7 @@ function initializeEventHandlers(): void {
       Utilities.onTab(
         event,
         ($sourceElement: JQuery) => {
-          var sourceIndex: string = $sourceElement.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
+          const sourceIndex: string = $sourceElement.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
 
           if (sourceIndex === firstIndex) {
             event.preventDefault();
@@ -324,14 +326,14 @@ function initializeEventHandlers(): void {
       });
     });
 }
-
+//eslint-disable-next-line
 function updateSelectionStatus(oSettings: any): void {
-  var $dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
+  const $dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
   if ($dataTableRows) {
-    for (var i = 0; i < $dataTableRows.length; i++) {
-      var $row: JQuery = $dataTableRows.eq(i);
-      var rowKey: string = $row.attr(Constants.htmlAttributeNames.dataTableRowKeyAttr);
-      var table = tableEntityListViewModelMap[oSettings.ajax].tableViewModel;
+    for (let i = 0; i < $dataTableRows.length; i++) {
+      const $row: JQuery = $dataTableRows.eq(i);
+      const rowKey: string = $row.attr(Constants.htmlAttributeNames.dataTableRowKeyAttr);
+      const table = tableEntityListViewModelMap[oSettings.ajax].tableViewModel;
       if (table.isItemSelected(table.getTableEntityKeys(rowKey))) {
         $row.attr("tabindex", "0");
       }
@@ -346,10 +348,10 @@ function updateSelectionStatus(oSettings: any): void {
 // TODO consider centralizing this "post-command" logic into some sort of Command Manager entity.
 // See VSO:166520: "[Storage Explorer] Consider adding a 'command manager' to track command post-effects."
 function updateDataTableFocus(queryTablesTabId: string): void {
-  var $activeElement: JQuery = $(document.activeElement);
-  var isFocusLost: boolean = $activeElement.is("body"); // When focus is lost, "body" becomes the active element.
-  var storageExplorerFrameHasFocus: boolean = document.hasFocus();
-  var operationManager = tableEntityListViewModelMap[queryTablesTabId].operationManager;
+  const $activeElement: JQuery = $(document.activeElement);
+  const isFocusLost: boolean = $activeElement.is("body"); // When focus is lost, "body" becomes the active element.
+  const storageExplorerFrameHasFocus: boolean = document.hasFocus();
+  const operationManager = tableEntityListViewModelMap[queryTablesTabId].operationManager;
   if (operationManager) {
     if (isFocusLost && storageExplorerFrameHasFocus) {
       // We get here when no control is active, meaning that the table update was triggered
@@ -371,19 +373,20 @@ function updateDataTableFocus(queryTablesTabId: string): void {
     }
   }
 }
-
+//eslint-disable-next-line
 (<any>ko.bindingHandlers).tableSource = {
   init: bindDataTable,
   update: dataChanged,
 };
-
+//eslint-disable-next-line
 (<any>ko.bindingHandlers).tableSelection = {
   update: selectionChanged,
 };
-
+//eslint-disable-next-line
 (<any>ko.bindingHandlers).readOnly = {
-  update: function (element: any, valueAccessor: any) {
-    var value = ko.utils.unwrapObservable(valueAccessor());
+  //eslint-disable-next-line
+  update: (element: any, valueAccessor: any) => {
+    const value = ko.utils.unwrapObservable(valueAccessor());
     if (value) {
       element.setAttribute("readOnly", true);
     } else {

src/Explorer/Tables/DataTable/DataTableBuilder.ts

@@ -8,7 +8,7 @@ import * as Utilities from "../Utilities";
  * @param{$dataTableElem} JQuery data table element
  * @param{$settings} Settings to use when creating the data table
  */
-export function createDataTable($dataTableElem: JQuery, settings: any): DataTables.DataTable {
+export function createDataTable($dataTableElem: JQuery, settings: DataTables.Settings): DataTables.DataTable {
   return $dataTableElem.DataTable(applyDefaultRendering(settings));
 }
 
@@ -18,8 +18,9 @@ export function createDataTable($dataTableElem: JQuery, settings: any): DataTabl
  * @param{settings} The settings to check
  * @return The given settings with all columns having a rendering function
  */
+//eslint-disable-next-line
 function applyDefaultRendering(settings: any): DataTables.SettingsLegacy {
-  var tableColumns: DataTables.ColumnLegacy[] = null;
+  let tableColumns: DataTables.ColumnLegacy[] = null;
 
   if (settings.aoColumns) {
     tableColumns = settings.aoColumns;
@@ -34,7 +35,7 @@ function applyDefaultRendering(settings: any): DataTables.SettingsLegacy {
     return settings;
   }
 
-  for (var i = 0; i < tableColumns.length; i++) {
+  for (let i = 0; i < tableColumns.length; i++) {
     // the column does not have a render function
     if (!tableColumns[i].mRender) {
       tableColumns[i].mRender = defaultDataRender;
@@ -47,6 +48,7 @@ function applyDefaultRendering(settings: any): DataTables.SettingsLegacy {
  * Default data render function, whatever is done to data in here
  * will be done to any data which we do not specify a render for.
  */
-function defaultDataRender(data: any, type: string, full: any) {
+//eslint-disable-next-line
+function defaultDataRender(data: any) {
   return Utilities.htmlEncode(data);
 }

src/Explorer/Tables/TableDataClient.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { FeedOptions } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
@@ -32,6 +31,8 @@ export interface CassandraTableKey {
 }
 
 export abstract class TableDataClient {
+  constructor() {}
+
   public abstract createDocument(
     collection: ViewModels.Collection,
     entity: Entities.ITableEntity
@@ -53,7 +54,7 @@ export abstract class TableDataClient {
   public abstract deleteDocuments(
     collection: ViewModels.Collection,
     entitiesToDelete: Entities.ITableEntity[]
-  ): Promise<unknown>;
+  ): Promise<any>;
 }
 
 export class TablesAPIDataClient extends TableDataClient {
@@ -66,7 +67,7 @@ export class TablesAPIDataClient extends TableDataClient {
       collection,
       TableEntityProcessor.convertEntityToNewDocument(<Entities.ITableEntityForTablesAPI>entity)
     ).then(
-      (newDocument: unknown) => {
+      (newDocument: any) => {
         const newEntity = TableEntityProcessor.convertDocumentsToEntities([newDocument])[0];
         deferred.resolve(newEntity);
       },
@@ -145,7 +146,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     const clearInProgressMessage = logConsoleProgress(`Adding new row to table ${collection.id()}`);
     let properties = "(";
     let values = "(";
-    for (const property in entity) {
+    for (let property in entity) {
       if (entity[property]._ === null) {
         continue;
       }
@@ -163,7 +164,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     const deferred = Q.defer<Entities.ITableEntity>();
     this.queryDocuments(collection, query)
       .then(
-        () => {
+        (data: any) => {
           entity[TableConstants.EntityKeyNames.RowKey] = entity[this.getCassandraPartitionKeyProperty(collection)];
           entity[TableConstants.EntityKeyNames.RowKey]._ = entity[TableConstants.EntityKeyNames.RowKey]._.toString();
           logConsoleInfo(`Successfully added new row to table ${collection.id()}`);
@@ -187,10 +188,10 @@ export class CassandraAPIDataClient extends TableDataClient {
 
     try {
       let whereSegment = " WHERE";
-      const keys: CassandraTableKey[] = collection.cassandraKeys.partitionKeys.concat(
+      let keys: CassandraTableKey[] = collection.cassandraKeys.partitionKeys.concat(
         collection.cassandraKeys.clusteringKeys
       );
-      for (const keyIndex in keys) {
+      for (let keyIndex in keys) {
         const key = keys[keyIndex].property;
         const keyType = keys[keyIndex].type;
         whereSegment += this.isStringType(keyType)
@@ -201,21 +202,14 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
       let isPropertyUpdated = false;
-      let isFirstPropertyToUpdate = true;
-      for (const property in newEntity) {
+      for (let property in newEntity) {
         if (
           !originalDocument[property] ||
           newEntity[property]._.toString() !== originalDocument[property]._.toString()
         ) {
-          let propertyQuerySegment = this.isStringType(newEntity[property].$)
-            ? `${property} = '${newEntity[property]._}',`
-            : `${property} = ${newEntity[property]._},`;
-          // Only add the "SET" keyword once
-          if (isFirstPropertyToUpdate) {
-            propertyQuerySegment = " SET " + propertyQuerySegment;
-            isFirstPropertyToUpdate = false;
-          }
-          updateQuery += propertyQuerySegment;
+          updateQuery += this.isStringType(newEntity[property].$)
+            ? ` SET ${property} = '${newEntity[property]._}',`
+            : ` SET ${property} = ${newEntity[property]._},`;
           isPropertyUpdated = true;
         }
       }
@@ -228,7 +222,7 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let deleteQuery = `DELETE `;
       let isPropertyDeleted = false;
-      for (const property in originalDocument) {
+      for (let property in originalDocument) {
         if (property !== TableConstants.EntityKeyNames.RowKey && !newEntity[property] && !!originalDocument[property]) {
           deleteQuery += ` ${property},`;
           isPropertyDeleted = true;
@@ -332,16 +326,16 @@ export class CassandraAPIDataClient extends TableDataClient {
     resourceId: string,
     explorer: Explorer,
     createKeyspaceQuery: string
-  ): Q.Promise<unknown> {
+  ): Q.Promise<any> {
     if (!createKeyspaceQuery) {
       return Q.reject("No query specified");
     }
 
-    const deferred: Q.Deferred<unknown> = Q.defer();
+    const deferred: Q.Deferred<any> = Q.defer();
     const clearInProgressMessage = logConsoleProgress(`Creating a new keyspace with query ${createKeyspaceQuery}`);
     this.createOrDeleteQuery(cassandraEndpoint, resourceId, createKeyspaceQuery)
       .then(
-        () => {
+        (data: any) => {
           logConsoleInfo(`Successfully created a keyspace with query ${createKeyspaceQuery}`);
           deferred.resolve();
         },
@@ -365,8 +359,8 @@ export class CassandraAPIDataClient extends TableDataClient {
     explorer: Explorer,
     createTableQuery: string,
     createKeyspaceQuery?: string
-  ): Q.Promise<unknown> {
-    let createKeyspacePromise: Q.Promise<unknown>;
+  ): Q.Promise<any> {
+    let createKeyspacePromise: Q.Promise<any>;
     if (createKeyspaceQuery) {
       createKeyspacePromise = this.createKeyspace(cassandraEndpoint, resourceId, explorer, createKeyspaceQuery);
     } else {
@@ -379,7 +373,7 @@ export class CassandraAPIDataClient extends TableDataClient {
         const clearInProgressMessage = logConsoleProgress(`Creating a new table with query ${createTableQuery}`);
         this.createOrDeleteQuery(cassandraEndpoint, resourceId, createTableQuery)
           .then(
-            () => {
+            (data: any) => {
               logConsoleInfo(`Successfully created a table with query ${createTableQuery}`);
               deferred.resolve();
             },
@@ -398,7 +392,7 @@ export class CassandraAPIDataClient extends TableDataClient {
   }
 
   public getTableKeys(collection: ViewModels.Collection): Q.Promise<CassandraTableKeys> {
-    if (collection.cassandraKeys) {
+    if (!!collection.cassandraKeys) {
       return Q.resolve(collection.cassandraKeys);
     }
     const clearInProgressMessage = logConsoleProgress(`Fetching keys for table ${collection.id()}`);
@@ -407,7 +401,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestKeysApi
         : Constants.CassandraBackend.keysApi;
-    const endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
+    let endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
     const deferred = Q.defer<CassandraTableKeys>();
 
     $.ajax(endpoint, {
@@ -428,7 +422,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           logConsoleInfo(`Successfully fetched keys for table ${collection.id()}`);
           deferred.resolve(data);
         },
-        (error: Error) => {
+        (error: any) => {
           handleError(error, "FetchKeysCassandra", `Error fetching keys for table ${collection.id()}`);
           deferred.reject(error);
         }
@@ -438,7 +432,7 @@ export class CassandraAPIDataClient extends TableDataClient {
   }
 
   public getTableSchema(collection: ViewModels.Collection): Q.Promise<CassandraTableKey[]> {
-    if (collection.cassandraSchema) {
+    if (!!collection.cassandraSchema) {
       return Q.resolve(collection.cassandraSchema);
     }
     const clearInProgressMessage = logConsoleProgress(`Fetching schema for table ${collection.id()}`);
@@ -447,7 +441,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestSchemaApi
         : Constants.CassandraBackend.schemaApi;
-    const endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
+    let endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
     const deferred = Q.defer<CassandraTableKey[]>();
 
     $.ajax(endpoint, {
@@ -468,7 +462,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           logConsoleInfo(`Successfully fetched schema for table ${collection.id()}`);
           deferred.resolve(data.columns);
         },
-        (error: Error) => {
+        (error: any) => {
           handleError(error, "FetchSchemaCassandra", `Error fetching schema for table ${collection.id()}`);
           deferred.reject(error);
         }
@@ -495,7 +489,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       beforeSend: this.setAuthorizationHeader,
       cache: false,
     }).then(
-      () => {
+      (data: any) => {
         deferred.resolve();
       },
       (reason) => {