feat: add state for club view

academic-relations · Feb 2, 2025 · bef61e7 · bef61e7
1 parent 5ef163f
commit bef61e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx b/...web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx
@@ -17,6 +17,8 @@ const ExecutiveActivityReportChargedFrame: React.FC = () => {
     executiveId: Number(executiveId),
   });
 
+  window.history.replaceState({ isClubView: false }, "");
+
   const clubsActivities = data?.activities.reduce(
     (acc, activity) => {
       if (!activity.club?.id || !activity.chargedExecutive?.id) {

diff --git a/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx b/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx
@@ -15,7 +15,9 @@ import ExecutiveActivityClubTable from "../components/ExecutiveActivityClubTable
 import useGetExecutiveActivities from "../services/useGetExecutiveActivities";
 
 const ExecutiveActivityReportFrame = () => {
-  const [isClubView, setIsClubView] = useState<boolean>(true);
+  const [isClubView, setIsClubView] = useState<boolean>(
+    window.history.state.isClubView ?? true,
+  );
   const [searchText, setSearchText] = useState<string>("");
   const { data, isLoading, isError } = useGetExecutiveActivities();
 
@@ -24,6 +26,10 @@ const ExecutiveActivityReportFrame = () => {
     ChargedChangeClubProps[]
   >([]);
 
+  useEffect(() => {
+    window.history.replaceState({ isClubView }, "");
+  }, [isClubView]);
+
   useEffect(() => {
     if (data) {
       setSelectedClubInfos(