fix pages

Author: slavkap

ui/public/locales/en.json

@@ -3709,7 +3709,7 @@
 "message.template.arch": "Please select a Template architecture.",
 "message.template.desc": "OS image that can be used to boot Instances.",
 "message.template.import.vm.temporary": "If a temporary Template is used, the reset Instance operation will not work after importing it.",
-"message.template.iso": "Please select a Template or ISO to continue.",
+"message.template.iso": "Please select a Template, ISO, volume or a snapshot to continue.",
 "message.template.type.change.warning": "WARNING: Changing the Template type to SYSTEM will disable further changes to the Template.",
 "message.tooltip.reserved.system.netmask": "The Network prefix that defines the pod subnet. Uses CIDR notation.",
 "message.traffic.type.deleted": "Successfully deleted traffic type",

ui/src/views/compute/DeployVM.vue

@@ -1392,7 +1392,7 @@ export default {
       return this.$route.query.arch || null
     },
     querySnapshotId () {
-      return this.$route.query.snapshotid | null
+      return this.$route.query.snapshotid || null
     },
     queryVolumeId () {
       return this.$route.query.volumeid || null
@@ -2645,21 +2645,28 @@ export default {
       args.showicon = 'true'
       args.id = this.queryVolumeId
       args.isvnf = false
+      args.state = 'Ready'
+      const pageSize = args.pageSize ? args.pageSize : 10
+      const pageStart = (args.page ? args.page - 1 : 0) * pageSize
+      const pageEnd = pageSize * (pageStart + 1)
 
       delete args.category
       delete args.public
       delete args.featured
+      delete args.page
+      delete args.pageSize
 
       return new Promise((resolve, reject) => {
         getAPI('listVolumes', args).then((response) => {
-          const listvolumesresponse = { count: 0, volume: [] }
+          let count = 0
+          const volumes = []
           response.listvolumesresponse.volume.forEach(volume => {
-            if (!volume.virtualmachineid && volume.state === 'Ready') {
-              listvolumesresponse.count += 1
-              listvolumesresponse.volume.push({ ...volume, displaytext: volume.name })
+            if (!volume.virtualmachineid) {
+              count += 1
+              volumes.push({ ...volume, displaytext: volume.name })
             }
           })
-          resolve({ listvolumesresponse })
+          resolve({ listvolumesresponse: { count, volume: volumes.slice(pageStart, pageEnd) } })
         }).catch((reason) => {
           // ToDo: Handle errors
           reject(reason)
@@ -2686,21 +2693,27 @@ export default {
       args.details = 'all'
       args.showicon = 'true'
       args.isvnf = false
+      const pageSize = args.pageSize ? args.pageSize : 10
+      const pageStart = (args.page ? args.page - 1 : 0) * pageSize
+      const pageEnd = pageSize * (pageStart + 1)
 
       delete args.category
       delete args.public
       delete args.featured
+      delete args.page
+      delete args.pageSize
 
       return new Promise((resolve, reject) => {
         getAPI('listSnapshots', args).then((response) => {
-          const listsnapshotsresponse = { count: 0, snapshot: [] }
+          let count = 0
+          const snapshots = []
           response.listsnapshotsresponse.snapshot.forEach(snapshot => {
             if (snapshot.volumetype === 'ROOT') {
-              listsnapshotsresponse.count += 1
-              listsnapshotsresponse.snapshot.push({ ...snapshot, displaytext: snapshot.name })
+              count += 1
+              snapshots.push({ ...snapshot, displaytext: snapshot.name })
             }
           })
-          resolve({ listsnapshotsresponse })
+          resolve({ listsnapshotsresponse: { count, snapshot: snapshots.slice(pageStart, pageEnd) } })
         }).catch((reason) => {
           // ToDo: Handle errors
           reject(reason)
@@ -2842,7 +2855,7 @@ export default {
       this.imageSearchFilters = params
       const volumeFilters = this.getImageFilters(params)
       volumeFilters.forEach((filter) => {
-        volumes[filter] = { count: 0, iso: [] }
+        volumes[filter] = { count: 0, volume: [] }
         promises.push(this.fetchUnattachedVolumes(filter, params))
       })
       this.options.volumes = volumes
@@ -2864,7 +2877,7 @@ export default {
       this.imageSearchFilters = params
       const snapshotFilters = this.getImageFilters(params)
       snapshotFilters.forEach((filter) => {
-        snapshots[filter] = { count: 0, iso: [] }
+        snapshots[filter] = { count: 0, snapshot: [] }
         promises.push(this.fetchRootSnapshots(filter, params))
       })
       this.options.snapshots = snapshots