From 885e749333400f609869b788a1369bf7e4c5ea25 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Wed, 8 Jun 2022 23:18:22 +0700
Subject: [PATCH 1/2] fixes the added storage tags issues on adding primary
 storage (#6438)

---
 ui/src/views/infra/AddPrimaryStorage.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue
index 79f81075be0..3c2e34e1130 100644
--- a/ui/src/views/infra/AddPrimaryStorage.vue
+++ b/ui/src/views/infra/AddPrimaryStorage.vue
@@ -320,11 +320,6 @@
           <a-select
             mode="tags"
             v-model:value="selectedTags"
-            showSearch
-            optionFilterProp="label"
-            :filterOption="(input, option) => {
-              return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            }"
             :placeholder="apiParams.tags.description">
             <a-select-option v-for="tag in storageTags" :key="tag.name">{{ tag.name }}</a-select-option>
           </a-select>

From 22c48363a193196487cedcf20d3a975b47ac3010 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Wed, 8 Jun 2022 23:18:59 +0700
Subject: [PATCH 2/2] hide project delete button while in this project view
 (#6439)

---
 ui/src/config/section/project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/config/section/project.js b/ui/src/config/section/project.js
index a8f5335df97..ee8f2359b9a 100644
--- a/ui/src/config/section/project.js
+++ b/ui/src/config/section/project.js
@@ -154,7 +154,7 @@ export default {
       docHelp: 'adminguide/projects.html#suspending-or-deleting-a-project',
       dataView: true,
       show: (record, store) => {
-        return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) || record.isCurrentUserProjectAdmin
+        return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) || record.isCurrentUserProjectAdmin) && record.id !== store.project.id
       },
       groupAction: true,
       popup: true,