ESLint: Remove ts-ignore comments (#10933)

* Upgrade json-bigint, add @types/json-bigint to deps * Upgrade react-bootstrap-dialog * Fix ts-ignore * Fix ts-ignore * Fix ts-ignore * Upgrade react-syntax-highlighter, fix ts-ignore * Fix ts-ignore * Fix ts-ignore in styles.tsx * Wrap Input in div to pass onPaste * Change esm to cjs imports for highlighter to fix tests * Add null checks
apache · Sep 21, 2020 · a8f5029 · a8f5029
1 parent e4e78b6
commit a8f5029
Show file tree

Hide file tree

Showing 19 changed files with 217 additions and 132 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -108,10 +108,10 @@
     "dom-to-image": "^2.6.0",
     "geolib": "^2.0.24",
     "global-box": "^1.2.0",
-    "immutable": "^3.8.2",
+    "immutable": "^4.0.0-rc.12",
     "interweave": "^11.2.0",
     "jquery": "^3.5.1",
-    "json-bigint": "^0.3.0",
+    "json-bigint": "^1.0.0",
     "lodash": "^4.17.20",
     "lodash-es": "^4.17.14",
     "mathjs": "^3.20.2",
@@ -127,7 +127,7 @@
     "react-ace": "^5.10.0",
     "react-avatar": "^3.9.7",
     "react-bootstrap": "^0.33.1",
-    "react-bootstrap-dialog": "^0.10.0",
+    "react-bootstrap-dialog": "^0.13.0",
     "react-bootstrap-slider": "2.1.5",
     "react-checkbox-tree": "^1.5.1",
     "react-color": "^2.13.8",
@@ -150,7 +150,7 @@
     "react-sortable-hoc": "^1.11.0",
     "react-split": "^2.0.4",
     "react-sticky": "^6.0.2",
-    "react-syntax-highlighter": "^7.0.4",
+    "react-syntax-highlighter": "^13.5.3",
     "react-table": "^7.2.1",
     "react-transition-group": "^2.5.3",
     "react-ultimate-pagination": "^1.2.0",
@@ -200,6 +200,7 @@
     "@types/fetch-mock": "^7.3.2",
     "@types/jest": "^26.0.3",
     "@types/jquery": "^3.3.32",
+    "@types/json-bigint": "^1.0.0",
     "@types/react": "^16.9.43",
     "@types/react-bootstrap": "^0.32.22",
     "@types/react-dom": "^16.9.8",

diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql.jsx b/superset-frontend/src/SqlLab/components/HighlightedSql.jsx
@@ -18,16 +18,14 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import SyntaxHighlighter, {
-  registerLanguage,
-} from 'react-syntax-highlighter/dist/light';
-import sql from 'react-syntax-highlighter/dist/languages/hljs/sql';
-import github from 'react-syntax-highlighter/dist/styles/hljs/github';
+import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
+import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
+import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import { t } from '@superset-ui/core';
 
 import ModalTrigger from '../../components/ModalTrigger';
 
-registerLanguage('sql', sql);
+SyntaxHighlighter.registerLanguage('sql', sql);
 
 const defaultProps = {
   maxWidth: 50,

diff --git a/superset-frontend/src/SqlLab/components/LimitControl.tsx b/superset-frontend/src/SqlLab/components/LimitControl.tsx
@@ -17,7 +17,13 @@
  * under the License.
  */
 import React from 'react';
-import { FormGroup, FormControl, Overlay, Popover } from 'react-bootstrap';
+import {
+  FormGroup,
+  FormControl,
+  Overlay,
+  Popover,
+  FormControlProps,
+} from 'react-bootstrap';
 import Button from 'src/components/Button';
 import { t, styled } from '@superset-ui/core';
 
@@ -105,9 +111,12 @@ export default class LimitControl extends React.PureComponent<
               value={textValue}
               placeholder={t(`Max: ${this.props.maxRow}`)}
               bsSize="small"
-              // @ts-ignore
-              onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                this.setState({ textValue: event.target.value })
+              onChange={(
+                event: React.FormEvent<FormControl & FormControlProps>,
+              ) =>
+                this.setState({
+                  textValue: (event.currentTarget?.value as string) ?? '',
+                })
               }
             />
           </FormGroup>

diff --git a/superset-frontend/src/SqlLab/components/ShowSQL.tsx b/superset-frontend/src/SqlLab/components/ShowSQL.tsx
@@ -17,19 +17,14 @@
  * under the License.
  */
 import React from 'react';
-import SyntaxHighlighter, {
-  registerLanguage,
-  // @ts-ignore
-} from 'react-syntax-highlighter/dist/light';
-// @ts-ignore
-import sql from 'react-syntax-highlighter/dist/languages/hljs/sql';
-// @ts-ignore
-import github from 'react-syntax-highlighter/dist/styles/hljs/github';
+import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
+import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
+import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 
 import Link from '../../components/Link';
 import ModalTrigger from '../../components/ModalTrigger';
 
-registerLanguage('sql', sql);
+SyntaxHighlighter.registerLanguage('sql', sql);
 
 interface ShowSQLProps {
   sql: string;

diff --git a/superset-frontend/src/components/DeleteModal.tsx b/superset-frontend/src/components/DeleteModal.tsx
@@ -18,7 +18,7 @@
  */
 import { t, styled } from '@superset-ui/core';
 import React, { useState } from 'react';
-import { FormGroup, FormControl } from 'react-bootstrap';
+import { FormGroup, FormControl, FormControlProps } from 'react-bootstrap';
 import Modal from 'src/components/Modal';
 import FormLabel from 'src/components/FormLabel';
 
@@ -70,10 +70,12 @@ export default function DeleteModal({
           id="delete"
           type="text"
           bsSize="sm"
-          // @ts-ignore
-          onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-            setDisableChange(event.target.value.toUpperCase() !== 'DELETE')
-          }
+          onChange={(
+            event: React.FormEvent<FormControl & FormControlProps>,
+          ) => {
+            const targetValue = (event.currentTarget?.value as string) ?? '';
+            setDisableChange(targetValue.toUpperCase() !== 'DELETE');
+          }}
         />
       </StyleFormGroup>
     </Modal>