Merge branch 'master' of https://github.com/Azure/cosmos-explorer into eslint/NotebookV2Tab-ScriptTabBase-TabComponents

.eslintignore

@@ -84,6 +84,7 @@ src/Explorer/Tables/DataTable/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
+src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
 src/Explorer/Tabs/ConflictsTab.ts
@@ -92,11 +93,7 @@ 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
 src/Explorer/Tabs/TabsBase.ts
-src/Explorer/Tabs/TriggerTab.ts
 src/Explorer/Tabs/UserDefinedFunctionTab.ts
 src/Explorer/Tree/AccessibleVerticalList.ts
 src/Explorer/Tree/Collection.ts

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

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

src/Explorer/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/TableDataClient.ts

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

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -54,7 +54,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
     });
   }
 
-  public onCloseTabButtonClick(): Q.Promise<any> {
+  public onCloseTabButtonClick(): Q.Promise<void> {
     const cleanup = () => {
       this.notebookComponentAdapter.notebookShutdown();
       super.onCloseTabButtonClick();
@@ -78,7 +78,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
     }
   }
 
-  public async reconfigureServiceEndpoints() {
+  public async reconfigureServiceEndpoints(): Promise<void> {
     if (!this.notebookComponentAdapter) {
       return;
     }
@@ -136,7 +136,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
       ariaLabel: publishLabel,
     });
 
-    let buttons: CommandButtonComponentProps[] = [
+    const buttons: CommandButtonComponentProps[] = [
       {
         iconSrc: SaveIcon,
         iconAlt: saveLabel,
@@ -160,7 +160,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
       {
         iconSrc: null,
         iconAlt: kernelLabel,
-        onCommandClick: () => {},
+        onCommandClick: () => undefined,
         commandButtonLabel: null,
         hasPopup: false,
         disabled: availableKernels.length < 1,
@@ -271,7 +271,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
       {
         iconSrc: null,
         iconAlt: null,
-        onCommandClick: () => {},
+        onCommandClick: () => undefined,
         commandButtonLabel: null,
         ariaLabel: cellTypeLabel,
         hasPopup: false,
@@ -361,7 +361,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
   }
 
   private onKernelUpdate = async () => {
-    await this.configureServiceEndpoints(this.notebookComponentAdapter.getCurrentKernelName()).catch((reason) => {
+    await this.configureServiceEndpoints(this.notebookComponentAdapter.getCurrentKernelName()).catch(() => {
       /* Erroring is ok here */
     });
     this.updateNavbarWithTabsButtons();

src/Explorer/Tabs/ScriptTabBase.ts

@@ -25,11 +25,12 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
   public errors: ko.ObservableArray<ViewModels.QueryError>;
   public statusMessge: ko.Observable<string>;
   public statusIcon: ko.Observable<string>;
-  public formFields: ko.ObservableArray<ViewModels.Editable<any>>;
+  public formFields: ko.ObservableArray<ViewModels.Editable<unknown>>;
   public formIsValid: ko.Computed<boolean>;
   public formIsDirty: ko.Computed<boolean>;
   public isNew: ko.Observable<boolean>;
   // TODO: Remove any. The SDK types for all the script.body are slightly incorrect which makes this REALLY hard to type correct.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public resource: ko.Observable<any>;
   public isTemplateReady: ko.Observable<boolean>;
   protected _partitionKey: DataModels.PartitionKey;
@@ -85,7 +86,6 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
             this.editorState(ViewModels.ScriptEditorState.exisitingDirtyInvalid);
           }
           break;
-        case ViewModels.ScriptEditorState.exisitingDirtyValid:
         default:
           break;
       }
@@ -182,7 +182,7 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
     this.editorContent.setBaseline(resource.body);
   }
 
-  public setBaselines() {
+  public setBaselines(): void {
     this._setBaselines();
   }
 
@@ -194,9 +194,9 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
   }
 
   public abstract onSaveClick: () => void;
-  public abstract onUpdateClick: () => Promise<any>;
+  public abstract onUpdateClick: () => Promise<void>;
 
-  public onDiscard = (): Q.Promise<any> => {
+  public onDiscard = (): Q.Promise<void> => {
     this.setBaselines();
     const original = this.editorContent.getEditableOriginalValue();
     const editorModel = this.editor() && this.editor().getModel();
@@ -289,7 +289,7 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
     return !!value;
   }
 
-  protected async _createBodyEditor() {
+  protected async _createBodyEditor(): Promise<void> {
     const id = this.editorId;
     const container = document.getElementById(id);
     const options = {
@@ -308,7 +308,7 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
     editorModel.onDidChangeContent(this._onBodyContentChange.bind(this));
   }
 
-  private _onBodyContentChange(e: monaco.editor.IModelContentChangedEvent) {
+  private _onBodyContentChange() {
     const editorModel = this.editor().getModel();
     this.editorContent(editorModel.getValue());
   }