Fix eslint issues for D3ForceGraph and test file

.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
@@ -87,6 +87,7 @@ 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/Graph/GraphExplorerComponent/D3ForceGraph.test.ts

@@ -1,4 +1,5 @@
-import * as sinon from "sinon";
+/*eslint-disable jest/no-test-callback */
+import * as sinon from "sinon";
 import GraphTab from "../../Tabs/GraphTab";
 import { D3Link, D3Node, GraphData } from "../GraphExplorerComponent/GraphData";
 import { D3ForceGraph, D3GraphNodeData, LoadMoreDataAction } from "./D3ForceGraph";
@@ -70,6 +71,7 @@ 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,4 +1,6 @@
-import { BaseType } from "d3";
+/*eslint-disable @typescript-eslint/no-explicit-any*/
+/*eslint-disable @typescript-eslint/no-this-alias*/
+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";
@@ -261,10 +263,10 @@ export class D3ForceGraph implements GraphRenderer {
         return;
       }
 
-      var self = this;
+      const self = this;
       // Select this node id
       selectAll(".node")
-        .filter(function (d: D3Node, i) {
+        .filter((d: D3Node) => {
           return d.id === newVal;
         })
         .each(function (d: D3Node) {
@@ -277,15 +279,15 @@ export class D3ForceGraph implements GraphRenderer {
   } // initialize
 
   private updateUniqueValues(key: string) {
-    for (var i = 0; i < this.graphDataWrapper.vertices.length; i++) {
-      let vertex = this.graphDataWrapper.vertices[i];
+    for (let i = 0; i < this.graphDataWrapper.vertices.length; i++) {
+      const vertex = this.graphDataWrapper.vertices[i];
 
-      let props = D3ForceGraph.getNodeProperties(vertex);
+      const props = D3ForceGraph.getNodeProperties(vertex);
       if (props.indexOf(key) === -1) {
         // Vertex doesn't have the property
         continue;
       }
-      let val = GraphData.getNodePropValue(vertex, key);
+      const val = GraphData.getNodePropValue(vertex, key);
       if (typeof val !== "string" && typeof val !== "number") {
         // Not a type we can map
         continue;
@@ -313,7 +315,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));
     }
@@ -405,7 +407,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 });
@@ -549,7 +551,7 @@ export class D3ForceGraph implements GraphRenderer {
       .transition()
       .delay(D3ForceGraph.TRANSITION_STEP3_MS - 100)
       .duration(D3ForceGraph.TRANSITION_STEP3_MS)
-      .attrTween("fill", (t: any) => {
+      .attrTween("fill", () => {
         const ic = interpolate("#ffffff", "#000000");
         return (t: number) => {
           return ic(t);
@@ -567,7 +569,7 @@ export class D3ForceGraph implements GraphRenderer {
     // Distribute nodes initial position before simulation
     const nodes = graph.vertices;
     for (let i = 0; i < nodes.length; i++) {
-      let v = nodes[i];
+      const v = nodes[i];
 
       if (v._isRoot) {
         this.rootVertex = v;
@@ -611,6 +613,20 @@ 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);
@@ -634,20 +650,6 @@ 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> {
@@ -677,7 +679,7 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private addNewNodes(): d3.Selection<Element, any, any, any> {
-    var self = this;
+    const self = this;
 
     const newNodes = this.nodeSelection
       .enter()
@@ -705,7 +707,7 @@ export class D3ForceGraph implements GraphRenderer {
         this.highlightNode(this, d);
         this.simulation.stop();
       })
-      .on("mouseout", (_: MouseEvent, d: D3Node) => {
+      .on("mouseout", () => {
         if (this.isHighlightDisabled || this.selectedNode || this.isDragging) {
           return;
         }
@@ -726,7 +728,7 @@ export class D3ForceGraph implements GraphRenderer {
       .attr("class", "main")
       .attr("r", this.igraphConfig.nodeSize);
 
-    var iconGroup = newNodes
+    const iconGroup = newNodes
       .append("g")
       .attr("class", "iconContainer")
       .attr("tabindex", 0)
@@ -749,8 +751,8 @@ export class D3ForceGraph implements GraphRenderer {
           self.onNodeClicked(this.parentNode, d);
         }
       });
-    var nodeSize = this.igraphConfig.nodeSize;
-    var bgsize = nodeSize + 1;
+    const nodeSize = this.igraphConfig.nodeSize;
+    const bgsize = nodeSize + 1;
 
     iconGroup
       .append("rect")
@@ -758,7 +760,7 @@ export class D3ForceGraph implements GraphRenderer {
       .attr("y", -bgsize)
       .attr("width", bgsize * 2)
       .attr("height", bgsize * 2)
-      .attr("fill-opacity", (d: D3Node) => {
+      .attr("fill-opacity", () => {
         return this.igraphConfig.nodeIconKey ? 1 : 0;
       })
       .attr("class", "icon-background");
@@ -830,10 +832,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.NEXT_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseover", ((e: MouseEvent) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseout", ((e: MouseEvent) => {
         select(e.target as any).classed("active", false);
       }) as any)
       .attr("visibility", (d: D3Node) => (!d._outEAllLoaded || !d._inEAllLoaded ? "visible" : "hidden"));
@@ -859,10 +861,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.PREVIOUS_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseover", ((e: MouseEvent) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseout", ((e: MouseEvent) => {
         select(e.target as any).classed("active", false);
       }) as any)
       .attr("visibility", (d: D3Node) =>
@@ -955,10 +957,10 @@ export class D3ForceGraph implements GraphRenderer {
           self.loadNeighbors(d, PAGE_ACTION.FIRST_PAGE);
         }
       }) as any)
-      .on("mouseover", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseover", ((e: MouseEvent) => {
         select(e.target as any).classed("active", true);
       }) as any)
-      .on("mouseout", ((e: MouseEvent, d: D3Node) => {
+      .on("mouseout", ((e: MouseEvent) => {
         select(e.target as any).classed("active", false);
       }) as any);
   }
@@ -967,10 +969,9 @@ 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();
 
-    var nodeSize = this.igraphConfig.nodeSize;
+    const nodeSize = this.igraphConfig.nodeSize;
     const rootSelectionG = nodeSelection
       .filter((d: D3Node) => {
         return !!d._isRoot && !!d._pagination;
@@ -1090,7 +1091,7 @@ export class D3ForceGraph implements GraphRenderer {
 
   private fadeNonNeighbors(nodeId: string) {
     this.g.selectAll(".node").classed("inactive", (d: D3Node) => {
-      var neighbors = ((showNeighborType) => {
+      const neighbors = ((showNeighborType) => {
         switch (showNeighborType) {
           case NeighborType.SOURCES_ONLY:
             return this.graphDataWrapper.getSourcesForId(nodeId);
@@ -1151,7 +1152,7 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private retrieveNodeCaption(d: D3Node) {
-    let key = this.igraphConfig.nodeCaption;
+    const key = this.igraphConfig.nodeCaption;
     let value: string = d.id || d.label;
     if (key) {
       value = <string>GraphData.getNodePropValue(d, key) || "";
@@ -1202,14 +1203,14 @@ export class D3ForceGraph implements GraphRenderer {
       y: (<D3Node>l.target).y,
     };
     const d1 = D3ForceGraph.calculateControlPoint(source, target);
-    var radius = this.igraphConfig.nodeSize + 3;
+    const radius = this.igraphConfig.nodeSize + 3;
 
     // End
     const dx = target.x - d1.x;
     const dy = target.y - d1.y;
     const angle = Math.atan2(dy, dx);
-    var ux = target.x - Math.cos(angle) * radius;
-    var uy = target.y - Math.sin(angle) * radius;
+    const ux = target.x - Math.cos(angle) * radius;
+    const uy = target.y - Math.sin(angle) * radius;
 
     return `translate(${ux},${uy}) rotate(${(angle * 180) / Math.PI})`;
   }
@@ -1224,21 +1225,21 @@ export class D3ForceGraph implements GraphRenderer {
       y: (<D3Node>l.target).y,
     };
     const d1 = D3ForceGraph.calculateControlPoint(source, target);
-    var radius = this.igraphConfig.nodeSize + 3;
+    const radius = this.igraphConfig.nodeSize + 3;
 
     // Start
-    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;
+    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;
 
     // End
     dx = target.x - d1.x;
     dy = target.y - d1.y;
     angle = Math.atan2(dy, dx);
-    var ux = target.x - Math.cos(angle) * radius;
-    var uy = target.y - Math.sin(angle) * radius;
+    const ux = target.x - Math.cos(angle) * radius;
+    const uy = target.y - Math.sin(angle) * radius;
 
     return "M" + tx + "," + ty + "S" + d1.x + "," + d1.y + " " + ux + "," + uy;
   }
@@ -1260,9 +1261,9 @@ export class D3ForceGraph implements GraphRenderer {
   }
 
   private static computeImageData(d: D3Node, config: IGraphConfig): string {
-    let propValue = <string>GraphData.getNodePropValue(d, config.nodeIconKey) || "";
+    const propValue = <string>GraphData.getNodePropValue(d, config.nodeIconKey) || "";
     // Trim leading and trailing spaces to make comparison more forgiving.
-    let value = config.iconsMap[propValue.trim()];
+    const value = config.iconsMap[propValue.trim()];
     if (!value) {
       return undefined;
     }
@@ -1288,7 +1289,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", (d: D3Node) => {
+    this.g.selectAll(".node .icon-background").attr("fill-opacity", () => {
       return config.nodeIconKey ? 1 : 0;
     });
     this.g.selectAll(".node text.caption").text((d: D3Node) => {

src/Explorer/Tabs/ConflictsTab.ts

@@ -1,5 +1,3 @@
-/* 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";
@@ -71,13 +69,13 @@ export default class ConflictsTab extends TabsBase {
       ViewModels.DocumentExplorerState.noDocumentSelected
     );
     this.selectedConflictId = ko.observable<ConflictId>();
-    this.selectedConflictContent = editable.observable<string>("");
-    this.selectedConflictCurrent = editable.observable<string>("");
+    this.selectedConflictContent = editable.observable<any>("");
+    this.selectedConflictCurrent = editable.observable<any>("");
     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;
 
@@ -189,7 +187,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;
@@ -197,7 +195,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();
@@ -244,7 +242,7 @@ export default class ConflictsTab extends TabsBase {
     return true;
   };
 
-  public onConflictIdClick(): Q.Promise<unknown> {
+  public onConflictIdClick(clickedDocumentId: ConflictId): Q.Promise<any> {
     if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
       return Q();
     }
@@ -407,19 +405,19 @@ export default class ConflictsTab extends TabsBase {
     }
   };
 
-  public onDiscardClick = (): Q.Promise<unknown> => {
+  public onDiscardClick = (): Q.Promise<any> => {
     this.selectedConflictContent(this.selectedConflictContent.getEditableOriginalValue());
     this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
 
     return Q();
   };
 
-  public onValidDocumentEdit(): Q.Promise<unknown> {
+  public onValidDocumentEdit(): Q.Promise<any> {
     this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid);
     return Q();
   }
 
-  public onInvalidDocumentEdit(): Q.Promise<unknown> {
+  public onInvalidDocumentEdit(): Q.Promise<any> {
     if (
       this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentNoEdits ||
       this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid
@@ -444,7 +442,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,
             {
@@ -473,7 +471,7 @@ export default class ConflictsTab extends TabsBase {
     return queryConflicts(this.collection.databaseId, this.collection.id(), query, options as FeedOptions);
   }
 
-  public loadNextPage(): Q.Promise<unknown> {
+  public loadNextPage(): Q.Promise<any> {
     this.isExecuting(true);
     this.isExecutionError(false);
     return this._loadNextPageInternal()
@@ -493,7 +491,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,
               {
@@ -510,7 +508,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,
               {
@@ -543,18 +541,18 @@ export default class ConflictsTab extends TabsBase {
     return Q(this._documentsIterator.fetchNext().then((response) => response.resources));
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected _onEditorContentChange(_newContent: string) {
+  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<unknown> {
+  public initDocumentEditorForCreate(documentId: ConflictId, documentToInsert: any): Q.Promise<any> {
     if (documentId) {
-      const parsedConflictContent: any = JSON.parse(documentToInsert);
+      let parsedConflictContent: any = JSON.parse(documentToInsert);
       const renderedConflictContent: string = this.renderObjectForEditor(parsedConflictContent, null, 4);
       this.selectedConflictContent.setBaseline(renderedConflictContent);
       this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
@@ -567,7 +565,7 @@ export default class ConflictsTab extends TabsBase {
     documentId: ConflictId,
     conflictContent: any,
     currentContent: any
-  ): Q.Promise<unknown> {
+  ): Q.Promise<any> {
     if (documentId) {
       currentContent = ConflictsTab.removeSystemProperties(currentContent);
       const renderedCurrentContent: string = this.renderObjectForEditor(currentContent, null, 4);
@@ -584,7 +582,7 @@ export default class ConflictsTab extends TabsBase {
     return Q();
   }
 
-  public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<unknown> {
+  public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<any> {
     if (documentId) {
       let parsedDocumentToDelete: any = JSON.parse(documentToDelete);
       parsedDocumentToDelete = ConflictsTab.removeSystemProperties(parsedDocumentToDelete);
@@ -596,8 +594,7 @@ export default class ConflictsTab extends TabsBase {
     return Q();
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public initDocumentEditorForNoOp(_documentId: ConflictId): Q.Promise<unknown> {
+  public initDocumentEditorForNoOp(documentId: ConflictId): Q.Promise<any> {
     this.selectedConflictContent(null);
     this.selectedConflictCurrent(null);
     this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);