From b280370a983aca2fa5c065960c25786e9b40341b Mon Sep 17 00:00:00 2001 From: Harikrishna Date: Tue, 2 May 2023 17:06:54 +0530 Subject: [PATCH] Few UI fixes and details improvements (#7434) * Better hover label and message for generate API/secret keys form * Added a message to select network during instance deployment * Removed project icon in dashboard listing * Disable network operations for the user who does not have permission * UI allignments * added document help for sticky policy secion under load balancer * Added tooltips and some form layout changes * donot display options to configure when stickypolicy is none * Network selection message allignment * Fixed the grid view to be uniform in infra summary page --- .../CreateLBStickinessPolicyCmd.java | 2 +- ui/public/locales/en.json | 5 +- ui/src/components/header/ProjectMenu.vue | 12 -- ui/src/components/view/ActionButton.vue | 5 +- ui/src/config/section/network.js | 3 + ui/src/config/section/user.js | 1 + ui/src/views/AutogenView.vue | 11 +- ui/src/views/compute/DeployVM.vue | 5 +- ui/src/views/infra/InfraSummary.vue | 4 +- ui/src/views/network/LoadBalancing.vue | 121 ++++++++++-------- 10 files changed, 97 insertions(+), 72 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java index 45e6f81a0aa..66a15984ae4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java @@ -68,7 +68,7 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.METHOD_NAME, type = CommandType.STRING, required = true, - description = "name of the load balancer stickiness policy method, possible values can be obtained from listNetworks API") + description = "name of the load balancer stickiness policy method, possible values are LbCookie, AppCookie, SourceBased") private String stickinessMethodName; @Parameter(name = ApiConstants.PARAM_LIST, type = CommandType.MAP, description = "param list. Example: param[0].name=cookiename¶m[0].value=LBCookie ") diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index dfa813238be..5284a3b1379 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -123,6 +123,7 @@ "label.action.expunge.instance": "Expunge instance", "label.action.force.reconnect": "Force reconnect", "label.action.generate.keys": "Generate keys", +"label.action.generate.api.secret.keys": "Generate New API/Secret Keys", "label.action.get.diagnostics": "Get diagnostics data", "label.action.health.monitor": "Health monitor", "label.action.image.store.read.only": "Make image store read-only", @@ -2691,7 +2692,7 @@ "message.failed.to.add": "Failed to add", "message.failed.to.assign.vms": "Failed to assign VMs", "message.failed.to.remove": "Failed to remove", -"message.generate.keys": "Please confirm that you would like to generate new keys for this user.", +"message.generate.keys": "Please confirm that you would like to generate new API/Secret keys for this user.", "message.chart.statistic.info": "The shown charts are self-adjustable, that means, if the value gets close to the limit or overpass it, it will grow to adjust the shown value", "message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", @@ -2743,6 +2744,7 @@ "message.linstor.resourcegroup.description": "Linstor resource group to use for primary storage.", "message.listnsp.not.return.providerid": "error: listNetworkServiceProviders API doesn't return VirtualRouter provider ID.", "message.load.host.failed": "Failed to load hosts.", +"message.loadbalancer.stickypolicy.configuration": "Customize the load balancer stickiness policy:", "message.loading.add.interface.static.route": "Adding interface Static Route...", "message.loading.add.network.static.route": "Adding network Static Route...", "message.loading.add.policy.rule": "Adding Policy rule...", @@ -2786,6 +2788,7 @@ "message.network.offering.promiscuous.mode": "Applicable for guest networks on VMware hypervisor only.\nReject - The switch drops any outbound frame from a virtual machine adapter with a source MAC address that is different from the one in the .vmx configuration file.\nAccept - The switch does not perform filtering, and permits all outbound frames.\nNone - Default to value from global setting.", "message.network.removenic": "Please confirm that want to remove this NIC, which will also remove the associated network from the VM.", "message.network.secondaryip": "Please confirm that you would like to acquire a new secondary IP for this NIC. \n NOTE: You need to manually configure the newly-acquired secondary IP inside the virtual machine.", +"message.network.selection": "Choose one or more networks to attach the instance to. A new network can also be created here.", "message.network.updateip": "Please confirm that you would like to change the IP address for this NIC on VM.", "message.network.usage.info.data.points": "Each data point represents the difference in data traffic since the last data point.", "message.network.usage.info.sum.of.vnics": "The network usage shown is made up of the sum of data traffic from all the vNICs in the VM.", diff --git a/ui/src/components/header/ProjectMenu.vue b/ui/src/components/header/ProjectMenu.vue index 722bc2877d6..11b1a7957e4 100644 --- a/ui/src/components/header/ProjectMenu.vue +++ b/ui/src/components/header/ProjectMenu.vue @@ -27,18 +27,6 @@ @focus="fetchData" showSearch> - - -