fixed eslint of ConflictsTab

* Revert "Fix keyboard focus does not retain on 'New Database' button after closing the 'New Database' blade via ESC key (#1109)"

This reverts commit f7e7240010.

* Revert "Fix ally database panel open issue (#1120)"

This reverts commit ed1ffb692f.

.eslintignore

@@ -80,14 +80,13 @@ 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/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
-# src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.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/Tabs/DatabaseSettingsTab.ts
 src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -307,18 +307,11 @@ 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} buttonElement={newDatabaseButton} />
-        ),
+      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -23,12 +23,10 @@ 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;
@@ -79,7 +77,6 @@ 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,23 +307,16 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: () => this.openAddDatabasePanel(),
+        onClick: () =>
+          useSidePanel
+            .getState()
+            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
       });
     }
 
     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/DataTableOperationManager.ts

@@ -1,10 +1,11 @@
 import ko from "knockout";
-import * as Constants from "../Constants";
-import * as Entities from "../Entities";
-import * as Utilities from "../Utilities";
+
 import * as DataTableOperations from "./DataTableOperations";
+import * as Constants from "../Constants";
 import TableCommands from "./TableCommands";
 import TableEntityListViewModel from "./TableEntityListViewModel";
+import * as Utilities from "../Utilities";
+import * as Entities from "../Entities";
 
 /*
  * Base class for data table row selection.
@@ -24,7 +25,7 @@ export default class DataTableOperationManager {
   }
 
   private click = (event: JQueryEventObject) => {
-    const elem: JQuery = $(event.currentTarget);
+    var elem: JQuery = $(event.currentTarget);
     this.updateLastSelectedItem(elem, event.shiftKey);
 
     if (Utilities.isEnvironmentCtrlPressed(event)) {
@@ -36,30 +37,30 @@ export default class DataTableOperationManager {
     }
   };
 
-  private doubleClick = () => {
+  private doubleClick = (event: JQueryEventObject) => {
     this.tryOpenEditor();
   };
 
   private keyDown = (event: JQueryEventObject): boolean => {
-    const isUpArrowKey: boolean = event.keyCode === Constants.keyCodes.UpArrow,
-      isDownArrowKey: boolean = event.keyCode === Constants.keyCodes.DownArrow;
-    let handled = false;
+    var isUpArrowKey: boolean = event.keyCode === Constants.keyCodes.UpArrow,
+      isDownArrowKey: boolean = event.keyCode === Constants.keyCodes.DownArrow,
+      handled: boolean = false;
 
     if (isUpArrowKey || isDownArrowKey) {
-      const lastSelectedItem: Entities.ITableEntity = this._tableEntityListViewModel.lastSelectedItem;
-      const dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
-      const maximumIndex = dataTableRows.length - 1;
+      var lastSelectedItem: Entities.ITableEntity = this._tableEntityListViewModel.lastSelectedItem;
+      var dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
+      var maximumIndex = dataTableRows.length - 1;
 
       // If can't find an index for lastSelectedItem, then either no item is previously selected or it goes across page.
       // Simply select the first item in this case.
-      const lastSelectedItemIndex = lastSelectedItem
+      var lastSelectedItemIndex = lastSelectedItem
         ? this._tableEntityListViewModel.getItemIndexFromCurrentPage(
             this._tableEntityListViewModel.getTableEntityKeys(lastSelectedItem.RowKey._)
           )
         : -1;
-      const nextIndex: number = isUpArrowKey ? lastSelectedItemIndex - 1 : lastSelectedItemIndex + 1;
-      const safeIndex: number = Utilities.ensureBetweenBounds(nextIndex, 0, maximumIndex);
-      const selectedRowElement: JQuery = dataTableRows.eq(safeIndex);
+      var nextIndex: number = isUpArrowKey ? lastSelectedItemIndex - 1 : lastSelectedItemIndex + 1;
+      var safeIndex: number = Utilities.ensureBetweenBounds(nextIndex, 0, maximumIndex);
+      var selectedRowElement: JQuery = dataTableRows.eq(safeIndex);
 
       if (selectedRowElement) {
         if (event.shiftKey) {
@@ -89,7 +90,7 @@ export default class DataTableOperationManager {
   // in contrast, there may be more than one key down and key
   // pressed events.
   private keyUp = (event: JQueryEventObject): boolean => {
-    let handled = false;
+    var handled: boolean = false;
 
     switch (event.keyCode) {
       case Constants.keyCodes.Enter:
@@ -104,9 +105,8 @@ export default class DataTableOperationManager {
   };
 
   private itemDropped = (event: JQueryEventObject): boolean => {
-    const handled = false;
-    //eslint-disable-next-line
-    const items = (<any>event.originalEvent).dataTransfer.items;
+    var handled: boolean = false;
+    var items = (<any>event.originalEvent).dataTransfer.items;
 
     if (!items) {
       // On browsers outside of Chromium
@@ -115,9 +115,9 @@ export default class DataTableOperationManager {
       return null;
     }
 
-    for (let i = 0; i < items.length; i++) {
-      const item = items[i];
-      const entry = item.webkitGetAsEntry();
+    for (var i = 0; i < items.length; i++) {
+      var item = items[i];
+      var entry = item.webkitGetAsEntry();
 
       if (entry.isFile) {
         // TODO: parse the file and insert content as entities
@@ -132,8 +132,8 @@ export default class DataTableOperationManager {
   }
 
   private tryHandleDeleteSelected(): boolean {
-    const selectedEntities: Entities.ITableEntity[] = this._tableEntityListViewModel.selected();
-    let handled = false;
+    var selectedEntities: Entities.ITableEntity[] = this._tableEntityListViewModel.selected();
+    var handled: boolean = false;
 
     if (selectedEntities && selectedEntities.length) {
       this._tableCommands.deleteEntitiesCommand(this._tableEntityListViewModel);
@@ -150,8 +150,8 @@ export default class DataTableOperationManager {
   }
 
   private updateLastSelectedItem($elem: JQuery, isShiftSelect: boolean) {
-    const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
-    const entity = this._tableEntityListViewModel.getItemFromCurrentPage(
+    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+    var entity = this._tableEntityListViewModel.getItemFromCurrentPage(
       this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
     );
 
@@ -164,7 +164,7 @@ export default class DataTableOperationManager {
 
   private applySingleSelection($elem: JQuery) {
     if ($elem) {
-      const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
 
       this._tableEntityListViewModel.clearSelection();
       this.addToSelection(entityIdentity.RowKey);
@@ -180,12 +180,12 @@ export default class DataTableOperationManager {
   }
 
   private applyCtrlSelection($elem: JQuery): void {
-    const koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.selected
       : null;
 
     if (koSelected) {
-      const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
 
       if (
         !this._tableEntityListViewModel.isItemSelected(
@@ -201,7 +201,7 @@ export default class DataTableOperationManager {
   }
 
   private applyShiftSelection($elem: JQuery): void {
-    let anchorItem = this._tableEntityListViewModel.lastSelectedAnchorItem;
+    var anchorItem = this._tableEntityListViewModel.lastSelectedAnchorItem;
 
     // If anchor item doesn't exist, use the first available item of current page instead
     if (!anchorItem && this._tableEntityListViewModel.items().length > 0) {
@@ -209,16 +209,16 @@ export default class DataTableOperationManager {
     }
 
     if (anchorItem) {
-      const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
-      const elementIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      var elementIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
         this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
       );
-      const anchorIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+      var anchorIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
         this._tableEntityListViewModel.getTableEntityKeys(anchorItem.RowKey._)
       );
 
-      const startIndex = Math.min(elementIndex, anchorIndex);
-      const endIndex = Math.max(elementIndex, anchorIndex);
+      var startIndex = Math.min(elementIndex, anchorIndex);
+      var endIndex = Math.max(elementIndex, anchorIndex);
 
       this._tableEntityListViewModel.clearSelection();
       ko.utils.arrayPushAll<Entities.ITableEntity>(
@@ -229,7 +229,7 @@ export default class DataTableOperationManager {
   }
 
   private applyContextMenuSelection($elem: JQuery) {
-    const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
 
     if (
       !this._tableEntityListViewModel.isItemSelected(
@@ -244,26 +244,26 @@ export default class DataTableOperationManager {
   }
 
   private addToSelection(rowKey: string) {
-    const selectedEntity: Entities.ITableEntity = this._tableEntityListViewModel.getItemFromCurrentPage(
+    var selectedEntity: Entities.ITableEntity = this._tableEntityListViewModel.getItemFromCurrentPage(
       this._tableEntityListViewModel.getTableEntityKeys(rowKey)
     );
 
-    if (selectedEntity !== null) {
+    if (selectedEntity != null) {
       this._tableEntityListViewModel.selected.push(selectedEntity);
     }
   }
 
   // Selecting first row if the selection is empty.
   public selectFirstIfNeeded(): void {
-    const koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.selected
       : null;
-    const koEntities: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    var koEntities: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.items
       : null;
 
     if (!koSelected().length && koEntities().length) {
-      const firstEntity: Entities.ITableEntity = koEntities()[0];
+      var firstEntity: Entities.ITableEntity = koEntities()[0];
 
       // Clear last selection: lastSelectedItem and lastSelectedAnchorItem
       this._tableEntityListViewModel.clearLastSelected();
@@ -278,7 +278,7 @@ export default class DataTableOperationManager {
     }
   }
 
-  public bind(): void {
+  public bind() {
     this.dataTable.on("click", "tr", this.click);
     this.dataTable.on("dblclick", "tr", this.doubleClick);
     this.dataTable.on("keydown", "td", this.keyDown);

src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts

@@ -1,12 +1,12 @@
-import * as DateTimeUtilities from "./DateTimeUtilities";
 import QueryBuilderViewModel from "./QueryBuilderViewModel";
 import QueryClauseViewModel from "./QueryClauseViewModel";
+import * as DateTimeUtilities from "./DateTimeUtilities";
 
 /**
  * Constants
  */
