fix: Ingore services already deleted (#1166)

* fix: Ingore services already deleted
redhat-cop · May 2, 2023 · 51b964c · 51b964c
1 parent 73ded58
commit 51b964c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/catalog/ui/src/app/Services/ServicesList.tsx b/catalog/ui/src/app/Services/ServicesList.tsx
@@ -259,7 +259,14 @@ const ServicesList: React.FC<{
             resourceClaimName: resourceClaim.metadata.name,
           })
         );
-        return await deleteResourceClaim(resourceClaim);
+        try {
+          return await deleteResourceClaim(resourceClaim);
+        } catch (error) {
+          if (error.status === 404) {
+            return resourceClaim;
+          }
+          throw error;
+        }
       } else {
         const isPartOfWorkshop = isResourceClaimPartOfWorkshop(resourceClaim);
         if (isPartOfWorkshop) return resourceClaim; // If has a workshopProvision -> Do nothing.
@@ -279,7 +286,14 @@ const ServicesList: React.FC<{
   const performModalActionForWorkshop = useCallback(
     async (workshop: WorkshopWithResourceClaims): Promise<WorkshopWithResourceClaims> => {
       if (modalState.action === 'delete') {
-        return await deleteWorkshop(workshop);
+        try {
+          return await deleteWorkshop(workshop);
+        } catch (error) {
+          if (error.status === 404) {
+            return workshop;
+          }
+          throw error;
+        }
       } else {
         if (Array.isArray(workshop.resourceClaims)) {
           if (modalState.action === 'start') {

diff --git a/catalog/ui/src/app/api.ts b/catalog/ui/src/app/api.ts
@@ -1066,14 +1066,14 @@ export async function patchWorkshop({
   jsonPatch?: JSONPatch;
   patch?: Record<string, unknown>;
 }): Promise<Workshop> {
-  return (await patchK8sObject({
+  return await patchK8sObject({
     apiVersion: `${BABYLON_DOMAIN}/v1`,
     jsonPatch: jsonPatch,
     name: name,
     namespace: namespace,
     plural: 'workshops',
     patch: patch,
-  }));
+  });
 }
 
 export async function patchWorkshopProvision({
@@ -1087,14 +1087,14 @@ export async function patchWorkshopProvision({
   jsonPatch?: JSONPatch;
   patch?: Record<string, unknown>;
 }): Promise<WorkshopProvision> {
-  return (await patchK8sObject({
+  return await patchK8sObject({
     apiVersion: `${BABYLON_DOMAIN}/v1`,
     jsonPatch: jsonPatch,
     name: name,
     namespace: namespace,
     plural: 'workshopprovisions',
     patch: patch,
-  }));
+  });
 }
 
 export async function requestStatusForAllResourcesInResourceClaim(resourceClaim: ResourceClaim) {