From f1d40aefefa27e5f0f25c19cab7b9ac1fbf33418 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <harshmahajan2345@gmail.com>
Date: Fri, 21 Nov 2025 05:38:50 +0000
Subject: [PATCH] fix: handle missing deploymentId gracefully

---
 .../functions/function-[function]/+page.ts    | 22 ++++++++++++++-----
 .../sites/site-[site]/+page.ts                | 17 +++++++++-----
 .../sites/site-[site]/deployments/+page.ts    | 19 +++++++++++-----
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
index d5b08e19f..bc8d205ea 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
@@ -15,17 +15,27 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
 
     const parsedQueries = queryParamToMap(query || '[]');
     queries.set(parsedQueries);
+    let activeDeployment = null;
+    if (data.function.deploymentId) {
+        try {
+            activeDeployment = await sdk
+                .forProject(params.region, params.project)
+                .functions.getDeployment({
+                    functionId: params.function,
+                    deploymentId: data.function.deploymentId
+                });
+        } catch (error) {
+            // active deployment with the requested ID could not be found
+            activeDeployment = null;
+        }
+    }
+
     return {
         offset,
         limit,
         query,
         installations: data.installations,
-        activeDeployment: data.function.deploymentId
-            ? await sdk.forProject(params.region, params.project).functions.getDeployment({
-                  functionId: params.function,
-                  deploymentId: data.function.deploymentId
-              })
-            : null,
+        activeDeployment,
         deploymentList: await sdk
             .forProject(params.region, params.project)
             .functions.listDeployments({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
index e442376ce..6c1110a72 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
@@ -46,11 +46,18 @@ export const load = async ({ params, depends, parent }) => {
         })
     ]);
 
-    const deployment = deploymentList?.total
-        ? await sdk
-              .forProject(params.region, params.project)
-              .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId })
-        : null;
+    let deployment = null;
+    if (deploymentList?.total && site.deploymentId) {
+        try {
+            deployment = await sdk
+                .forProject(params.region, params.project)
+                .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId });
+        } catch (error) {
+            // active deployment with the requested ID could not be found
+            deployment = null;
+        }
+    }
+
     return {
         site,
         deploymentList,
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
index 059aefc4d..7c0863210 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
@@ -37,17 +37,24 @@ export const load = async ({ params, depends, url, route, parent }) => {
         sdk.forProject(params.region, params.project).vcs.listInstallations()
     ]);
 
+    let activeDeployment = null;
+    if (site.deploymentId && deploymentList?.total) {
+        try {
+            activeDeployment = await sdk
+                .forProject(params.region, params.project)
+                .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId });
+        } catch (error) {
+            // active deployment with the requested ID could not be found
+            activeDeployment = null;
+        }
+    }
+
     return {
         offset,
         limit,
         query,
         deploymentList,
-        activeDeployment:
-            site.deploymentId && deploymentList?.total
-                ? await sdk
-                      .forProject(params.region, params.project)
-                      .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId })
-                : null,
+        activeDeployment,
         installations
     };
 };