From 22f667018454b92f652970636a6ff3a8408ca49f Mon Sep 17 00:00:00 2001 From: vaidankarswapnil Date: Tue, 5 Oct 2021 15:57:36 +0530 Subject: [PATCH] Fix ESLint for few files --- .eslintignore | 9 --------- src/Common/Splitter.ts | 7 +++++-- src/Explorer/Controls/Editor/EditorComponent.ts | 3 ++- .../NotebookComponent/VirtualCommandBarComponent.tsx | 4 +++- .../NotebookRenderer/decorators/hijack-scroll/index.tsx | 6 ++---- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.eslintignore b/.eslintignore index a026dfdf5..553a414b3 100644 --- a/.eslintignore +++ b/.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 @@ -152,14 +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 diff --git a/src/Common/Splitter.ts b/src/Common/Splitter.ts index 1db6d3ba5..f5aab0f2d 100644 --- a/src/Common/Splitter.ts +++ b/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 = document.getElementById(this.splitterId); this.leftSide = document.getElementById(this.leftSideId); } diff --git a/src/Explorer/Controls/Editor/EditorComponent.ts b/src/Explorer/Controls/Editor/EditorComponent.ts index 0b697c8e2..60eb42a45 100644 --- a/src/Explorer/Controls/Editor/EditorComponent.ts +++ b/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)); }); diff --git a/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx b/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx index 719e42930..06499cfe5 100644 --- a/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx +++ b/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 { diff --git a/src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx b/src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx index d45e79b01..937bb6da9 100644 --- a/src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx +++ b/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 { - el: HTMLDivElement | null = null; + el: HTMLDivElement | null | undefined = undefined; scrollIntoViewIfNeeded(prevFocused?: boolean): void { // Check if the element is being hovered over. @@ -38,6 +35,7 @@ export class HijackScroll extends React.Component { ) { if (this.el && "scrollIntoViewIfNeeded" in this.el) { // This is only valid in Chrome, WebKit + //eslint-disable-next-line (this.el as any).scrollIntoViewIfNeeded(); } else if (this.el) { // Make a best guess effort for older platforms