Merge branch 'CE-2889-modify-ioc-endpoints' into 'develop'

CE-2889: Modify ioc endpoints

See merge request !490

src/components/IOC/DeployIOC/DeployIOC.js

@@ -22,7 +22,7 @@ export function DeployIOC({
     wrapper: action,
     error: deployError
   } = useAPIMethod({
-    fcn: client.apis.IOCs.updateAndDeployIoc,
+    fcn: client.apis.IOCs.startOperation,
     call: false
   });
 
@@ -56,7 +56,7 @@ export function DeployIOC({
     submitCallback(); // This works but throws a warning because I am changing state in the parent while the child is rerendering. Not sure yet how to fix.
     return (
       <Navigate
-        to={`/jobs/${deployment.operationId}`}
+        to={`/jobs/${deployment.id}`}
         push
       />
     );

src/components/IOC/IOCDeployDialog/IOCDeployDialog.js

@@ -107,7 +107,8 @@ export function IOCDeployDialog({
         requestBody: {
           sourceUrl: git,
           sourceVersion: revision.reference,
-          hostId: host.hostId
+          hostId: host.hostId,
+          type: "DEPLOY"
         }
       }
     );

src/components/IOC/IOCService/IOCService.js

@@ -5,13 +5,7 @@ import {
   Typography,
   Tooltip
 } from "@mui/material";
-import React, {
-  useState,
-  useEffect,
-  useContext,
-  useCallback,
-  useMemo
-} from "react";
+import React, { useState, useEffect, useContext, useCallback } from "react";
 import { ConfirmationDialog, useAPIMethod } from "@ess-ics/ce-ui-common";
 import Alert from "@mui/material/Alert";
 import { initRequestParams } from "../../common/Helper";
@@ -36,21 +30,13 @@ export function IOCService({
 
   const client = useContext(apiContext);
 
-  const params = useMemo(
-    () => ({
-      ioc_id: ioc?.id
-    }),
-    [ioc?.id]
-  );
-
   const {
     value: startJob,
     wrapper: startIOC,
     error: startJobError
   } = useAPIMethod({
-    fcn: client.apis.IOCs.startIoc,
-    call: false,
-    params
+    fcn: client.apis.IOCs.startOperation,
+    call: false
   });
 
   const {
@@ -58,9 +44,8 @@ export function IOCService({
     wrapper: stopIOC,
     error: stopJobError
   } = useAPIMethod({
-    fcn: client.apis.IOCs.stopIoc,
-    call: false,
-    params
+    fcn: client.apis.IOCs.startOperation,
+    call: false
   });
 
   useEffect(() => {
@@ -93,7 +78,16 @@ export function IOCService({
     setInProgress(true);
     setButtonDisabled(true);
 
-    startIOC();
+    startIOC(
+      {
+        ioc_id: ioc.id
+      },
+      {
+        requestBody: {
+          type: "START"
+        }
+      }
+    );
 
     let requestParams = initRequestParams(jobLazyParams);
 
@@ -113,7 +107,16 @@ export function IOCService({
     setInProgress(true);
     setButtonDisabled(true);
 
-    stopIOC();
+    stopIOC(
+      {
+        ioc_id: ioc.id
+      },
+      {
+        requestBody: {
+          type: "STOP"
+        }
+      }
+    );
 
     let requestParams = initRequestParams(jobLazyParams);
 

src/components/IOC/IOCUndeployDialog/IOCUndeployDialog.js

@@ -25,9 +25,16 @@ export function IOCUndeployDialog({
   };
 
   const onConfirm = () => {
-    submitCallback({
-      ioc_id: ioc.id
-    });
+    submitCallback(
+      {
+        ioc_id: ioc.id
+      },
+      {
+        requestBody: {
+          type: "UNDEPLOY"
+        }
+      }
+    );
   };
 
   return (

src/components/IOC/UndeployIOC/UndeployIOC.js

@@ -20,7 +20,7 @@ export function UndeployIOC({
     wrapper: action,
     error: deploymentError
   } = useAPIMethod({
-    fcn: client.apis.IOCs.createUndeployment,
+    fcn: client.apis.IOCs.startOperation,
     call: false
   });
 
@@ -47,7 +47,7 @@ export function UndeployIOC({
     submitCallback(); // This works but throws a warning because I am changing state in the parent while the child is rerendering. Not sure yet how to fix.
     return (
       <Navigate
-        to={`/jobs/${deployment.operationId}`}
+        to={`/jobs/${deployment.id}`}
         push
       />
     );

src/components/Job/JobDetails.js

@@ -103,7 +103,8 @@ export const JobDetails = ({ operation, job }) => {
   );
 
   useEffect(() => {
-    setAlerts([createAlert(jobOperation, job), ...operation.alerts]);
+    const operationAlerts = operation.alerts ? operation.alerts : [];
+    setAlerts([createAlert(jobOperation, job), ...operationAlerts]);
   }, [operation, job, jobOperation]);
 
   return (