etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show security group selection in Basic zone VM deployment and fix SG listing for cross-domain deployments (#12775)

This commit is contained in:
Daman Arora 2026-03-12 02:36:20 -04:00 committed by GitHub
parent 7aa0558c5b
commit 71daf84c9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/views/compute/DeployVM.vue
View File

@ -459,6 +459,9 @@
:value="securitygroupids"
:loading="loading.networks"
:preFillContent="dataPreFill"
:domainId="owner.domainid"
:account="owner.account"
:projectId="owner.projectid"
@select-security-group-item="($event) => updateSecurityGroups($event)"></security-group-selection>
</template>
</a-step>
@ -1501,6 +1504,9 @@ export default {
return tabList
},
showSecurityGroupSection () {
if (this.zone && this.zone.networktype === 'Basic') {
return true
}
if (this.networks.length < 1) {
return false
}

26
ui/src/views/compute/wizard/SecurityGroupSelection.vue
View File

@ -75,6 +75,18 @@ export default {
preFillContent: {
type: Object,
default: () => {}
},
domainId: {
type: String,
default: () => ''
},
account: {
type: String,
default: () => ''
},
projectId: {
type: String,
default: () => ''
}
},
data () {
@ -102,6 +114,9 @@ export default {
}
},
computed: {
ownerParams () {
return `${this.domainId}-${this.account}-${this.projectId}`
},
rowSelection () {
return {
type: 'checkbox',
@ -121,6 +136,11 @@ export default {
this.selectedRowKeys = newValue
}
},
ownerParams () {
this.selectedRowKeys = []
this.$emit('select-security-group-item', null)
this.fetchData()
},
loading () {
if (!this.loading) {
if (this.preFillContent.securitygroupids) {
@ -140,9 +160,9 @@ export default {
methods: {
fetchData () {
const params = {
projectid: this.$store.getters.project ? this.$store.getters.project.id : null,
domainid: this.$store.getters.project && this.$store.getters.project.id ? null : this.$store.getters.userInfo.domainid,
account: this.$store.getters.project && this.$store.getters.project.id ? null : this.$store.getters.userInfo.account,
projectid: this.projectId || (this.$store.getters.project ? this.$store.getters.project.id : null),
domainid: this.projectId || (this.$store.getters.project && this.$store.getters.project.id) ? null : (this.domainId || this.$store.getters.userInfo.domainid),
account: this.projectId || (this.$store.getters.project && this.$store.getters.project.id) ? null : (this.account || this.$store.getters.userInfo.account),
page: this.page,
pageSize: this.pageSize
}