ui: Downgrade TypeScript to 3.9.9 (#3906)

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
thanos-io · Mar 11, 2021 · 45163f2 · 45163f2
1 parent ebba2b8
commit 45163f2
Show file tree

Hide file tree

Showing 7 changed files with 558 additions and 519 deletions.
diff --git a/pkg/ui/bindata.go b/pkg/ui/bindata.go
diff --git a/pkg/ui/react-app/package.json b/pkg/ui/react-app/package.json
@@ -44,7 +44,7 @@
     "sanitize-html": "^2.3.2",
     "tempusdominus-bootstrap-4": "^5.39.0",
     "tempusdominus-core": "^5.19.0",
-    "typescript": "^4.1.5",
+    "typescript": "3.9.9",
     "use-query-params": "^1.1.9"
   },
   "scripts": {

diff --git a/pkg/ui/react-app/src/components/withStatusIndicator.tsx b/pkg/ui/react-app/src/components/withStatusIndicator.tsx
@@ -16,7 +16,7 @@ export const withStatusIndicator = <T extends any>(Component: ComponentType<T>):
   customErrorMsg,
   componentTitle,
   ...rest
-}) => {
+}: StatusIndicatorProps) => {
   if (error) {
     return (
       <UncontrolledAlert color="danger">
@@ -42,5 +42,5 @@ export const withStatusIndicator = <T extends any>(Component: ComponentType<T>):
       />
     );
   }
-  return <Component {...(rest as T)} />;
+  return <Component {...(rest as any)} />;
 };
diff --git a/pkg/ui/react-app/src/pages/graph/GraphControls.test.tsx b/pkg/ui/react-app/src/pages/graph/GraphControls.test.tsx
@@ -166,7 +166,7 @@ describe('GraphControls', () => {
       const btn = group.find(Button).filterWhere((btn) => btn.prop('title') === testCase.title);
       const onClick = btn.prop('onClick');
       if (onClick) {
-        onClick({} as React.MouseEvent);
+        onClick({} as React.MouseEvent<HTMLButtonElement, MouseEvent>);
         expect(results).toHaveLength(1);
         expect(results[0]).toBe(!testCase.active);
         results.pop();

diff --git a/pkg/ui/react-app/src/pages/graph/Panel.test.tsx b/pkg/ui/react-app/src/pages/graph/Panel.test.tsx
@@ -22,6 +22,7 @@ const defaultProps = {
     useDeduplication: true,
     usePartialResponse: false,
     storeMatches: [],
+    defaultStep: '1s',
   },
   onOptionsChanged: (): void => {
     // Do nothing.

diff --git a/pkg/ui/react-app/src/pages/graph/TimeInput.test.tsx b/pkg/ui/react-app/src/pages/graph/TimeInput.test.tsx
@@ -11,6 +11,7 @@ describe('TimeInput', () => {
     time: 1572102237932,
     range: 60 * 60 * 7,
     placeholder: 'time input',
+    useLocalTime: true,
     onChangeTime: (): void => {
       // Do nothing.
     },

diff --git a/pkg/ui/react-app/yarn.lock b/pkg/ui/react-app/yarn.lock