Revert unnecessary changes to operator containers.

Signed-off-by: Michael Nelson <minelson@vmware.com>
vmware-tanzu · Jul 12, 2023 · dfe2a96 · dfe2a96
1 parent 55cef03
commit dfe2a96
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 62 deletions.
diff --git a/dashboard/src/containers/OperatorInstanceCreateContainer/OperatorInstanceCreateContainer.tsx b/dashboard/src/containers/OperatorInstanceCreateContainer/OperatorInstanceCreateContainer.tsx
@@ -8,19 +8,20 @@ import { ThunkDispatch } from "redux-thunk";
 import { IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorInstanceForm from "../../components/OperatorInstanceForm";
-import { useParams } from "react-router-dom";
 
 interface IRouteProps {
-  csv: string;
-  crd: string;
+  match: {
+    params: {
+      csv: string;
+      crd: string;
+    };
+  };
 }
 
-function mapStateToProps({
-  operators,
-  clusters: { currentCluster, clusters },
-  config,
-}: IStoreState) {
-  const { csv, crd } = useParams<IRouteProps>();
+function mapStateToProps(
+  { operators, clusters: { currentCluster, clusters }, config }: IStoreState,
+  { match: { params } }: IRouteProps,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,
@@ -31,8 +32,8 @@ function mapStateToProps({
       fetch: operators.errors.csv.fetch,
       create: operators.errors.resource.create,
     },
-    csvName: csv,
-    crdName: crd,
+    csvName: params.csv,
+    crdName: params.crd,
   };
 }
 

diff --git a/dashboard/src/containers/OperatorInstanceUpdateContainer/OperatorInstanceUpdateContainer.tsx b/dashboard/src/containers/OperatorInstanceUpdateContainer/OperatorInstanceUpdateContainer.tsx
@@ -8,30 +8,31 @@ import { ThunkDispatch } from "redux-thunk";
 import { IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorInstanceUpdateForm from "../../components/OperatorInstanceUpdateForm";
-import { useParams } from "react-router-dom";
 
 interface IRouteProps {
-  csv: string;
-  crd: string;
-  instanceName: string;
+  match: {
+    params: {
+      csv: string;
+      crd: string;
+      instanceName: string;
+    };
+  };
 }
 
-function mapStateToProps({
-  operators,
-  clusters: { currentCluster, clusters },
-  config,
-}: IStoreState) {
-  const { csv, crd, instanceName } = useParams<IRouteProps>();
+function mapStateToProps(
+  { operators, clusters: { currentCluster, clusters }, config }: IStoreState,
+  { match: { params } }: IRouteProps,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,
     kubeappsCluster: config.kubeappsCluster,
     isFetching: operators.isFetching,
     csv: operators.csv,
     errors: operators.errors.resource,
-    csvName: csv,
-    crdName: crd,
-    resourceName: instanceName,
+    csvName: params.csv,
+    crdName: params.crd,
+    resourceName: params.instanceName,
     resource: operators.resource,
   };
 }

diff --git a/dashboard/src/containers/OperatorInstanceViewContainer/OperatorInstanceViewContainer.tsx b/dashboard/src/containers/OperatorInstanceViewContainer/OperatorInstanceViewContainer.tsx
@@ -8,26 +8,27 @@ import { ThunkDispatch } from "redux-thunk";
 import { IResource, IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorInstance from "../../components/OperatorInstance";
-import { useParams } from "react-router-dom";
 
 interface IRouteProps {
-  csv: string;
-  crd: string;
-  instanceName: string;
+  match: {
+    params: {
+      csv: string;
+      crd: string;
+      instanceName: string;
+    };
+  };
 }
-function mapStateToProps({
-  clusters: { currentCluster, clusters },
-  config,
-  operators,
-}: IStoreState) {
-  const { csv, crd, instanceName } = useParams<IRouteProps>();
+function mapStateToProps(
+  { clusters: { currentCluster, clusters }, config, operators }: IStoreState,
+  { match: { params } }: IRouteProps,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,
     kubeappsCluster: config.kubeappsCluster,
-    csvName: csv,
-    crdName: crd,
-    instanceName: instanceName,
+    csvName: params.csv,
+    crdName: params.crd,
+    instanceName: params.instanceName,
     isFetching: operators.isFetching,
     resource: operators.resource,
     csv: operators.csv,

diff --git a/dashboard/src/containers/OperatorNewContainer/OperatorNewContainer.tsx b/dashboard/src/containers/OperatorNewContainer/OperatorNewContainer.tsx
@@ -9,26 +9,27 @@ import { ThunkDispatch } from "redux-thunk";
 import { IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorNew from "../../components/OperatorNew";
-import { useParams } from "react-router-dom";
 
 interface IRouteProps {
-  operator: string;
+  match: {
+    params: {
+      operator: string;
+    };
+  };
 }
 
-function mapStateToProps({
-  operators,
-  clusters: { currentCluster, clusters },
-  config,
-}: IStoreState) {
-  const { operator } = useParams<IRouteProps>();
+function mapStateToProps(
+  { operators, clusters: { currentCluster, clusters }, config }: IStoreState,
+  { match: { params } }: IRouteProps,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,
     kubeappsCluster: config.kubeappsCluster,
     isFetching: operators.isFetching,
     operator: operators.operator,
     errors: operators.errors.operator,
-    operatorName: operator,
+    operatorName: params.operator,
   } as Partial<IOperatorNewProps>;
 }
 

diff --git a/dashboard/src/containers/OperatorViewContainer/OperatorViewContainer.tsx b/dashboard/src/containers/OperatorViewContainer/OperatorViewContainer.tsx
@@ -8,26 +8,27 @@ import { ThunkDispatch } from "redux-thunk";
 import { IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorView from "../../components/OperatorView";
-import { useParams } from "react-router-dom";
 
 interface IRouteProps {
-  operator: string;
+  match: {
+    params: {
+      operator: string;
+    };
+  };
 }
 
-function mapStateToProps({
-  operators,
-  clusters: { currentCluster, clusters },
-  config,
-}: IStoreState) {
-  const { operator } = useParams<IRouteProps>();
+function mapStateToProps(
+  { operators, clusters: { currentCluster, clusters }, config }: IStoreState,
+  { match: { params } }: IRouteProps,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,
     kubeappsCluster: config.kubeappsCluster,
     isFetching: operators.isFetching,
     operator: operators.operator,
     error: operators.errors.operator.fetch,
-    operatorName: operator,
+    operatorName: params.operator,
     csv: operators.csv,
   };
 }

diff --git a/dashboard/src/containers/OperatorsListContainer/OperatorsListContainer.tsx b/dashboard/src/containers/OperatorsListContainer/OperatorsListContainer.tsx
@@ -3,19 +3,17 @@
 
 import qs from "qs";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { RouteComponentProps } from "react-router-dom";
 import { Action } from "redux";
 import { ThunkDispatch } from "redux-thunk";
 import { IStoreState } from "shared/types";
 import actions from "../../actions";
 import OperatorList from "../../components/OperatorList";
 
-function mapStateToProps({
-  operators,
-  clusters: { currentCluster, clusters },
-  config,
-}: IStoreState) {
-  const location = useLocation();
+function mapStateToProps(
+  { operators, clusters: { currentCluster, clusters }, config }: IStoreState,
+  { location }: RouteComponentProps<{}>,
+) {
   return {
     cluster: currentCluster,
     namespace: clusters[currentCluster].currentNamespace,