[SIP-36] Migrate setupApp.js to setupApp.ts (#9180)

apache · Feb 24, 2020 · eeec63c · eeec63c
1 parent 421aeb4
commit eeec63c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 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
@@ -161,6 +161,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.5.5",
     "@types/jest": "^23.3.5",
+    "@types/jquery": "^3.3.32",
     "@types/react": "^16.4.18",
     "@types/react-dom": "^16.0.9",
     "@types/react-json-tree": "^0.6.11",

diff --git a/superset-frontend/src/setup/setupApp.js → superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.js → superset-frontend/src/setup/setupApp.ts
@@ -21,7 +21,7 @@ import $ from 'jquery';
 import { SupersetClient } from '@superset-ui/connection';
 import getClientErrorObject from '../utils/getClientErrorObject';
 
-function showApiMessage(resp) {
+function showApiMessage(resp: { severity?: string; message: string }) {
   const template =
     '<div class="alert"> ' +
     '<button type="button" class="close" ' +
@@ -33,9 +33,11 @@ function showApiMessage(resp) {
     .appendTo($('#alert-container'));
 }
 
-function toggleCheckbox(apiUrlPrefix, selector) {
-  SupersetClient.get({ endpoint: apiUrlPrefix + $(selector)[0].checked })
-    .then(() => {})
+function toggleCheckbox(apiUrlPrefix: string, selector: string) {
+  SupersetClient.get({
+    endpoint: apiUrlPrefix + ($(selector)[0] as HTMLInputElement).checked,
+  })
+    .then(() => undefined)
     .catch(response =>
       getClientErrorObject(response).then(parsedResp => {
         if (parsedResp && parsedResp.message) {
@@ -55,10 +57,17 @@ export default function setupApp() {
     });
 
     // for language picker dropdown
-    $('#language-picker a').click(function(ev) {
+    $('#language-picker a').click(function(
+      ev: JQuery.ClickEvent<
+        HTMLLinkElement,
+        null,
+        HTMLLinkElement,
+        HTMLLinkElement
+      >,
+    ) {
       ev.preventDefault();
       SupersetClient.get({
-        endpoint: ev.currentTarget.getAttribute('href'),
+        endpoint: ev.currentTarget.href,
         parseMethod: null,
       }).then(() => {
         location.reload();
@@ -68,7 +77,9 @@ export default function setupApp() {
 
   // A set of hacks to allow apps to run within a FAB template
   // this allows for the server side generated menus to function
+  // @ts-ignore
   window.$ = $;
+  // @ts-ignore
   window.jQuery = $;
   require('bootstrap');
 }