Skip to content

Commit 03969d0

Browse files
committed
fix: use state for absolute values checkbox
1 parent 5e44fe5 commit 03969d0

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

src/components/ResourceBrowser/ResourceList/ResourceFilterOptions.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
GVK_FILTER_KIND_QUERY_PARAM_KEY,
2828
GVKOptionValueType,
2929
Nodes,
30+
noop,
3031
OptionType,
3132
ResourceRecommenderHeaderType,
3233
SearchBar,
@@ -70,7 +71,7 @@ const ResourceFilterOptions = ({
7071
filteredRows,
7172
gvkFilterConfig,
7273
isResourceListLoading,
73-
showAbsoluteValuesInResourceRecommender,
74+
resourceRecommenderConfig,
7475
selectedAPIVersionGVKFilter,
7576
selectedKindGVKFilter,
7677
}: ResourceFilterOptionsProps) => {
@@ -88,6 +89,9 @@ const ResourceFilterOptions = ({
8889
const showShortcutKey = !isInputFocused && !searchText
8990
const isResourceRecommender = selectedResource?.gvk?.Kind === Nodes.ResourceRecommender
9091

92+
const { showAbsoluteValuesInResourceRecommender = false, setShowAbsoluteValuesInResourceRecommender = noop } =
93+
resourceRecommenderConfig ?? {}
94+
9195
const [, namespaceByClusterIdList] = useAsync(() => namespaceListByClusterId(clusterId), [clusterId])
9296

9397
const namespaceOptions = useMemo(
@@ -165,11 +169,7 @@ const ResourceFilterOptions = ({
165169
}
166170

167171
const handleToggleShowAbsoluteValues = () => {
168-
const newValue = !showAbsoluteValuesInResourceRecommender
169-
updateSearchParams(
170-
{ showAbsoluteValuesInResourceRecommender: newValue ? true : null },
171-
{ redirectionMethod: 'replace' },
172-
)
172+
setShowAbsoluteValuesInResourceRecommender((prevValue) => !prevValue)
173173
}
174174

175175
const getIsGVKOptionSelected = (option: SelectPickerOptionType<GVKOptionValueType>): boolean => {

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,11 @@ const ResourceList = () => {
288288
reloadGVKOptions,
289289
gvkOptionsError,
290290
}: GetResourceRecommenderResourceListPropsType) => ({
291-
addTab,
292291
selectedCluster,
293292
selectedResource: {
294293
gvk: SIDEBAR_KEYS.resourceRecommenderGVK,
295294
namespaced: true,
296295
},
297-
updateK8sResourceTab: getUpdateTabUrlForId(RESOURCE_RECOMMENDER_TAB_ID),
298296
lowercaseKindToResourceGroupMap,
299297
resourceRecommenderConfig: {
300298
setShowAbsoluteValuesInResourceRecommender,

src/components/ResourceBrowser/ResourceList/ResourceRecommenderTableCellComponent.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ const ResourceRecommendationChip = importComponentFromFELibrary('ResourceRecomme
3737
interface ResourceRecommenderTableCellComponentProps extends TableCellComponentProps<FiltersTypeEnum.URL> {
3838
handleReloadDataAfterBulkOperation: () => void
3939
showAbsoluteValuesInResourceRecommender: boolean
40-
filterData: TableCellComponentProps<FiltersTypeEnum.URL>['filterData'] & {
41-
showAbsoluteValuesInResourceRecommender: boolean
42-
}
4340
}
4441

4542
const ResourceRecommenderTableCellComponent = ({
4643
field: columnName,
4744
row: { id, data: resourceData },
48-
filterData: { searchKey: searchText, showAbsoluteValuesInResourceRecommender },
45+
filterData: { searchKey: searchText },
4946
signals,
5047
handleReloadDataAfterBulkOperation,
48+
showAbsoluteValuesInResourceRecommender,
5149
}: ResourceRecommenderTableCellComponentProps) => {
5250
const { push } = useHistory()
5351
const { clusterId } = useParams<ClusterDetailBaseParams>()

src/components/ResourceBrowser/ResourceList/ResourceRecommenderTableViewWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const ResourceRecommenderTableViewWrapper = ({
1515
...props
1616
}: ResourceRecommenderTableViewWrapperProps) => (
1717
<div className="resource-list-container flexbox-col flex-grow-1 border__primary--left dc__overflow-hidden">
18-
<ResourceFilterOptions {...props} />
18+
<ResourceFilterOptions searchPlaceholder="Search" {...props} />
1919

2020
{resourceListError ? (
2121
<ErrorScreenManager

src/components/ResourceBrowser/Types.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import React, { RefObject } from 'react'
17+
import React, { Dispatch, RefObject, SetStateAction } from 'react'
1818
import { GroupBase } from 'react-select'
1919

2020
import {
@@ -114,9 +114,12 @@ export interface ResourceFilterOptionsProps
114114
reloadGVKOptions: () => void
115115
gvkOptionsError: ServerErrors
116116
}
117-
showAbsoluteValuesInResourceRecommender?: boolean
118117
selectedAPIVersionGVKFilter?: string
119118
selectedKindGVKFilter?: string
119+
resourceRecommenderConfig?: {
120+
showAbsoluteValuesInResourceRecommender: boolean
121+
setShowAbsoluteValuesInResourceRecommender: Dispatch<SetStateAction<boolean>>
122+
}
120123
}
121124

122125
export interface K8SResourceListType

0 commit comments

Comments
 (0)