Skip to content

Commit a03ccab

Browse files
EnsiyehEArnei
andauthored
Fix series filters being overwritten by existing event filters (#1423)
* initial commit * fix merge conflict * Fix formatting --------- Co-authored-by: Arnei <[email protected]>
1 parent 682f29b commit a03ccab

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/components/events/partials/SeriesTitleCell.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const SeriesTitleCell = ({
1515
filterName={"series"}
1616
filterValue={row.id}
1717
// tooltipText={"EVENTS.SERIES.TABLE.TOOLTIP.SERIES"} // Disabled due to performance concerns
18+
resetBeforeRedirect
1819
>
1920
{row.title}
2021
</RedirectCell>

src/components/shared/RedirectCell.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useNavigate } from "react-router";
2-
import { setSpecificEventFilter } from "../../slices/tableFilterSlice";
2+
import { setSpecificEventFilter, resetFilterValues } from "../../slices/tableFilterSlice";
33
import { useAppDispatch } from "../../store";
44
import ButtonLikeAnchor from "./ButtonLikeAnchor";
55
import { ParseKeys } from "i18next";
@@ -14,17 +14,22 @@ const RedirectCell = ({
1414
filterValue,
1515
tooltipText,
1616
children,
17+
resetBeforeRedirect = false,
1718
}: {
1819
path: string
1920
filterName: string
2021
filterValue: string
2122
tooltipText?: ParseKeys
2223
children: ReactNode
24+
resetBeforeRedirect?: boolean;
2325
}) => {
2426
const dispatch = useAppDispatch();
2527
const navigate = useNavigate();
2628

2729
const redirectToResource = async (filterValue: string) => {
30+
if (resetBeforeRedirect) {
31+
dispatch(resetFilterValues());
32+
}
2833
// Set filter before redirecting
2934
await dispatch(setSpecificEventFilter({ filter: filterName, filterValue }));
3035
navigate(path);

0 commit comments

Comments
 (0)