src: fix translation key usage

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

ui/src/components/view/InfoCard.vue

@@ -440,7 +440,7 @@
           <div class="resource-detail-item__label">{{ $t('label.zone') }}</div>
           <div class="resource-detail-item__details">
             <a-icon type="global" />
-            <router-link v-if="$router.resolve('/zone/' + resource.zoneid).route.name !== '404'" :to="{ path: '/zone/' + resource.zoneid }">{{ resource.zonename || resource.zoneid }}</router-link>
+            <router-link v-if="$router.resolve('/zone/' + resource.zoneid).route.name !== '404'" :to="{ path: '/zone/' + resource.zoneid }">{{ resource.zone || resource.zonename || resource.zoneid }}</router-link>
             <span v-else>{{ resource.zone || resource.zonename }}</span>
           </div>
         </div>

ui/src/config/section/compute.js

@@ -192,7 +192,7 @@ export default {
           docHelp: 'adminguide/virtual_machines.html#backup-offerings',
           dataView: true,
           args: ['virtualmachineid', 'backupofferingid'],
-          show: (record) => { return !record.backupofferingid },
+          show: (record) => { return !record.backupofferingid && !['Error', 'Destroyed'].includes(record.state) && ['VMware', 'Simulator'].includes(record.hypervisor) },
           mapping: {
             virtualmachineid: {
               value: (record, params) => { return record.id }

ui/src/config/section/offering.js

@@ -257,7 +257,7 @@ export default {
       details: ['name', 'id', 'displaytext', 'distributedvpcrouter', 'tags', 'service', 'domain', 'zone', 'created'],
       related: [{
         name: 'vpc',
-        title: 'label.vpcs',
+        title: 'label.vpc',
         param: 'vpcofferingid'
       }],
       actions: [{

ui/src/config/section/storage.js

@@ -318,7 +318,7 @@ export default {
       title: 'label.backup',
       icon: 'cloud-upload',
       permission: ['listBackups'],
-      columns: ['virtualmachinename', 'status', 'type', 'created', 'account', 'zone'],
+      columns: [{ name: (record) => { return record.virtualmachinename } }, 'virtualmachinename', 'status', 'type', 'created', 'account', 'zone'],
       details: ['virtualmachinename', 'id', 'type', 'externalid', 'size', 'virtualsize', 'volumes', 'backupofferingname', 'zone', 'account', 'domain', 'created'],
       actions: [
         {

ui/src/locales/en.json

@@ -224,7 +224,6 @@
 "label.action.revert.snapshot": "Revert to Snapshot",
 "label.action.revert.snapshot.processing": "Reverting to Snapshot...",
 "label.action.router.health.checks": "Get health checks result",
-"label.perform.fresh.checks":"Perform fresh checks",
 "label.action.run.diagnostics": "Run Diagnostics",
 "label.action.secure.host": "Provision Host Security Keys",
 "label.action.share.template": "Update Template Permissions",
@@ -579,6 +578,7 @@
 "label.createnfscache": "Create NFS secondary staging store",
 "label.credit": "Credit",
 "label.crosszones": "Cross Zones",
+"label.currency": "Currency",
 "label.current": "isCurrent",
 "label.currentpassword": "Current Password",
 "label.custom": "Custom",
@@ -619,6 +619,7 @@
 "label.delete.ciscoasa1000v": "Delete CiscoASA1000v",
 "label.delete.ciscovnmc.resource": "Delete CiscoVNMC resource",
 "label.delete.confirm": "Delete?",
+"label.delete.domain": "Delete Domain",
 "label.delete.events": "Delete events",
 "label.delete.f5": "Delete F5",
 "label.delete.gateway": "Delete gateway",
@@ -634,7 +635,6 @@
 "label.delete.srx": "Delete SRX",
 "label.delete.sslcertificate": "Delete SSL Certificate",
 "label.delete.ucs.manager": "Delete UCS Manager",
-"label.delete.domain": "Delete Domain",
 "label.delete.volumes": "Data Volumes to be deleted",
 "label.delete.vpn.connection": "Delete VPN connection",
 "label.delete.vpn.customer.gateway": "Delete VPN Customer Gateway",
@@ -880,6 +880,7 @@
 "label.guestosid": "OS Type",
 "label.gueststartip": "Guest start IP",
 "label.guestvlanrange": "VLAN Range(s)",
+"label.guestvmcidr": "CIDR",
 "label.ha": "HA",
 "label.ha.configure": "Configure HA",
 "label.ha.disable": "Disable HA",
@@ -1318,6 +1319,7 @@
 "label.new.vm": "New VM",
 "label.newdiskoffering": "New Offering",
 "label.newinstance": "New instance",
+"label.newname": "New Name",
 "label.newsize": "New Size (GB)",
 "label.next": "Next",
 "label.nexusvswitch": "Nexus 1000v",
@@ -1379,6 +1381,7 @@
 "label.outofbandmanagement.configure": "Configure Out-of-band Management",
 "label.outofbandmanagement.disable": "Disable Out-of-band Management",
 "label.outofbandmanagement.enable": "Enable Out-of-band Management",
+"label.overprovisionfactor": "Overprovisioning Factor",
 "label.override.guest.traffic": "Override Guest-Traffic",
 "label.override.public.traffic": "Override Public-Traffic",
 "label.overrideguesttraffic": "Override Guest-Traffic",
@@ -1411,6 +1414,7 @@
 "label.per.account": "Per Account",
 "label.per.zone": "Per Zone",
 "label.perfectforwardsecrecy": "Perfect Forward Secrecy",
+"label.perform.fresh.checks":"Perform fresh checks",
 "label.performfreshchecks": "Perform fresh checks",
 "label.permission": "Permission",
 "label.physical.network": "Physical Network",
@@ -1485,7 +1489,7 @@
 "label.protocol": "Protocol",
 "label.protocol.number": "Protocol Number",
 "label.protocolnumber": "#Protocol",
-"label.provider": "HA Provider",
+"label.provider": "Provider",
 "label.providername": "Provider",
 "label.providers": "Providers",
 "label.provisioning": "Provisioning",
@@ -1795,6 +1799,7 @@
 "label.sshkeypairs": "SSH keypairs",
 "label.sslcertificates": "SSL Certificates",
 "label.standard.us.keyboard": "Standard (US) keyboard",
+"label.start": "Start",
 "label.start.ip": "Start IP",
 "label.start.lb.vm": "Start LB VM",
 "label.start.reserved.system.ip": "Start Reserved system IP",
@@ -1966,6 +1971,7 @@
 "label.userdatal2": "User Data",
 "label.username": "Username",
 "label.users": "Users",
+"label.usersource": "User Type",
 "label.usevpc": "VPC",
 "label.utilization": "Utilisation",
 "label.uuid": "ID",
@@ -2074,6 +2080,7 @@
 "label.vpclimit": "VPC limits",
 "label.vpcname": "VPC",
 "label.vpcoffering": "VPC Offering",
+"label.vpcofferingid": "VPC Offering",
 "label.vpctotal": "Total VPCs",
 "label.vpn": "VPN",
 "label.vpn.connection": "VPN Connection",

ui/src/views/AutogenView.vue

@@ -543,6 +543,8 @@ export default {
         params.id = this.$route.params.id
         if (this.$route.path.startsWith('/ssh/')) {
           params.name = this.$route.params.id
+        } else if (this.$route.path.startsWith('/vmsnapshot/')) {
+          params.vmsnapshotid = this.$route.params.id
         } else if (this.$route.path.startsWith('/ldapsetting/')) {
           params.hostname = this.$route.params.id
         }

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

@@ -1512,7 +1512,7 @@ export default {
     stepComplete () {
       this.setStepStatus(STATUS_FINISH)
       this.currentStep++
-      this.addStep('message.Zone.creation.complete', 'stepComplete')
+      this.addStep('message.zone.creation.complete', 'stepComplete')
       this.setStepStatus(STATUS_FINISH)
       this.currentStep++
       this.processStatus = STATUS_FINISH