Merge branch 'CE-2105-replace-useUndeployInDb' into 'develop'

CE-2105: convert useUndeployInDb to common

See merge request !366

src/api/SwaggerApi.js

@@ -520,20 +520,6 @@ export function unpackUpdateIoc(updateIoc) {
   return d;
 }
 
-export function unpackUndeployInDb(deployment) {
-  return { ...deployment };
-}
-
-export function useUndeployInDb(id, onError) {
-  const api = useContext(apiContext);
-  const method = useCallAndUnpack(
-    api.apis.Deployments.unDeployInDb,
-    unpackUndeployInDb
-  );
-  const boundMethod = useCallback(method.bind(null, { ioc_id: id }), [id]);
-  return useAsync({ fcn: boundMethod, call: false, onError: onError });
-}
-
 export function unpackUpdateActiveDeploymentHost(ioc) {
   return { ...ioc };
 }

src/components/IOC/AdministerUndeployment/AdministerUndeployment.js

-import React, { useState, useEffect, useCallback } from "react";
+import React, {
+  useState,
+  useEffect,
+  useCallback,
+  useContext,
+  useMemo
+} from "react";
 import { useNavigate } from "react-router-dom";
-import { Button, Typography, Grid, Tooltip } from "@mui/material";
-import { useUndeployInDb } from "../../../api/SwaggerApi";
+import {
+  Button,
+  Typography,
+  Grid,
+  Tooltip,
+  LinearProgress
+} from "@mui/material";
 import { SimpleAccordion, ConfirmationDialog } from "@ess-ics/ce-ui-common";
 import Alert from "@mui/material/Alert";
 import AccessControl from "../../auth/AccessControl";
 import { IocActiveDeployment } from "../../../api/DataTypes";
+import { apiContext } from "../../../api/DeployApi";
+import { useAPIMethod } from "@ess-ics/ce-ui-common/dist/hooks/API";
 
 export default function AdministerUndeployment({ ioc, buttonDisabled }) {
   const navigate = useNavigate();
 
-  function onError(message) {
-    setError(message);
-  }
-
   // for the dialog
   const [error, setError] = useState();
   const [open, setOpen] = useState(false);
 
-  const [response, undeployIOC] = useUndeployInDb(ioc.id, onError);
+  const client = useContext(apiContext);
+
+  const params = useMemo(
+    () => ({
+      ioc_id: ioc?.id
+    }),
+    [ioc]
+  );
+
+  const {
+    value: response,
+    wrapper: undeployIOC,
+    loading,
+    error: errorResponse
+  } = useAPIMethod({
+    fcn: client.apis.IOCs.unDeployInDb,
+    call: false,
+    params
+  });
+
+  useEffect(() => {
+    setError(errorResponse?.message);
+  }, [errorResponse]);
 
   const onClose = useCallback(() => {
     setOpen(false);
@@ -30,22 +61,22 @@ export default function AdministerUndeployment({ ioc, buttonDisabled }) {
 
   useEffect(() => {
     if (response) {
+      setOpen(false);
       navigate(-1);
     }
   }, [response, navigate]);
 
-  const failedDeployment = new IocActiveDeployment(
+  const hasDeployment = new IocActiveDeployment(
     ioc.activeDeployment
-  ).failedDeployment();
+  ).hasDeployment();
 
   let disabledButtonTitle = "";
   if (buttonDisabled || ioc.operationInProgress) {
     disabledButtonTitle =
       "There is an ongoing operation, you cannot 'undeploy' the IOC right now";
   } else {
-    if (!failedDeployment) {
-      disabledButtonTitle =
-        "IOC doesn't have failed (un)deployment, you cannot 'undeploy' it";
+    if (!hasDeployment) {
+      disabledButtonTitle = "IOC is not deployed";
     }
   }
 
@@ -70,6 +101,7 @@ export default function AdministerUndeployment({ ioc, buttonDisabled }) {
                 </Typography>{" "}
                 ?
               </Typography>
+              {loading ? <LinearProgress /> : null}
             </>
           }
           confirmText="Undeploy IOC"
@@ -108,7 +140,8 @@ export default function AdministerUndeployment({ ioc, buttonDisabled }) {
                     disabled={
                       buttonDisabled ||
                       ioc.operationInProgress ||
-                      !failedDeployment
+                      !hasDeployment ||
+                      loading
                     }
                     color="error"
                     variant="contained"