Merge branch 'master' into eslint/fixed-TableEntityProcessor-DatabaseSettingsTab

.eslintignore

@@ -2,6 +2,8 @@
 src/**/__mocks__/**/*
 dist/
 Contracts/
+src/Api/Apis.ts
+src/AuthType.ts
 src/Bindings/BindingHandlersRegisterer.ts
 src/Bindings/ReactBindingHandler.ts
 src/Common/Constants.ts
@@ -35,6 +37,7 @@ src/Definitions/svg.d.ts
 src/Explorer/ComponentRegisterer.test.ts
 src/Explorer/ComponentRegisterer.ts
 src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
+
 src/Explorer/Controls/Editor/EditorComponent.ts
 src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -82,14 +85,10 @@ 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/Tabs/DatabaseSettingsTab.ts
 src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts
-src/Explorer/Tabs/GraphTab.ts
-src/Explorer/Tabs/MongoDocumentsTab.ts
 src/Explorer/Tabs/NotebookV2Tab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
 src/Explorer/Tabs/TabComponents.ts
@@ -113,8 +112,12 @@ src/ReactDevTools.ts
 src/Shared/Constants.ts
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
+src/Shared/appInsights.ts
+src/SparkClusterManager/ArcadiaResourceManager.ts
+src/SparkClusterManager/SparkClusterManager.ts
 src/Terminal/JupyterLabAppFactory.ts
 src/Terminal/NotebookAppContracts.d.ts
+src/applyExplorerBindings.ts
 src/global.d.ts
 src/setupTests.ts
 src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
@@ -124,6 +127,8 @@ src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
+src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
 src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
@@ -132,6 +137,7 @@ src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
+src/Explorer/Notebook/temp/inputs/connected-editors/codemirror.tsx
 src/Explorer/Tree/ResourceTreeAdapter.tsx
 __mocks__/monaco-editor.ts
 src/Explorer/Tree/ResourceTree.tsx

src/Contracts/Versions.ts

@@ -1,4 +1,4 @@
 /**
  * Data Explorer version {major.minor.patch}
  */
-export const DataExplorer = "1.0.1";
+export const DataExplorer: string = "1.0.1";

src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx

@@ -1,6 +1,7 @@
-import { shallow } from "enzyme";
 import React from "react";
+import { shallow } from "enzyme";
 import { GraphHighlightedNodeData } from "./GraphExplorer";
