Fix eslint issues for ContainerSampleGenerator aand its test case file

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

This reverts commit f7e7240010.

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

This reverts commit ed1ffb692f.

.eslintignore

@@ -40,8 +40,8 @@ src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
 
 src/Explorer/Controls/Editor/EditorComponent.ts
 src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
-src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
-src/Explorer/DataSamples/ContainerSampleGenerator.ts
+# src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+# src/Explorer/DataSamples/ContainerSampleGenerator.ts
 src/Explorer/DataSamples/DataSamplesUtil.test.ts
 src/Explorer/DataSamples/DataSamplesUtil.ts
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.test.ts
@@ -93,7 +93,11 @@ 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/DataSamples/ContainerSampleGenerator.test.ts

@@ -1,3 +1,4 @@
+/*eslint-disable @typescript-eslint/no-empty-function*/
 jest.mock("../Graph/GraphExplorerComponent/GremlinClient");
 jest.mock("../../Common/dataAccess/createCollection");
 jest.mock("../../Common/dataAccess/createDocument");
@@ -69,6 +70,7 @@ describe("ContainerSampleGenerator", () => {
     expect(createDocument).toHaveBeenCalled();
   });
 
+  // eslint-disable-next-line jest/expect-expect
   it("should send gremlin queries for Graph API account", async () => {
     updateUserContext({
       databaseAccount: {
@@ -134,6 +136,7 @@ describe("ContainerSampleGenerator", () => {
     });
 
     // Rejects with error that contains experience
+    // eslint-disable-next-line jest/valid-expect
     expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
   });
 

src/Explorer/DataSamples/ContainerSampleGenerator.ts

@@ -10,6 +10,7 @@ import { GremlinClient } from "../Graph/GraphExplorerComponent/GremlinClient";
 import { useDatabases } from "../useDatabases";
 
 interface SampleDataFile extends DataModels.CreateCollectionParams {
+  //eslint-disable-next-line
   data: any[];
 }
 
@@ -23,6 +24,7 @@ export class ContainerSampleGenerator {
    */
   public static async createSampleGeneratorAsync(container: Explorer): Promise<ContainerSampleGenerator> {
     const generator = new ContainerSampleGenerator(container);
+    //eslint-disable-next-line
     let dataFileContent: any;
     if (userContext.apiType === "Gremlin") {
       dataFileContent = await import(
@@ -72,7 +74,7 @@ export class ContainerSampleGenerator {
     if (!collection) {
       throw new Error("No container to populate");
     }
-    const promises: Q.Promise<any>[] = [];
+    // const promises: Q.Promise<any>[] = [];
 
     if (userContext.apiType === "Gremlin") {
       // For Gremlin, all queries are executed sequentially, because some queries might be dependent on other queries
@@ -113,7 +115,7 @@ export class ContainerSampleGenerator {
    * public for unit testing
    * @param data
    */
-  public setData(data: SampleDataFile) {
+  public setData(data: SampleDataFile): void {
     this.sampleDataFile = data;
   }
 }

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

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

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -23,12 +23,10 @@ import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneFor
 
 export interface AddDatabasePaneProps {
   explorer: Explorer;
-  buttonElement?: HTMLElement;
 }
 
 export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   explorer: container,
-  buttonElement,
 }: AddDatabasePaneProps) => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   let throughput: number;
@@ -79,7 +77,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
       dataExplorerArea: Constants.Areas.ContextualPane,
     };
     TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
-    buttonElement.focus();
   }, []);
 
   const onSubmit = () => {

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -307,23 +307,16 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: () => this.openAddDatabasePanel(),
+        onClick: () =>
+          useSidePanel
+            .getState()
+            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
       });
     }
 
     return items;
   }
 
-  private openAddDatabasePanel() {
-    const newDatabaseButton = document.activeElement as HTMLElement;
-    useSidePanel
-      .getState()
-      .openSidePanel(
-        "New " + getDatabaseName(),
-        <AddDatabasePanel explorer={this.container} buttonElement={newDatabaseButton} />
-      );
-  }
-
   private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
     return {
       iconSrc: NotebookIcon,

src/Explorer/Tables/TableDataClient.ts

@@ -202,14 +202,21 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
       let isPropertyUpdated = false;
+      let isFirstPropertyToUpdate = true;
       for (let property in newEntity) {
         if (
           !originalDocument[property] ||
           newEntity[property]._.toString() !== originalDocument[property]._.toString()
         ) {
-          updateQuery += this.isStringType(newEntity[property].$)
-            ? ` SET ${property} = '${newEntity[property]._}',`
-            : ` SET ${property} = ${newEntity[property]._},`;
+          let propertyQuerySegment = this.isStringType(newEntity[property].$)
+            ? `${property} = '${newEntity[property]._}',`
+            : `${property} = ${newEntity[property]._},`;
+          // Only add the "SET" keyword once
+          if (isFirstPropertyToUpdate) {
+            propertyQuerySegment = " SET " + propertyQuerySegment;
+            isFirstPropertyToUpdate = false;
+          }
+          updateQuery += propertyQuerySegment;
           isPropertyUpdated = true;
         }
       }

src/Explorer/Tabs/NotebookV2Tab.ts

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

src/Explorer/Tabs/ScriptTabBase.ts

@@ -25,12 +25,11 @@ 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<unknown>>;
+  public formFields: ko.ObservableArray<ViewModels.Editable<any>>;
   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;
@@ -86,6 +85,7 @@ 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(): void {
+  public setBaselines() {
     this._setBaselines();
   }
 
@@ -194,9 +194,9 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
   }
 
   public abstract onSaveClick: () => void;
-  public abstract onUpdateClick: () => Promise<void>;
+  public abstract onUpdateClick: () => Promise<any>;
 
-  public onDiscard = (): Q.Promise<void> => {
+  public onDiscard = (): Q.Promise<any> => {
     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(): Promise<void> {
+  protected async _createBodyEditor() {
     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() {
+  private _onBodyContentChange(e: monaco.editor.IModelContentChangedEvent) {
     const editorModel = this.editor().getModel();
     this.editorContent(editorModel.getValue());
   }