Skip to content

Commit 8296d48

Browse files
committed
ui: fix custom action add/update
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 5210121 commit 8296d48

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

ui/src/views/extension/AddCustomAction.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,11 @@ export default {
190190
name: values.name,
191191
enabled: values.enabled
192192
}
193-
if (values.description) {
194-
params.description = values.description
193+
const keys = ['description', 'successmessage', 'errormessage']
194+
for (const key of keys) {
195+
if (values[key]) {
196+
params[key] = Array.isArray(values[key]) ? values[key].join(',') : values[key]
197+
}
195198
}
196199
if (values.parameters) {
197200
values.parameters.forEach((param, index) => {

ui/src/views/extension/UpdateCustomAction.vue

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,14 @@ export default {
148148
},
149149
initForm () {
150150
this.formRef = ref()
151-
this.form = reactive({
152-
description: this.resource.description,
153-
roles: this.resource.roles,
154-
parameters: this.fixParamatersOptions(this.resource.parameters),
155-
detail: this.resource.details,
156-
enabled: this.resource.enabled
157-
})
151+
const formData = {
152+
parameters: this.fixParamatersOptions(this.resource.parameters)
153+
}
154+
const keys = ['description', 'roles', 'successmessage', 'errormessage', 'details', 'enabled']
155+
for (const key of keys) {
156+
formData[key] = this.resource[key]
157+
}
158+
this.form = reactive(formData)
158159
this.rules = reactive({})
159160
},
160161
fetchRoles () {
@@ -177,8 +178,11 @@ export default {
177178
id: this.resource.id,
178179
enabled: values.enabled
179180
}
180-
if (values.description) {
181-
params.description = values.description
181+
const keys = ['description', 'roles', 'successmessage', 'errormessage']
182+
for (const key of keys) {
183+
if (values[key] !== undefined || values[key] !== null) {
184+
params[key] = Array.isArray(values[key]) ? values[key].join(',') : values[key]
185+
}
182186
}
183187
if (values.parameters && values.parameters.length > 0) {
184188
values.parameters.forEach((param, index) => {

0 commit comments

Comments
 (0)