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

@@ -18,9 +18,7 @@ src/Common/MessageHandler.test.ts
 src/Common/MessageHandler.ts
 src/Common/MongoProxyClient.test.ts
 src/Common/MongoUtility.ts
-src/Common/NotificationsClientBase.ts
 src/Common/QueriesClient.ts
-src/Common/Splitter.ts
 src/Controls/Heatmap/Heatmap.test.ts
 src/Controls/Heatmap/Heatmap.ts
 src/Definitions/datatables.d.ts
@@ -34,11 +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/Editor/EditorComponent.ts
 src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.ts
@@ -106,6 +100,7 @@ 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/Tree/ConflictId.ts
@@ -117,12 +112,14 @@ src/Explorer/Tree/TreeComponents.ts
 src/Explorer/Tree/Trigger.ts
 src/Explorer/WaitsForTemplateViewModel.ts
 src/GitHub/GitHubClient.test.ts
+src/GitHub/GitHubClient.ts
 src/GitHub/GitHubConnector.ts
 src/GitHub/GitHubOAuthService.ts
 src/Index.ts
 src/Juno/JunoClient.test.ts
 src/Juno/JunoClient.ts
 src/Platform/Hosted/Authorization.ts
+src/ReactDevTools.ts
 src/Shared/Constants.ts
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
@@ -149,13 +146,11 @@ 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/NotebookComponentBootstrapper.tsx
-src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
 src/Explorer/Notebook/NotebookComponent/contents/index.tsx
 src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
+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

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/Common/Splitter.ts

@@ -35,8 +35,11 @@ export class Splitter {
     this.initialize();
   }
 
