Skip to content

Commit 2a1b3ae

Browse files
committed
refactor: NodeListSearchFilter - search filter fix, style updates
1 parent 694dce9 commit 2a1b3ae

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

src/components/ResourceBrowser/Constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ export const NODE_LIST_HEADERS_TO_KEY_MAP: Record<(typeof NODE_LIST_HEADERS)[num
325325
unschedulable: 'unschedulable',
326326
} as const
327327

328+
export const NODE_LIST_HEADER_KEYS_TO_SEARCH = Object.values(NODE_LIST_HEADERS_TO_KEY_MAP)
329+
328330
export const NODE_SEARCH_KEYS_TO_OBJECT_KEYS: Record<
329331
NODE_SEARCH_KEYS,
330332
(typeof NODE_LIST_HEADERS_TO_KEY_MAP)[keyof typeof NODE_LIST_HEADERS_TO_KEY_MAP]

src/components/ResourceBrowser/ResourceBrowser.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@
6868
display: grid;
6969
grid-template-columns: 1fr auto 1px 180px;
7070
column-gap: 8px;
71+
72+
.grouped-filter-select-picker {
73+
width: 350px;
74+
> .dc__mxw-250 {
75+
max-width: 350px;
76+
}
77+
}
7178
}
7279

7380
.resource-filter-options-container {
@@ -87,6 +94,7 @@
8794
.cluster-terminal-hidden {
8895
visibility: hidden;
8996
height: 0;
97+
9098
.terminal-action-strip {
9199
display: none;
92100
}

src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {
4444
updateManifestResourceHelmApps,
4545
} from '@Components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api'
4646

47-
import { NODE_LIST_HEADERS_TO_KEY_MAP } from '../Constants'
47+
import { NODE_LIST_HEADER_KEYS_TO_SEARCH, NODE_LIST_HEADERS_TO_KEY_MAP } from '../Constants'
4848
import { getResourceData } from '../ResourceBrowser.service'
4949
import { K8SResourceListType } from '../Types'
5050
import K8sResourceListTableCellComponent from './K8sResourceListTableCellComponent'
@@ -233,6 +233,7 @@ export const K8SResourceList = ({
233233
Object.entries(row.data).some(
234234
([key, value]) =>
235235
key !== 'id' &&
236+
(!isNodeListing || NODE_LIST_HEADER_KEYS_TO_SEARCH.includes(key)) &&
236237
value !== null &&
237238
value !== undefined &&
238239
String(value).toLowerCase().includes(filterData.searchKey.toLowerCase()),

src/components/ResourceBrowser/ResourceList/NodeListSearchFilter.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ const NodeListSearchFilter = ({
190190
placeholder: 'Search Nodes',
191191
onKeyUp: handleSearchInputKeyUp,
192192
}}
193+
containerClassName="w-250"
193194
/>
194195

195196
<GroupedFilterSelectPicker<NODE_SEARCH_KEYS | typeof NODE_K8S_VERSION_FILTER_KEY>

0 commit comments

Comments
 (0)