Skip to content

Commit ddc2a36

Browse files
nvazqueznvazquez
authored
UI: Add missing tooltips to Register/Upload Templates/ISOs views (#7879)
1 parent d296f54 commit ddc2a36

File tree

2 files changed

+91
-29
lines changed

2 files changed

+91
-29
lines changed

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

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
<a-form-item
3636
v-if="currentForm === 'Create'"
3737
ref="url"
38-
name="url"
39-
:label="$t('label.url')">
38+
name="url">
39+
<template #label>
40+
<tooltip-label :title="$t('label.url')" :tooltip="apiParams.url.description"/>
41+
</template>
4042
<a-input
4143
v-focus="currentForm === 'Create'"
4244
v-model:value="form.url"
@@ -61,23 +63,35 @@
6163
</p>
6264
</a-upload-dragger>
6365
</a-form-item>
64-
<a-form-item ref="name" name="name" :label="$t('label.name')">
66+
<a-form-item ref="name" name="name">
67+
<template #label>
68+
<tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
69+
</template>
6570
<a-input
6671
v-model:value="form.name"
6772
:placeholder="apiParams.name.description"
6873
v-focus="currentForm !== 'Create'" />
6974
</a-form-item>
70-
<a-form-item ref="displaytext" name="displaytext" :label="$t('label.displaytext')">
75+
<a-form-item ref="displaytext" name="displaytext">
76+
<template #label>
77+
<tooltip-label :title="$t('label.displaytext')" :tooltip="apiParams.displaytext.description"/>
78+
</template>
7179
<a-input
7280
v-model:value="form.displaytext"
7381
:placeholder="apiParams.displaytext.description" />
7482
</a-form-item>
7583

76-
<a-form-item ref="directdownload" name="directdownload" v-if="allowed && currentForm !== 'Upload'" :label="$t('label.directdownload')">
84+
<a-form-item ref="directdownload" name="directdownload" v-if="allowed && currentForm !== 'Upload'">
85+
<template #label>
86+
<tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
87+
</template>
7788
<a-switch v-model:checked="form.directdownload"/>
7889
</a-form-item>
7990

80-
<a-form-item ref="zoneid" name="zoneid" :label="$t('label.zoneid')">
91+
<a-form-item ref="zoneid" name="zoneid">
92+
<template #label>
93+
<tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>
94+
</template>
8195
<a-select
8296
v-model:value="form.zoneid"
8397
showSearch
@@ -97,11 +111,17 @@
97111
</a-select>
98112
</a-form-item>
99113

100-
<a-form-item ref="bootable" name="bootable" :label="$t('label.bootable')">
114+
<a-form-item ref="bootable" name="bootable">
115+
<template #label>
116+
<tooltip-label :title="$t('label.bootable')" :tooltip="apiParams.bootable.description"/>
117+
</template>
101118
<a-switch v-model:checked="form.bootable" />
102119
</a-form-item>
103120

104-
<a-form-item ref="ostypeid" name="ostypeid" v-if="form.bootable" :label="$t('label.ostypeid')">
121+
<a-form-item ref="ostypeid" name="ostypeid" v-if="form.bootable">
122+
<template #label>
123+
<tooltip-label :title="$t('label.ostypeid')" :tooltip="apiParams.ostypeid.description"/>
124+
</template>
105125
<a-select
106126
v-model:value="form.ostypeid"
107127
showSearch
@@ -125,8 +145,10 @@
125145
<a-col :md="24" :lg="12">
126146
<a-form-item
127147
name="userdataid"
128-
ref="userdataid"
129-
:label="$t('label.userdata')">
148+
ref="userdataid">
149+
<template #label>
150+
<tooltip-label :title="$t('label.userdata')" :tooltip="linkUserDataParams.userdataid.description"/>
151+
</template>
130152
<a-select
131153
showSearch
132154
optionFilterProp="label"
@@ -145,7 +167,7 @@
145167
<a-col :md="24" :lg="12">
146168
<a-form-item ref="userdatapolicy" name="userdatapolicy">
147169
<template #label>
148-
<tooltip-label :title="$t('label.userdatapolicy')" :tooltip="$t('label.userdatapolicy.tooltip')"/>
170+
<tooltip-label :title="$t('label.userdatapolicy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
149171
</template>
150172
<a-select
151173
v-model:value="userdatapolicy"
@@ -162,19 +184,27 @@
162184
</a-col>
163185
</a-row>
164186

165-
<a-form-item ref="isextractable" name="isextractable" :label="$t('label.isextractable')">
187+
<a-form-item ref="isextractable" name="isextractable">
188+
<template #label>
189+
<tooltip-label :title="$t('label.isextractable')" :tooltip="apiParams.isextractable.description"/>
190+
</template>
166191
<a-switch v-model:checked="form.isextractable" />
167192
</a-form-item>
168193

169194
<a-form-item
170195
ref="ispublic"
171196
name="ispublic"
172-
:label="$t('label.ispublic')"
173197
v-if="$store.getters.userInfo.roletype === 'Admin' || $store.getters.features.userpublictemplateenabled" >
198+
<template #label>
199+
<tooltip-label :title="$t('label.ispublic')" :tooltip="apiParams.ispublic.description"/>
200+
</template>
174201
<a-switch v-model:checked="form.ispublic" />
175202
</a-form-item>
176203

177-
<a-form-item ref="isfeatured" name="isfeatured" :label="$t('label.isfeatured')" v-if="$store.getters.userInfo.roletype === 'Admin'">
204+
<a-form-item ref="isfeatured" name="isfeatured" v-if="$store.getters.userInfo.roletype === 'Admin'">
205+
<template #label>
206+
<tooltip-label :title="$t('label.isfeatured')" :tooltip="apiParams.isfeatured.description"/>
207+
</template>
178208
<a-switch v-model:checked="form.isfeatured" />
179209
</a-form-item>
180210

@@ -276,7 +306,7 @@ export default {
276306
params.showicon = true
277307
278308
this.zoneLoading = true
279-
if (store.getters.userInfo.roletype === this.rootAdmin) {
309+
if (store.getters.userInfo.roletype === 'Admin') {
280310
this.allowed = true
281311
}
282312
api('listZones', params).then(json => {

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

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
@finish="handleSubmit"
3333
layout="vertical">
3434
<div v-if="currentForm === 'Create'">
35-
<a-form-item :label="$t('label.url')" name="url" ref="url">
35+
<a-form-item name="url" ref="url">
36+
<template #label>
37+
<tooltip-label :title="$t('label.url')" :tooltip="apiParams.url.description"/>
38+
</template>
3639
<a-input
3740
v-focus="currentForm === 'Create'"
3841
v-model:value="form.url"
@@ -56,22 +59,30 @@
5659
</a-upload-dragger>
5760
</a-form-item>
5861
</div>
59-
<a-form-item :label="$t('label.name')" ref="name" name="name">
62+
<a-form-item ref="name" name="name">
63+
<template #label>
64+
<tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
65+
</template>
6066
<a-input
6167
v-model:value="form.name"
6268
:placeholder="apiParams.name.description"
6369
v-focus="currentForm !== 'Create'"/>
6470
</a-form-item>
65-
<a-form-item :label="$t('label.displaytext')" ref="displaytext" name="displaytext">
71+
<a-form-item ref="displaytext" name="displaytext">
72+
<template #label>
73+
<tooltip-label :title="$t('label.displaytext')" :tooltip="apiParams.displaytext.description"/>
74+
</template>
6675
<a-input
6776
v-model:value="form.displaytext"
6877
:placeholder="apiParams.displaytext.description" />
6978
</a-form-item>
7079
<div v-if="currentForm === 'Create'">
7180
<a-form-item
72-
:label="$t('label.zone')"
7381
name="zoneids"
7482
ref="zoneids">
83+
<template #label>
84+
<tooltip-label :title="$t('label.zone')" :tooltip="apiParams.zoneids.description"/>
85+
</template>
7586
<a-select
7687
v-model:value="form.zoneids"
7788
:loading="zones.loading"
@@ -94,9 +105,11 @@
94105
</div>
95106
<div v-else>
96107
<a-form-item
97-
:label="$t('label.zoneid')"
98108
ref="zoneid"
99109
name="zoneid">
110+
<template #label>
111+
<tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>
112+
</template>
100113
<a-select
101114
v-model:value="form.zoneid"
102115
showSearch
@@ -119,7 +132,10 @@
119132
</div>
120133
<a-row :gutter="12">
121134
<a-col :md="24" :lg="12">
122-
<a-form-item ref="hypervisor" name="hypervisor" :label="$t('label.hypervisor')">
135+
<a-form-item ref="hypervisor" name="hypervisor">
136+
<template #label>
137+
<tooltip-label :title="$t('label.hypervisor')" :tooltip="apiParams.hypervisor.description"/>
138+
</template>
123139
<a-select
124140
v-model:value="form.hypervisor"
125141
:loading="hyperVisor.loading"
@@ -137,7 +153,10 @@
137153
</a-form-item>
138154
</a-col>
139155
<a-col :md="24" :lg="12">
140-
<a-form-item ref="format" name="format" :label="$t('label.format')">
156+
<a-form-item ref="format" name="format">
157+
<template #label>
158+
<tooltip-label :title="$t('label.format')" :tooltip="apiParams.format.description"/>
159+
</template>
141160
<a-select
142161
v-model:value="form.format"
143162
:placeholder="apiParams.format.description"
@@ -156,12 +175,18 @@
156175
</a-row>
157176
<a-row :gutter="12" v-if="allowed && hyperKVMShow && currentForm !== 'Upload'">
158177
<a-col :md="24" :lg="12">
159-
<a-form-item ref="directdownload" name="directdownload" :label="$t('label.directdownload')">
178+
<a-form-item ref="directdownload" name="directdownload">
179+
<template #label>
180+
<tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
181+
</template>
160182
<a-switch v-model:checked="form.directdownload" @change="handleChangeDirect" />
161183
</a-form-item>
162184
</a-col>
163185
<a-col :md="24" :lg="12" v-if="allowDirectDownload">
164-
<a-form-item ref="checksum" name="checksum" :label="$t('label.checksum')">
186+
<a-form-item ref="checksum" name="checksum">
187+
<template #label>
188+
<tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/>
189+
</template>
165190
<a-input
166191
v-model:value="form.checksum"
167192
:placeholder="apiParams.checksum.description" />
@@ -174,7 +199,10 @@
174199
</a-form-item>
175200
</a-row>
176201

177-
<a-form-item ref="deployasis" name="deployasis" :label="$t('label.deployasis')" v-if="selectedFormat === 'OVA'">
202+
<a-form-item ref="deployasis" name="deployasis" v-if="selectedFormat === 'OVA'">
203+
<template #label>
204+
<tooltip-label :title="$t('label.deployasis')" :tooltip="apiParams.deployasis.description"/>
205+
</template>
178206
<a-switch
179207
v-model:checked="form.deployasis"
180208
:checked="deployasis"
@@ -237,8 +265,10 @@
237265
<a-form-item
238266
name="ostypeid"
239267
ref="ostypeid"
240-
:label="$t('label.ostypeid')"
241268
v-if="!hyperVMWShow || (hyperVMWShow && !deployasis)">
269+
<template #label>
270+
<tooltip-label :title="$t('label.ostypeid')" :tooltip="apiParams.ostypeid.description"/>
271+
</template>
242272
<a-select
243273
showSearch
244274
optionFilterProp="label"
@@ -257,8 +287,10 @@
257287
<a-col :md="24" :lg="12">
258288
<a-form-item
259289
name="userdataid"
260-
ref="userdataid"
261-
:label="$t('label.userdata')">
290+
ref="userdataid">
291+
<template #label>
292+
<tooltip-label :title="$t('label.userdata')" :tooltip="linkUserDataParams.userdataid.description"/>
293+
</template>
262294
<a-select
263295
showSearch
264296
optionFilterProp="label"
@@ -277,7 +309,7 @@
277309
<a-col :md="24" :lg="12">
278310
<a-form-item ref="userdatapolicy" name="userdatapolicy">
279311
<template #label>
280-
<tooltip-label :title="$t('label.userdatapolicy')" :tooltip="$t('label.userdatapolicy.tooltip')"/>
312+
<tooltip-label :title="$t('label.userdatapolicy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
281313
</template>
282314
<a-select
283315
v-model:value="userdatapolicy"

0 commit comments

Comments
 (0)