Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ describe('useDatasourcePreference', () => {
expect(setPreferenceMock).toHaveBeenCalledWith(['archived-data']);
});

it('should reset preference to default', () => {
it('should clear preference to empty array', () => {
const { result } = testHook(() =>
useDatasourcePreference('pipelineRun', true),
);
result.current.resetPreference();
expect(setPreferenceMock).toHaveBeenCalledWith(DEFAULT_DATASOURCE_VALUES);
result.current.clearPreference();
expect(setPreferenceMock).toHaveBeenCalledWith([]);
});

it('should use the correct preference key for pipelineRun', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/hooks/useDataViewFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export const useDataViewFilter = <T extends K8sResourceCommon>({
const {
preference: datasourcePreference,
setPreference: setDatasourcePreference,
resetPreference: resetDatasourcePreference,
clearPreference: clearDatasourcePreference,
} = useDatasourcePreference(resourceType, shouldPersistDataSource);
const allStatusIds = useMemo(() => Object.values(ListFilterId), []);

Expand Down Expand Up @@ -330,10 +330,10 @@ export const useDataViewFilter = <T extends K8sResourceCommon>({
setTimespanDateFilter(NO_DATE_RANGE_FILTER);
}
if (config?.hasDataSourceFilter) {
resetDatasourcePreference();
clearDatasourcePreference();
}
resetPage();
}, [resetPage, setTimespanDateFilter, resetDatasourcePreference, config]);
}, [resetPage, setTimespanDateFilter, clearDatasourcePreference, config]);

const labelSuggestions = useMemo(() => {
if (!data) return [];
Expand Down
9 changes: 5 additions & 4 deletions src/components/hooks/useDatasourcePreference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useCallback } from 'react';
import { USER_PREFERENCE_PREFIX } from '../../consts';

export const DEFAULT_DATASOURCE_VALUES = ['cluster-data'];
const NO_DATASOURCE_FILTER = [];

// When persist is false, no ConfigMap entry is auto-created; sync is enabled when resourceType is defined.
export const useDatasourcePreference = (
Expand All @@ -15,14 +16,14 @@ export const useDatasourcePreference = (
!!resourceType,
);

const resetPreference = useCallback(() => {
setPreference(DEFAULT_DATASOURCE_VALUES);
const clearPreference = useCallback(() => {
setPreference(NO_DATASOURCE_FILTER);
}, [setPreference]);

return {
preference: preference ?? DEFAULT_DATASOURCE_VALUES,
preference: preference ?? (loaded ? DEFAULT_DATASOURCE_VALUES : NO_DATASOURCE_FILTER),
setPreference,
resetPreference,
clearPreference,
loaded,
};
};
Loading