From 19b7dda361a7b74455a9a62fd4756d66cdc5e7e6 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 28 Oct 2019 10:58:40 +0100 Subject: [PATCH 01/45] Remove unused lodash partial dependencies. Use full lodash instead. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 129237b31..fbcceaa2d 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,7 @@ "axios": "^0.19.0", "enquire.js": "^2.1.6", "js-cookie": "^2.2.1", - "lodash.get": "^4.4.2", - "lodash.pick": "^4.4.0", + "lodash": "^4.17.15", "md5": "^2.2.1", "moment": "^2.24.0", "node-emoji": "^1.10.0", From 332d250cbb257f11487e31073ed4398747a33646 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 28 Oct 2019 11:29:47 +0100 Subject: [PATCH 02/45] Remove requirement of os id for the os logo component. --- src/components/widgets/OsLogo.vue | 238 +++++++++++++++--------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/src/components/widgets/OsLogo.vue b/src/components/widgets/OsLogo.vue index a26609048..ef2755a37 100644 --- a/src/components/widgets/OsLogo.vue +++ b/src/components/widgets/OsLogo.vue @@ -1,119 +1,119 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - - - - - - +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 2dcb8eaa1c176b0f86b09965c46ec6ff71994756 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 28 Oct 2019 11:32:18 +0100 Subject: [PATCH 03/45] Fix line endings. --- src/components/widgets/OsLogo.vue | 238 +++++++++++++++--------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/src/components/widgets/OsLogo.vue b/src/components/widgets/OsLogo.vue index ef2755a37..bcc79c2b2 100644 --- a/src/components/widgets/OsLogo.vue +++ b/src/components/widgets/OsLogo.vue @@ -1,119 +1,119 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - - - - - - +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 322984da23681f8b55002c10e1015b4f291c3048 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 28 Oct 2019 15:45:31 +0100 Subject: [PATCH 04/45] Move style fix to main component. --- src/views/compute/DeployVM.vue | 9 +++++++++ src/views/compute/wizard/ComputeSelection.vue | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 45456f625..1f385b818 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -321,3 +321,12 @@ export default { margin: 2rem 0; } + + diff --git a/src/views/compute/wizard/ComputeSelection.vue b/src/views/compute/wizard/ComputeSelection.vue index 255c1f26d..0b19f2134 100644 --- a/src/views/compute/wizard/ComputeSelection.vue +++ b/src/views/compute/wizard/ComputeSelection.vue @@ -99,12 +99,3 @@ export default { margin: 2rem 0; } - - From 978a9534c846c44e63255b38f5e406c7d8de5182 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 28 Oct 2019 16:37:14 +0100 Subject: [PATCH 05/45] Add custom disk offering selection component. --- src/locales/en.json | 3 +- src/views/compute/DeployVM.vue | 28 +++--- .../compute/wizard/DiskOfferingSelection.vue | 99 +++++++++++++++++++ 3 files changed, 113 insertions(+), 17 deletions(-) create mode 100644 src/views/compute/wizard/DiskOfferingSelection.vue diff --git a/src/locales/en.json b/src/locales/en.json index b2477f5e9..cd8de662d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -943,5 +943,6 @@ "yourInstance": "Your instance", "newInstance": "New instance", "cpu": "CPU", -"ram": "RAM" +"ram": "RAM", +"minMaxIops": "Min IOPS / Max IOPS" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 1f385b818..d3d1262de 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -90,22 +90,11 @@ @select-compute-item="($event) => updateComputeOffering($event)" > - - - - {{ opt.name }} - - - +
@@ -140,10 +129,12 @@ import _ from 'lodash' import InfoCard from '@/components/view/InfoCard' import ComputeSelection from './wizard/ComputeSelection' import TemplateSelection from './wizard/TemplateSelection' +import DiskOfferingSelection from '@views/compute/wizard/DiskOfferingSelection' export default { name: 'Wizard', components: { + DiskOfferingSelection, InfoCard, ComputeSelection, TemplateSelection @@ -249,6 +240,11 @@ export default { computeofferingid: id }) }, + updateDiskOffering (id) { + this.form.setFieldsValue({ + diskofferingid: id + }) + }, getParam (paramName) { return this.params.find((param) => param.name === paramName) }, diff --git a/src/views/compute/wizard/DiskOfferingSelection.vue b/src/views/compute/wizard/DiskOfferingSelection.vue new file mode 100644 index 000000000..33860fd73 --- /dev/null +++ b/src/views/compute/wizard/DiskOfferingSelection.vue @@ -0,0 +1,99 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 8657d62bda237d672d6887dcf7b32b59a4793a0f Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Tue, 29 Oct 2019 16:29:24 +0100 Subject: [PATCH 06/45] Extract disk size selection as component. Add disk size selection for custom disk offering ids. --- src/views/compute/DeployVM.vue | 38 ++++++++----------- .../compute/wizard/DiskOfferingSelection.vue | 18 ++++++--- .../compute/wizard/DiskSizeSelection.vue | 38 +++++++++++++++++++ 3 files changed, 67 insertions(+), 27 deletions(-) create mode 100644 src/views/compute/wizard/DiskSizeSelection.vue diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index d3d1262de..16242f4fa 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -57,27 +57,9 @@ - - - - - - - - - - + @@ -96,6 +78,11 @@ @select-disk-offering-item="($event) => updateDiskOffering($event)" > + +
{{ this.$t('cancel') }} @@ -111,7 +98,10 @@ {{ instanceConfig.rootdisksize }} GB (Root) | - {{ diskOffering.disksize }} GB (Data) + + {{ diskOffering.disksize }} GB (Data) + {{ instanceConfig.size }} GB (Data) +
@@ -130,10 +120,12 @@ import InfoCard from '@/components/view/InfoCard' import ComputeSelection from './wizard/ComputeSelection' import TemplateSelection from './wizard/TemplateSelection' import DiskOfferingSelection from '@views/compute/wizard/DiskOfferingSelection' +import DiskSizeSelection from '@views/compute/wizard/DiskSizeSelection' export default { name: 'Wizard', components: { + DiskSizeSelection, DiskOfferingSelection, InfoCard, ComputeSelection, @@ -224,6 +216,7 @@ export default { } }) this.form.getFieldDecorator('computeofferingid', { initialValue: [], preserve: true }) + this.form.getFieldDecorator('diskofferingid', { initialValue: [], preserve: true }) }, created () { this.params = store.getters.apis[this.$route.name]['params'] @@ -303,6 +296,7 @@ export default { diff --git a/src/views/compute/wizard/DiskSizeSelection.vue b/src/views/compute/wizard/DiskSizeSelection.vue new file mode 100644 index 000000000..fef550ee7 --- /dev/null +++ b/src/views/compute/wizard/DiskSizeSelection.vue @@ -0,0 +1,38 @@ + + + + + From 631d3f7bb563c063b5320f9cb16842e52f645ded Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Tue, 29 Oct 2019 16:51:24 +0100 Subject: [PATCH 07/45] Hide the info card for mobile devices. Change translation. --- src/locales/en.json | 1 - src/views/compute/DeployVM.vue | 4 +++- src/views/compute/wizard/ComputeSelection.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index cd8de662d..d2db7c384 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -943,6 +943,5 @@ "yourInstance": "Your instance", "newInstance": "New instance", "cpu": "CPU", -"ram": "RAM", "minMaxIops": "Min IOPS / Max IOPS" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 16242f4fa..fc6d39ef9 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -91,7 +91,7 @@ - +
@@ -115,6 +115,7 @@ import Vue from 'vue' import { api } from '@/api' import store from '@/store' import _ from 'lodash' +import { mixin, mixinDevice } from '@/utils/mixin.js' import InfoCard from '@/components/view/InfoCard' import ComputeSelection from './wizard/ComputeSelection' @@ -136,6 +137,7 @@ export default { type: Boolean } }, + mixins: [mixin, mixinDevice], data () { return { vm: {}, diff --git a/src/views/compute/wizard/ComputeSelection.vue b/src/views/compute/wizard/ComputeSelection.vue index 0b19f2134..caeaf1841 100644 --- a/src/views/compute/wizard/ComputeSelection.vue +++ b/src/views/compute/wizard/ComputeSelection.vue @@ -25,7 +25,7 @@ size="middle" > {{ $t('cpu') }} - {{ $t('ram') }} + {{ $t('memory') }} From 327f3884483bd0765320ab2b5348320a9daf3f8f Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Tue, 29 Oct 2019 18:05:48 +0100 Subject: [PATCH 08/45] Simplify the disk size output in the info card. --- src/views/compute/DeployVM.vue | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index fc6d39ef9..01b076f14 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -93,16 +93,9 @@ -
+
- - {{ instanceConfig.rootdisksize }} GB (Root) - | - - {{ diskOffering.disksize }} GB (Data) - {{ instanceConfig.size }} GB (Data) - - + {{ diskSize }}
@@ -174,6 +167,20 @@ export default { }, zoneId () { return this.getParam('zoneid') + }, + diskSize () { + const rootDiskSize = _.get(this.instanceConfig, 'rootdisksize', 0) + const customDiskSize = _.get(this.instanceConfig, 'size', 0) + const diskOfferingDiskSize = _.get(this.diskOffering, 'disksize', 0) + const dataDiskSize = diskOfferingDiskSize > 0 ? diskOfferingDiskSize : customDiskSize + const size = [] + if (rootDiskSize > 0) { + size.push(`${rootDiskSize} GB (Root)`) + } + if (dataDiskSize > 0) { + size.push(`${dataDiskSize} GB (Data)`) + } + return size.join(' | ') } }, watch: { From da3b5b6c864ef2c0a6507848238dccf0a426021f Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Wed, 30 Oct 2019 12:17:15 +0100 Subject: [PATCH 09/45] Add custom component for iso selection. --- src/views/compute/DeployVM.vue | 24 ++++++- src/views/compute/wizard/IsoSelection.vue | 83 +++++++++++++++++++++++ 2 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 src/views/compute/wizard/IsoSelection.vue diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 01b076f14..4e429f50f 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -61,8 +61,11 @@ input-decorator="rootdisksize" > + - + @@ -115,10 +118,12 @@ import ComputeSelection from './wizard/ComputeSelection' import TemplateSelection from './wizard/TemplateSelection' import DiskOfferingSelection from '@views/compute/wizard/DiskOfferingSelection' import DiskSizeSelection from '@views/compute/wizard/DiskSizeSelection' +import IsoSelection from '@views/compute/wizard/IsoSelection' export default { name: 'Wizard', components: { + IsoSelection, DiskSizeSelection, DiskOfferingSelection, InfoCard, @@ -147,7 +152,8 @@ export default { template: {}, serviceOffering: {}, diskOffering: {}, - zone: {} + zone: {}, + isos: [] } }, computed: { @@ -226,12 +232,14 @@ export default { }) this.form.getFieldDecorator('computeofferingid', { initialValue: [], preserve: true }) this.form.getFieldDecorator('diskofferingid', { initialValue: [], preserve: true }) + this.form.getFieldDecorator('isoid', { initialValue: [], preserve: true }) }, created () { this.params = store.getters.apis[this.$route.name]['params'] this.filteredParams.forEach((param) => { this.fetchOptions(param) }) + this.fetchIsos() Vue.nextTick().then(() => { this.instanceConfig = this.form.getFieldsValue() // ToDo: maybe initialize with some other defaults }) @@ -297,6 +305,18 @@ export default { console.log(error.stack) param.loading = false }) + }, + fetchIsos () { + api('listIsos', { + // zoneid: '', // ToDo: filter by selected zone + isofilter: 'community', // ToDo: Repeat for all other filter + bootable: true + }).then((response) => { + this.isos = _.get(response, 'listisosresponse.iso', []) + }).catch((reason) => { + // ToDo: Handle errors + console.log(reason) + }) } } } diff --git a/src/views/compute/wizard/IsoSelection.vue b/src/views/compute/wizard/IsoSelection.vue new file mode 100644 index 000000000..6cc8d1123 --- /dev/null +++ b/src/views/compute/wizard/IsoSelection.vue @@ -0,0 +1,83 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 366fd32c5847ecc3591b4100f71d1148fc14c60d Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Wed, 30 Oct 2019 14:40:39 +0100 Subject: [PATCH 10/45] Lazy load isos on oping the collapse item. Respect zone selection on loading isos. Fetch isos again on zone id change. --- src/locales/en.json | 3 ++- src/views/compute/DeployVM.vue | 16 ++++++++++++++-- src/views/compute/wizard/IsoSelection.vue | 11 ++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index d2db7c384..6dcf7a366 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -943,5 +943,6 @@ "yourInstance": "Your instance", "newInstance": "New instance", "cpu": "CPU", -"minMaxIops": "Min IOPS / Max IOPS" +"minMaxIops": "Min IOPS / Max IOPS", +"community": "Community" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 4e429f50f..dcf9cc486 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -38,6 +38,7 @@ rules: [{ required: zoneId.required, message: 'Please select option' }] }]" :placeholder="this.$t('vm.zone.description')" + @change="onSelectZoneId" > { this.fetchOptions(param) }) - this.fetchIsos() Vue.nextTick().then(() => { this.instanceConfig = this.form.getFieldsValue() // ToDo: maybe initialize with some other defaults }) @@ -308,7 +309,7 @@ export default { }, fetchIsos () { api('listIsos', { - // zoneid: '', // ToDo: filter by selected zone + zoneid: _.get(this.zone, 'id'), isofilter: 'community', // ToDo: Repeat for all other filter bootable: true }).then((response) => { @@ -317,6 +318,17 @@ export default { // ToDo: Handle errors console.log(reason) }) + }, + onTemplatesIsosCollapseChange (key) { + if (key === 'isos' && this.isos.length === 0) { + this.fetchIsos() + } + }, + onSelectZoneId () { + if (this.isos.length === 0) { + return + } + this.fetchIsos() } } } diff --git a/src/views/compute/wizard/IsoSelection.vue b/src/views/compute/wizard/IsoSelection.vue index 6cc8d1123..a623a5ef2 100644 --- a/src/views/compute/wizard/IsoSelection.vue +++ b/src/views/compute/wizard/IsoSelection.vue @@ -33,7 +33,16 @@ {{ os.displaytext }} + > + {{ os.displaytext }}  + {{ $t('community') }} + {{ $t('isFeatured') }} From dd1cfa93d08e466a7b585826910a48882f848fd7 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 4 Nov 2019 14:48:22 +0100 Subject: [PATCH 11/45] Fetch more categories of isos. Add tag for self uploaded isos. --- src/locales/en.json | 3 ++- src/views/compute/DeployVM.vue | 24 +++++++++++++++++------ src/views/compute/wizard/IsoSelection.vue | 4 ++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 6dcf7a366..a35265d30 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -944,5 +944,6 @@ "newInstance": "New instance", "cpu": "CPU", "minMaxIops": "Min IOPS / Max IOPS", -"community": "Community" +"community": "Community", +"self": "Self" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index dcf9cc486..39988a37d 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -155,7 +155,13 @@ export default { serviceOffering: {}, diskOffering: {}, zone: {}, - isos: [] + isos: [], + isoFilter: [ + 'community', + 'featured', + 'selfexecutable', + 'sharedexecutable' + ] } }, computed: { @@ -307,28 +313,34 @@ export default { param.loading = false }) }, - fetchIsos () { + fetchIsos (isoFilter) { api('listIsos', { zoneid: _.get(this.zone, 'id'), - isofilter: 'community', // ToDo: Repeat for all other filter + isofilter: isoFilter, bootable: true }).then((response) => { - this.isos = _.get(response, 'listisosresponse.iso', []) + const concatedIsos = _.concat(this.isos, _.get(response, 'listisosresponse.iso', [])) + this.isos = _.uniqWith(concatedIsos, _.isEqual) }).catch((reason) => { // ToDo: Handle errors console.log(reason) }) }, + fetchAllIsos () { + this.isoFilter.forEach((filter) => { + this.fetchIsos(filter) + }) + }, onTemplatesIsosCollapseChange (key) { if (key === 'isos' && this.isos.length === 0) { - this.fetchIsos() + this.fetchAllIsos() } }, onSelectZoneId () { if (this.isos.length === 0) { return } - this.fetchIsos() + this.fetchAllIsos() } } } diff --git a/src/views/compute/wizard/IsoSelection.vue b/src/views/compute/wizard/IsoSelection.vue index a623a5ef2..b38156c78 100644 --- a/src/views/compute/wizard/IsoSelection.vue +++ b/src/views/compute/wizard/IsoSelection.vue @@ -43,6 +43,10 @@ :visible="os.isfeatured" color="green" >{{ $t('isFeatured') }} + {{ $t('self') }} From f81b3880585d2810aa85faed5e38f7c45a6e6409 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 4 Nov 2019 16:21:10 +0100 Subject: [PATCH 12/45] Distinguish between shared and self uploaded isos. --- src/locales/en.json | 4 ++-- src/views/compute/DeployVM.vue | 3 +-- src/views/compute/wizard/IsoSelection.vue | 19 ++++++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index a35265d30..135f9e72f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -944,6 +944,6 @@ "newInstance": "New instance", "cpu": "CPU", "minMaxIops": "Min IOPS / Max IOPS", -"community": "Community", -"self": "Self" +"isSelf": "Self", +"isShared": "Shared" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 39988a37d..7728b619b 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -157,8 +157,7 @@ export default { zone: {}, isos: [], isoFilter: [ - 'community', - 'featured', + 'executable', 'selfexecutable', 'sharedexecutable' ] diff --git a/src/views/compute/wizard/IsoSelection.vue b/src/views/compute/wizard/IsoSelection.vue index b38156c78..f957fcf95 100644 --- a/src/views/compute/wizard/IsoSelection.vue +++ b/src/views/compute/wizard/IsoSelection.vue @@ -38,15 +38,19 @@ {{ $t('community') }} + >{{ $t('isPublic') }} {{ $t('isFeatured') }} {{ $t('self') }} + >{{ $t('isSelf') }} + {{ $t('isShared') }} @@ -55,6 +59,7 @@ From 4f81c6d58cee93252dfab477937b9abe4f608aa0 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 4 Nov 2019 16:58:13 +0100 Subject: [PATCH 13/45] Unify template and iso selection. --- src/views/compute/DeployVM.vue | 23 ++--- ...Selection.vue => TemplateIsoSelection.vue} | 30 ++++--- .../compute/wizard/TemplateSelection.vue | 86 ------------------- 3 files changed, 29 insertions(+), 110 deletions(-) rename src/views/compute/wizard/{IsoSelection.vue => TemplateIsoSelection.vue} (81%) delete mode 100644 src/views/compute/wizard/TemplateSelection.vue diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 7728b619b..36d23484c 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -56,18 +56,20 @@ @change="onTemplatesIsosCollapseChange" > - + - + @@ -117,20 +119,18 @@ import { mixin, mixinDevice } from '@/utils/mixin.js' import InfoCard from '@/components/view/InfoCard' import ComputeSelection from './wizard/ComputeSelection' -import TemplateSelection from './wizard/TemplateSelection' import DiskOfferingSelection from '@views/compute/wizard/DiskOfferingSelection' import DiskSizeSelection from '@views/compute/wizard/DiskSizeSelection' -import IsoSelection from '@views/compute/wizard/IsoSelection' +import TemplateIsoSelection from '@views/compute/wizard/TemplateIsoSelection' export default { name: 'Wizard', components: { - IsoSelection, + TemplateIsoSelection, DiskSizeSelection, DiskOfferingSelection, InfoCard, - ComputeSelection, - TemplateSelection + ComputeSelection }, props: { visible: { @@ -326,6 +326,7 @@ export default { }) }, fetchAllIsos () { + this.isos = [] this.isoFilter.forEach((filter) => { this.fetchIsos(filter) }) diff --git a/src/views/compute/wizard/IsoSelection.vue b/src/views/compute/wizard/TemplateIsoSelection.vue similarity index 81% rename from src/views/compute/wizard/IsoSelection.vue rename to src/views/compute/wizard/TemplateIsoSelection.vue index f957fcf95..94845a54e 100644 --- a/src/views/compute/wizard/IsoSelection.vue +++ b/src/views/compute/wizard/TemplateIsoSelection.vue @@ -26,7 +26,7 @@ v-for="(os, osIndex) in osList" :key="osIndex" class="radio-group" - v-decorator="['isoId', { + v-decorator="[inputDecorator, { rules: [{ required: true, message: 'Please select option' }] }]" > @@ -64,34 +64,38 @@ import OsLogo from '@/components/widgets/OsLogo' import { getNormalizedOsName } from '@/utils/icons' export default { - name: 'IsoSelection', + name: 'TemplateIsoSelection', components: { OsLogo }, props: { - isos: { + items: { type: Array, default: () => [] + }, + inputDecorator: { + type: String, + default: '' } }, computed: { osTypes () { - const mappedIsos = {} - this.isos.forEach((os) => { + const mappedItems = {} + this.items.forEach((os) => { const osName = getNormalizedOsName(os.ostypename) - if (Array.isArray(mappedIsos[osName])) { - mappedIsos[osName].push(os) + if (Array.isArray(mappedItems[osName])) { + mappedItems[osName].push(os) } else { - mappedIsos[osName] = [os] + mappedItems[osName] = [os] } }) - return mappedIsos + return mappedItems } }, methods: { - isShared (iso) { - return !iso.ispublic && (iso.account !== store.getters.userInfo.account) + isShared (item) { + return !item.ispublic && (item.account !== store.getters.userInfo.account) }, - isSelf (iso) { - return !iso.ispublic && (iso.account === store.getters.userInfo.account) + isSelf (item) { + return !item.ispublic && (item.account === store.getters.userInfo.account) } } } diff --git a/src/views/compute/wizard/TemplateSelection.vue b/src/views/compute/wizard/TemplateSelection.vue deleted file mode 100644 index 0d55afc6f..000000000 --- a/src/views/compute/wizard/TemplateSelection.vue +++ /dev/null @@ -1,86 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - - - - - - From 5d0c425b3d507b9431cff4101927956cba912f37 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 4 Nov 2019 17:23:49 +0100 Subject: [PATCH 14/45] Apply iso selection to the instance config info card. --- src/views/compute/DeployVM.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 36d23484c..7faafe778 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -152,6 +152,7 @@ export default { ], instanceConfig: [], template: {}, + iso: {}, serviceOffering: {}, diskOffering: {}, zone: {}, @@ -199,6 +200,7 @@ export default { watch: { instanceConfig (instanceConfig) { this.template = this.templateId.opts.find((option) => option.id === instanceConfig.templateid) + this.iso = this.isos.find((option) => option.id === instanceConfig.isoid) this.serviceOffering = this.serviceOfferingId.opts.find((option) => option.id === instanceConfig.computeofferingid) this.diskOffering = this.diskOfferingId.opts.find((option) => option.id === instanceConfig.diskofferingid) this.zone = this.zoneId.opts.find((option) => option.id === instanceConfig.zoneid) @@ -215,6 +217,13 @@ export default { this.vm['ostypename'] = this.template.ostypename } + if (this.iso) { + this.vm['templateid'] = this.iso.id + this.vm['templatename'] = this.iso.displaytext + this.vm['ostypeid'] = this.iso.ostypeid + this.vm['ostypename'] = this.iso.ostypename + } + if (this.serviceOffering) { this.vm['serviceofferingid'] = this.serviceOffering.id this.vm['serviceofferingname'] = this.serviceOffering.displaytext From c09c6c8917ffb88fa6f0bd09a012feda90a0a2d5 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 2 Dec 2019 11:29:31 +0100 Subject: [PATCH 15/45] Fix linting issues. --- package-lock.json | 8 ++------ src/views/compute/DeployVM.vue | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 781e8018a..34e2be94f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15161,7 +15161,8 @@ "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true }, "lodash.identity": { "version": "3.0.0", @@ -15193,11 +15194,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" - }, "lodash.pickby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index db19b7b7a..a9bbc0d2b 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -218,10 +218,10 @@ export default { } if (this.iso) { - this.vm['templateid'] = this.iso.id - this.vm['templatename'] = this.iso.displaytext - this.vm['ostypeid'] = this.iso.ostypeid - this.vm['ostypename'] = this.iso.ostypename + this.vm.templateid = this.iso.id + this.vm.templatename = this.iso.displaytext + this.vm.ostypeid = this.iso.ostypeid + this.vm.ostypename = this.iso.ostypename } if (this.serviceOffering) { From 4483e8b4c85ce6e3c6a46c1154e9844a3e3f6851 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 2 Dec 2019 15:12:42 +0100 Subject: [PATCH 16/45] Pin featured isos/templates at the top at each list. Sort the icons/templates. --- src/views/compute/wizard/TemplateIsoSelection.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/compute/wizard/TemplateIsoSelection.vue b/src/views/compute/wizard/TemplateIsoSelection.vue index 94845a54e..07f11ecff 100644 --- a/src/views/compute/wizard/TemplateIsoSelection.vue +++ b/src/views/compute/wizard/TemplateIsoSelection.vue @@ -62,6 +62,7 @@ import store from '@/store' import OsLogo from '@/components/widgets/OsLogo' import { getNormalizedOsName } from '@/utils/icons' +import _ from 'lodash' export default { name: 'TemplateIsoSelection', @@ -78,7 +79,7 @@ export default { }, computed: { osTypes () { - const mappedItems = {} + let mappedItems = {} this.items.forEach((os) => { const osName = getNormalizedOsName(os.ostypename) if (Array.isArray(mappedItems[osName])) { @@ -87,6 +88,13 @@ export default { mappedItems[osName] = [os] } }) + mappedItems = _.mapValues(mappedItems, (list) => { + let featuredItems = list.filter((item) => item.isfeatured) + let nonFeaturedItems = list.filter((item) => !item.isfeatured) + featuredItems = _.sortBy(featuredItems, (item) => item.displaytext.toLowerCase()) + nonFeaturedItems = _.sortBy(nonFeaturedItems, (item) => item.displaytext.toLowerCase()) + return featuredItems.concat(nonFeaturedItems) // pin featured isos/templates at the top + }) return mappedItems } }, From ec6e7aa7ac7b91647311a7ec451e5e3a50d81e6d Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 2 Dec 2019 16:28:50 +0100 Subject: [PATCH 17/45] Make the info card sticky. --- src/views/compute/DeployVM.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index a9bbc0d2b..aaad9b492 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -99,12 +99,14 @@ - -
- - {{ diskSize }} -
- + + +
+ + {{ diskSize }} +
+ +
From eb23f190a1fd14d97cd821310f4ec1e4b3db86b8 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Tue, 3 Dec 2019 14:43:24 +0100 Subject: [PATCH 18/45] Add template/iso filter. --- .../compute/wizard/TemplateIsoSelection.vue | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/views/compute/wizard/TemplateIsoSelection.vue b/src/views/compute/wizard/TemplateIsoSelection.vue index 07f11ecff..ea7c44f50 100644 --- a/src/views/compute/wizard/TemplateIsoSelection.vue +++ b/src/views/compute/wizard/TemplateIsoSelection.vue @@ -17,6 +17,10 @@ From 13d8b5da6a90577dbc274659d878a347e6497ac1 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Thu, 16 Jan 2020 13:09:11 +0100 Subject: [PATCH 35/45] Add VPC filter to the network selection table. --- src/views/compute/wizard/NetworkSelection.vue | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/views/compute/wizard/NetworkSelection.vue b/src/views/compute/wizard/NetworkSelection.vue index 443e5598f..4adc34f56 100644 --- a/src/views/compute/wizard/NetworkSelection.vue +++ b/src/views/compute/wizard/NetworkSelection.vue @@ -21,7 +21,6 @@ :dataSource="networkItems" :rowKey="record => record.id" :pagination="false" - :scroll="{x: 0, y: 320}" :rowSelection="rowSelection" > - + -
{{ item.title }}
+ @@ -61,7 +60,23 @@ export default { }, data () { return { - columns: [ + selectedRowKeys: [], + vpcs: [], + filteredInfo: null + } + }, + computed: { + columns () { + let vpcFilter = [] + if (this.vpcs) { + vpcFilter = this.vpcs.map((vpc) => { + return { + text: vpc.displaytext, + value: vpc.id + } + }) + } + return [ { dataIndex: 'name', title: this.$t('networks'), @@ -75,14 +90,15 @@ export default { { dataIndex: 'vpcName', title: this.$t('VPC'), - width: '30%' + width: '30%', + filters: vpcFilter, + filteredValue: _.get(this.filteredInfo, 'id'), + onFilter: (value, record) => { + return record.vpcid === value + } } - ], - selectedRowKeys: [], - vpcs: [] - } - }, - computed: { + ] + }, rowSelection () { return { type: 'checkbox', From 92738cdfe33fa89c2e7c81a44a34a020584641f5 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Tue, 21 Jan 2020 10:16:56 +0100 Subject: [PATCH 36/45] Introduce network configuration component. --- src/locales/en.json | 1 + src/views/compute/DeployVM.vue | 7 ++ .../compute/wizard/NetworkConfiguration.vue | 102 ++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 src/views/compute/wizard/NetworkConfiguration.vue diff --git a/src/locales/en.json b/src/locales/en.json index 1b01cc8d3..2591de2b6 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1019,6 +1019,7 @@ "instance": "Instance", "yourInstance": "Your instance", "newInstance": "New instance", +"defaultNetwork": "Default network", "cpu": "CPU", "minMaxIops": "Min IOPS / Max IOPS", "isSelf": "Self", diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index c7cd22f08..5187ebf6b 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -95,6 +95,11 @@ @select-network-item="($event) => updateNetworks($event)" > + +
{{ this.$t('cancel') }} @@ -138,10 +143,12 @@ import DiskSizeSelection from '@views/compute/wizard/DiskSizeSelection' import TemplateIsoSelection from '@views/compute/wizard/TemplateIsoSelection' import AffinityGroupSelection from '@views/compute/wizard/AffinityGroupSelection' import NetworkSelection from '@views/compute/wizard/NetworkSelection' +import NetworkConfiguration from '@views/compute/wizard/NetworkConfiguration' export default { name: 'Wizard', components: { + NetworkConfiguration, NetworkSelection, AffinityGroupSelection, TemplateIsoSelection, diff --git a/src/views/compute/wizard/NetworkConfiguration.vue b/src/views/compute/wizard/NetworkConfiguration.vue new file mode 100644 index 000000000..8ea43cd01 --- /dev/null +++ b/src/views/compute/wizard/NetworkConfiguration.vue @@ -0,0 +1,102 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 3c6ef28108d02d40bdcf4c79eb46bfacc9b58d11 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 27 Jan 2020 16:00:02 +0100 Subject: [PATCH 37/45] Wrap all selections/inputs with collapse components. --- src/locales/en.json | 2 + src/views/compute/DeployVM.vue | 153 +++++++++++++++++++-------------- 2 files changed, 91 insertions(+), 64 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 3689fd147..6d2a6def5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1061,5 +1061,7 @@ "isSelf": "Self", "isShared": "Shared", "networks": "Networks", +"BasicSetup": "Basic setup", +"templateIso": "Template/ISO", "wednesday": "Wednesday" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 5187ebf6b..34509f1a9 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -25,80 +25,97 @@ @submit="handleSubmit" layout="vertical" > - - - - - - - - - - - - + + + + - - + + + - - + + + + + + - + + + + + - + + + - + + + + + + + + - + + - + + +
@@ -436,10 +453,18 @@ export default { From d986afdc476c62b68ecbae810db4bbe66b08f145 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Mon, 27 Jan 2020 16:04:25 +0100 Subject: [PATCH 38/45] Adjust the styling of main collapse. --- src/views/compute/DeployVM.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 34509f1a9..38977d3e0 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -462,9 +462,8 @@ export default { } } .ant-collapse-borderless > .ant-collapse-item { - /*border: 1px solid #e8e8e8;*/ border: 1px solid @border-color-split; border-radius: @border-radius-base; - margin: 1.2rem; + margin: 0 0 1.2rem; } From df5444d517a04ccf8151bbf9ab6601e0c4d6d4eb Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Wed, 29 Jan 2020 16:37:08 +0100 Subject: [PATCH 39/45] Introduce network creation component. --- src/locales/en.json | 3 + src/views/compute/DeployVM.vue | 29 +++- src/views/compute/wizard/NetworksCreation.vue | 133 ++++++++++++++++++ 3 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 src/views/compute/wizard/NetworksCreation.vue diff --git a/src/locales/en.json b/src/locales/en.json index 6d2a6def5..87391ba42 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1063,5 +1063,8 @@ "networks": "Networks", "BasicSetup": "Basic setup", "templateIso": "Template/ISO", +"addAnotherNetwork": "Add another network", +"addNewNetworks": "Add new networks", +"existingNetworks": "Existing networks", "wednesday": "Wednesday" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index 38977d3e0..be9504be7 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -104,11 +104,25 @@ - + + + + + + + + + .ant-collapse-item { border: 1px solid @border-color-split; - border-radius: @border-radius-base; + border-radius: @border-radius-base !important; margin: 0 0 1.2rem; } diff --git a/src/views/compute/wizard/NetworksCreation.vue b/src/views/compute/wizard/NetworksCreation.vue new file mode 100644 index 000000000..3424f7eb7 --- /dev/null +++ b/src/views/compute/wizard/NetworksCreation.vue @@ -0,0 +1,133 @@ + + + + + From 19b3cf4cb8438fbf33fd5a213acbd996976489a2 Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Thu, 30 Jan 2020 15:29:36 +0100 Subject: [PATCH 40/45] Introduce ssh keypair selection. --- src/locales/en.json | 1 + src/views/compute/DeployVM.vue | 24 ++++- .../compute/wizard/SshKeyPairSelection.vue | 102 ++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 src/views/compute/wizard/SshKeyPairSelection.vue diff --git a/src/locales/en.json b/src/locales/en.json index 87391ba42..78692137f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1066,5 +1066,6 @@ "addAnotherNetwork": "Add another network", "addNewNetworks": "Add new networks", "existingNetworks": "Existing networks", +"sshKeyPairs": "SSH keypairs", "wednesday": "Wednesday" } diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue index be9504be7..eb0a5f723 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -129,6 +129,14 @@ :items="networks" > + + + +
@@ -176,10 +184,12 @@ import AffinityGroupSelection from '@views/compute/wizard/AffinityGroupSelection import NetworkSelection from '@views/compute/wizard/NetworkSelection' import NetworkConfiguration from '@views/compute/wizard/NetworkConfiguration' import NetworkCreation from '@views/compute/wizard/NetworksCreation' +import SshKeyPairSelection from '@views/compute/wizard/SshKeyPairSelection' export default { name: 'Wizard', components: { + SshKeyPairSelection, NetworkCreation, NetworkConfiguration, NetworkSelection, @@ -206,7 +216,8 @@ export default { diskOfferings: [], zones: [], affinityGroups: [], - networks: [] + networks: [], + sshKeyPairs: [] }, instanceConfig: [], template: {}, @@ -216,6 +227,7 @@ export default { affinityGroups: [], networks: [], zone: {}, + sshKeyPair: {}, isoFilter: [ 'executable', 'selfexecutable', @@ -262,6 +274,9 @@ export default { affinityGroups: { list: 'listAffinityGroups' }, + sshKeyPairs: { + list: 'listSSHKeyPairs' + }, networks: { list: 'listNetworks', options: { @@ -293,6 +308,7 @@ export default { this.zone = _.find(this.options.zones, (option) => option.id === instanceConfig.zoneid) this.affinityGroups = _.filter(this.options.affinityGroups, (option) => _.includes(instanceConfig.affinitygroupids, option.id)) this.networks = _.filter(this.options.networks, (option) => _.includes(instanceConfig.networkids, option.id)) + this.sshKeyPair = _.find(this.options.sshKeyPairs, (option) => option.name === instanceConfig.keypair) if (this.zone) { this.vm.zoneid = this.zone.id @@ -352,6 +368,7 @@ export default { this.form.getFieldDecorator('affinitygroupids', { initialValue: [], preserve: true }) this.form.getFieldDecorator('isoid', { initialValue: [], preserve: true }) this.form.getFieldDecorator('networkids', { initialValue: [], preserve: true }) + this.form.getFieldDecorator('keypair', { initialValue: [], preserve: true }) }, created () { _.each(this.params, this.fetchOptions) @@ -380,6 +397,11 @@ export default { networkids: ids }) }, + updateSshKeyPairs (name) { + this.form.setFieldsValue({ + keypair: name + }) + }, getText (option) { return _.get(option, 'displaytext', _.get(option, 'name')) }, diff --git a/src/views/compute/wizard/SshKeyPairSelection.vue b/src/views/compute/wizard/SshKeyPairSelection.vue new file mode 100644 index 000000000..989e9a552 --- /dev/null +++ b/src/views/compute/wizard/SshKeyPairSelection.vue @@ -0,0 +1,102 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + From 23a2858c5316ebf09ecfd97aecf1f9ea72860aee Mon Sep 17 00:00:00 2001 From: Florian Symanowski Date: Thu, 30 Jan 2020 15:38:30 +0100 Subject: [PATCH 41/45] Replace scroll property with pagination in all tables. --- src/views/compute/wizard/AffinityGroupSelection.vue | 3 +-- src/views/compute/wizard/ComputeSelection.vue | 3 +-- src/views/compute/wizard/DiskOfferingSelection.vue | 3 +-- src/views/compute/wizard/NetworkConfiguration.vue | 2 +- src/views/compute/wizard/NetworkSelection.vue | 2 +- src/views/compute/wizard/NetworksCreation.vue | 2 +- src/views/compute/wizard/SshKeyPairSelection.vue | 3 +-- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/compute/wizard/AffinityGroupSelection.vue b/src/views/compute/wizard/AffinityGroupSelection.vue index 1355eb412..c13cbcc9a 100644 --- a/src/views/compute/wizard/AffinityGroupSelection.vue +++ b/src/views/compute/wizard/AffinityGroupSelection.vue @@ -20,8 +20,7 @@ :columns="columns" :dataSource="items" :rowKey="record => record.id" - :pagination="false" - :scroll="{x: 0, y: 320}" + :pagination="{showSizeChanger: true}" :rowSelection="rowSelection" size="middle" > diff --git a/src/views/compute/wizard/ComputeSelection.vue b/src/views/compute/wizard/ComputeSelection.vue index 50e1ecaa4..dfe4e4950 100644 --- a/src/views/compute/wizard/ComputeSelection.vue +++ b/src/views/compute/wizard/ComputeSelection.vue @@ -19,8 +19,7 @@ diff --git a/src/views/compute/wizard/DiskOfferingSelection.vue b/src/views/compute/wizard/DiskOfferingSelection.vue index 759b1ea80..f56374572 100644 --- a/src/views/compute/wizard/DiskOfferingSelection.vue +++ b/src/views/compute/wizard/DiskOfferingSelection.vue @@ -19,8 +19,7 @@ diff --git a/src/views/compute/wizard/NetworkConfiguration.vue b/src/views/compute/wizard/NetworkConfiguration.vue index 8ea43cd01..d647e9d70 100644 --- a/src/views/compute/wizard/NetworkConfiguration.vue +++ b/src/views/compute/wizard/NetworkConfiguration.vue @@ -19,7 +19,7 @@