From 91020072c58c9b479d62e4336b43e637359f20b8 Mon Sep 17 00:00:00 2001 From: Sidney Alcantara Date: Fri, 17 Sep 2021 16:18:43 +1000 Subject: [PATCH] Home: fix userClaims?.roles.includes crash --- src/contexts/AppContext.tsx | 2 +- src/pages/Home.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/contexts/AppContext.tsx b/src/contexts/AppContext.tsx index e1d10868..b109f462 100644 --- a/src/contexts/AppContext.tsx +++ b/src/contexts/AppContext.tsx @@ -24,7 +24,7 @@ interface IAppContext { projectId: string; currentUser: firebase.User | null | undefined; userClaims: Record | undefined; - userRoles: null | string[]; + userRoles: string[]; authToken: string; userDoc: any; theme: keyof typeof themes; diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 9a8d0b65..bd4f5f7b 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -48,7 +48,7 @@ import { APP_BAR_HEIGHT } from "components/Navigation"; const useHomeViewState = createPersistedState("__ROWY__HOME_VIEW"); export default function HomePage() { - const { userDoc, userClaims } = useAppContext(); + const { userDoc, userRoles } = useAppContext(); const { tables } = useProjectContext(); const [results, query, handleQuery] = useBasicSearch( @@ -131,7 +131,7 @@ export default function HomePage() { ); if (tables.length === 0) { - if (userClaims?.roles.includes("ADMIN")) + if (userRoles.includes("ADMIN")) return ( <> @@ -167,7 +167,7 @@ export default function HomePage() { const getActions = (table: Table) => ( <> - {userClaims?.roles.includes("ADMIN") && ( + {userRoles.includes("ADMIN") && ( @@ -258,7 +258,7 @@ export default function HomePage() { /> )} - {userClaims?.roles.includes("ADMIN") && ( + {userRoles.includes("ADMIN") && ( <> {createTableFab}