Skip to content

Reset page and previous results on filter apply #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged

Reset page and previous results on filter apply #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/components/explore-section/ControlPanel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ import { ExploreDataScope, FilterValues } from '@/types/explore-section/applicat
import {
activeColumnsAtom,
filtersAtom,
pageNumberAtom,
previousDataAtom,
searchStringAtom,
} from '@/state/explore-section/list-view-atoms';
import { getFieldEsConfig, getFieldLabel } from '@/api/explore-section/fields';
import { FilterTypeEnum } from '@/types/explore-section/filters';
import { DataType } from '@/constants/explore-section/list-views';
import { DataType, PAGE_NUMBER } from '@/constants/explore-section/list-views';
import ClearFilters from '@/components/explore-section/ExploreSectionListingView/ClearFilters';
import { fieldTitleSentenceCase } from '@/util/utils';
import { VirtualLabInfo } from '@/types/virtual-lab/common';

export type ControlPanelProps = {
children?: ReactNode;
Expand All @@ -44,6 +47,7 @@ export type ControlPanelProps = {
setFilters: any;
showDisplayTrigger?: boolean;
resourceId?: string;
virtualLabInfo?: VirtualLabInfo;
};

function createFilterItemComponent(
Expand Down Expand Up @@ -166,6 +170,7 @@ export default function ControlPanel({
setFilters,
showDisplayTrigger = true,
resourceId,
virtualLabInfo,
}: ControlPanelProps) {
const [activeColumns, setActiveColumns] = useAtom(
useMemo(
Expand All @@ -176,6 +181,11 @@ export default function ControlPanel({

const [filterValues, setFilterValues] = useState<FilterValues>({});
const resetFilters = useResetAtom(filtersAtom({ dataType, dataScope, resourceId, key: dataKey }));
const setPrevData = useSetAtom(
previousDataAtom({ virtualLabInfo, dataType, dataScope, key: dataKey })
);
const setPageNumber = useSetAtom(pageNumberAtom(dataKey));

const setSearchString = useSetAtom(searchStringAtom(dataKey));

const onToggleActive = (key: string) => {
Expand Down Expand Up @@ -203,6 +213,8 @@ export default function ControlPanel({
}, [filters]);

const submitValues = () => {
setPageNumber(PAGE_NUMBER);
setPrevData([]);
setFilters(filters?.map((fil: Filter) => ({ ...fil, value: filterValues[fil.field] })));
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/explore-section/ExploreSectionListingView/LoadMoreButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HTMLProps, useCallback } from 'react';
import { useAtom } from 'jotai';
import { useAtom, useAtomValue } from 'jotai';
import {
dataAtom,
pageNumberAtom,
Expand Down Expand Up @@ -33,7 +33,7 @@ export function useData(
},
key: string
) {
const [prevData] = useAtom(previousDataAtom({ ...dataContext, key }));
const prevData = useAtomValue(previousDataAtom({ ...dataContext, key }));

const data = useUnwrappedValue(
dataAtom({
Expand Down
1 change: 1 addition & 0 deletions src/components/explore-section/ExploreSectionListingView/WithControlPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default function WithControlPanel({
dataType={dataType}
dataScope={dataScope}
dataKey={dataKey}
virtualLabInfo={virtualLabInfo}
/>
)}
</>
Expand Down