diff --git a/ui/src/components/CloudMonkey/Resource.vue b/ui/src/components/CloudMonkey/Resource.vue index 482fe08abc7..98eba02f1ca 100644 --- a/ui/src/components/CloudMonkey/Resource.vue +++ b/ui/src/components/CloudMonkey/Resource.vue @@ -26,7 +26,7 @@ - + @@ -152,7 +152,7 @@ -
+
@@ -258,7 +258,7 @@ export default { selectedRowKeys: [], currentAction: {}, showAction: false, - showDetails: false, + dataView: false, actions: [], breadList: [] } @@ -309,9 +309,9 @@ export default { params['keyword'] = search } if (this.$route && this.$route.params && this.$route.params.id) { - this.showDetails = true + this.dataView = true } else { - this.showDetails = false + this.dataView = false } if (this.$route && this.$route.meta && this.$route.meta.permission) { this.apiName = this.$route.meta.permission[0] diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 7a4274651cf..a5982e3dbd3 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -20,19 +20,57 @@ export default { api: 'deployVirtualMachine', icon: 'plus', label: 'Deploy VM', - params: ['name', 'zoneid', 'diskofferingid'] + params: ['name', 'zoneid', 'diskofferingid'], + listView: true }, + { + api: 'startVirtualMachine', + icon: 'right-square', + label: 'View Console', + dataView: true + }, + { api: 'startVirtualMachine', icon: 'caret-right', label: 'Start VM', - params: ['name', 'zoneid', 'diskofferingid'] + params: ['name', 'zoneid', 'diskofferingid'], + listView: true, + dataView: true }, { api: 'stopVirtualMachine', icon: 'stop', label: 'Stop VM', - params: ['name', 'zoneid', 'diskofferingid'] + params: ['name', 'zoneid', 'diskofferingid'], + listView: true, + dataView: true + }, + { + api: 'rebootVirtualMachine', + icon: 'sync', + label: 'Reboot VM', + dataView: true + }, + { + api: 'migrateVirtualMachine', + icon: 'drag', + label: 'Migrate VM', + dataView: true + }, + { + api: 'resetSSHKeyForVirtualMachine', + icon: 'lock', + label: 'Reset SSH Key', + dataView: true + }, + { + api: 'destroyVirtualMachine', + icon: 'delete', + label: 'Destroy VM', + params: ['id'], + listView: true, + dataView: true } ] }, diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js index 20b5da3b623..06de086a39b 100644 --- a/ui/src/config/section/storage.js +++ b/ui/src/config/section/storage.js @@ -17,34 +17,48 @@ export default { icon: 'plus', label: 'Create Volume', type: 'main', - params: ['name', 'zoneid', 'diskofferingid'] + params: ['name', 'zoneid', 'diskofferingid'], + listView: true }, { api: 'uploadVolume', icon: 'cloud-upload', label: 'Upload Volume From URL', type: 'main', - params: ['url', 'name', 'zoneid', 'format', 'diskofferingid', 'checksum'] + params: ['url', 'name', 'zoneid', 'format', 'diskofferingid', 'checksum'], + listView: true }, { api: 'getUploadParamsForVolume', icon: 'upload', label: 'Upload Local Volume', - params: ['@file', 'name', 'zoneid', 'format', 'checksum'] - }, { + params: ['@file', 'name', 'zoneid', 'format', 'checksum'], + listView: true + }, + { + api: 'migrateVolume', + icon: 'drag', + label: 'Migrate Volume', + params: ['volumeid', 'storageid', 'livemigrate'], + dataView: true + }, + { api: 'resizeVolume', icon: 'fullscreen', label: 'Resize Volume', type: 'main', - params: ['id', 'virtualmachineid'] + params: ['id', 'virtualmachineid'], + dataView: true }, { api: 'attachVolume', icon: 'paper-clip', label: 'Attach Volume', - params: ['id', 'virtualmachineid'] + params: ['id', 'virtualmachineid'], + dataView: true }, { api: 'detachVolume', icon: 'link', label: 'Detach Volume', - params: ['id', 'virtualmachineid'] + params: ['id', 'virtualmachineid'], + dataView: true }, { api: 'extractVolume', icon: 'cloud-download', @@ -54,17 +68,16 @@ export default { 'mode': { 'value': 'HTTP_DOWNLOAD' } - } - }, { - api: 'migrateVolume', - icon: 'drag', - label: 'Migrate Volume', - params: ['volumeid', 'storageid', 'livemigrate'] - }, { + }, + dataView: true + }, + { api: 'deleteVolume', icon: 'delete', label: 'Delete Volume', - params: ['id'] + params: ['id'], + listView: true, + dataView: true } ] },