Merge pull request #14680 from TheRealJon/OCPBUGS-30973

OCPBUGS-30973: Update @types/react-redux

Author: openshift-merge-bot[bot]

frontend/package.json

@@ -198,7 +198,7 @@
     "react-measure": "^2.2.6",
     "react-modal": "^3.12.1",
     "react-monaco-editor": "0.46.x",
-    "react-redux": "7.2.2",
+    "react-redux": "7.2.9",
     "react-router": "5.3.x",
     "react-router-dom": "5.3.x",
     "react-router-dom-v5-compat": "^6.11.2",
@@ -255,7 +255,6 @@
     "@types/react-helmet": "5.x",
     "@types/react-jsonschema-form": "^1.3.8",
     "@types/react-measure": "^2.0.6",
-    "@types/react-redux": "6.0.2",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "5.3.x",
     "@types/react-transition-group": "2.x",

frontend/packages/console-app/src/components/admission-webhook-warnings/AdmissionWebhookWarningNotifications.tsx

@@ -1,21 +1,20 @@
 import * as React from 'react';
 import { AlertVariant } from '@patternfly/react-core';
+import { Map } from 'immutable';
 import { useTranslation } from 'react-i18next';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useDispatch, useSelector } from 'react-redux';
 import {
   AdmissionWebhookWarning,
-  CoreState,
   getAdmissionWebhookWarnings,
   removeAdmissionWebhookWarning,
+  SDKStoreState,
 } from '@console/dynamic-plugin-sdk/src';
 import { documentationURLs, getDocumentationURL } from '@console/internal/components/utils';
 import { useToast } from '@console/shared/src';
 
 type UseAdmissionWebhookWarnings = () => Map<string, AdmissionWebhookWarning>;
 const useAdmissionWebhookWarnings: UseAdmissionWebhookWarnings = () =>
-  useSelector<CoreState, Map<string, AdmissionWebhookWarning>>(getAdmissionWebhookWarnings);
+  useSelector<SDKStoreState, Map<string, AdmissionWebhookWarning>>(getAdmissionWebhookWarnings);
 
 export const AdmissionWebhookWarningNotifications = () => {
   const { t } = useTranslation();

frontend/packages/console-app/src/components/detect-namespace/__tests__/namespace.spec.ts

@@ -1,7 +1,5 @@
 import * as React from 'react';
 import { act } from 'react-dom/test-utils';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom-v5-compat';
 import { k8sGet } from '@console/dynamic-plugin-sdk/src/utils/k8s';

frontend/packages/console-app/src/components/detect-namespace/namespace.ts

@@ -1,6 +1,4 @@
 import * as React from 'react';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useDispatch } from 'react-redux';
 import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
 import {

frontend/packages/console-app/src/components/nodes/NodesPage.tsx

@@ -3,8 +3,6 @@ import { sortable } from '@patternfly/react-table';
 import { TFunction } from 'i18next';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useSelector, useDispatch } from 'react-redux';
 import {
   ListPageBody,
@@ -45,6 +43,7 @@ import {
   referenceFor,
   Selector,
 } from '@console/internal/module/k8s';
+import { RootState } from '@console/internal/redux';
 import {
   getName,
   getUID,
@@ -258,7 +257,7 @@ const NodesTableRow: React.FC<RowProps<NodeKind, GetNodeStatusExtensions>> = ({
   rowData,
 }) => {
   const { t } = useTranslation();
-  const metrics = useSelector(({ UI }) => UI.getIn(['metrics', 'node']));
+  const metrics = useSelector<RootState, NodeMetrics>(({ UI }) => UI.getIn(['metrics', 'node']));
   const nodeName = getName(node);
   const nodeUID = getUID(node);
   const usedMem = metrics?.usedMemory?.[nodeName];

frontend/packages/console-app/src/components/tour/tour-context.ts

@@ -9,8 +9,6 @@ import {
   useCallback,
 } from 'react';
 import { pick, union, isEqual } from 'lodash';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useSelector } from 'react-redux';
 import { createSelector } from 'reselect';
 import { useActivePerspective } from '@console/dynamic-plugin-sdk';

frontend/packages/console-dynamic-plugin-sdk/src/api/internal-types.ts

@@ -273,7 +273,11 @@ export type UseDashboardResources = ({
 }) => {
   urlResults: RequestMap<any>;
   prometheusResults: RequestMap<PrometheusResponse>;
-  notificationAlerts: { alerts: Alert[]; loaded: boolean; loadError: Error };
+  notificationAlerts: {
+    alerts: Alert[];
+    loaded: boolean;
+    loadError: Error;
+  };
 };
 
 export type QuickStartsLoaderProps = {

frontend/packages/console-dynamic-plugin-sdk/src/app/useReduxStore.ts

@@ -1,6 +1,4 @@
 import * as React from 'react';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useStore } from 'react-redux';
 import { applyMiddleware, combineReducers, createStore, compose, Store } from 'redux';
 import thunk from 'redux-thunk';

frontend/packages/console-dynamic-plugin-sdk/src/utils/flags.ts

@@ -1,5 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useSelector } from 'react-redux';
 import { FeatureSubStore } from '../app/features';
 

frontend/packages/console-dynamic-plugin-sdk/src/utils/k8s/hooks/useK8sModel.ts

@@ -1,7 +1,6 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
 import { useSelector } from 'react-redux';
 import { K8sModel } from '../../../api/common-types';
+import { SDKStoreState } from '../../../app/redux-types';
 import {
   UseK8sModel,
   K8sResourceKindReference,
@@ -33,6 +32,6 @@ export const getK8sModel = (
  * ```
  */
 export const useK8sModel: UseK8sModel = (k8sGroupVersionKind) => [
-  useSelector(({ k8s }) => getK8sModel(k8s, k8sGroupVersionKind)),
-  useSelector(({ k8s }) => k8s.getIn(['RESOURCES', 'inFlight']) ?? false),
+  useSelector<SDKStoreState, K8sModel>(({ k8s }) => getK8sModel(k8s, k8sGroupVersionKind)),
+  useSelector<SDKStoreState, boolean>(({ k8s }) => k8s.getIn(['RESOURCES', 'inFlight']) ?? false),
 ];