Skip to content

Commit be99173

Browse files
committed
ui fixes
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 2951a67 commit be99173

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

ui/public/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3685,6 +3685,7 @@
36853685
"message.success.delete.acl.rule": "Successfully removed ACL rule",
36863686
"message.success.delete.backup.schedule": "Successfully deleted configure Instance backup schedule",
36873687
"message.success.delete.bgp.peer": "Successfully deleted BGP peer",
3688+
"message.success.delete.custom.action": "Successfully deleted Custom Action",
36883689
"message.success.delete.icon": "Successfully deleted icon of",
36893690
"message.success.delete.interface.static.route": "Successfully removed interface Static Route",
36903691
"message.success.delete.ipv4.subnet": "Successfully removed IPv4 subnet",

ui/src/components/view/DetailsTab.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@
176176
<div>{{ dataResource[item].rbd_default_data_pool }}</div>
177177
</div>
178178
</a-list-item>
179-
<a-list-item v-else-if="item === 'details' && ['xaas'].includes($route.meta.name)">
179+
<a-list-item v-else-if="item === 'details' && ['xaas', 'extca'].includes($route.meta.name) && dataResource[item] && Object.keys(dataResource[item]).length > 0">
180180
<div>
181-
<strong>{{ $t('label.' + String(item).toLowerCase()) }}</strong>
181+
<strong>{{ $t('label.configuration.details') }}</strong>
182182
<br/>
183183
<div>
184184
<object-list-table :data-map="dataResource[item]" />

ui/src/components/view/ListView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
<status :text="text ? text : ''" displayText />
278278
</template>
279279
<template v-if="column.key === 'entrypoint'">
280-
{{ text ? text.replace('/home/abhishek/lab/shapeblue/cloudstack', '/var/lib/cloudstack/management') : '' }}
280+
{{ text }}
281281
</template>
282282
<template v-if="column.key === 'entrypointstate'">
283283
<status :text="text ? text : ''" displayText :styles="{ 'min-width': '80px' }" />

ui/src/components/widgets/DetailsInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default {
8989
columns: [
9090
{ title: this.$t('label.key'), dataIndex: 'key', key: 'key', width: '40%' },
9191
{ title: this.$t('label.value'), dataIndex: 'value', key: 'value', width: '40%' },
92-
{ title: this.$t('label.actions'), key: 'action', width: '20%' }
92+
{ title: this.$t('label.actions'), key: 'actions', width: '20%' }
9393
],
9494
newKey: '',
9595
newValue: '',

ui/src/views/extension/AddCustomAction.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@
4242
</template>
4343
<a-input
4444
v-model:value="form.name"
45-
:placeholder="apiParams.name.description" />
45+
:placeholder="apiParams.name.description"
46+
v-focus="true" />
4647
</a-form-item>
4748
<a-form-item name="description" ref="description">
4849
<template #label>
4950
<tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
5051
</template>
5152
<a-input
5253
v-model:value="form.description"
53-
:placeholder="apiParams.description.description"
54-
v-focus="true" />
54+
:placeholder="apiParams.description.description" />
5555
</a-form-item>
5656
<a-form-item ref="allowedroletypes" name="allowedroletypes">
5757
<template #label>

ui/src/views/extension/ParametersInput.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@
112112
class="table"
113113
>
114114
<template #bodyCell="{ column, record }">
115-
<template v-if="column.key === 'valueoptions'">
116-
{{ Array.isArray(record.valueoptions) ? record.valueoptions.join(',') : record.valueoptions }}
117-
</template>
118115
<template v-if="column.key === 'actions'">
119116
<template v-if="record.editing">
120117
<div class="flex-gap">
@@ -154,6 +151,9 @@
154151

155152
<template v-else>
156153
<template v-if="column.key === 'required'">{{ record.required ? 'Yes' : 'No' }}</template>
154+
<template v-else-if="column.key === 'valueoptions'">
155+
{{ Array.isArray(record.valueoptions) ? record.valueoptions.join(',') : record.valueoptions }}
156+
</template>
157157
<template v-else>{{ record[column.key] }}</template>
158158
</template>
159159
</template>
@@ -287,7 +287,7 @@ export default {
287287
name,
288288
type,
289289
validationformat,
290-
valueoptions: Array.isArray(valueoptions) ? valueoptions.join(',') : null,
290+
valueoptions: Array.isArray(valueoptions) ? valueoptions.join(',') : valueoptions,
291291
required
292292
}))
293293
this.$emit('update:value', data)

ui/src/views/extension/UpdateCustomAction.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ export default {
180180
if (values.parameters && values.parameters.length > 0) {
181181
values.parameters.forEach((param, index) => {
182182
Object.keys(param).forEach(key => {
183-
params['parameters[' + index + '].' + key] = param[key]
183+
const val = param[key]
184+
params['parameters[' + index + '].' + key] = Array.isArray(val) ? val.join(',') : val
184185
})
185186
})
186187
} else {

0 commit comments

Comments
 (0)