diff --git a/package-lock.json b/package-lock.json index 9ef0b7dc7..31d3050d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15839,7 +15839,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", @@ -15871,11 +15872,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/package.json b/package.json index a06b26a20..75929a0e2 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "core-js": "^3.6.1", "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", diff --git a/src/components/view/InfoCard.vue b/src/components/view/InfoCard.vue index e63a31a4b..ffd768254 100644 --- a/src/components/view/InfoCard.vue +++ b/src/components/view/InfoCard.vue @@ -425,6 +425,16 @@ {{ resource.created }} +
+ + + {{ group.name }} + , + +
diff --git a/src/locales/en.json b/src/locales/en.json index 22455e54b..78692137f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1055,7 +1055,17 @@ "instance": "Instance", "yourInstance": "Your instance", "newInstance": "New instance", +"defaultNetwork": "Default network", "cpu": "CPU", -"ram": "RAM", +"minMaxIops": "Min IOPS / Max IOPS", +"isSelf": "Self", +"isShared": "Shared", +"networks": "Networks", +"BasicSetup": "Basic setup", +"templateIso": "Template/ISO", +"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 8daf0adee..eb0a5f723 100644 --- a/src/views/compute/DeployVM.vue +++ b/src/views/compute/DeployVM.vue @@ -25,87 +25,119 @@ @submit="handleSubmit" layout="vertical" > - - - - - - - - {{ opt.name }} - - - - - - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + - - + + + + + + + + + + + + - - - + - {{ opt.name }} - - - + + + + + + + + + + + + + + + +
@@ -115,17 +147,22 @@ - - -
- - - {{ instanceConfig.rootdisksize }} GB (Root) - | - {{ diskOffering.disksize }} GB (Data) - -
- + + + + +
+ + {{ diskSize }} +
+
+
+ + {{ network.name }} +
+
+ +
@@ -134,69 +171,144 @@ + + diff --git a/src/views/compute/wizard/ComputeSelection.vue b/src/views/compute/wizard/ComputeSelection.vue index 255c1f26d..dfe4e4950 100644 --- a/src/views/compute/wizard/ComputeSelection.vue +++ b/src/views/compute/wizard/ComputeSelection.vue @@ -19,13 +19,12 @@ {{ $t('cpu') }} - {{ $t('ram') }} + {{ $t('memory') }} @@ -47,6 +46,7 @@ export default { columns: [ { dataIndex: 'name', + title: this.$t('serviceOfferingId'), width: '40%' }, { @@ -99,12 +99,3 @@ export default { margin: 2rem 0; } - - diff --git a/src/views/compute/wizard/DiskOfferingSelection.vue b/src/views/compute/wizard/DiskOfferingSelection.vue new file mode 100644 index 000000000..f56374572 --- /dev/null +++ b/src/views/compute/wizard/DiskOfferingSelection.vue @@ -0,0 +1,107 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/DiskSizeSelection.vue b/src/views/compute/wizard/DiskSizeSelection.vue new file mode 100644 index 000000000..f973741dd --- /dev/null +++ b/src/views/compute/wizard/DiskSizeSelection.vue @@ -0,0 +1,55 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/NetworkConfiguration.vue b/src/views/compute/wizard/NetworkConfiguration.vue new file mode 100644 index 000000000..d647e9d70 --- /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. + + + + + + diff --git a/src/views/compute/wizard/NetworkSelection.vue b/src/views/compute/wizard/NetworkSelection.vue new file mode 100644 index 000000000..5eeeb342c --- /dev/null +++ b/src/views/compute/wizard/NetworkSelection.vue @@ -0,0 +1,158 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/NetworksCreation.vue b/src/views/compute/wizard/NetworksCreation.vue new file mode 100644 index 000000000..a708402ec --- /dev/null +++ b/src/views/compute/wizard/NetworksCreation.vue @@ -0,0 +1,150 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/SshKeyPairSelection.vue b/src/views/compute/wizard/SshKeyPairSelection.vue new file mode 100644 index 000000000..5e62a2425 --- /dev/null +++ b/src/views/compute/wizard/SshKeyPairSelection.vue @@ -0,0 +1,101 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/TemplateIsoRadioGroup.vue b/src/views/compute/wizard/TemplateIsoRadioGroup.vue new file mode 100644 index 000000000..cb879e1e3 --- /dev/null +++ b/src/views/compute/wizard/TemplateIsoRadioGroup.vue @@ -0,0 +1,92 @@ +// 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. + + + + + + diff --git a/src/views/compute/wizard/TemplateIsoSelection.vue b/src/views/compute/wizard/TemplateIsoSelection.vue new file mode 100644 index 000000000..27796fee9 --- /dev/null +++ b/src/views/compute/wizard/TemplateIsoSelection.vue @@ -0,0 +1,120 @@ +// 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. + + + + + + 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. - - - - - -