diff --git a/apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx index c6a6ffbba4..3f027d4d4d 100644 --- a/apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx +++ b/apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx @@ -6,7 +6,8 @@ import { useDebouncedValue } from "@mantine/hooks" import { IconCheck, IconLink, IconUsersGroup, IconX, IconArrowUpRight } from "@tabler/icons-react" import { type FC, useEffect, useState } from "react" import { useLinkOwUserToWorkspaceUserMutation, useUpdateUserMutation } from "../mutations" -import { useFindWorkspaceUserQuery, useGroupAllByMemberQuery, useIsAdminQuery } from "../queries" +import { useAuthorization } from "@/auth/authorization-context" +import { useFindWorkspaceUserQuery, useGroupAllByMemberQuery } from "../queries" import { useUserProfileEditForm } from "./edit-form" import { useUserDetailsContext } from "./provider" import { getStudyGrade } from "@dotkomonline/utils" @@ -17,7 +18,7 @@ export const UserEditCard: FC = () => { const [customKey, setCustomKey] = useState(undefined) - const { isAdmin } = useIsAdminQuery() + const { isAdministrator } = useAuthorization() const { groups } = useGroupAllByMemberQuery(user.id) const update = useUpdateUserMutation() @@ -27,7 +28,7 @@ export const UserEditCard: FC = () => { const isWorkspaceLinked = Boolean(user.workspaceUserId) const showWorkspaceLink = isWorkspaceLinked || groups.length > 0 - const isWorkspaceFetchEnabled = (isAdmin || isUser) && showWorkspaceLink + const isWorkspaceFetchEnabled = (isAdministrator || isUser) && showWorkspaceLink const { workspaceUser, isLoading: isLoadingWorkspaceUser } = useFindWorkspaceUserQuery( user.id, customKey, @@ -78,7 +79,7 @@ export const UserEditCard: FC = () => { { interface LinkUserProps { showWorkspaceLink: boolean - isAdmin: boolean + isAdministrator: boolean isWorkspaceLinked: boolean isWorkspaceFetchEnabled: boolean isLoadingWorkspaceUser: boolean @@ -105,7 +106,7 @@ interface LinkUserProps { const LinkUser: FC = ({ showWorkspaceLink, - isAdmin, + isAdministrator, isWorkspaceLinked, isWorkspaceFetchEnabled, isLoadingWorkspaceUser, @@ -171,14 +172,14 @@ const LinkUser: FC = ({ )} - {!isWorkspaceLinked && !isAdmin && ( + {!isWorkspaceLinked && !isAdministrator && ( Kontakt HS for å tilknytte brukeren til en Google-bruker. Brukeren må tilknyttes for å kunne bli lagt til i e-postlister. )} - {!isWorkspaceLinked && isAdmin && ( + {!isWorkspaceLinked && isAdministrator && ( = ({ ), }), - ...(isAdmin + ...(isAdministrator ? [ columnHelper.accessor((role) => role, { id: "delete", @@ -100,7 +100,7 @@ export const useMembershipTable = ({ data }: Props) => { ] : []), ], - [columnHelper, openEditMembershipModal, openDeleteMembershipModal, isAdmin] + [columnHelper, openEditMembershipModal, openDeleteMembershipModal, isAdministrator] ) return useReactTable({ diff --git a/apps/dashboard/src/app/(internal)/brukere/queries.ts b/apps/dashboard/src/app/(internal)/brukere/queries.ts index fafa0c1dff..e1c9452488 100644 --- a/apps/dashboard/src/app/(internal)/brukere/queries.ts +++ b/apps/dashboard/src/app/(internal)/brukere/queries.ts @@ -51,12 +51,6 @@ export const useGroupAllByMemberQuery = (userId: UserId) => { return { groups, isLoading } } -export const useIsAdminQuery = () => { - const trpc = useTRPC() - const { data: isAdmin, isLoading } = useQuery(trpc.user.isAdmin.queryOptions()) - return { isAdmin, isLoading } -} - export const useFindWorkspaceUserQuery = (userId: UserId, customKey?: string, enabled = true) => { const trpc = useTRPC() const { diff --git a/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx index 54c1a44835..d7d74c87e4 100644 --- a/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx +++ b/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx @@ -5,7 +5,7 @@ import { useDebouncedValue } from "@mantine/hooks" import { IconCheck, IconLink, IconTrash, IconUsersGroup, IconX } from "@tabler/icons-react" import { useRouter } from "next/navigation" import { type FC, useEffect, useState } from "react" -import { useIsAdminQuery } from "@/app/(internal)/brukere/queries" +import { useAuthorization } from "@/auth/authorization-context" import { useDeleteGroupMutation, useLinkGroupMutation, useUpdateGroupMutation } from "../mutations" import { useFindWorkspaceGroupQuery } from "../queries" import { useGroupWriteForm } from "../write-form" @@ -30,12 +30,12 @@ export const GroupEditCard: FC = () => { }, }) - const { isAdmin } = useIsAdminQuery() + const { isAdministrator } = useAuthorization() const isWorkspaceLinked = Boolean(group.workspaceGroupId) const showWorkspaceLink = isWorkspaceLinked || group.type === "COMMITTEE" || group.type === "NODE_COMMITTEE" || group.type === "EMAIL_ONLY" - const isWorkspaceFetchEnabled = (isAdmin ?? false) && showWorkspaceLink + const isWorkspaceFetchEnabled = isAdministrator && showWorkspaceLink const { workspaceGroup, isLoading: isLoadingWorkspaceGroup } = useFindWorkspaceGroupQuery( group.slug, customKey || undefined, @@ -57,7 +57,7 @@ export const GroupEditCard: FC = () => { { interface LinkGroupProps { showWorkspaceLink: boolean - isAdmin: boolean + isAdministrator: boolean isWorkspaceLinked: boolean isWorkspaceFetchEnabled: boolean isLoadingWorkspaceGroup: boolean @@ -88,7 +88,7 @@ interface LinkGroupProps { const LinkGroup: FC = ({ showWorkspaceLink, - isAdmin, + isAdministrator, isWorkspaceLinked, isWorkspaceFetchEnabled, isLoadingWorkspaceGroup, @@ -152,14 +152,14 @@ const LinkGroup: FC = ({ )} - {!isWorkspaceLinked && !isAdmin && ( + {!isWorkspaceLinked && !isAdministrator && ( Kontakt HS for å tilknytte gruppen til en e-postliste. Gruppen må tilknyttes for å kunne legge medlemmer til i e-postlisten. )} - {!isWorkspaceLinked && isAdmin && ( + {!isWorkspaceLinked && isAdministrator && ( = ({