Skip to content

Commit f2d2e03

Browse files
Pearl1594yadvr
Pearl1594
and
yadvr
committed
storage: custom upload action for template, iso, volume (apache#144)
This implements custom upload action form for template, iso, volume with progress bar. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Co-authored-by: Rohit Yadav <rohit@apache.org>
1 parent d24f226 commit f2d2e03

8 files changed

Lines changed: 1566 additions & 1076 deletions

File tree

‎ui/src/config/section/image.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ export default {
4848
{
4949
api: 'registerTemplate',
5050
icon: 'plus',
51-
label: 'Create template',
51+
label: 'Register Template',
5252
listView: true,
5353
popup: true,
54-
component: () => import('@/views/image/RegisterTemplate.vue')
54+
component: () => import('@/views/image/RegisterOrUploadTemplate.vue')
5555
},
5656
{
5757
api: 'getUploadParamsForTemplate',
5858
icon: 'cloud-upload',
5959
label: 'Upload Local Template',
6060
listView: true,
6161
popup: true,
62-
component: () => import('@/views/image/UploadLocalTemplate.vue')
62+
component: () => import('@/views/image/RegisterOrUploadTemplate.vue')
6363
},
6464
{
6565
api: 'updateTemplate',
@@ -88,7 +88,7 @@ export default {
8888
{
8989
api: 'updateTemplatePermissions',
9090
icon: 'reconciliation',
91-
label: 'Update template permissions',
91+
label: 'Update Template Permissions',
9292
dataView: true,
9393
popup: true,
9494
show: (record, store) => { return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && (record.domainid === store.userInfo.domainid && record.account === store.userInfo.account) || record.templatetype !== 'BUILTIN') },
@@ -139,15 +139,15 @@ export default {
139139
label: 'Register ISO',
140140
listView: true,
141141
popup: true,
142-
component: () => import('@/views/image/RegisterIso.vue')
142+
component: () => import('@/views/image/RegisterOrUploadIso.vue')
143143
},
144144
{
145145
api: 'getUploadParamsForIso',
146146
icon: 'cloud-upload',
147-
label: 'Upload Local Iso',
147+
label: 'Upload Local ISO',
148148
listView: true,
149149
popup: true,
150-
component: () => import('@/views/image/UploadLocalIso.vue')
150+
component: () => import('@/views/image/RegisterOrUploadIso.vue')
151151
},
152152
{
153153
api: 'updateIso',

‎ui/src/config/section/storage.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ export default {
4040
label: 'Create Volume',
4141
listView: true,
4242
args: ['name', 'zoneid', 'diskofferingid']
43-
}, {
43+
},
44+
{
45+
api: 'getUploadParamsForVolume',
46+
icon: 'cloud-upload',
47+
label: 'Upload Local Volume',
48+
listView: true,
49+
popup: true,
50+
component: () => import('@/views/storage/UploadLocalVolume.vue')
51+
},
52+
{
4453
api: 'uploadVolume',
4554
icon: 'link',
4655
label: 'Upload Volume From URL',
@@ -51,13 +60,6 @@ export default {
5160
options: ['RAW', 'VHD', 'VHDX', 'OVA', 'QCOW2']
5261
}
5362
}
54-
}, {
55-
api: 'getUploadParamsForVolume',
56-
icon: 'cloud-upload',
57-
label: 'Upload Local Volume',
58-
listView: true,
59-
popup: true,
60-
component: () => import('@/views/storage/UploadLocalVolume.vue')
6163
},
6264
{
6365
api: 'attachVolume',

‎ui/src/views/AutogenView.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
:is="currentAction.component"
7575
:resource="resource"
7676
:loading="loading"
77+
:action="{currentAction}"
7778
v-bind="{currentAction}"
7879
@refresh-data="fetchData"
7980
@poll-action="pollActionCompletion"

‎ui/src/views/image/RegisterIso.vue‎

Lines changed: 0 additions & 241 deletions
This file was deleted.

0 commit comments

Comments
 (0)