From cada52b29ad14a3773d6af0b0f2fc27261e2ba41 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Mon, 31 Aug 2020 13:27:44 +0530 Subject: [PATCH] images: Bug fixes (#634) * Removing sshKeyEnabled from template details * Hide cancel while deploying a vm * Disabling rather than showing cancel * Setting custom offerings to zero Fixes #604 Also : Hide cance button while deploying a vm Signed-off-by: Rohit Yadav --- ui/src/config/section/image.js | 4 ++-- ui/src/config/section/storage.js | 4 ++-- ui/src/locales/de_DE.json | 1 - ui/src/locales/en.json | 1 - ui/src/locales/hi.json | 1 - ui/src/views/compute/DeployVM.vue | 3 +-- ui/src/views/compute/wizard/ComputeSelection.vue | 6 +++--- ui/src/views/image/RegisterOrUploadTemplate.vue | 13 ++++--------- 8 files changed, 12 insertions(+), 21 deletions(-) diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js index ad3a11991d2..e36fafdea16 100644 --- a/ui/src/config/section/image.js +++ b/ui/src/config/section/image.js @@ -43,7 +43,7 @@ export default { } return fields }, - details: ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'format', 'ostypename', 'size', 'isready', 'passwordenabled', 'sshkeyenabled', 'directdownload', 'deployasis', 'isextractable', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'crosszones', 'type', 'account', 'domain', 'created', 'url'], + details: ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'format', 'ostypename', 'size', 'isready', 'passwordenabled', 'directdownload', 'deployasis', 'isextractable', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'crosszones', 'type', 'account', 'domain', 'created', 'url'], searchFilters: ['name', 'zoneid', 'tags'], related: [{ name: 'vm', @@ -92,7 +92,7 @@ export default { record.isready }, args: (record, store) => { - var fields = ['name', 'displaytext', 'passwordenabled', 'sshkeyenabled', 'ostypeid', 'isdynamicallyscalable'] + var fields = ['name', 'displaytext', 'passwordenabled', 'ostypeid', 'isdynamicallyscalable'] if (['Admin'].includes(store.userInfo.roletype)) { fields.push('isrouting') } diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js index 794906194d3..4a7550b058d 100644 --- a/ui/src/config/section/storage.js +++ b/ui/src/config/section/storage.js @@ -200,7 +200,7 @@ export default { ((record.type === 'ROOT' && record.vmstate === 'Stopped') || (record.type !== 'ROOT' && !record.virtualmachineid && !['Allocated', 'Uploaded'].includes(record.state))) }, - args: ['volumeid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled', 'sshkeyenabled'], + args: ['volumeid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled'], mapping: { volumeid: { value: (record) => { return record.id } @@ -271,7 +271,7 @@ export default { label: 'label.create.template', dataView: true, show: (record) => { return record.state === 'BackedUp' }, - args: ['snapshotid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled', 'sshkeyenabled'], + args: ['snapshotid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled'], mapping: { snapshotid: { value: (record) => { return record.id } diff --git a/ui/src/locales/de_DE.json b/ui/src/locales/de_DE.json index c941a3884e6..9637a911022 100644 --- a/ui/src/locales/de_DE.json +++ b/ui/src/locales/de_DE.json @@ -1919,7 +1919,6 @@ "label.srx.firewall": "Juniper SRX Firewall", "label.ssh.key.pair.details": "SSH-Schlüsselpaardetails", "label.ssh.key.pairs": "SSH-Schlüsselpaare", -"label.sshkeyenabled": "SSH aktiviert", "label.sshkeypair": "Neues SSH-Schlüsselpaar", "label.sshkeypairs": "SSH Schlüsselpaare", "label.sslcertificates": "SSL Zertifikate", diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 37f2d493299..791da76d842 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -1959,7 +1959,6 @@ "label.srx.firewall": "Juniper SRX Firewall", "label.ssh.key.pair.details": "SSH Key Pair Details", "label.ssh.key.pairs": "SSH Key Pairs", -"label.sshkeyenabled": "SSH Enabled", "label.sshkeypair": "New SSH Key Pair", "label.sshkeypairs": "SSH keypairs", "label.sslcertificates": "SSL Certificates", diff --git a/ui/src/locales/hi.json b/ui/src/locales/hi.json index b78b036ef30..525fdffe5cd 100644 --- a/ui/src/locales/hi.json +++ b/ui/src/locales/hi.json @@ -412,7 +412,6 @@ "label.sourcenattype": "समर्थित स्रोत NAT प्रकार", "label.specifyipranges": "IP पर्वतमाला निर्दिष्ट करें", "label.specifyvlan": "वीएलएएन निर्दिष्ट करें", -"label.sshkeyenabled": "SSH सक्षम", "label.sshkeypair": "न्यू SSH कुंजी जोड़ी", "label.sshkeypairs": "SSH keypairs", "label.sslcert प्रमाणपत्र": "SSL प्रमाणपत्र", diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index 3ef06da74e3..0a679dd0ec0 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -505,7 +505,7 @@
- + {{ this.$t('label.cancel') }} @@ -1411,7 +1411,6 @@ export default { this.$router.back() }).catch(error => { this.$notifyError(error) - }).finally(() => { this.loading.deploy = false }) }) diff --git a/ui/src/views/compute/wizard/ComputeSelection.vue b/ui/src/views/compute/wizard/ComputeSelection.vue index 76aa5e82dbd..46a9f73dd9c 100644 --- a/ui/src/views/compute/wizard/ComputeSelection.vue +++ b/ui/src/views/compute/wizard/ComputeSelection.vue @@ -128,9 +128,9 @@ export default { }, data () { return { - cpuNumberInputValue: 1, - cpuSpeedInputValue: 1, - memoryInputValue: 1, + cpuNumberInputValue: 0, + cpuSpeedInputValue: 0, + memoryInputValue: 0, errors: { cpu: { status: '', diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue index d0b46892bc7..64e64803bdd 100644 --- a/ui/src/views/image/RegisterOrUploadTemplate.vue +++ b/ui/src/views/image/RegisterOrUploadTemplate.vue @@ -338,30 +338,25 @@ {{ $t('label.isdynamicallyscalable') }} - - - {{ $t('label.sshkeyenabled') }} - - - - {{ $t('label.ispublic') }} + + {{ $t('label.isfeatured') }} - - {{ $t('label.requireshvm') }} + + {{ $t('label.isrouting') }}