From f64dc0c6e206fe4b77a49ec0b3b4b4d9a1a6dabb Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:38:40 +0000
Subject: [PATCH] fix: update base icon in cmd modal

---
 packages/nc-gui/components/cmd-k/index.vue       | 16 ++++++++++++++--
 packages/nc-gui/components/cmd-l/index.vue       |  9 ++++++++-
 .../components/base-icon-color-picker/index.vue  | 16 +++++++++++++++-
 packages/nc-gui/store/views.ts                   |  7 +++++--
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index 0a2f1bb6cc..aa5f82a0a0 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -16,6 +16,8 @@ interface CmdAction {
   keywords?: string[]
   section?: string
   iconColor?: string
+  managed_app_master?: boolean
+  managed_app_id?: string
 }
 
 const props = defineProps<{
@@ -90,6 +92,8 @@ const nestedScope = computed(() => {
       section: parentEl?.section,
       iconType: parentEl?.iconType,
       iconColor: parent.startsWith('ws-') ? parentEl?.iconColor : null,
+      managed_app_master: !!parentEl?.managed_app_master,
+      managed_app_id: parentEl?.managed_app_id || '',
     })
     parent = parentEl?.parent || 'root'
   }
@@ -431,9 +435,13 @@ defineExpose({
 
                 <template v-else-if="el.section === 'Bases' || el.icon === 'project'">
                   <GeneralBaseIconColorPicker
-                    :key="el.iconColor"
+                    :key="`${el.iconColor}-${el.managed_app_id}-${el.managed_app_master}`"
                     :model-value="el.iconColor"
                     type="database"
+                    :managed-app="{
+                      managed_app_master: el.managed_app_master,
+                      managed_app_id: el.managed_app_id,
+                    }"
                     readonly
                     class="cmdk-action-icon !w-5"
                   >
@@ -544,10 +552,14 @@ defineExpose({
                           />
                           <template v-else-if="item.data.section === 'Bases' || item.data.icon === 'project'">
                             <GeneralBaseIconColorPicker
-                              :key="item.data.iconColor"
+                              :key="`${item.data.iconColor}-${item.data.managed_app_id}-${item.data.managed_app_master}`"
                               :model-value="item.data.iconColor"
                               type="database"
                               readonly
+                              :managed-app="{
+                                managed_app_master: item.data.managed_app_master,
+                                managed_app_id: item.data.managed_app_id,
+                              }"
                             >
                             </GeneralBaseIconColorPicker>
                           </template>
diff --git a/packages/nc-gui/components/cmd-l/index.vue b/packages/nc-gui/components/cmd-l/index.vue
index ca5d037945..27eb13b555 100644
--- a/packages/nc-gui/components/cmd-l/index.vue
+++ b/packages/nc-gui/components/cmd-l/index.vue
@@ -219,7 +219,14 @@ onMounted(() => {
                 </div>
                 <div class="flex w-1/2 justify-end text-nc-content-gray-subtle2">
                   <div class="flex gap-2 px-2 py-1 rounded-md items-center">
-                    <component :is="iconMap.project" class="w-4 h-4" />
+                    <GeneralProjectIcon
+                      :managed-app="{
+                        managed_app_master: cmdOption?.managed_app_master,
+                        managed_app_id: cmdOption?.managed_app_id,
+                      }"
+                      :color="cmdOption?.iconColor"
+                      class="!h-4 !w-4"
+                    />
                     <a-tooltip overlay-class-name="!px-2 !py-1 !rounded-lg" :tooltip-style="{ zIndex: 1100 }">
                       <template #title>
                         {{ cmdOption.baseName }}
diff --git a/packages/nc-gui/pages/playground/components/base-icon-color-picker/index.vue b/packages/nc-gui/pages/playground/components/base-icon-color-picker/index.vue
index 049cf77769..caa93286ce 100644
--- a/packages/nc-gui/pages/playground/components/base-icon-color-picker/index.vue
+++ b/packages/nc-gui/pages/playground/components/base-icon-color-picker/index.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup>
 const color1 = ref('')
+
+const managedApp = ref({
+  managed_app_master: false,
+  managed_app_id: 'prr1pr4xx9vqn5c',
+})
 </script>
 
 <template>
@@ -8,8 +13,17 @@ const color1 = ref('')
       <h4>Simple</h4>
 
       Selected color: {{ color1 }}
+
+      <div class="flex items-center gap-2">
+        <NcSwitch v-model:checked="managedApp.managed_app_master"> Toggle Managed App state </NcSwitch>
+      </div>
       <div class="inline-block min-h-[24px] min-w-[24px] h-[24px] w-[24px] rounded-md" :class="[`bg-${color1}`]"></div>
-      <GeneralBaseIconColorPicker :model-value="color1" type="database" @update:model-value="color1 = $event">
+      <GeneralBaseIconColorPicker
+        :model-value="color1"
+        type="database"
+        @update:model-value="color1 = $event"
+        :managed-app="managedApp"
+      >
       </GeneralBaseIconColorPicker>
     </a-card>
   </div>
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index cbfe7f6dfc..e4bffe56a7 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -1264,7 +1264,7 @@ export const useViewsStore = defineStore('viewsStore', () => {
 
     const tableName = tablesStore.baseTables.get(view.base_id)?.find((t) => t.id === view.fk_model_id)?.title
 
-    const baseName = bases.basesList.find((p) => p.id === view.base_id)?.title
+    const base = bases.basesList.find((p) => p.id === view.base_id)
     allRecentViews.value = [
       {
         viewId: view.id,
@@ -1274,7 +1274,10 @@ export const useViewsStore = defineStore('viewsStore', () => {
         viewType: view.type,
         workspaceId: activeWorkspaceId.value,
         tableName: tableName as string,
-        baseName: baseName as string,
+        baseName: base?.title as string,
+        managed_app_master: base?.managed_app_master,
+        managed_app_id: base?.managed_app_id,
+        iconColor: parseProp(base?.meta).iconColor,
       },
       ...allRecentViews.value.filter((f) => f.viewId !== view.id || f.tableID !== view.fk_model_id),
     ]