Merge branch 'master' of https://github.com/Azure/cosmos-explorer into fix_eslint_issues_2

* mock to instance

* Update jest.config.js

Co-authored-by: Jordi Bunster <jbunster@microsoft.com>

.eslintignore

@@ -32,10 +32,7 @@ src/Definitions/jquery.d.ts
 src/Definitions/plotly.js-cartesian-dist.d-min.ts
 src/Definitions/png.d.ts
 src/Definitions/svg.d.ts
-src/Explorer/ComponentRegisterer.test.ts
-src/Explorer/ComponentRegisterer.ts
 src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
-src/Explorer/Controls/DynamicList/DynamicList.test.ts
 src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.ts

jest.config.js

@@ -37,8 +37,8 @@ module.exports = {
     global: {
       branches: 25,
       functions: 25,
-      lines: 29.5,
-      statements: 29.5,
+      lines: 29,
+      statements: 29,
     },
   },
 

src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx

@@ -16,7 +16,7 @@ export interface NotebookComponentAdapterOptions {
 
 export class NotebookComponentAdapter extends NotebookComponentBootstrapper implements ReactAdapter {
   private onUpdateKernelInfo: () => void;
-  public parameters: undefined;
+  public parameters: unknown;
 
   constructor(options: NotebookComponentAdapterOptions) {
     super({

src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx

@@ -1,6 +1,3 @@
-// /* eslint jsx-a11y/no-static-element-interactions: 0 */
-// /* eslint jsx-a11y/click-events-have-key-events: 0 */
-
 import { actions, AppState, ContentRef, selectors } from "@nteract/core";
 import React from "react";
 import { connect } from "react-redux";
@@ -38,8 +35,7 @@ export class HijackScroll extends React.Component<Props> {
     ) {
       if (this.el && "scrollIntoViewIfNeeded" in this.el) {
         // This is only valid in Chrome, WebKit
-        //eslint-disable-next-line
-        (this.el as any).scrollIntoViewIfNeeded();
+        ((this.el as unknown) as HijackScroll).scrollIntoViewIfNeeded();
       } else if (this.el) {
         // Make a best guess effort for older platforms
         this.el.scrollIntoView();
@@ -47,7 +43,7 @@ export class HijackScroll extends React.Component<Props> {
     }
   }
 
-  componentDidUpdate(prevProps: Props): void {
+  componentDidUpdate(prevProps: Props) {
     this.scrollIntoViewIfNeeded(prevProps.focused);
   }
 
@@ -55,7 +51,7 @@ export class HijackScroll extends React.Component<Props> {
     this.scrollIntoViewIfNeeded();
   }
 
-  render(): JSX.Element {
+  render() {
     return (
       <div
         onClick={this.props.selectCell}

src/Utils/GalleryUtils.test.ts

@@ -30,7 +30,7 @@ describe("GalleryUtils", () => {
   });
 
   it("downloadItem shows dialog in data explorer", () => {
-    const container = {} as Explorer;
+    const container = new Explorer();
     GalleryUtils.downloadItem(container, undefined, galleryItem, undefined);
 
     expect(useDialog.getState().visible).toBe(true);

src/hooks/useTabs.ts

@@ -69,7 +69,11 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
     if (tab.tabId === activeTab.tabId && tabIndex !== -1) {
       const tabToTheRight = updatedTabs[tabIndex];
       const lastOpenTab = updatedTabs[updatedTabs.length - 1];
-      set({ activeTab: tabToTheRight || lastOpenTab });
+      const newActiveTab = tabToTheRight ?? lastOpenTab;
+      set({ activeTab: newActiveTab });
+      if (newActiveTab) {
+        newActiveTab.onActivate();
+      }
     }
 
     set({ openedTabs: updatedTabs });