Skip to content

Commit b795525

Browse files
committed
refactor: capitalize selected resource title and improve tree view node structure
1 parent 58326f1 commit b795525

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

src/components/ResourceBrowser/ResourceList/Sidebar.tsx

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import Select, { FormatOptionLabelMeta } from 'react-select/base'
2121
import DOMPurify from 'dompurify'
2222

2323
import {
24+
capitalizeFirstLetter,
2425
GVKType,
2526
highlightSearchText,
2627
K8S_EMPTY_GROUP,
@@ -114,9 +115,7 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
114115
}
115116

116117
const _url = `${path}?${params.toString()}`
117-
118-
// Using lowercase here need to confirm
119-
updateK8sResourceTab({ url: _url, dynamicTitle: selectedKind, retainSearchParams: true })
118+
updateK8sResourceTab({ url: _url, dynamicTitle: capitalizeFirstLetter(selectedKind), retainSearchParams: true })
120119
updateTabLastSyncMoment(ResourceBrowserTabsId.k8s_Resources)
121120

122121
push(_url)
@@ -209,31 +208,33 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
209208
})
210209

211210
const getTreeViewNodes = () => {
212-
const fixedNodes: TreeNode<RBResourceSidebarDataAttributeType>[] = [
213-
!!list?.size &&
214-
!!list.get(AggregationKeys.Nodes) && {
215-
type: 'item',
216-
title: SIDEBAR_KEYS.nodes,
217-
id: getTreeViewNodeId(SIDEBAR_KEYS.nodeGVK),
218-
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.nodeGVK),
219-
},
220-
221-
!!list?.size &&
222-
!!list.get(AggregationKeys.Events) && {
223-
type: 'item',
224-
title: SIDEBAR_KEYS.events,
225-
id: getTreeViewNodeId(SIDEBAR_KEYS.eventGVK),
226-
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.eventGVK),
227-
},
228-
229-
!!list?.size &&
230-
!!list.get(AggregationKeys.Namespaces) && {
231-
type: 'item',
232-
title: SIDEBAR_KEYS.namespaces,
233-
id: getTreeViewNodeId(SIDEBAR_KEYS.namespaceGVK),
234-
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.namespaceGVK),
235-
},
236-
]
211+
const fixedNodes: TreeNode<RBResourceSidebarDataAttributeType>[] = (
212+
[
213+
!!list?.size &&
214+
!!list.get(AggregationKeys.Nodes) && {
215+
type: 'item',
216+
title: SIDEBAR_KEYS.nodes,
217+
id: getTreeViewNodeId(SIDEBAR_KEYS.nodeGVK),
218+
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.nodeGVK),
219+
},
220+
221+
!!list?.size &&
222+
!!list.get(AggregationKeys.Events) && {
223+
type: 'item',
224+
title: SIDEBAR_KEYS.events,
225+
id: getTreeViewNodeId(SIDEBAR_KEYS.eventGVK),
226+
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.eventGVK),
227+
},
228+
229+
!!list?.size &&
230+
!!list.get(AggregationKeys.Namespaces) && {
231+
type: 'item',
232+
title: SIDEBAR_KEYS.namespaces,
233+
id: getTreeViewNodeId(SIDEBAR_KEYS.namespaceGVK),
234+
dataAttributes: getTreeViewNodeDataAttributes(SIDEBAR_KEYS.namespaceGVK),
235+
},
236+
] satisfies TreeNode<RBResourceSidebarDataAttributeType>[]
237+
).filter(Boolean)
237238

238239
const dynamicNodesList = list?.size
239240
? [...list.values()].filter(

0 commit comments

Comments
 (0)