Fix eslint issues for DataTableOperationManager and CustomTimestampHelper

.eslintignore

@@ -46,8 +46,8 @@ src/Explorer/DataSamples/DataSamplesUtil.test.ts
 src/Explorer/DataSamples/DataSamplesUtil.ts
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.test.ts
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.ts
-# src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.test.ts
-# src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts
+src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.test.ts
+src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts
 src/Explorer/Graph/GraphExplorerComponent/EdgeInfoCache.ts
 src/Explorer/Graph/GraphExplorerComponent/GraphData.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GraphData.ts
@@ -80,10 +80,10 @@ 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/Graph/GraphExplorerComponent/D3ForceGraph.test.ts

@@ -1,5 +1,4 @@
-/*eslint-disable jest/no-test-callback */
-import * as sinon from "sinon";
+import * as sinon from "sinon";
 import GraphTab from "../../Tabs/GraphTab";
 import { D3Link, D3Node, GraphData } from "../GraphExplorerComponent/GraphData";
 import { D3ForceGraph, D3GraphNodeData, LoadMoreDataAction } from "./D3ForceGraph";
@@ -71,7 +70,6 @@ describe("D3ForceGraph", () => {
       forceGraph = new D3ForceGraph({
         igraphConfig: GraphTab.createIGraphConfig(),
         onHighlightedNode: sinon.spy(),
-        //eslint-disable-next-line
         onLoadMoreData: (action: LoadMoreDataAction): void => {},
 
         // parent to graph

src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts

@@ -1,6 +1,4 @@
-/*eslint-disable @typescript-eslint/no-explicit-any*/
-/*eslint-disable @typescript-eslint/no-this-alias*/
-import { BaseType } from "d3";
+import { BaseType } from "d3";
 import { map as d3Map } from "d3-collection";
 import { D3DragEvent, drag } from "d3-drag";
 import { forceCollide, forceLink, forceManyBody, forceSimulation } from "d3-force";
@@ -263,10 +261,10 @@ export class D3ForceGraph implements GraphRenderer {
         return;
       }
 
-      const self = this;
+      var self = this;
       // Select this node id
       selectAll(".node")
-        .filter((d: D3Node) => {
+        .filter(function (d: D3Node, i) {
           return d.id === newVal;
         })
         .each(function (d: D3Node) {
@@ -279,15 +277,15 @@ export class D3ForceGraph implements GraphRenderer {
   } // initialize
 
   private updateUniqueValues(key: string) {
-    for (let i = 0; i < this.graphDataWrapper.vertices.length; i++) {
-      const vertex = this.graphDataWrapper.vertices[i];
+    for (var i = 0; i < this.graphDataWrapper.vertices.length; i++) {
+      let vertex = this.graphDataWrapper.vertices[i];
 
-      const props = D3ForceGraph.getNodeProperties(vertex);
+      let props = D3ForceGraph.getNodeProperties(vertex);
       if (props.indexOf(key) === -1) {
         // Vertex doesn't have the property
         continue;
       }
-      const val = GraphData.getNodePropValue(vertex, key);
+      let val = GraphData.getNodePropValue(vertex, key);
       if (typeof val !== "string" && typeof val !== "number") {
         // Not a type we can map
         continue;
@@ -315,7 +313,7 @@ export class D3ForceGraph implements GraphRenderer {
    */
   private static getNodeProperties(node: D3Node): string[] {
     let props = ["id", "label"];
-    //eslint-disable-next-line
+
     if (node.hasOwnProperty("properties")) {
       props = props.concat(Object.keys(node.properties));
     }
@@ -407,7 +405,7 @@ export class D3ForceGraph implements GraphRenderer {
     // Remember nodes current position
     const posMap = new Map<string, Point2D>();
     this.simulation.nodes().forEach((d: D3Node) => {
-      if (d.x === undefined || d.y === undefined) {
+      if (d.x == undefined || d.y == undefined) {
         return;
       }
       posMap.set(d.id, { x: d.x, y: d.y });
@@ -551,7 +549,7 @@ export class D3ForceGraph implements GraphRenderer {
       .transition()
       .delay(D3ForceGraph.TRANSITION_STEP3_MS - 100)
       .duration(D3ForceGraph.TRANSITION_STEP3_MS)
-      .attrTween("fill", () => {
+      .attrTween("fill", (t: any) => {
         const ic = interpolate("#ffffff", "#000000");
         return (t: number) => {
           return ic(t);
@@ -569,7 +567,7 @@ export class D3ForceGraph implements GraphRenderer {
     // Distribute nodes initial position before simulation
     const nodes = graph.vertices;
     for (let i = 0; i < nodes.length; i++) {
-      const v = nodes[i];
+      let v = nodes[i];
 
       if (v._isRoot) {
         this.rootVertex = v;
@@ -613,20 +611,6 @@ export class D3ForceGraph implements GraphRenderer {
 
     const self = this;
 
-    const ticked = () => {
-      self.linkSelection.select(".link").attr("d", (l: D3Link) => {
-        return self.positionLink(l);
-      });
-      if (!D3ForceGraph.useSvgMarkerEnd()) {
-        self.linkSelection.select(".markerEnd").attr("transform", (l: D3Link) => {
-          return self.positionLinkEnd(l);
-        });
-      }
-      self.nodeSelection.attr("transform", (d: D3Node) => {
-        return self.positionNode(d);
-      });
-    };
-
     this.simulation.nodes(nodes).on("tick", ticked);
 
     this.simulation.force<d3.ForceLink<D3Node, D3Link>>("link").links(graph.edges);
@@ -650,6 +634,20 @@ export class D3ForceGraph implements GraphRenderer {
       this.simulation.alpha(1).restart();
       this.params.onGraphUpdated(new Date().getTime());
     });
+
+    function ticked() {
+      self.linkSelection.select(".link").attr("d", (l: D3Link) => {
+        return self.positionLink(l);
+      });
+      if (!D3ForceGraph.useSvgMarkerEnd()) {
+        self.linkSelection.select(".markerEnd").attr("transform", (l: D3Link) => {
+          return self.positionLinkEnd(l);
+        });
+      }
+      self.nodeSelection.attr("transform", (d: D3Node) => {
+        return self.positionNode(d);
+      });
+    }
   }
 
   private addNewLinks(): d3.Selection<Element, any, any, any> {
@@ -679,7 +677,7 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private addNewNodes(): d3.Selection<Element, any, any, any> {
-    const self = this;
+    var self = this;
 
     const newNodes = this.nodeSelection
       .enter()
@@ -707,7 +705,7 @@ export class D3ForceGraph implements GraphRenderer {
         this.highlightNode(this, d);
         this.simulation.stop();
       })
-      .on("mouseout", () => {
+      .on("mouseout", (_: MouseEvent, d: D3Node) => {
         if (this.isHighlightDisabled || this.selectedNode || this.isDragging) {
           return;
         }
@@ -728,7 +726,7 @@ export class D3ForceGraph implements GraphRenderer {
       .attr("class", "main")
       .attr("r", this.igraphConfig.nodeSize);
 
-    const iconGroup = newNodes
+    var iconGroup = newNodes
       .append("g")
       .attr("class", "iconContainer")
       .attr("tabindex", 0)
@@ -751,8 +749,8 @@ export class D3ForceGraph implements GraphRenderer {
           self.onNodeClicked(this.parentNode, d);
         }
       });
-    const nodeSize = this.igraphConfig.nodeSize;
-    const bgsize = nodeSize + 1;
+    var nodeSize = this.igraphConfig.nodeSize;
+    var bgsize = nodeSize + 1;
 
     iconGroup
       .append("rect")
@@ -760,7 +758,7 @@ export class D3ForceGraph implements GraphRenderer {
       .attr("y", -bgsize)
       .attr("width", bgsize * 2)
       .attr("height", bgsize * 2)
-      .attr("fill-opacity", () => {
+      .attr("fill-opacity", (d: D3Node) => {
         return this.igraphConfig.nodeIconKey ? 1 : 0;
       })
       .attr("class", "icon-background");
@@ -832,10 +830,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.NEXT_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent) => {
+      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent) => {
+      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", false);
       }) as any)
       .attr("visibility", (d: D3Node) => (!d._outEAllLoaded || !d._inEAllLoaded ? "visible" : "hidden"));
@@ -861,10 +859,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.PREVIOUS_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent) => {
+      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent) => {
+      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", false);
       }) as any)
       .attr("visibility", (d: D3Node) =>
@@ -957,10 +955,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.FIRST_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent) => {
+      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent) => {
+      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
         select(e.target as any).classed("active", false);
       }) as any);
   }
@@ -969,9 +967,10 @@ export class D3ForceGraph implements GraphRenderer {
    * Remove LoadMore subassembly for existing nodes that show all their children in the graph
    */
   private updateLoadMore(nodeSelection: d3.Selection<Element, any, any, any>) {
+    const self = this;
     nodeSelection.selectAll(".loadmore").remove();
 
-    const nodeSize = this.igraphConfig.nodeSize;
+    var nodeSize = this.igraphConfig.nodeSize;
     const rootSelectionG = nodeSelection
       .filter((d: D3Node) => {
         return !!d._isRoot && !!d._pagination;
@@ -1091,7 +1090,7 @@ export class D3ForceGraph implements GraphRenderer {
 
   private fadeNonNeighbors(nodeId: string) {
     this.g.selectAll(".node").classed("inactive", (d: D3Node) => {
-      const neighbors = ((showNeighborType) => {
+      var neighbors = ((showNeighborType) => {
         switch (showNeighborType) {
           case NeighborType.SOURCES_ONLY:
             return this.graphDataWrapper.getSourcesForId(nodeId);
@@ -1152,7 +1151,7 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private retrieveNodeCaption(d: D3Node) {
-    const key = this.igraphConfig.nodeCaption;
+    let key = this.igraphConfig.nodeCaption;
     let value: string = d.id || d.label;
     if (key) {
       value = <string>GraphData.getNodePropValue(d, key) || "";
@@ -1203,14 +1202,14 @@ export class D3ForceGraph implements GraphRenderer {
       y: (<D3Node>l.target).y,
     };
     const d1 = D3ForceGraph.calculateControlPoint(source, target);
-    const radius = this.igraphConfig.nodeSize + 3;
+    var radius = this.igraphConfig.nodeSize + 3;
 
     // End
     const dx = target.x - d1.x;
     const dy = target.y - d1.y;
     const angle = Math.atan2(dy, dx);
-    const ux = target.x - Math.cos(angle) * radius;
-    const uy = target.y - Math.sin(angle) * radius;
+    var ux = target.x - Math.cos(angle) * radius;
+    var uy = target.y - Math.sin(angle) * radius;
 
     return `translate(${ux},${uy}) rotate(${(angle * 180) / Math.PI})`;
   }
@@ -1225,21 +1224,21 @@ export class D3ForceGraph implements GraphRenderer {
       y: (<D3Node>l.target).y,
     };
     const d1 = D3ForceGraph.calculateControlPoint(source, target);
-    const radius = this.igraphConfig.nodeSize + 3;
+    var radius = this.igraphConfig.nodeSize + 3;
 
     // Start
-    let dx = d1.x - source.x;
-    let dy = d1.y - source.y;
-    let angle = Math.atan2(dy, dx);
-    const tx = source.x + Math.cos(angle) * radius;
-    const ty = source.y + Math.sin(angle) * radius;
+    var dx = d1.x - source.x;
+    var dy = d1.y - source.y;
+    var angle = Math.atan2(dy, dx);
+    var tx = source.x + Math.cos(angle) * radius;
+    var ty = source.y + Math.sin(angle) * radius;
 
     // End
     dx = target.x - d1.x;
     dy = target.y - d1.y;
     angle = Math.atan2(dy, dx);
-    const ux = target.x - Math.cos(angle) * radius;
-    const uy = target.y - Math.sin(angle) * radius;
+    var ux = target.x - Math.cos(angle) * radius;
+    var uy = target.y - Math.sin(angle) * radius;
 
     return "M" + tx + "," + ty + "S" + d1.x + "," + d1.y + " " + ux + "," + uy;
   }
@@ -1261,9 +1260,9 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private static computeImageData(d: D3Node, config: IGraphConfig): string {
-    const propValue = <string>GraphData.getNodePropValue(d, config.nodeIconKey) || "";
+    let propValue = <string>GraphData.getNodePropValue(d, config.nodeIconKey) || "";
     // Trim leading and trailing spaces to make comparison more forgiving.
-    const value = config.iconsMap[propValue.trim()];
+    let value = config.iconsMap[propValue.trim()];
     if (!value) {
       return undefined;
     }
@@ -1289,7 +1288,7 @@ export class D3ForceGraph implements GraphRenderer {
       // clear icons
       this.g.selectAll(".node .icon").attr("xlink:href", undefined);
     }
-    this.g.selectAll(".node .icon-background").attr("fill-opacity", () => {
+    this.g.selectAll(".node .icon-background").attr("fill-opacity", (d: D3Node) => {
       return config.nodeIconKey ? 1 : 0;
     });
     this.g.selectAll(".node text.caption").text((d: D3Node) => {

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/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/DataTableOperationManager.ts

@@ -1,11 +1,10 @@
 import ko from "knockout";
-
-import * as DataTableOperations from "./DataTableOperations";
 import * as Constants from "../Constants";
+import * as Entities from "../Entities";
+import * as Utilities from "../Utilities";
+import * as DataTableOperations from "./DataTableOperations";
 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.
@@ -25,7 +24,7 @@ export default class DataTableOperationManager {
   }
 
   private click = (event: JQueryEventObject) => {
-    var elem: JQuery = $(event.currentTarget);
+    const elem: JQuery = $(event.currentTarget);
     this.updateLastSelectedItem(elem, event.shiftKey);
 
     if (Utilities.isEnvironmentCtrlPressed(event)) {
@@ -37,30 +36,30 @@ export default class DataTableOperationManager {
     }
   };
 
-  private doubleClick = (event: JQueryEventObject) => {
+  private doubleClick = () => {
     this.tryOpenEditor();
   };
 
   private keyDown = (event: JQueryEventObject): boolean => {
-    var isUpArrowKey: boolean = event.keyCode === Constants.keyCodes.UpArrow,
-      isDownArrowKey: boolean = event.keyCode === Constants.keyCodes.DownArrow,
-      handled: boolean = false;
+    const isUpArrowKey: boolean = event.keyCode === Constants.keyCodes.UpArrow,
+      isDownArrowKey: boolean = event.keyCode === Constants.keyCodes.DownArrow;
+    let handled = false;
 
     if (isUpArrowKey || isDownArrowKey) {
-      var lastSelectedItem: Entities.ITableEntity = this._tableEntityListViewModel.lastSelectedItem;
-      var dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
-      var maximumIndex = dataTableRows.length - 1;
+      const lastSelectedItem: Entities.ITableEntity = this._tableEntityListViewModel.lastSelectedItem;
+      const dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
+      const 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.
-      var lastSelectedItemIndex = lastSelectedItem
+      const lastSelectedItemIndex = lastSelectedItem
         ? this._tableEntityListViewModel.getItemIndexFromCurrentPage(
             this._tableEntityListViewModel.getTableEntityKeys(lastSelectedItem.RowKey._)
           )
         : -1;
-      var nextIndex: number = isUpArrowKey ? lastSelectedItemIndex - 1 : lastSelectedItemIndex + 1;
-      var safeIndex: number = Utilities.ensureBetweenBounds(nextIndex, 0, maximumIndex);
-      var selectedRowElement: JQuery = dataTableRows.eq(safeIndex);
+      const nextIndex: number = isUpArrowKey ? lastSelectedItemIndex - 1 : lastSelectedItemIndex + 1;
+      const safeIndex: number = Utilities.ensureBetweenBounds(nextIndex, 0, maximumIndex);
+      const selectedRowElement: JQuery = dataTableRows.eq(safeIndex);
 
       if (selectedRowElement) {
         if (event.shiftKey) {
@@ -90,7 +89,7 @@ export default class DataTableOperationManager {
   // in contrast, there may be more than one key down and key
   // pressed events.
   private keyUp = (event: JQueryEventObject): boolean => {
-    var handled: boolean = false;
+    let handled = false;
 
     switch (event.keyCode) {
       case Constants.keyCodes.Enter:
@@ -105,8 +104,9 @@ export default class DataTableOperationManager {
   };
 
   private itemDropped = (event: JQueryEventObject): boolean => {
-    var handled: boolean = false;
-    var items = (<any>event.originalEvent).dataTransfer.items;
+    const handled = false;
+    //eslint-disable-next-line
+    const items = (<any>event.originalEvent).dataTransfer.items;
 
     if (!items) {
       // On browsers outside of Chromium
@@ -115,9 +115,9 @@ export default class DataTableOperationManager {
       return null;
     }
 
-    for (var i = 0; i < items.length; i++) {
-      var item = items[i];
-      var entry = item.webkitGetAsEntry();
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+      const 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 {
-    var selectedEntities: Entities.ITableEntity[] = this._tableEntityListViewModel.selected();
-    var handled: boolean = false;
+    const selectedEntities: Entities.ITableEntity[] = this._tableEntityListViewModel.selected();
+    let handled = false;
 
     if (selectedEntities && selectedEntities.length) {
       this._tableCommands.deleteEntitiesCommand(this._tableEntityListViewModel);
@@ -150,8 +150,8 @@ export default class DataTableOperationManager {
   }
 
   private updateLastSelectedItem($elem: JQuery, isShiftSelect: boolean) {
-    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
-    var entity = this._tableEntityListViewModel.getItemFromCurrentPage(
+    const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+    const entity = this._tableEntityListViewModel.getItemFromCurrentPage(
       this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
     );
 
@@ -164,7 +164,7 @@ export default class DataTableOperationManager {
 
   private applySingleSelection($elem: JQuery) {
     if ($elem) {
-      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      const 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 {
-    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    const koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.selected
       : null;
 
     if (koSelected) {
-      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
 
       if (
         !this._tableEntityListViewModel.isItemSelected(
@@ -201,7 +201,7 @@ export default class DataTableOperationManager {
   }
 
   private applyShiftSelection($elem: JQuery): void {
-    var anchorItem = this._tableEntityListViewModel.lastSelectedAnchorItem;
+    let 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) {
-      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
-      var elementIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+      const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      const elementIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
         this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
       );
-      var anchorIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+      const anchorIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
         this._tableEntityListViewModel.getTableEntityKeys(anchorItem.RowKey._)
       );
 
-      var startIndex = Math.min(elementIndex, anchorIndex);
-      var endIndex = Math.max(elementIndex, anchorIndex);
+      const startIndex = Math.min(elementIndex, anchorIndex);
+      const 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) {
-    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+    const entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
 
     if (
       !this._tableEntityListViewModel.isItemSelected(
@@ -244,26 +244,26 @@ export default class DataTableOperationManager {
   }
 
   private addToSelection(rowKey: string) {
-    var selectedEntity: Entities.ITableEntity = this._tableEntityListViewModel.getItemFromCurrentPage(
+    const 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 {
-    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    const koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.selected
       : null;
-    var koEntities: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+    const koEntities: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
       ? this._tableEntityListViewModel.items
       : null;
 
     if (!koSelected().length && koEntities().length) {
-      var firstEntity: Entities.ITableEntity = koEntities()[0];
+      const firstEntity: Entities.ITableEntity = koEntities()[0];
 
       // Clear last selection: lastSelectedItem and lastSelectedAnchorItem
       this._tableEntityListViewModel.clearLastSelected();
@@ -278,7 +278,7 @@ export default class DataTableOperationManager {
     }
   }
 
-  public bind() {
+  public bind(): void {
     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 var utc = "utc";
-export var local = "local";
+export const utc = "utc";
+export const 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: number = 24): string {
-  var startTimestamp: string;
+export function getDefaultStart(localTime: boolean, durationHours = 24): string {
+  let startTimestamp: string;
 
-  var utcNowString: string = new Date().toISOString();
-  var yesterday: Date = new Date(utcNowString);
+  const utcNowString: string = new Date().toISOString();
+  const yesterday: Date = new Date(utcNowString);
 
   yesterday.setHours(yesterday.getHours() - durationHours);
   startTimestamp = yesterday.toISOString();
@@ -58,9 +58,9 @@ export function getDefaultStart(localTime: boolean, durationHours: number = 24):
 }
 
 export function getDefaultEnd(localTime: boolean): string {
-  var endTimestamp: string;
+  let endTimestamp: string;
 
-  var utcNowString: string = new Date().toISOString();
+  const 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
-  var date: Date = null;
+  let 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"
-      var millisecondTime = Date.parse(dateString),
+      const 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.
-        var year = parsed.getUTCFullYear(),
+        const 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
-  var localDate = parseDate(localDateString, false),
-    utcDateString: string = null;
+  const localDate = parseDate(localDateString, false);
+  let utcDateString: string = null;
 
   if (localDate) {
     utcDateString = localDate.toISOString();
@@ -120,7 +120,7 @@ export function utcFromLocalDateString(localDateString: string): string {
 }
 
 function padIfNeeded(value: number): string {
-  var padded: string = String(value);
+  let padded = String(value);
 
   if (0 <= value && value < 10) {
     padded = "0" + padded;
@@ -130,7 +130,7 @@ function padIfNeeded(value: number): string {
 }
 
 function toLocalDateString(date: Date): string {
-  var localDateString: string = null;
+  let localDateString: string = null;
 
   if (date) {
     localDateString =
@@ -152,8 +152,8 @@ function toLocalDateString(date: Date): string {
 
 export function localFromUtcDateString(utcDateString: string): string {
   // TODO validate utcDateString
-  var utcDate: Date = parseDate(utcDateString, true),
-    localDateString: string = null;
+  const utcDate: Date = parseDate(utcDateString, true);
+  let 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) {
-    var currentDateString: string = koTimestamp(),
-      newDateString: string;
+    const currentDateString: string = koTimestamp();
+    let newDateString: string;
 
     if (currentDateString) {
       if (toUTC) {
@@ -189,16 +189,16 @@ export function tryChangeTimestampTimeZone(koTimestamp: ko.Observable<string>, t
  * Input validation helpers
  */
 
-export var noTooltip = "",
+export const 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 {
-  var success: boolean = false;
+  let success = false;
 
   if (dateString) {
-    var date: number = Date.parse(dateString);
+    const date = Date.parse(dateString);
 
     success = $.isNumeric(date);
   }
@@ -308,10 +308,10 @@ function _getLocalIsoDateStringFromParts(
 }
 
 function _addDaysHours(time: Date, days: number, hours: number): Date {
-  var msPerHour = 1000 * 60 * 60;
-  var daysMs = days * msPerHour * 24;
-  var hoursMs = hours * msPerHour;
-  var newTimeMs = time.getTime() + daysMs + hoursMs;
+  const msPerHour = 1000 * 60 * 60;
+  const daysMs = days * msPerHour * 24;
+  const hoursMs = hours * msPerHour;
+  const 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 */
-  var daysHoursAgo = _getLocalIsoDateTimeString(_daysHoursBeforeNow(days, hours));
+  let 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 {
-  var now = new Date();
-  var start = _getLocalIsoDateStringFromParts(now.getFullYear(), now.getMonth(), 1);
+  const now = new Date();
+  let start = _getLocalIsoDateStringFromParts(now.getFullYear(), now.getMonth(), 1);
   start = DateTimeUtilities.getUTCDateTime(start);
   return start;
 }
 
 export function _queryCurrentYearLocal(): string {
-  var now = new Date();
-  var start = _getLocalIsoDateStringFromParts(now.getFullYear(), 0, 1); // Month is 0..11, date is 1..31
+  const now = new Date();
+  let 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 {
-  var timeMS: number;
+  let 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);
   }
-  var newTimeMS = time.getTime() + timeMS;
+  const 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 */
-  var daysHoursAgo = _getLocalIsoDateTimeString(_timeBeforeNow(lastNumber, timeUnit));
+  let daysHoursAgo = _getLocalIsoDateTimeString(_timeBeforeNow(lastNumber, timeUnit));
   daysHoursAgo = DateTimeUtilities.getUTCDateTime(daysHoursAgo);
   return daysHoursAgo;
   /* tslint:enable: no-unused-variable */

src/Explorer/Tables/TableDataClient.ts

@@ -202,21 +202,14 @@ 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()
         ) {
-          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;
         }
       }