From 8282aa5d53d90668dd04094aa7386f0d465fb326 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 27 Apr 2025 19:16:18 +0530 Subject: [PATCH 1/4] add deploy button on info card Signed-off-by: Abhishek Kumar --- ui/src/components/view/InfoCard.vue | 1600 +++++++++-------- .../views/compute/CreateAutoScaleVmGroup.vue | 32 +- ui/src/views/compute/DeployVM.vue | 66 +- ui/src/views/compute/DeployVnfAppliance.vue | 62 +- ui/src/views/compute/wizard/DeployButtons.vue | 125 ++ 5 files changed, 1013 insertions(+), 872 deletions(-) create mode 100644 ui/src/views/compute/wizard/DeployButtons.vue diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index 65c4d3ac0f5e..e4d9a69cf366 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -14,845 +14,851 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// $message.success(`${$t('label.copied.clipboard')} : ${name}`) @@ -903,6 +909,10 @@ export default { isStatic: { type: Boolean, default: false + }, + footerVisible: { + type: Boolean, + default: false } }, data () { @@ -1233,7 +1243,25 @@ export default { diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue index 5e1baac3d8fb..1b5447d70193 100644 --- a/ui/src/views/compute/DeployVnfAppliance.vue +++ b/ui/src/views/compute/DeployVnfAppliance.vue @@ -818,36 +818,31 @@ -
- - - - - - {{ $t('label.cancel') }} - - - - {{ $t('label.launch.vnf.appliance') }} - - - +
+
- + + + @@ -863,6 +858,7 @@ import store from '@/store' import eventBus from '@/config/eventBus' import InfoCard from '@/components/view/InfoCard' +import DeployButtons from '@views/compute/wizard/DeployButtons' import ResourceIcon from '@/components/view/ResourceIcon' import ComputeOfferingSelection from '@views/compute/wizard/ComputeOfferingSelection' import ComputeSelection from '@views/compute/wizard/ComputeSelection' @@ -883,6 +879,9 @@ import InstanceNicsNetworkSelectListView from '@/components/view/InstanceNicsNet export default { name: 'Wizard', components: { + InfoCard, + DeployButtons, + ResourceIcon, SshKeyPairSelection, UserDataSelection, NetworkConfiguration, @@ -892,12 +891,10 @@ export default { DiskSizeSelection, MultiDiskSelection, DiskOfferingSelection, - InfoCard, ComputeOfferingSelection, ComputeSelection, SecurityGroupSelection, VnfNicsSelection, - ResourceIcon, TooltipLabel, InstanceNicsNetworkSelectListView }, @@ -1339,6 +1336,9 @@ export default { }, isCustomizedIOPS () { return this.rootDiskSelected?.iscustomizediops || this.serviceOffering?.iscustomizediops || false + }, + deployMenuOptions () { + return [this.$t('label.launch.vnf.appliance.and.stay')] } }, watch: { @@ -2887,7 +2887,7 @@ export default { .vm-info-card { .ant-card-body { min-height: 250px; - max-height: calc(100vh - 150px); + max-height: calc(100vh - 229px); overflow-y: auto; scroll-behavior: smooth; } @@ -2908,12 +2908,4 @@ export default { .form-item-hidden { display: none; } - - .btn-stay-on-page { - &.ant-dropdown-menu-dark { - .ant-dropdown-menu-item:hover { - background: transparent !important; - } - } - } diff --git a/ui/src/views/compute/wizard/DeployButtons.vue b/ui/src/views/compute/wizard/DeployButtons.vue new file mode 100644 index 000000000000..e6039a6a3583 --- /dev/null +++ b/ui/src/views/compute/wizard/DeployButtons.vue @@ -0,0 +1,125 @@ +// 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 8c1fbd0352bc2b140dbeb233a7d55c71a3402588 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 6 May 2025 17:09:36 +0530 Subject: [PATCH 2/4] info height Signed-off-by: Abhishek Kumar --- ui/src/views/compute/CreateAutoScaleVmGroup.vue | 2 +- ui/src/views/compute/DeployVM.vue | 2 +- ui/src/views/compute/DeployVnfAppliance.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/views/compute/CreateAutoScaleVmGroup.vue b/ui/src/views/compute/CreateAutoScaleVmGroup.vue index e2a298f2b140..4113c118dce1 100644 --- a/ui/src/views/compute/CreateAutoScaleVmGroup.vue +++ b/ui/src/views/compute/CreateAutoScaleVmGroup.vue @@ -3192,7 +3192,7 @@ export default { .vm-info-card { .ant-card-body { min-height: 250px; - max-height: calc(100vh - 229px); + max-height: calc(100vh - 258px); overflow-y: auto; scroll-behavior: smooth; } diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index 0234d4101238..73ea3fcc59d3 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -2936,7 +2936,7 @@ export default { .vm-info-card { .ant-card-body { min-height: 250px; - height: calc(100vh - 229px); + height: calc(100vh - 258px); overflow-y: auto; scroll-behavior: smooth; } diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue index 1b5447d70193..49a2a9ef8f36 100644 --- a/ui/src/views/compute/DeployVnfAppliance.vue +++ b/ui/src/views/compute/DeployVnfAppliance.vue @@ -2887,7 +2887,7 @@ export default { .vm-info-card { .ant-card-body { min-height: 250px; - max-height: calc(100vh - 229px); + max-height: calc(100vh - 258px); overflow-y: auto; scroll-behavior: smooth; } From aa530518a792b55346ecd0b92b481536129896cc Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 8 May 2025 13:36:15 +0530 Subject: [PATCH 3/4] fix Signed-off-by: Abhishek Kumar --- ui/src/components/view/InfoCard.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index e4d9a69cf366..2ad7b96602f6 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -1243,7 +1243,8 @@ export default {