refactor ⚙: Refactored the procedure applying the same logic of the p…

…revious one
omnia-network · Jun 19, 2024 · 724f660 · 724f660
1 parent 51fe8a4
commit 724f660
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 29 deletions.
diff --git a/frontend/app/dashboard/new-deployment/page.tsx b/frontend/app/dashboard/new-deployment/page.tsx
@@ -19,7 +19,7 @@ import {displayE8sAsIcp, icpToE8s} from "@/helpers/ui";
 import {Spinner} from "@/components/spinner";
 import {NewDeploymentForm} from "@/components/new-deployment-form";
 import {transferE8sToBackend} from "@/services/backend";
-import {confirmDeployment} from "@/services/deployment";
+import {confirmDeployment, updateDeploymentState} from "@/services/deployment";
 
 const FETCH_DEPLOYMENT_PRICE_INTERVAL_MS = 30_000; // 30 seconds
 
@@ -156,9 +156,6 @@ export default function NewDeployment() {
 
       try {
         if ("LeaseCreated" in deploymentUpdate.update) {
-          // closeWs();
-          // return;
-
           const deploymentCreatedState = deploymentSteps.find((el) =>
             el.hasOwnProperty("DeploymentCreated")
           )!;
@@ -183,12 +180,7 @@ export default function NewDeployment() {
 
           setDeploymentSteps((prev) => [...prev, stepFailed]);
 
-          extractOk(
-            await backendActor!.update_deployment_state(
-              deploymentUpdate.id,
-              stepFailed
-            )
-          );
+          await updateDeploymentState(backendActor!, deploymentUpdate.id, stepFailed);
         } catch (e) {
           console.error("Failed to update deployment:", e);
         }
@@ -207,12 +199,8 @@ export default function NewDeployment() {
             Active: null,
           };
           setDeploymentSteps((prev) => [...prev, stepActive]);
-          extractOk(
-            await backendActor!.update_deployment_state(
-              deploymentUpdate.id,
-              stepActive
-            )
-          );
+
+          await updateDeploymentState(backendActor!, deploymentUpdate.id, stepActive);
 
           await fetchDeployments(backendActor!);
 

diff --git a/frontend/app/dashboard/page.tsx b/frontend/app/dashboard/page.tsx
@@ -31,12 +31,11 @@ import {
   isDeploymentFailed,
 } from "@/helpers/deployment";
 import {displayIcp} from "@/helpers/ui";
-import {confirmDeployment, queryLeaseStatus} from "@/services/deployment";
+import {confirmDeployment, queryLeaseStatus, updateDeploymentState} from "@/services/deployment";
 import {DeploymentTier} from "@/types/deployment";
 import {ChevronsUpDown} from "lucide-react";
 import {useRouter} from "next/navigation";
 import {useCallback, useEffect, useState} from "react";
-import {extractOk} from "@/helpers/result";
 
 export default function Dashboard() {
   const router = useRouter();
@@ -128,6 +127,8 @@ export default function Dashboard() {
       const lastState = deployment.deployment.state_history[deployment.deployment.state_history.length - 1][1];
       const deploymentCreatedState = deployment.deployment.state_history.find(([_, state]) => "DeploymentCreated" in state)![1];
       if ("LeaseCreated" in lastState) {
+        let leaseCreated = false;
+
         try {
           const cert = await loadOrCreateCertificate(backendActor!);
 
@@ -137,20 +138,35 @@ export default function Dashboard() {
             cert!
           );
 
-          const stepActive = {
-            Active: null,
-          };
+          leaseCreated = true;
+        } catch (e) {
+          console.error("Failed to update deployment:", e);
 
-          extractOk(
-            await backendActor!.update_deployment_state(
-              deployment.id,
-              stepActive
-            )
-          );
+          try {
+            const stepFailed = {
+              FailedOnClient: {
+                reason: JSON.stringify(e),
+              },
+            };
+            await updateDeploymentState(backendActor!, deployment.id, stepFailed);
+          } catch (e) {
+            console.error("Failed to update deployment:", e);
+          }
+        }
 
-          await fetchDeployments(backendActor!);
+        try {
+          if (leaseCreated) {
+
+            const stepActive = {
+              Active: null,
+            };
+
+            await updateDeploymentState(backendActor!, deployment.id, stepActive);
+
+            await fetchDeployments(backendActor!);
+          }
         } catch (e) {
-          console.error("Failed to update deployment:", e);
+          console.error("Failed to complete deployment:", e);
         }
       }
     }

diff --git a/frontend/services/deployment.ts b/frontend/services/deployment.ts
@@ -2,6 +2,8 @@ import {X509CertificateData} from "@/lib/certificate";
 import {wait} from "@/helpers/timer";
 import {DeploymentState, MTlsCertificateData} from "@/declarations/backend.did";
 import {extractDeploymentCreated} from "@/helpers/deployment";
+import {BackendActor} from "@/services/backend";
+import {extractOk} from "@/helpers/result";
 
 const PROVIDER_PROXY_URL = "https://akash-provider-proxy.omnia-network.com/";
 
@@ -103,3 +105,13 @@ export const confirmDeployment = async (deploymentState: DeploymentState, deploy
     throw e;
   }
 }
+
+export const updateDeploymentState = async (backendActor: BackendActor, deploymentId: string, step: DeploymentState) => {
+  try {
+    extractOk(await backendActor.update_deployment_state(deploymentId, step));
+  } catch (e) {
+    console.error("Failed to update deployment state", e);
+    throw e;
+  }
+
+}