@kumori/aurora-backend-handler 1.1.61 → 1.1.63

package/api/resources-api-service.ts

@@ -587,9 +587,9 @@ const deleteResourceBase = async (
       body,
       30000,
       "DELETE",
-      resource.name
+      resource.name,
+      "resource"
     );
-
     //eventHelper.resource.publish.deleted(resource);
     const resourceNotification: Notification = {
       type: "success",

package/api/tenant-api-service.ts

@@ -190,20 +190,28 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
 
     const hasNpmRegistry =
       tenant.npmRegistry !== undefined && tenant.npmRegistry !== null;
+    const isNpmRegistryEmpty =
+      hasNpmRegistry &&
+      tenant.npmRegistry!.endpoint === "" &&
+      tenant.npmRegistry!.domain === "" &&
+      tenant.npmRegistry!.credentials === "" &&
+      tenant.npmRegistry!.public === false;
     const hasPlan = tenant.plan?.name;
 
     const updateBody: Record<string, any> = {
       tenant: tenant.name,
       spec: {
-        registry: hasNpmRegistry
-          ? {
-              kind: "git",
-              endpoint: tenant.npmRegistry!.endpoint,
-              domain: tenant.npmRegistry!.domain,
-              credentials: tenant.npmRegistry!.credentials,
-              public: tenant.npmRegistry!.public,
-            }
-          : undefined,
+        registry: !hasNpmRegistry
+          ? undefined
+          : isNpmRegistryEmpty
+            ? null
+            : {
+                kind: "git",
+                endpoint: tenant.npmRegistry!.endpoint,
+                domain: tenant.npmRegistry!.domain,
+                credentials: tenant.npmRegistry!.credentials,
+                public: tenant.npmRegistry!.public,
+              },
       },
     };
 

package/helpers/resource-helper.ts

@@ -376,6 +376,22 @@ export const handleVolumeEvent = (
     hasRequestingServices: false
   });
 };
+export const setResourceDeleting = (
+  tenantsMap: Map<string, any>,
+  tenantName: string,
+  resourceName: string,
+  resourceType: string,
+) => {
+  const tenant = tenantsMap.get(tenantName);
+  if (!tenant) return;
+  const index = tenant.resources.findIndex(
+    (res: Resource) => res.name === resourceName && res.type === resourceType,
+  );
+  if (index === -1) return;
+  tenant.resources[index] = { ...tenant.resources[index], deleting: true };
+  tenantsMap.set(tenantName, tenant);
+};
+
 export const processResourceResult = (
   result: any,
   tenantsMap: Map<string, any>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {
@@ -11,7 +11,7 @@
     "glob": "^11.0.0"
   },
   "dependencies": {
-    "@kumori/aurora-interfaces": "1.0.15",
+    "@kumori/aurora-interfaces": "1.0.16",
     "@kumori/kumori-dsl-generator": "1.0.6",
     "@kumori/kumori-module-generator": "^1.1.6",
     "ts-node": "^10.9.2",

package/websocket-manager.ts

@@ -61,6 +61,7 @@ import {
   handleSecretEvent,
   handleVolumeEvent,
   processResourceResult,
+  setResourceDeleting,
 } from "./helpers/resource-helper";
 import {
   handlePlanInstanceEvent,
@@ -1475,6 +1476,16 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
         user = new User(userData);
       }
       break;
+    case "resource":
+      if (action === "DELETE") {
+        const tenant = originalData?.payload?.tenant;
+        const resourceName = originalData?.payload?.resource;
+        const resourceType = originalData?.payload?.kind;
+        if (tenant && resourceName && resourceType) {
+          setResourceDeleting(tenantsMap, tenant, resourceName, resourceType);
+        }
+      }
+      break;
   }
 
   setTimeout(async () => {
@@ -2114,3 +2125,4 @@ export const fetchAndStoreMarketplaceSchema = async (
   rebuildHierarchy();
   await updateUserWithPlatformInfo();
 };
+