Skip to content

Commit 98baae6

Browse files
committed
ui: fix column filter for templates, isos
Template and ISO list was showing State column as undefined in the column filter. This PR fixes such cases when the column key is an object. Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 9967bb3 commit 98baae6

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ui/src/components/view/ListView.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<a-menu>
3333
<a-menu-item v-for="(column, idx) in columnKeys" :key="idx" @click="updateSelectedColumns(column)">
3434
<a-checkbox :id="idx.toString()" :checked="selectedColumns.includes(getColumnKey(column))"/>
35-
{{ $t('label.' + String(getColumTitle(column)).toLowerCase()) }}
35+
{{ $t('label.' + String(getColumnTitle(column)).toLowerCase()) }}
3636
</a-menu-item>
3737
</a-menu>
3838
</div>
@@ -904,16 +904,16 @@ export default {
904904
return host.state
905905
},
906906
getColumnKey (name) {
907-
if (typeof name === 'object') {
908-
name = Object.keys(name).includes('field') ? name.field : name.customTitle
907+
if (typeof name !== 'object' || name === null) {
908+
return name
909909
}
910-
return name
910+
return name.field ?? name.customTitle ?? Object.keys(name)[0]
911911
},
912-
getColumTitle (name) {
913-
if (typeof name === 'object') {
914-
name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
912+
getColumnTitle (name) {
913+
if (typeof name !== 'object' || name === null) {
914+
return name
915915
}
916-
return name
916+
return name.customTitle ?? name.field ?? Object.keys(name)[0]
917917
},
918918
updateSelectedColumns (name) {
919919
this.$emit('update-selected-columns', name)

0 commit comments

Comments
 (0)