From 3865a4d7f522f0ce52abd885457c07dc31c04044 Mon Sep 17 00:00:00 2001 From: Saanicc Date: Tue, 17 Sep 2024 16:01:20 +0200 Subject: [PATCH] Switch to Role enum --- src/context/useUserLevel.tsx | 5 +++-- src/lib/enums/userlevels.js | 7 ------- src/screens/ActivityCard/ActivityCard.tsx | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 src/lib/enums/userlevels.js diff --git a/src/context/useUserLevel.tsx b/src/context/useUserLevel.tsx index 9dc835615..6e611cf9b 100644 --- a/src/context/useUserLevel.tsx +++ b/src/context/useUserLevel.tsx @@ -2,11 +2,12 @@ import { createContext, PropsWithChildren, useContext, useState } from "react"; import { Role } from "../utility/enums"; type UserLevelContextType = { - userLevel?: Role; + userLevel: Role; setUserLevel: (role: Role) => void; }; const UserLevelContext = createContext({ + userLevel: Role.user, setUserLevel: () => {}, }); @@ -15,7 +16,7 @@ export const useUserLevel = () => { }; export const UserLevelProvider = ({ children }: PropsWithChildren) => { - const [userLevel, setUserLevel] = useState(); + const [userLevel, setUserLevel] = useState(Role.user); return ( diff --git a/src/lib/enums/userlevels.js b/src/lib/enums/userlevels.js deleted file mode 100644 index 24452d976..000000000 --- a/src/lib/enums/userlevels.js +++ /dev/null @@ -1,7 +0,0 @@ -export const UserLevels = { - User: "user", - Admin: "admin", - SuperAdmin: "superadmin", -}; - -// TODU: (Alona) We need to use enum Role diff --git a/src/screens/ActivityCard/ActivityCard.tsx b/src/screens/ActivityCard/ActivityCard.tsx index 10056129a..f6b850895 100644 --- a/src/screens/ActivityCard/ActivityCard.tsx +++ b/src/screens/ActivityCard/ActivityCard.tsx @@ -19,7 +19,7 @@ import { useActivityImages } from "../../context/ActivityImagesContext/ActivityI import { useAdminGalleryFunction } from "../../context/AdminGalleryContext"; import { useCreateActivityFunction } from "../../context/CreateActivityContext/CreateActivityContext"; import { useUserLevel } from "../../context/useUserLevel"; -import { UserLevels } from "../../lib/enums/userlevels"; +import { Role } from "../../utility/enums"; type Props = { route: any; @@ -467,7 +467,7 @@ export function ActivityCard({ route, navigation }: Props) { - {[UserLevels.SuperAdmin, UserLevels.Admin].includes(userLevel) && ( + {[Role.superadmin, Role.admin].includes(userLevel) && (