Skip to content

Commit 2579cc4

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 52a9566 commit 2579cc4

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
@@ -33,7 +33,7 @@
3333
<a-menu>
3434
<a-menu-item v-for="(column, idx) in columnKeys" :key="idx" @click="updateSelectedColumns(column)">
3535
<a-checkbox :id="idx.toString()" :checked="selectedColumns.includes(getColumnKey(column))"/>
36-
{{ $t('label.' + String(getColumTitle(column)).toLowerCase()) }}
36+
{{ $t('label.' + String(getColumnTitle(column)).toLowerCase()) }}
3737
</a-menu-item>
3838
</a-menu>
3939
</div>
@@ -999,16 +999,16 @@ export default {
999999
return host.state
10001000
},
10011001
getColumnKey (name) {
1002-
if (typeof name === 'object') {
1003-
name = Object.keys(name).includes('field') ? name.field : name.customTitle
1002+
if (typeof name !== 'object' || name === null) {
1003+
return name
10041004
}
1005-
return name
1005+
return name.field ?? name.customTitle ?? Object.keys(name)[0]
10061006
},
1007-
getColumTitle (name) {
1008-
if (typeof name === 'object') {
1009-
name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
1007+
getColumnTitle (name) {
1008+
if (typeof name !== 'object' || name === null) {
1009+
return name
10101010
}
1011-
return name
1011+
return name.customTitle ?? name.field ?? Object.keys(name)[0]
10121012
},
10131013
handleResizeColumn (w, col) {
10141014
col.width = w

0 commit comments

Comments
 (0)