From 18a9cf55f0a0b66a770a03d1e64c2a143570b748 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Fri, 24 Oct 2025 18:03:51 +0530
Subject: [PATCH 1/2] UI: Enable listall (for Affinity Groups, SSH Keypairs,
 User Data) in deploy instance wizard for admin

---
 ui/src/views/compute/DeployVM.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 82a54ed83149..fa5170249cef 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -879,6 +879,7 @@
 import { ref, reactive, toRaw, nextTick, h } from 'vue'
 import { Button } from 'ant-design-vue'
 import { api } from '@/api'
+import { isAdmin } from '@/role'
 import _ from 'lodash'
 import { mixin, mixinDevice } from '@/utils/mixin.js'
 import store from '@/store'
@@ -1170,6 +1171,7 @@ export default {
       return _.map(this.affinityGroups, 'id')
     },
     params () {
+      const listAll = isAdmin()
       return {
         serviceOfferings: {
           list: 'listServiceOfferings',
@@ -1217,7 +1219,7 @@ export default {
             domainid: this.owner.domainid,
             projectid: this.owner.projectid,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         sshKeyPairs: {
@@ -1226,7 +1228,7 @@ export default {
             page: 1,
             pageSize: 10,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         userDatas: {
@@ -1235,7 +1237,7 @@ export default {
             page: 1,
             pageSize: 10,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         networks: {

From 999adbd0c30564ea5254be255c972f6280a30a7e Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Tue, 28 Oct 2025 15:48:57 +0530
Subject: [PATCH 2/2] Fix listing of ssh keypairs, user data by domain/account

---
 ui/src/views/compute/DeployVM.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index fa5170249cef..97ef7bb5a968 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -1227,6 +1227,9 @@ export default {
           options: {
             page: 1,
             pageSize: 10,
+            account: this.owner.account,
+            domainid: this.owner.domainid,
+            projectid: this.owner.projectid,
             keyword: undefined,
             listall: listAll
           }
@@ -1236,6 +1239,9 @@ export default {
           options: {
             page: 1,
             pageSize: 10,
+            account: this.owner.account,
+            domainid: this.owner.domainid,
+            projectid: this.owner.projectid,
             keyword: undefined,
             listall: listAll
           }