-export const utc = "utc";
-export const local = "local";
+export var utc = "utc";
+export var local = "local";
 
 export interface ITimestampQuery {
   queryType: string; // valid values are "last" and "range"
@@ -41,11 +41,11 @@ export function addRangeTimestamp(
   queryBuilderViewModel.addCustomRange(timestamp, queryClauseViewModel);
 }
 
-export function getDefaultStart(localTime: boolean, durationHours = 24): string {
-  let startTimestamp: string;
+export function getDefaultStart(localTime: boolean, durationHours: number = 24): string {
+  var startTimestamp: string;
 
-  const utcNowString: string = new Date().toISOString();
-  const yesterday: Date = new Date(utcNowString);
+  var utcNowString: string = new Date().toISOString();
+  var yesterday: Date = new Date(utcNowString);
 
   yesterday.setHours(yesterday.getHours() - durationHours);
   startTimestamp = yesterday.toISOString();
@@ -58,9 +58,9 @@ export function getDefaultStart(localTime: boolean, durationHours = 24): string
 }
 
 export function getDefaultEnd(localTime: boolean): string {
-  let endTimestamp: string;
+  var endTimestamp: string;
 
-  const utcNowString: string = new Date().toISOString();
+  var utcNowString: string = new Date().toISOString();
 
   endTimestamp = utcNowString;
 
@@ -73,14 +73,14 @@ export function getDefaultEnd(localTime: boolean): string {
 
 export function parseDate(dateString: string, isUTC: boolean): Date {
   // TODO validate dateString
-  let date: Date = null;
+  var date: Date = null;
 
   if (dateString) {
     try {
       // Date string is assumed to be UTC in Storage Explorer Standalone.
       // Behavior may vary in other browsers.
       // Here's an example of how the string looks like "2015-10-24T21:44:12"
-      const millisecondTime = Date.parse(dateString),
+      var millisecondTime = Date.parse(dateString),
         parsed: Date = new Date(millisecondTime);
 
       if (isUTC) {
@@ -89,7 +89,7 @@ export function parseDate(dateString: string, isUTC: boolean): Date {
         // Since we parsed in UTC, accessors are flipped - we get local time from the getUTC* group
         // Reinstating, the date is parsed above as UTC, and here we are creating a new date object
         // in local time.
-        const year = parsed.getUTCFullYear(),
+        var year = parsed.getUTCFullYear(),
           month = parsed.getUTCMonth(),
           day = parsed.getUTCDate(),
           hours = parsed.getUTCHours(),
@@ -109,8 +109,8 @@ export function parseDate(dateString: string, isUTC: boolean): Date {
 
 export function utcFromLocalDateString(localDateString: string): string {
   // TODO validate localDateString
-  const localDate = parseDate(localDateString, false);
-  let utcDateString: string = null;
+  var localDate = parseDate(localDateString, false),
+    utcDateString: string = null;
 
   if (localDate) {
     utcDateString = localDate.toISOString();
@@ -120,7 +120,7 @@ export function utcFromLocalDateString(localDateString: string): string {
 }
 
 function padIfNeeded(value: number): string {
-  let padded = String(value);
+  var padded: string = String(value);
 
   if (0 <= value && value < 10) {
     padded = "0" + padded;
@@ -130,7 +130,7 @@ function padIfNeeded(value: number): string {
 }
 
 function toLocalDateString(date: Date): string {
-  let localDateString: string = null;
+  var localDateString: string = null;
 
   if (date) {
     localDateString =
@@ -152,8 +152,8 @@ function toLocalDateString(date: Date): string {
 
 export function localFromUtcDateString(utcDateString: string): string {
   // TODO validate utcDateString
-  const utcDate: Date = parseDate(utcDateString, true);
-  let localDateString: string = null;
+  var utcDate: Date = parseDate(utcDateString, true),
+    localDateString: string = null;
 
   if (utcDate) {
     localDateString = toLocalDateString(utcDate);
@@ -164,8 +164,8 @@ export function localFromUtcDateString(utcDateString: string): string {
 
 export function tryChangeTimestampTimeZone(koTimestamp: ko.Observable<string>, toUTC: boolean): void {
   if (koTimestamp) {
-    const currentDateString: string = koTimestamp();
-    let newDateString: string;
+    var currentDateString: string = koTimestamp(),
+      newDateString: string;
 
     if (currentDateString) {
       if (toUTC) {
@@ -189,16 +189,16 @@ export function tryChangeTimestampTimeZone(koTimestamp: ko.Observable<string>, t
  * Input validation helpers
  */
 
-export const noTooltip = "",
+export var noTooltip = "",
   invalidStartTimeTooltip = "Please provide a valid start time.", // localize
   invalidExpiryTimeRequiredTooltip = "Required field. Please provide a valid expiry time.", // localize
   invalidExpiryTimeGreaterThanStartTimeTooltip = "The expiry time must be greater than the start time."; // localize
 
 export function isDateString(dateString: string): boolean {
-  let success = false;
+  var success: boolean = false;
 
   if (dateString) {
-    const date = Date.parse(dateString);
+    var date: number = Date.parse(dateString);
 
     success = $.isNumeric(date);
   }
@@ -308,10 +308,10 @@ function _getLocalIsoDateStringFromParts(
 }
 
 function _addDaysHours(time: Date, days: number, hours: number): Date {
-  const msPerHour = 1000 * 60 * 60;
-  const daysMs = days * msPerHour * 24;
-  const hoursMs = hours * msPerHour;
-  const newTimeMs = time.getTime() + daysMs + hoursMs;
+  var msPerHour = 1000 * 60 * 60;
+  var daysMs = days * msPerHour * 24;
+  var hoursMs = hours * msPerHour;
+  var newTimeMs = time.getTime() + daysMs + hoursMs;
   return new Date(newTimeMs);
 }
 
@@ -321,7 +321,7 @@ function _daysHoursBeforeNow(days: number, hours: number): Date {
 
 export function _queryLastDaysHours(days: number, hours: number): string {
   /* tslint:disable: no-unused-variable */
-  let daysHoursAgo = _getLocalIsoDateTimeString(_daysHoursBeforeNow(days, hours));
+  var daysHoursAgo = _getLocalIsoDateTimeString(_daysHoursBeforeNow(days, hours));
   daysHoursAgo = DateTimeUtilities.getUTCDateTime(daysHoursAgo);
 
   return daysHoursAgo;
@@ -329,21 +329,21 @@ export function _queryLastDaysHours(days: number, hours: number): string {
 }
 
 export function _queryCurrentMonthLocal(): string {
-  const now = new Date();
-  let start = _getLocalIsoDateStringFromParts(now.getFullYear(), now.getMonth(), 1);
+  var now = new Date();
+  var start = _getLocalIsoDateStringFromParts(now.getFullYear(), now.getMonth(), 1);
   start = DateTimeUtilities.getUTCDateTime(start);
   return start;
 }
 
 export function _queryCurrentYearLocal(): string {
-  const now = new Date();
-  let start = _getLocalIsoDateStringFromParts(now.getFullYear(), 0, 1); // Month is 0..11, date is 1..31
+  var now = new Date();
+  var start = _getLocalIsoDateStringFromParts(now.getFullYear(), 0, 1); // Month is 0..11, date is 1..31
   start = DateTimeUtilities.getUTCDateTime(start);
   return start;
 }
 
 function _addTime(time: Date, lastNumber: number, timeUnit: string): Date {
-  let timeMS: number;
+  var timeMS: number;
   switch (TimeUnit[Number(timeUnit)]) {
     case TimeUnit.Days.toString():
       timeMS = lastNumber * 1000 * 60 * 60 * 24;
@@ -360,7 +360,7 @@ function _addTime(time: Date, lastNumber: number, timeUnit: string): Date {
     default:
     //throw new Errors.ArgumentOutOfRangeError(timeUnit);
   }
-  const newTimeMS = time.getTime() + timeMS;
+  var newTimeMS = time.getTime() + timeMS;
   return new Date(newTimeMS);
 }
 
@@ -370,7 +370,7 @@ function _timeBeforeNow(lastNumber: number, timeUnit: string): Date {
 
 export function _queryLastTime(lastNumber: number, timeUnit: string): string {
   /* tslint:disable: no-unused-variable */
-  let daysHoursAgo = _getLocalIsoDateTimeString(_timeBeforeNow(lastNumber, timeUnit));
+  var daysHoursAgo = _getLocalIsoDateTimeString(_timeBeforeNow(lastNumber, timeUnit));
   daysHoursAgo = DateTimeUtilities.getUTCDateTime(daysHoursAgo);
   return daysHoursAgo;
   /* tslint:enable: no-unused-variable */

src/Explorer/Tables/TableDataClient.ts

@@ -202,14 +202,21 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
       let isPropertyUpdated = false;
+      let isFirstPropertyToUpdate = true;
       for (let property in newEntity) {
         if (
           !originalDocument[property] ||
           newEntity[property]._.toString() !== originalDocument[property]._.toString()
         ) {
-          updateQuery += this.isStringType(newEntity[property].$)
-            ? ` SET ${property} = '${newEntity[property]._}',`
-            : ` SET ${property} = ${newEntity[property]._},`;
+          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;
           isPropertyUpdated = true;
         }
       }

src/Explorer/Tabs/ConflictsTab.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/switch-exhaustiveness-check */
 import { ConflictDefinition, FeedOptions, QueryIterator, Resource } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
@@ -69,13 +71,13 @@ export default class ConflictsTab extends TabsBase {
       ViewModels.DocumentExplorerState.noDocumentSelected
     );
     this.selectedConflictId = ko.observable<ConflictId>();
-    this.selectedConflictContent = editable.observable<any>("");
-    this.selectedConflictCurrent = editable.observable<any>("");
+    this.selectedConflictContent = editable.observable<string>("");
+    this.selectedConflictCurrent = editable.observable<string>("");
     this.partitionKey = options.partitionKey || (this.collection && this.collection.partitionKey);
     this.conflictIds = options.conflictIds;
     this.partitionKeyPropertyHeader =
       (this.collection && this.collection.partitionKeyPropertyHeader) || this._getPartitionKeyPropertyHeader();
-    this.partitionKeyProperty = !!this.partitionKeyPropertyHeader
+    this.partitionKeyProperty = this.partitionKeyPropertyHeader
       ? this.partitionKeyPropertyHeader.replace(/[/]+/g, ".").substr(1).replace(/[']+/g, "")
       : null;
 
@@ -187,7 +189,7 @@ export default class ConflictsTab extends TabsBase {
     this.buildCommandBarOptions();
     this.shouldShowDiffEditor = ko.pureComputed<boolean>(() => {
       const documentHasContent: boolean =
-        this.selectedConflictContent() != null && this.selectedConflictContent().length > 0;
+        this.selectedConflictContent() !== null && this.selectedConflictContent().length > 0;
       const operationIsReplace: boolean = this.conflictOperation() === Constants.ConflictOperationType.Replace;
       const isLoadingData: boolean = this.loadingConflictData();
       return documentHasContent && operationIsReplace && !isLoadingData;
@@ -195,7 +197,7 @@ export default class ConflictsTab extends TabsBase {
 
     this.shouldShowEditor = ko.pureComputed<boolean>(() => {
       const documentHasContent: boolean =
-        this.selectedConflictContent() != null && this.selectedConflictContent().length > 0;
+        this.selectedConflictContent() !== null && this.selectedConflictContent().length > 0;
       const operationIsInsert: boolean = this.conflictOperation() === Constants.ConflictOperationType.Create;
       const operationIsDelete: boolean = this.conflictOperation() === Constants.ConflictOperationType.Delete;
       const isLoadingData: boolean = this.loadingConflictData();
@@ -242,7 +244,7 @@ export default class ConflictsTab extends TabsBase {
     return true;
   };
 
-  public onConflictIdClick(clickedDocumentId: ConflictId): Q.Promise<any> {
+  public onConflictIdClick(): Q.Promise<unknown> {
     if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
       return Q();
     }
@@ -405,19 +407,19 @@ export default class ConflictsTab extends TabsBase {
     }
   };
 
-  public onDiscardClick = (): Q.Promise<any> => {
+  public onDiscardClick = (): Q.Promise<unknown> => {
     this.selectedConflictContent(this.selectedConflictContent.getEditableOriginalValue());
     this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
 
     return Q();
   };
 
-  public onValidDocumentEdit(): Q.Promise<any> {
+  public onValidDocumentEdit(): Q.Promise<unknown> {
     this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid);
     return Q();
   }
 
-  public onInvalidDocumentEdit(): Q.Promise<any> {
+  public onInvalidDocumentEdit(): Q.Promise<unknown> {
     if (
       this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentNoEdits ||
       this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid
@@ -442,7 +444,7 @@ export default class ConflictsTab extends TabsBase {
         this._documentsIterator = await this.createIterator();
         await this.loadNextPage();
       } catch (error) {
-        if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+        if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
           TelemetryProcessor.traceFailure(
             Action.Tab,
             {
@@ -471,7 +473,7 @@ export default class ConflictsTab extends TabsBase {
     return queryConflicts(this.collection.databaseId, this.collection.id(), query, options as FeedOptions);
   }
 
-  public loadNextPage(): Q.Promise<any> {
+  public loadNextPage(): Q.Promise<unknown> {
     this.isExecuting(true);
     this.isExecutionError(false);
     return this._loadNextPageInternal()
@@ -491,7 +493,7 @@ export default class ConflictsTab extends TabsBase {
 
           const merged = currentConflicts.concat(nextConflictIds);
           this.conflictIds(merged);
-          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+          if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
             TelemetryProcessor.traceSuccess(
               Action.Tab,
               {
@@ -508,7 +510,7 @@ export default class ConflictsTab extends TabsBase {
         },
         (error) => {
           this.isExecutionError(true);
-          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+          if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
             TelemetryProcessor.traceFailure(
               Action.Tab,
               {
@@ -541,18 +543,18 @@ export default class ConflictsTab extends TabsBase {
     return Q(this._documentsIterator.fetchNext().then((response) => response.resources));
   }
 
-  protected _onEditorContentChange(newContent: string) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  protected _onEditorContentChange(_newContent: string) {
     try {
-      const parsed: any = JSON.parse(newContent);
       this.onValidDocumentEdit();
     } catch (e) {
       this.onInvalidDocumentEdit();
     }
   }
 
-  public initDocumentEditorForCreate(documentId: ConflictId, documentToInsert: any): Q.Promise<any> {
+  public initDocumentEditorForCreate(documentId: ConflictId, documentToInsert: any): Q.Promise<unknown> {
     if (documentId) {
-      let parsedConflictContent: any = JSON.parse(documentToInsert);
+      const parsedConflictContent: any = JSON.parse(documentToInsert);
       const renderedConflictContent: string = this.renderObjectForEditor(parsedConflictContent, null, 4);
       this.selectedConflictContent.setBaseline(renderedConflictContent);
       this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
@@ -565,7 +567,7 @@ export default class ConflictsTab extends TabsBase {
     documentId: ConflictId,
     conflictContent: any,
     currentContent: any
-  ): Q.Promise<any> {
+  ): Q.Promise<unknown> {
     if (documentId) {
       currentContent = ConflictsTab.removeSystemProperties(currentContent);
       const renderedCurrentContent: string = this.renderObjectForEditor(currentContent, null, 4);
@@ -582,7 +584,7 @@ export default class ConflictsTab extends TabsBase {
     return Q();
   }
 
-  public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<any> {
+  public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<unknown> {
     if (documentId) {
       let parsedDocumentToDelete: any = JSON.parse(documentToDelete);
       parsedDocumentToDelete = ConflictsTab.removeSystemProperties(parsedDocumentToDelete);
@@ -594,7 +596,8 @@ export default class ConflictsTab extends TabsBase {
     return Q();
   }
 
-  public initDocumentEditorForNoOp(documentId: ConflictId): Q.Promise<any> {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public initDocumentEditorForNoOp(_documentId: ConflictId): Q.Promise<unknown> {
     this.selectedConflictContent(null);
     this.selectedConflictCurrent(null);
     this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);