From 47eec30100c0d311b3479ddd68347647ba6175ff Mon Sep 17 00:00:00 2001
From: Carl Tsai <moonape1226@gmail.com>
Date: Fri, 2 Jan 2026 18:00:20 +0800
Subject: [PATCH] feat: allow selecting docker registry accounts from all
 registries

- Modified AccountSelector to show accounts from all docker registries (not filtered by single provider)
- Added domain labels to docker accounts (e.g., 'username (ghcr.io)')
- Maintains backward compatibility with git provider behavior
- Enables users to select accounts from ghcr.io, docker.io, etc. in Deployment config
---
 frontend/src/components/config/util.tsx       | 56 +++++++++++++------
 .../resources/deployment/config/index.tsx     |  7 ++-
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/config/util.tsx b/frontend/src/components/config/util.tsx
index f2246d1db..d327c9553 100644
--- a/frontend/src/components/config/util.tsx
+++ b/frontend/src/components/config/util.tsx
@@ -837,26 +837,47 @@ export const AccountSelector = ({
       : ["ListDockerRegistryAccounts", "ListDockerRegistriesFromConfig"];
   const config_params =
     type === "None" ? {} : { target: id ? { type, id } : undefined };
-  const db_accounts = useRead(db_request, {}).data?.filter(
-    (account) => account.domain === provider
-  );
-  const config_providers = useRead(config_request, config_params).data?.filter(
-    (_provider) => _provider.domain === provider
-  );
-
-  const _accounts = new Set<string>();
+  
+  // For docker registry, get ALL accounts (cross-domain), not just for this provider
+  const db_accounts = account_type === "docker" 
+    ? useRead(db_request, {}).data 
+    : useRead(db_request, {}).data?.filter((account) => account.domain === provider);
+  
+  const config_providers = useRead(config_request, config_params).data;
+  
+  const _accounts = new Map<string, { username: string; domain?: string }>();
+  
   for (const account of db_accounts ?? []) {
     if (account.username) {
-      _accounts.add(account.username);
+      _accounts.set(account.username, { username: account.username, domain: account.domain });
     }
   }
-  for (const provider of config_providers ?? []) {
-    for (const account of provider.accounts ?? []) {
-      _accounts.add(account.username);
+  
+  if (account_type === "docker") {
+    // Show accounts from all registries
+    for (const provider of config_providers ?? []) {
+      for (const account of provider.accounts ?? []) {
+        if (account.username) {
+          _accounts.set(account.username, { username: account.username, domain: provider.domain });
+        }
+      }
+    }
+  } else {
+    // For git, filter by provider as before
+    for (const provider_obj of config_providers ?? []) {
+      if (provider_obj.domain === provider) {
+        for (const account of provider_obj.accounts ?? []) {
+          if (account.username) {
+            _accounts.set(account.username, { username: account.username, domain: provider_obj.domain });
+          }
+        }
+      }
     }
   }
-  const accounts = [..._accounts];
-  accounts.sort();
+  
+  const accounts = [..._accounts.values()];
+  accounts.sort((a, b) => a.username.localeCompare(b.username));
+  
   return (
     <Select
       value={selected}
@@ -879,15 +900,16 @@ export const AccountSelector = ({
       <SelectContent>
         <SelectItem value={"Empty"}>None</SelectItem>
         {accounts
-          ?.filter((account) => account)
+          ?.filter((account) => account.username)
           .map((account) => (
-            <SelectItem key={account} value={account}>
-              {account}
+            <SelectItem key={`${account.domain}:${account.username}`} value={account.username}>
+              {account_type === "docker" && account.domain ? `${account.username} (${account.domain})` : account.username}
             </SelectItem>
           ))}
       </SelectContent>
     </Select>
   );
+
 };
 
 export const AccountSelectorConfig = (params: {
diff --git a/frontend/src/components/resources/deployment/config/index.tsx b/frontend/src/components/resources/deployment/config/index.tsx
index 801941d2a..f9d33895f 100644
--- a/frontend/src/components/resources/deployment/config/index.tsx
+++ b/frontend/src/components/resources/deployment/config/index.tsx
@@ -105,19 +105,20 @@ export const DeploymentConfig = ({
               ),
               image_registry_account: (account, set) => {
                 const image = update.image ?? config.image;
-                const provider =
+                const suggested_provider =
                   image?.type === "Image" && image.params.image
                     ? extract_registry_domain(image.params.image)
                     : image?.type === "Build" && image.params.build_id
                       ? builds?.find((b) => b.id === image.params.build_id)
                           ?.info.image_registry_domain
                       : undefined;
+
                 return (
                   <AccountSelectorConfig
                     id={update.server_id ?? config.server_id ?? undefined}
-                    type="Server"
+                    type={update.server_id ?? config.server_id ? "Server" : "None"}
                     account_type="docker"
-                    provider={provider ?? "docker.io"}
+                    provider={suggested_provider ?? "docker.io"}
                     selected={account}
                     onSelect={(image_registry_account) =>
                       set({ image_registry_account })