-  public initialize() {
-    if (document.getElementById(this.splitterId) !== null && document.getElementById(this.leftSideId) != null) {
+  public initialize(): void {
+    if (
+      document.getElementById(this.splitterId) !== undefined &&
+      document.getElementById(this.leftSideId) !== undefined
+    ) {
       this.splitter = <HTMLElement>document.getElementById(this.splitterId);
       this.leftSide = <HTMLElement>document.getElementById(this.leftSideId);
     }

src/Explorer/Controls/Editor/EditorComponent.ts

@@ -5,6 +5,7 @@ import template from "./editor-component.html";
 /**
  * Helper class for ko component registration
  */
+//eslint-disable-next-line
 export class EditorComponent {
   constructor() {
     return {
@@ -38,7 +39,7 @@ class EditorViewModel extends JsonEditorViewModel {
      * setTimeout is needed as creating the edtior manipulates the dom directly and expects
      * Knockout to have completed all of the initial bindings for the component
      */
-    this.params.content() != null &&
+    this.params.content() !== undefined &&
       setTimeout(() => {
         this.createEditor(this.params.content(), this.configureEditor.bind(this));
       });

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: any;
+  public parameters: unknown;
 
   constructor(options: NotebookComponentAdapterOptions) {
     super({

src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx

@@ -46,7 +46,9 @@ const makeMapStateToProps = (
   const { contentRef } = initialProps;
   const mapStateToProps = (state: AppState) => {
     const content = selectors.content(state, { contentRef });
-    let kernelStatus, kernelSpecName, currentCellType;
+    let kernelStatus,
+      kernelSpecName,
+      currentCellType = "";
 
     if (!content || content.type !== "notebook") {
       return {

src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx

@@ -31,13 +31,12 @@ import StatusBar from "./StatusBar";
 import CellToolbar from "./Toolbar";
 
 export interface NotebookRendererBaseProps {
-  contentRef: ContentRef;
+  contentRef: any;
 }
 
 interface NotebookRendererDispatchProps {
   storeNotebookSnapshot: (imageSrc: string, requestId: string) => void;
   notebookSnapshotError: (error: string) => void;
-  addTransform: (transform: React.ComponentType & { MIMETYPE: string }) => void;
 }
 
 interface StateProps {
@@ -74,7 +73,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {
 
   componentDidMount() {
     if (!userContext.features.sandboxNotebookOutputs) {
-      loadTransform(this.props as NotebookRendererProps);
+      loadTransform(this.props as any);
     }
   }
 
@@ -139,7 +138,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {
                           }}
                         </CodeCell>
                       ),
-                    markdown: ({ id, contentRef }: { id: CellId; contentRef: ContentRef }) =>
+                    markdown: ({ id, contentRef }: { id: any; contentRef: ContentRef }) =>
                       decorate(
                         id,
                         contentRef,
@@ -156,7 +155,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {
                         </MarkdownCell>
                       ),
 
-                    raw: ({ id, contentRef }: { id: CellId; contentRef: ContentRef }) =>
+                    raw: ({ id, contentRef }: { id: any; contentRef: ContentRef }) =>
                       decorate(
                         id,
                         contentRef,
@@ -203,8 +202,7 @@ export const makeMapStateToProps = (
   return mapStateToProps;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const makeMapDispatchToProps = (_initialDispatch: Dispatch, _initialProps: NotebookRendererBaseProps) => {
+const makeMapDispatchToProps = (initialDispatch: Dispatch, initialProps: NotebookRendererBaseProps) => {
   const mapDispatchToProps = (dispatch: Dispatch) => {
     return {
       addTransform: (transform: React.ComponentType & { MIMETYPE: string }) =>

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";
@@ -23,7 +20,7 @@ interface DispatchProps {
 type Props = ComponentProps & DispatchProps & StateProps;
 
 export class HijackScroll extends React.Component<Props> {
-  el: HTMLDivElement | null = null;
+  el: HTMLDivElement | null | undefined = undefined;
 
   scrollIntoViewIfNeeded(prevFocused?: boolean): void {
     // Check if the element is being hovered over.
@@ -38,7 +35,7 @@ export class HijackScroll extends React.Component<Props> {
     ) {
       if (this.el && "scrollIntoViewIfNeeded" in this.el) {
         // This is only valid in Chrome, WebKit
-        (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();

src/GitHub/GitHubClient.ts

@@ -1,9 +1,9 @@
 import { Octokit } from "@octokit/rest";
 import { HttpStatusCodes } from "../Common/Constants";
-import { getErrorMessage } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import * as UrlUtility from "../Common/UrlUtility";
 import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil";
+import { getErrorMessage } from "../Common/ErrorHandlingUtils";
 
 export interface IGitHubPageInfo {
   endCursor: string;
@@ -225,7 +225,7 @@ export class GitHubClient {
   private static readonly SelfErrorCode = 599;
   private ocktokit: Octokit;
 
-  constructor(private errorCallback: (error: Error) => void) {
+  constructor(private errorCallback: (error: any) => void) {
     this.initOctokit();
   }
 
@@ -501,11 +501,10 @@ export class GitHubClient {
     this.ocktokit = new Octokit({
       auth: token,
       log: {
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
         debug: () => {},
-        info: (message?: string) => GitHubClient.log(Logger.logInfo, message),
-        warn: (message?: string) => GitHubClient.log(Logger.logWarning, message),
-        error: (error?: Error) => Logger.logError(getErrorMessage(error), "GitHubClient.Octokit"),
+        info: (message?: any) => GitHubClient.log(Logger.logInfo, message),
+        warn: (message?: any) => GitHubClient.log(Logger.logWarning, message),
+        error: (error?: any) => Logger.logError(getErrorMessage(error), "GitHubClient.Octokit"),
       },
     });
 
@@ -515,7 +514,7 @@ export class GitHubClient {
     });
   }
 
-  private static log(logger: (message: string, area: string) => void, message?: string) {
+  private static log(logger: (message: string, area: string) => void, message?: any) {
     if (message) {
       message = typeof message === "string" ? message : JSON.stringify(message);
       logger(message, "GitHubClient.Octokit");

src/ReactDevTools.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 if (window.parent !== window) {
   (window as any).__REACT_DEVTOOLS_GLOBAL_HOOK__ = (window.parent as any).__REACT_DEVTOOLS_GLOBAL_HOOK__;
 }

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 });