buncha fixes for typescript problems

apache · Feb 15, 2024 · 1605664 · 1605664
1 parent 753ef69
commit 1605664
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -120,8 +120,9 @@
     "@visx/axis": "^3.8.0",
     "@visx/grid": "^3.5.0",
     "@visx/responsive": "^3.0.0",
-    "@visx/scale": "^3.0.0",
-    "@visx/xychart": "^3.0.0",
+    "@visx/scale": "^3.5.0",
+    "@visx/tooltip": "^3.0.0",
+    "@visx/xychart": "^3.5.1",
     "abortcontroller-polyfill": "^1.1.9",
     "ace-builds": "^1.4.14",
     "antd": "4.10.3",

diff --git a/superset-frontend/packages/superset-ui-core/src/chart/components/createLoadableRenderer.ts b/superset-frontend/packages/superset-ui-core/src/chart/components/createLoadableRenderer.ts
@@ -33,11 +33,11 @@ export interface LoadableRenderer<Props>
   extends React.ComponentClass<Props & LoadableRendererProps>,
     Loadable.LoadableComponent {}
 
-export default function createLoadableRenderer<
-  Props,
-  Exports extends { [key: string]: any },
->(options: Loadable.OptionsWithMap<Props, Exports>): LoadableRenderer<Props> {
-  const LoadableRenderer = Loadable.Map(options) as LoadableRenderer<Props>;
+
+export default function createLoadableRenderer<Props, Exports extends { [key: string]: any }>(
+  options: Loadable.OptionsWithMap<Props, Exports>,
+): LoadableRenderer<Props> {
+  const LoadableRenderer = Loadable.Map<Props, Exports>(options) as LoadableRenderer<Props>;
 
   // Extends the behavior of LoadableComponent to provide post-render listeners
   class CustomLoadableRenderer extends LoadableRenderer {

diff --git a/superset-frontend/packages/superset-ui-core/src/chart/models/ChartPlugin.ts b/superset-frontend/packages/superset-ui-core/src/chart/models/ChartPlugin.ts
@@ -69,7 +69,7 @@ interface ChartPluginConfig<
  * Loaders of the form `() => import('foo')` may return esmodules
  * which require the value to be extracted as `module.default`
  * */
-function sanitizeLoader<T>(
+function sanitizeLoader<T extends object>(
   loader: PromiseOrValueLoader<ValueOrModuleWithValue<T>>,
 ): PromiseOrValueLoader<T> {
   return () => {

diff --git a/superset-frontend/packages/superset-ui-core/src/query/api/v1/makeApi.ts b/superset-frontend/packages/superset-ui-core/src/query/api/v1/makeApi.ts
@@ -110,15 +110,18 @@ export default function makeApi<
         ...requestOptions,
         method,
         endpoint,
+        searchParams: undefined as URLSearchParams | undefined,
+        postPayload: undefined as FormData | undefined,
+        jsonPayload: undefined as JsonObject | undefined,
       };
       if (requestType === 'search') {
-        requestConfig.searchParams = payload as SupersetPayload;
+        requestConfig.searchParams = payload as URLSearchParams;
       } else if (requestType === 'rison') {
         requestConfig.endpoint = `${endpoint}?q=${rison.encode(payload)}`;
       } else if (requestType === 'form') {
-        requestConfig.postPayload = payload as SupersetPayload;
+        requestConfig.postPayload = payload as FormData;
       } else {
-        requestConfig.jsonPayload = payload as SupersetPayload;
+        requestConfig.jsonPayload = payload as JsonObject;
       }
 
       let result: JsonValue | Response;

diff --git a/superset-frontend/packages/superset-ui-switchboard/src/switchboard.ts b/superset-frontend/packages/superset-ui-switchboard/src/switchboard.ts
@@ -175,10 +175,7 @@ export class Switchboard {
   /**
    * Defines a method that can be "called" from the other side by sending an event.
    */
-  defineMethod<A extends {} = any, R = any>(
-    methodName: string,
-    executor: Method<A, R>,
-  ) {
+  defineMethod<A extends {}, R = any>(methodName: string, executor: Method<A, R>) {
     this.methods[methodName] = executor;
   }
 

diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/hooks/useSticky.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/hooks/useSticky.tsx
@@ -354,8 +354,7 @@ function useInstance<D extends object>(instance: TableInstance<D>) {
   );
 
   const useStickyWrap = (renderer: TableRenderer) => {
-    // @ts-ignore
-    const { width, height } =
+    const { width, height }: { width?: number, height?: number } = 
       useMountedMemo(getTableSize, [getTableSize]) || sticky;
     // only change of data should trigger re-render
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx b/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
@@ -115,7 +115,12 @@ class WordCloud extends React.PureComponent<
     },
   });
 
-  createEncoder = this.wordCloudEncoderFactory.createSelector();
+  createEncoder = (encoding?: Partial<WordCloudEncoding>) => {
+    const selector = this.wordCloudEncoderFactory.createSelector();
+
+    // @ts-ignore
+    return selector(encoding as any);
+  };
 
   constructor(props: FullWordCloudProps) {
     super(props);
@@ -158,8 +163,7 @@ class WordCloud extends React.PureComponent<
   update() {
     const { data, encoding } = this.props;
 
-    // @ts-ignore
-    const encoder = this.createEncoder(encoding);
+    const encoder: Encoder<WordCloudEncodingConfig> = this.createEncoder(encoding);
     encoder.setDomainFromDataset(data);
 
     const sortedData = [...data].sort(

diff --git a/superset-frontend/src/components/Modal/Modal.tsx b/superset-frontend/src/components/Modal/Modal.tsx
@@ -261,8 +261,7 @@ const CustomModal = ({
   if (React.isValidElement(footer)) {
     // If a footer component is provided inject a closeModal function
     // so the footer can provide a "close" button if desired
-    // @ts-ignore
-    FooterComponent = React.cloneElement(footer, { closeModal: onHide });
+    FooterComponent = React.cloneElement(footer, { closeModal: onHide } as Partial<unknown>);
   }
   const modalFooter = isNil(FooterComponent)
     ? [