Skip to content

UI: Fix deploy VM wizard vApp properties #8072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shwstppr merged 1 commit into from
Oct 25, 2023
Merged

UI: Fix deploy VM wizard vApp properties #8072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 65 additions & 60 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,13 +470,13 @@

<span v-if="property.type && property.type==='boolean'">
<a-switch
v-model:checked="form['properties.' + escapePropertyKey(property.key)]"
v-model:checked="form.properties[escapePropertyKey(property.key)]"
:placeholder="property.description"
/>
</span>
<span v-else-if="property.type && (property.type==='int' || property.type==='real')">
<a-input-number
v-model:value="form['properties.'+ escapePropertyKey(property.key)]"
v-model:value="form.properties[escapePropertyKey(property.key)]"
:placeholder="property.description"
:min="getPropertyQualifiers(property.qualifiers, 'number-select').min"
:max="getPropertyQualifiers(property.qualifiers, 'number-select').max" />
Expand All @@ -485,7 +485,7 @@
<a-select
showSearch
optionFilterProp="label"
v-model:value="form['properties.' + escapePropertyKey(property.key)]"
v-model:value="form.properties[escapePropertyKey(property.key)]"
:placeholder="property.description"
:filterOption="(input, option) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
Expand All @@ -498,12 +498,12 @@
</span>
<span v-else-if="property.type && property.type==='string' && property.password">
<a-input-password
v-model:value="form['properties.' + escapePropertyKey(property.key)]"
v-model:value="form.properties[escapePropertyKey(property.key)]"
:placeholder="property.description" />
</span>
<span v-else>
<a-input
v-model:value="form['properties.' + escapePropertyKey(property.key)]"
v-model:value="form.properties[escapePropertyKey(property.key)]"
:placeholder="property.description" />
</span>
</a-form-item>
Expand Down Expand Up @@ -1509,61 +1509,7 @@ export default {
})
}

if (this.vm.templateid && this.templateProperties && Object.keys(this.templateProperties).length > 0) {
this.templateProperties.forEach((props, category) => {
props.forEach((property, propertyIndex) => {
if (property.type && property.type === 'boolean') {
this.form['properties.' + this.escapePropertyKey(property.key)] = property.value === 'TRUE'
} else if (property.type && (property.type === 'int' || property.type === 'real')) {
this.form['properties.' + this.escapePropertyKey(property.key)] = property.value
} else if (property.type && property.type === 'string' && property.qualifiers && property.qualifiers.startsWith('ValueMap')) {
this.form['properties.' + this.escapePropertyKey(property.key)] = property.value && property.value.length > 0
? property.value
: this.getPropertyQualifiers(property.qualifiers, 'select')[0]
} else if (property.type && property.type === 'string' && property.password) {
this.form['properties.' + this.escapePropertyKey(property.key)] = property.value
this.rules['properties.' + this.escapePropertyKey(property.key)] = [{
validator: async (rule, value) => {
if (!property.qualifiers) {
return Promise.resolve()
}
var minlength = this.getPropertyQualifiers(property.qualifiers, 'number-select').min
var maxlength = this.getPropertyQualifiers(property.qualifiers, 'number-select').max
var errorMessage = ''
var isPasswordInvalidLength = function () {
return false
}
if (minlength) {
errorMessage = this.$t('message.validate.minlength').replace('{0}', minlength)
isPasswordInvalidLength = function () {
return !value || value.length < minlength
}
}
if (maxlength !== Number.MAX_SAFE_INTEGER) {
if (minlength) {
errorMessage = this.$t('message.validate.range.length').replace('{0}', minlength).replace('{1}', maxlength)
isPasswordInvalidLength = function () {
return !value || (maxlength < value.length || value.length < minlength)
}
} else {
errorMessage = this.$t('message.validate.maxlength').replace('{0}', maxlength)
isPasswordInvalidLength = function () {
return !value || value.length > maxlength
}
}
}
if (isPasswordInvalidLength()) {
return Promise.reject(errorMessage)
}
return Promise.resolve()
}
}]
} else {
this.form['properties.' + this.escapePropertyKey(property.key)] = property.value
}
})
})
}
this.updateFormProperties()

if (this.vm.templateid && this.templateLicenses && this.templateLicenses.length > 0) {
this.rules.licensesaccepted = [{
Expand Down Expand Up @@ -2582,6 +2528,64 @@ export default {
this.dataPreFill.memory = params.memory
this.handleSearchFilter('serviceOfferings', params)
},
updateFormProperties () {
if (this.vm.templateid && this.templateProperties && Object.keys(this.templateProperties).length > 0) {
this.form.properties = {}
Object.keys(this.templateProperties).forEach((category, categoryIndex) => {
this.templateProperties[category].forEach((property, _) => {
if (property.type && property.type === 'boolean') {
this.form.properties[this.escapePropertyKey(property.key)] = property.value === 'TRUE'
} else if (property.type && (property.type === 'int' || property.type === 'real')) {
this.form.properties[this.escapePropertyKey(property.key)] = property.value
} else if (property.type && property.type === 'string' && property.qualifiers && property.qualifiers.startsWith('ValueMap')) {
this.form.properties[this.escapePropertyKey(property.key)] = property.value && property.value.length > 0
? property.value
: this.getPropertyQualifiers(property.qualifiers, 'select')[0]
} else if (property.type && property.type === 'string' && property.password) {
this.form.properties[this.escapePropertyKey(property.key)] = property.value
this.rules['properties.' + this.escapePropertyKey(property.key)] = [{
validator: async (rule, value) => {
if (!property.qualifiers) {
return Promise.resolve()
}
var minlength = this.getPropertyQualifiers(property.qualifiers, 'number-select').min
var maxlength = this.getPropertyQualifiers(property.qualifiers, 'number-select').max
var errorMessage = ''
var isPasswordInvalidLength = function () {
return false
}
if (minlength) {
errorMessage = this.$t('message.validate.minlength').replace('{0}', minlength)
isPasswordInvalidLength = function () {
return !value || value.length < minlength
}
}
if (maxlength !== Number.MAX_SAFE_INTEGER) {
if (minlength) {
errorMessage = this.$t('message.validate.range.length').replace('{0}', minlength).replace('{1}', maxlength)
isPasswordInvalidLength = function () {
return !value || (maxlength < value.length || value.length < minlength)
}
} else {
errorMessage = this.$t('message.validate.maxlength').replace('{0}', maxlength)
isPasswordInvalidLength = function () {
return !value || value.length > maxlength
}
}
}
if (isPasswordInvalidLength()) {
return Promise.reject(errorMessage)
}
return Promise.resolve()
}
}]
} else {
this.form.properties[this.escapePropertyKey(property.key)] = property.value
}
})
})
}
},
updateTemplateParameters () {
if (this.template) {
this.templateNics = this.fetchTemplateNics(this.template)
Expand All @@ -2599,6 +2603,7 @@ export default {
this.updateComputeOffering(null) // reset as existing selection may be incompatible
}
}, 500)
this.updateFormProperties()
}
},
onSelectTemplateConfigurationId (value) {
Expand Down