+
 import {
   ReadOnlyNodePropertiesComponent,
   ReadOnlyNodePropertiesComponentProps,
@@ -43,7 +44,7 @@ describe("<ReadOnlyNodePropertiesComponent />", () => {
     const mockNode2 = {
       ...mockNode,
       properties: {
-        key3: ["abcd", 1234, true, false, undefined],
+        key3: ["abcd", 1234, true, false, undefined, null],
       },
     };
     const props: ReadOnlyNodePropertiesComponentProps = { node: mockNode2 };

src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx

@@ -60,7 +60,9 @@ export class ReadOnlyNodePropertiesComponent extends React.Component<ReadOnlyNod
   }
 
   public static singlePropertyValueToString(value: ViewModels.GremlinPropertyValueType): string {
-    if (typeof value === "undefined") {
+    if (value === null) {
+      return "null";
+    } else if (typeof value === "undefined") {
       return "undefined";
     } else {
       return value.toString();
@@ -69,8 +71,11 @@ export class ReadOnlyNodePropertiesComponent extends React.Component<ReadOnlyNod
 
   public static renderSinglePropertyValue(value: ViewModels.GremlinPropertyValueType): JSX.Element {
     let singlePropValue = value;
-    const className = "propertyValue";
-    if (typeof singlePropValue === "undefined") {
+    let className = "propertyValue";
+    if (singlePropValue === null) {
+      singlePropValue = "null";
+      className += " isNull";
+    } else if (typeof singlePropValue === "undefined") {
       singlePropValue = "undefined";
     } else {
       singlePropValue = value.toString();

src/Explorer/Graph/GraphExplorerComponent/__snapshots__/ReadOnlyNodePropertiesComponent.test.tsx.snap

@@ -123,7 +123,7 @@ exports[`<ReadOnlyNodePropertiesComponent /> renders properties (with multiple v
       </td>
       <td
         className="valueCol"
-        title="abcd, 1234, true, false, undefined"
+        title="abcd, 1234, true, false, undefined, null"
       >
         <div
           className="propertyValue"
@@ -155,6 +155,12 @@ exports[`<ReadOnlyNodePropertiesComponent /> renders properties (with multiple v
         >
           undefined
         </div>
+        <div
+          className="propertyValue isNull"
+          key="null"
+        >
+          null
+        </div>
       </td>
     </tr>
   </tbody>

src/Explorer/Tables/TableEntityProcessor.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import * as ViewModels from "../../Contracts/ViewModels";
 import * as Constants from "./Constants";
 import * as Entities from "./Entities";
@@ -16,12 +17,12 @@ enum DataTypes {
   Int64 = 18,
 }
 
-var tablesIndexers = {
+const tablesIndexers = {
   Value: "$v",
   Type: "$t",
 };
 
-export var keyProperties = {
+export const keyProperties = {
   PartitionKey: "$pk",
   Id: "id",
   Id2: "$id", // This should always be the same value as Id
@@ -33,14 +34,17 @@ export var keyProperties = {
 };
 
 export function convertDocumentsToEntities(documents: any[]): Entities.ITableEntityForTablesAPI[] {
-  let results: Entities.ITableEntityForTablesAPI[] = [];
+  const results: Entities.ITableEntityForTablesAPI[] = [];
   documents &&
     documents.forEach((document) => {
-      if (!document.hasOwnProperty(keyProperties.PartitionKey) || !document.hasOwnProperty(keyProperties.Id)) {
+      if (
+        !Object.prototype.hasOwnProperty.call(document, keyProperties.PartitionKey) ||
+        Object.prototype.hasOwnProperty.call(document, keyProperties.Id)
+      ) {
         //Document does not match the current required format for Tables, so we ignore it
         return; // The rest of the key properties should be guaranteed as DocumentDB properties
       }
-      let entity: Entities.ITableEntityForTablesAPI = <Entities.ITableEntityForTablesAPI>{
+      const entity: Entities.ITableEntityForTablesAPI = <Entities.ITableEntityForTablesAPI>{
         PartitionKey: {
           _: document[keyProperties.PartitionKey],
           $: Constants.TableType.String,
@@ -71,8 +75,8 @@ export function convertDocumentsToEntities(documents: any[]): Entities.ITableEnt
           $: Constants.TableType.String,
         },
       };
-      for (var property in document) {
-        if (document.hasOwnProperty(property)) {
+      for (const property in document) {
+        if (Object.prototype.hasOwnProperty.call(document, property)) {
           if (
             property !== keyProperties.PartitionKey &&
             property !== keyProperties.Id &&
@@ -83,7 +87,10 @@ export function convertDocumentsToEntities(documents: any[]): Entities.ITableEnt
             property !== keyProperties.attachments &&
             property !== keyProperties.Id2
           ) {
-            if (!document[property].hasOwnProperty("$v") || !document[property].hasOwnProperty("$t")) {
+            if (
+              !Object.prototype.hasOwnProperty.call(document[property], "$v") ||
+              !Object.prototype.hasOwnProperty.call(document[property], "$t")
+            ) {
               return; //Document property does not match the current required format for Tables, so we ignore it
             }
             if (DataTypes[document[property][tablesIndexers.Type]] === DataTypes[DataTypes.DateTime]) {
@@ -111,10 +118,10 @@ export function convertEntitiesToDocuments(
   entities: Entities.ITableEntityForTablesAPI[],
   collection: ViewModels.Collection
 ): any[] {
-  let results: any[] = [];
+  const results: any[] = [];
   entities &&
     entities.forEach((entity) => {
-      let document: any = {
+      const document: any = {
         $id: entity.RowKey._,
         id: entity.RowKey._,
         ts: DateTimeUtilities.convertJSDateToUnix(entity.Timestamp._), // Convert back to unix time
@@ -129,7 +136,7 @@ export function convertEntitiesToDocuments(
         document[collection.partitionKeyProperty] = entity.PartitionKey._;
         document["partitionKeyValue"] = entity.PartitionKey._;
       }
-      for (var property in entity) {
+      for (const property in entity) {
         if (
           property !== Constants.EntityKeyNames.PartitionKey &&
           property !== Constants.EntityKeyNames.RowKey &&
@@ -160,7 +167,7 @@ export function convertEntitiesToDocuments(
 }
 
 export function convertEntityToNewDocument(entity: Entities.ITableEntityForTablesAPI): any {
-  let document: any = {
+  const document: any = {
     $pk: entity.PartitionKey._,
     $id: entity.RowKey._,
     id: entity.RowKey._,

src/Explorer/Tabs/DocumentsTab.ts

@@ -92,7 +92,7 @@ export default class DocumentsTab extends TabsBase {
 
     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;
 
@@ -446,8 +446,8 @@ export default class DocumentsTab extends TabsBase {
             this.partitionKey as PartitionKeyDefinition
           );
           const partitionKeyValue = partitionKeyValueArray && partitionKeyValueArray[0];
-          let id = new DocumentId(this, savedDocument, partitionKeyValue);
-          let ids = this.documentIds();
+          const id = new DocumentId(this, savedDocument, partitionKeyValue);
+          const ids = this.documentIds();
           ids.push(id);
 
           this.selectedDocumentId(id);
@@ -682,10 +682,10 @@ export default class DocumentsTab extends TabsBase {
   }
 
   public createIterator(): QueryIterator<ItemDefinition & Resource> {
-    let filters = this.lastFilterContents();
+    const filters = this.lastFilterContents();
     const filter: string = this.filterContent().trim();
     const query: string = this.buildQuery(filter);
-    let options: any = {};
+    const options: any = {};
     options.enableCrossPartitionQuery = HeadersUtility.shouldEnableCrossPartitionKey();
 
     if (this._resourceTokenPartitionKey) {
@@ -778,7 +778,7 @@ export default class DocumentsTab extends TabsBase {
 
   protected _onEditorContentChange(newContent: string) {
     try {
-      let parsed: any = JSON.parse(newContent);
+      const parsed: any = JSON.parse(newContent);
       this.onValidDocumentEdit();
     } catch (e) {
       this.onInvalidDocumentEdit();

src/Explorer/Tabs/MongoDocumentsTab.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
@@ -44,7 +46,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
     super.buildCommandBarOptions();
   }
 
-  public onSaveNewDocumentClick = (): Promise<any> => {
+  public onSaveNewDocumentClick = (): Promise<void> => {
     const documentContent = JSON.parse(this.selectedDocumentContent());
     this.displayedError("");
     const startKey: number = TelemetryProcessor.traceStart(Action.CreateDocument, {
@@ -59,9 +61,8 @@ export default class MongoDocumentsTab extends DocumentsTab {
     ) {
       const message = `The document is lacking the shard property: ${this.partitionKeyProperty}`;
       this.displayedError(message);
-      let that = this;
       setTimeout(() => {
-        that.displayedError("");
+        this.displayedError("");
       }, Constants.ClientDefaults.errorNotificationTimeoutMs);
       this.isExecutionError(true);
       TelemetryProcessor.traceFailure(
@@ -82,19 +83,19 @@ export default class MongoDocumentsTab extends DocumentsTab {
     return createDocument(this.collection.databaseId, this.collection, this.partitionKeyProperty, documentContent)
       .then(
         (savedDocument: any) => {
-          let partitionKeyArray = extractPartitionKey(
+          const partitionKeyArray = extractPartitionKey(
             savedDocument,
             this._getPartitionKeyDefinition() as PartitionKeyDefinition
           );
 
-          let partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
+          const partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
 
-          let id = new ObjectId(this, savedDocument, partitionKeyValue);
-          let ids = this.documentIds();
+          const id = new ObjectId(this, savedDocument, partitionKeyValue);
+          const ids = this.documentIds();
           ids.push(id);
           delete savedDocument._self;
 
-          let value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
+          const value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
           this.selectedDocumentContent.setBaseline(value);
 
           this.selectedDocumentId(id);
@@ -128,7 +129,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
       .finally(() => this.isExecuting(false));
   };
 
-  public onSaveExisitingDocumentClick = (): Promise<any> => {
+  public onSaveExisitingDocumentClick = (): Promise<void> => {
     const selectedDocumentId = this.selectedDocumentId();
     const documentContent = this.selectedDocumentContent();
     this.isExecutionError(false);
@@ -141,7 +142,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
     return updateDocument(this.collection.databaseId, this.collection, selectedDocumentId, documentContent)
       .then(
         (updatedDocument: any) => {
-          let value: string = this.renderObjectForEditor(updatedDocument || {}, null, 4);
+          const value: string = this.renderObjectForEditor(updatedDocument || {}, null, 4);
           this.selectedDocumentContent.setBaseline(value);
 
           this.documentIds().forEach((documentId: DocumentId) => {
@@ -151,7 +152,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
                 this._getPartitionKeyDefinition() as PartitionKeyDefinition
               );
 
-              let partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
+              const partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
 
               const id = new ObjectId(this, updatedDocument, partitionKeyValue);
               documentId.id(id.id());
@@ -196,7 +197,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
     this.initDocumentEditor(documentId, content);
   }
 
-  public loadNextPage(): Q.Promise<any> {
+  public loadNextPage(): Q.Promise<void> {
     this.isExecuting(true);
     this.isExecutionError(false);
     const filter: string = this.filterContent().trim();
@@ -228,7 +229,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
             this.selectedDocumentId(null);
             this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
           }
-          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+          if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
             TelemetryProcessor.traceSuccess(
               Action.Tab,
               {
@@ -243,8 +244,8 @@ export default class MongoDocumentsTab extends DocumentsTab {
             this.onLoadStartKey = null;
           }
         },
-        (error: any) => {
-          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+        (error: Error) => {
+          if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
             TelemetryProcessor.traceFailure(
               Action.Tab,
               {
@@ -265,13 +266,13 @@ export default class MongoDocumentsTab extends DocumentsTab {
       .finally(() => this.isExecuting(false));
   }
 
-  protected _onEditorContentChange(newContent: string) {
+  protected _onEditorContentChange(newContent: string): void {
     try {
       if (
         this.editorState() === ViewModels.DocumentExplorerState.newDocumentValid ||
         this.editorState() === ViewModels.DocumentExplorerState.newDocumentInvalid
       ) {
-        let parsed: any = JSON.parse(newContent);
+        const parsed: any = JSON.parse(newContent);
       }
 
       // Mongo uses BSON format for _id, trying to parse it as JSON blocks normal flow in an edit

src/applyExplorerBindings.ts

@@ -3,7 +3,7 @@ import { BindingHandlersRegisterer } from "./Bindings/BindingHandlersRegisterer"
 import Explorer from "./Explorer/Explorer";
 
 export const applyExplorerBindings = (explorer: Explorer) => {
-  if (explorer) {
+  if (!!explorer) {
     window.dataExplorer = explorer;
     BindingHandlersRegisterer.registerBindingHandlers();
     ko.applyBindings(explorer);