Fix operator code landed between #1974 proposed and landed. (#1989)

* Fix operator code landed between #1974 proposed and landed. * Moar lint
vmware-tanzu · Sep 1, 2020 · edd06a0 · edd06a0
1 parent c0aa913
commit edd06a0
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 18 deletions.
diff --git a/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.v2.test.tsx b/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.v2.test.tsx
@@ -87,7 +87,11 @@ it("retrieves CSV when mounted", () => {
   const getCSV = jest.fn();
   actions.operators.getCSV = getCSV;
   mountWrapper(defaultStore, <OperatorInstanceForm {...defaultProps} />);
-  expect(getCSV).toHaveBeenCalledWith(defaultProps.namespace, defaultProps.csvName);
+  expect(getCSV).toHaveBeenCalledWith(
+    defaultProps.cluster,
+    defaultProps.namespace,
+    defaultProps.csvName,
+  );
 });
 
 it("retrieves the example values and the target CRD from the given CSV", () => {
@@ -144,6 +148,7 @@ it("should submit the form", () => {
     },
   };
   expect(createResource).toHaveBeenCalledWith(
+    defaultProps.cluster,
     defaultProps.namespace,
     resource.apiVersion,
     defaultCRD.name,

diff --git a/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.v2.tsx b/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.v2.tsx
@@ -80,8 +80,8 @@ export default function DeploymentFormBody({
   const [icon, setIcon] = useState(placeholder);
 
   useEffect(() => {
-    dispatch(actions.operators.getCSV(namespace, csvName));
-  }, [dispatch, namespace, csvName]);
+    dispatch(actions.operators.getCSV(cluster, namespace, csvName));
+  }, [cluster, dispatch, namespace, csvName]);
 
   const {
     operators: {
@@ -119,7 +119,13 @@ export default function DeploymentFormBody({
     }
     const resourceType = crd.name.split(".")[0];
     const created = await dispatch(
-      actions.operators.createResource(namespace, resource.apiVersion, resourceType, resource),
+      actions.operators.createResource(
+        cluster,
+        namespace,
+        resource.apiVersion,
+        resourceType,
+        resource,
+      ),
     );
     if (created) {
       dispatch(

diff --git a/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.v2.test.tsx b/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.v2.test.tsx
@@ -72,8 +72,13 @@ it("gets resource and CSV", () => {
   actions.operators.getResource = getResource;
   actions.operators.getCSV = getCSV;
   mountWrapper(defaultStore, <OperatorInstanceUpdateForm {...defaultProps} />);
-  expect(getCSV).toHaveBeenCalledWith(defaultProps.namespace, defaultProps.csvName);
+  expect(getCSV).toHaveBeenCalledWith(
+    defaultProps.cluster,
+    defaultProps.namespace,
+    defaultProps.csvName,
+  );
   expect(getResource).toHaveBeenCalledWith(
+    defaultProps.cluster,
     defaultProps.namespace,
     defaultProps.csvName,
     defaultProps.crdName,
@@ -119,6 +124,7 @@ it("should submit the form", () => {
   form.simulate("submit", { preventDefault: jest.fn() });
 
   expect(updateResource).toHaveBeenCalledWith(
+    defaultProps.cluster,
     defaultProps.namespace,
     defaultResource.apiVersion,
     defaultProps.crdName,

diff --git a/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.v2.tsx b/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.v2.tsx
@@ -40,9 +40,9 @@ function OperatorInstanceUpdateForm({
   const [icon, setIcon] = useState(placeholder);
 
   useEffect(() => {
-    dispatch(actions.operators.getResource(namespace, csvName, crdName, resourceName));
-    dispatch(actions.operators.getCSV(namespace, csvName));
-  }, [dispatch, namespace, csvName, crdName, resourceName]);
+    dispatch(actions.operators.getResource(cluster, namespace, csvName, crdName, resourceName));
+    dispatch(actions.operators.getCSV(cluster, namespace, csvName));
+  }, [dispatch, cluster, namespace, csvName, crdName, resourceName]);
 
   const {
     operators: {
@@ -79,6 +79,7 @@ function OperatorInstanceUpdateForm({
   const handleDeploy = async (updatedResource: IResource) => {
     const created = await dispatch(
       actions.operators.updateResource(
+        cluster,
         namespace,
         updatedResource.apiVersion,
         crdName.split(".")[0],

diff --git a/dashboard/src/components/OperatorNew/OperatorNew.v2.test.tsx b/dashboard/src/components/OperatorNew/OperatorNew.v2.test.tsx
@@ -75,7 +75,11 @@ it("calls getOperator when mounting the component", () => {
   const getOperator = jest.fn();
   actions.operators.getOperator = getOperator;
   mountWrapper(defaultStore, <OperatorNew {...defaultProps} />);
-  expect(getOperator).toHaveBeenCalledWith(defaultProps.namespace, defaultProps.operatorName);
+  expect(getOperator).toHaveBeenCalledWith(
+    defaultProps.cluster,
+    defaultProps.namespace,
+    defaultProps.operatorName,
+  );
 });
 
 it("parses the default channel when receiving the operator", () => {
@@ -139,5 +143,12 @@ it("deploys an operator", async () => {
   const onSubmit = wrapper.find("form").prop("onSubmit") as () => Promise<void>;
   await onSubmit();
 
-  expect(createOperator).toHaveBeenCalledWith("kubeapps", "foo", "beta", "Automatic", "foo.1.0.0");
+  expect(createOperator).toHaveBeenCalledWith(
+    defaultProps.cluster,
+    "kubeapps",
+    "foo",
+    "beta",
+    "Automatic",
+    "foo.1.0.0",
+  );
 });
diff --git a/dashboard/src/components/OperatorNew/OperatorNew.v2.tsx b/dashboard/src/components/OperatorNew/OperatorNew.v2.tsx
@@ -22,12 +22,13 @@ import "./OperatorNew.v2.css";
 interface IOperatorNewProps {
   operatorName: string;
   operator?: IPackageManifest;
-  getOperator: (namespace: string, name: string) => Promise<void>;
+  getOperator: (cluster: string, namespace: string, name: string) => Promise<void>;
   isFetching: boolean;
   cluster: string;
   namespace: string;
   errors: IOperatorsStateError;
   createOperator: (
+    cluster: string,
     namespace: string,
     name: string,
     channel: string,
@@ -50,8 +51,8 @@ export default function OperatorNew({ namespace, operatorName, cluster }: IOpera
   const [approvalStrategyAutomatic, setApprovalStrategyAutomatic] = useState(true);
 
   useEffect(() => {
-    dispatch(actions.operators.getOperator(namespace, operatorName));
-  }, [dispatch, namespace, operatorName]);
+    dispatch(actions.operators.getOperator(cluster, namespace, operatorName));
+  }, [dispatch, cluster, namespace, operatorName]);
 
   const {
     operators: {
@@ -127,6 +128,7 @@ export default function OperatorNew({ namespace, operatorName, cluster }: IOpera
     const approvalStrategy = approvalStrategyAutomatic ? "Automatic" : "Manual";
     const deployed = await dispatch(
       actions.operators.createOperator(
+        cluster,
         targetNS,
         operator!.metadata.name,
         updateChannel!.name,

diff --git a/dashboard/src/components/OperatorView/OperatorView.v2.test.tsx b/dashboard/src/components/OperatorView/OperatorView.v2.test.tsx
@@ -72,7 +72,11 @@ it("calls getOperator when mounting the component", () => {
   const getOperator = jest.fn();
   actions.operators.getOperator = getOperator;
   mountWrapper(defaultStore, <OperatorView {...defaultProps} />);
-  expect(getOperator).toHaveBeenCalledWith(defaultProps.namespace, defaultProps.operatorName);
+  expect(getOperator).toHaveBeenCalledWith(
+    defaultProps.cluster,
+    defaultProps.namespace,
+    defaultProps.operatorName,
+  );
 });
 
 it("tries to get the CSV for the current operator", () => {
@@ -84,6 +88,7 @@ it("tries to get the CSV for the current operator", () => {
   );
 
   expect(getCSV).toHaveBeenCalledWith(
+    defaultProps.cluster,
     defaultOperator.metadata.namespace,
     defaultOperator.status.channels[0].currentCSV,
   );

diff --git a/dashboard/src/components/OperatorView/OperatorView.v2.tsx b/dashboard/src/components/OperatorView/OperatorView.v2.tsx
@@ -25,8 +25,8 @@ interface IOperatorViewProps {
 export default function OperatorView({ operatorName, cluster, namespace }: IOperatorViewProps) {
   const dispatch = useDispatch();
   useEffect(() => {
-    dispatch(actions.operators.getOperator(namespace, operatorName));
-  }, [dispatch, namespace, operatorName]);
+    dispatch(actions.operators.getOperator(cluster, namespace, operatorName));
+  }, [dispatch, cluster, namespace, operatorName]);
 
   const {
     operators: {
@@ -44,10 +44,10 @@ export default function OperatorView({ operatorName, cluster, namespace }: IOper
     if (operator) {
       const defaultChannel = Operators.getDefaultChannel(operator);
       if (defaultChannel) {
-        dispatch(actions.operators.getCSV(namespace, defaultChannel.currentCSV));
+        dispatch(actions.operators.getCSV(cluster, namespace, defaultChannel.currentCSV));
       }
     }
-  }, [dispatch, operator, namespace]);
+  }, [dispatch, operator, cluster, namespace]);
 
   const redirect = () => dispatch(push(app.operators.new(cluster, namespace, operatorName)));