changes

ohcnetwork · Dec 18, 2024 · db15f8b · db15f8b
1 parent 71ac706
commit db15f8b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/src/Routers/routes/ShiftingRoutes.tsx b/src/Routers/routes/ShiftingRoutes.tsx
@@ -11,9 +11,7 @@ import { getDefaultView } from "@/Utils/viewStorageUtils";
 
 const ShiftingRoutes: AppRoutes = {
   "/shifting": () => (
-    <Redirect
-      to={`/shifting/${getDefaultView("defaultShiftingView", "board")}`}
-    />
+    <Redirect to={`/shifting/${getDefaultView("defaultShiftView", "board")}`} />
   ),
   "/shifting/board": () => <BoardView />,
   "/shifting/list": () => <ListView />,

diff --git a/src/Routers/routes/UserRoutes.tsx b/src/Routers/routes/UserRoutes.tsx
@@ -4,12 +4,9 @@ import UserHome from "@/components/Users/UserHome";
 import UserProfile from "@/components/Users/UserProfile";
 
 import { AppRoutes } from "@/Routers/AppRouter";
-import { getDefaultView } from "@/Utils/viewStorageUtils";
 
 const UserRoutes: AppRoutes = {
-  "/users": () => (
-    <ManageUsers defaultView={getDefaultView("usersDefaultView", "card")} />
-  ),
+  "/users": () => <ManageUsers />,
   "/users/add": () => <UserAdd />,
   "/users/:username": ({ username }) => (
     <UserHome username={username} tab={"profile"} />

diff --git a/src/components/Resource/ResourceBoard.tsx b/src/components/Resource/ResourceBoard.tsx
@@ -25,6 +25,7 @@ import { RESOURCE_CHOICES } from "@/common/constants";
 
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
+import { setDefaultView } from "@/Utils/viewStorageUtils";
 
 const KanbanBoard = lazy(
   () => import("@/components/Kanban/Board"),
@@ -47,7 +48,7 @@ export default function BoardView() {
 
   const onListViewBtnClick = () => {
     navigate("/resource/list", { query: qParams });
-    localStorage.setItem("defaultResourceView", "list");
+    setDefaultView("defaultResourceView", "list");
   };
 
   return (

diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx
@@ -22,6 +22,7 @@ import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
 import { formatDateTime } from "@/Utils/utils";
+import { setDefaultView } from "@/Utils/viewStorageUtils";
 
 export default function ListView() {
   const {
@@ -37,7 +38,7 @@ export default function ListView() {
 
   const onBoardViewBtnClick = () => {
     navigate("/resource/board", { query: qParams });
-    localStorage.setItem("defaultResourceView", "board");
+    setDefaultView("defaultResourceView", "board");
   };
   const appliedFilters = formatFilter(qParams);
 

diff --git a/src/components/Shifting/ShiftingBoard.tsx b/src/components/Shifting/ShiftingBoard.tsx
@@ -30,6 +30,7 @@ import {
 
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
+import { setDefaultView } from "@/Utils/viewStorageUtils";
 
 const KanbanBoard = lazy(
   () => import("@/components/Kanban/Board"),
@@ -78,7 +79,7 @@ export default function BoardView() {
   const { t } = useTranslation();
   const onListViewBtnClick = () => {
     navigate("/shifting/list", { query: qParams });
-    localStorage.setItem("defaultShiftView", "list");
+    setDefaultView("defaultShiftView", "list");
   };
 
   return (

diff --git a/src/components/Shifting/ShiftingList.tsx b/src/components/Shifting/ShiftingList.tsx
@@ -19,6 +19,7 @@ import useFilters from "@/hooks/useFilters";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import { setDefaultView } from "@/Utils/viewStorageUtils";
 
 import ShiftingTable from "./ShiftingTable";
 
@@ -35,7 +36,7 @@ export default function ListView() {
   const { t } = useTranslation();
   const onBoardViewBtnClick = () => {
     navigate("/shifting/board", { query: qParams });
-    localStorage.setItem("defaultShiftView", "board");
+    setDefaultView("defaultShiftView", "board");
   };
   const {
     data: shiftData,

diff --git a/src/components/Users/ManageUsers.tsx b/src/components/Users/ManageUsers.tsx
@@ -27,9 +27,9 @@ import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
 import { classNames } from "@/Utils/utils";
-import { setDefaultView } from "@/Utils/viewStorageUtils";
+import { getDefaultView, setDefaultView } from "@/Utils/viewStorageUtils";
 
-export default function ManageUsers({ defaultView }: { defaultView: string }) {
+export default function ManageUsers() {
   const { t } = useTranslation();
   const {
     qParams,
@@ -48,7 +48,9 @@ export default function ManageUsers({ defaultView }: { defaultView: string }) {
   const userTypes = authUser.is_superuser
     ? [...USER_TYPES]
     : USER_TYPES.slice(0, userIndex + 1);
-  const [activeTab, setActiveTab] = useState(defaultView === "list" ? 1 : 0);
+  const [activeTab, setActiveTab] = useState(
+    getDefaultView("usersDefaultView", "card") === "list" ? 1 : 0,
+  );
 
   const { data: homeFacilityData } = useTanStackQueryInstead(
     routes.getAnyFacility,