From 0bd98b9662133f83a5eab84ea2aeac2af36f7bc7 Mon Sep 17 00:00:00 2001
From: gitlawr <lawrleegle@gmail.com>
Date: Fri, 5 Jun 2026 12:03:32 +0800
Subject: [PATCH] fix(llmodels): scope catalog deploy cluster seed by
 create-scope org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

initClusterId picked the platform default cluster without considering
the form's organization_id, so opening the catalog deploy form in the
admin all-scope view could seed a cluster that the (org-filtered)
dropdown then hides — submit failed with "Cluster not found".

Mirror the same scope-aware selection deploy-modal already does:
filter clusterList by owner_principal_id when organization_id is set
before picking default/ready/first.

Return number | undefined honestly (the picked org may own no
clusters, or clusterList may still be loading) and guard the
open-handler caller so undefined doesn't flow into fetchSpecData /
getGPUOptionList — the user resolves the empty state by picking an
org that owns clusters.
---
 .../deployment/deploy-builtin-modal.tsx       | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx b/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx
index 3a17dd81..a564a9b6 100644
--- a/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx
+++ b/src/pages/llmodels/components/deployment/deploy-builtin-modal.tsx
@@ -193,16 +193,24 @@ const AddModal: React.FC<AddModalProps> = (props) => {
     handleCheckFormData();
   };
 
-  const initClusterId = (): number => {
-    const defaultCluster = clusterList?.find((item) => item.is_default);
+  const initClusterId = (): number | undefined => {
+    // When a platform admin has targeted an org via the create-scope picker,
+    // seed the cluster from that org's own clusters so the initial selection
+    // matches the (org-filtered) dropdown the form renders.
+    const scopeOrgId = form.current?.getFieldValue?.('organization_id');
+    const scopedList =
+      scopeOrgId == null
+        ? clusterList
+        : clusterList?.filter((item) => item.owner_principal_id === scopeOrgId);
+
+    const defaultCluster = scopedList?.find((item) => item.is_default);
     if (defaultCluster) {
       return defaultCluster.value;
     }
-    const cluster_id =
-      clusterList?.find((item) => item.state === ClusterStatusValueMap.Ready)
-        ?.value || clusterList?.[0]?.value;
-
-    return cluster_id as number;
+    return (
+      scopedList?.find((item) => item.state === ClusterStatusValueMap.Ready)
+        ?.value || scopedList?.[0]?.value
+    );
   };
 
   const fetchSpecData = async (clusterId: number) => {
@@ -336,6 +344,12 @@ const AddModal: React.FC<AddModalProps> = (props) => {
     if (open) {
       setTimeout(() => {
         const clusterId = initClusterId();
+        // No cluster available for the current scope (zero clusters, or none
+        // owned by the picked org). Leave the form's cluster field empty and
+        // skip downstream fetches — the user resolves it by picking an org
+        // that owns clusters, which triggers the scope-change re-pick in the
+        // basic form.
+        if (!clusterId) return;
         fetchSpecData(clusterId);
         form.current?.getGPUOptionList?.({
           clusterId: clusterId