wip: update membership system

Author: brage-andreas

apps/dashboard/src/app/(internal)/arrangementer/components/qr-code-scanned-modal.tsx

@@ -5,10 +5,10 @@ import {
   type User,
   findActiveMembership,
   getAttendeeQueuePosition,
-  getMembershipGrade,
   getUnreservedAttendeeCount,
+  getMembershipTypeName,
 } from "@dotkomonline/types"
-import { getCurrentUTC } from "@dotkomonline/utils"
+import { getCurrentUTC, getStudyGrade } from "@dotkomonline/utils"
 import { Button, Flex, Group, Image, Stack, Text, Title, useComputedColorScheme } from "@mantine/core"
 import { useMediaQuery } from "@mantine/hooks"
 import { type ContextModalProps, modals } from "@mantine/modals"
@@ -167,7 +167,8 @@ const UserBox = ({ user, isMobile }: UserBoxProps) => {
   const isLightMode = useComputedColorScheme() === "light"
 
   const membership = findActiveMembership(user)
-  const grade = membership ? getMembershipGrade(membership) : null
+  const grade = membership?.semester != null ? getStudyGrade(membership.semester) : null
+  const membershipType = membership && getMembershipTypeName(membership.type)
 
   return (
     <Stack>
@@ -183,7 +184,8 @@ const UserBox = ({ user, isMobile }: UserBoxProps) => {
         <Image src={user.imageUrl} alt={user.name ?? user.profileSlug} radius="md" w={100} h={100} />
         <Stack gap={2}>
           <Title order={4}>{user.name}</Title>
-          <Text size="sm">Klasse: {grade}</Text>
+          <Text size="sm">{membership ? `Medlemskap: ${membershipType}` : "Ingen aktivt medlemskap"}</Text>
+          <Text size="sm">{membership ? (grade ? `Klasse: ${grade}` : "Ingen klassetrinn") : "-"}</Text>
           <Text size="sm">Kjønn: {user.gender || "Ikke oppgitt"}</Text>
           <Text size="sm">Kostholdsrestriksjoner: {user.dietaryRestrictions || "Ingen"}</Text>
         </Stack>

apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx

@@ -1,12 +1,6 @@
 import { env } from "@/lib/env"
 import { useSession } from "@dotkomonline/oauth2/react"
-import {
-  UserWriteSchema,
-  type WorkspaceUser,
-  findActiveMembership,
-  getMembershipGrade,
-  getMembershipTypeName,
-} from "@dotkomonline/types"
+import { UserWriteSchema, type WorkspaceUser, findActiveMembership, getMembershipTypeName } from "@dotkomonline/types"
 import { Button, Group, Loader, Stack, Text, TextInput, Title } from "@mantine/core"
 import { useDebouncedValue } from "@mantine/hooks"
 import { IconCheck, IconLink, IconUsersGroup, IconX, IconArrowUpRight } from "@tabler/icons-react"
@@ -15,6 +9,7 @@ import { useLinkOwUserToWorkspaceUserMutation, useUpdateUserMutation } from "../
 import { useFindWorkspaceUserQuery, useGroupAllByMemberQuery, useIsAdminQuery } from "../queries"
 import { useUserProfileEditForm } from "./edit-form"
 import { useUserDetailsContext } from "./provider"
+import { getStudyGrade } from "@dotkomonline/utils"
 
 export const UserEditCard: FC = () => {
   const session = useSession()
@@ -57,7 +52,7 @@ export const UserEditCard: FC = () => {
   })
 
   const activeMembership = findActiveMembership(user)
-  const grade = activeMembership ? getMembershipGrade(activeMembership) : null
+  const grade = activeMembership?.semester != null ? getStudyGrade(activeMembership.semester) : null
   const membershipType = activeMembership ? getMembershipTypeName(activeMembership.type) : null
 
   return (

apps/dashboard/src/app/(internal)/brukere/components/create-membership-modal.tsx

@@ -3,6 +3,7 @@ import { type ContextModalProps, modals } from "@mantine/modals"
 import type { FC } from "react"
 import { useCreateMembershipMutation } from "../mutations"
 import { useMembershipWriteForm } from "./membership-form"
+import { Stack, Text } from "@mantine/core"
 
 export const CreateMembershipModal: FC<ContextModalProps<{ user: User }>> = ({ context, id, innerProps: { user } }) => {
   const close = () => context.closeModal(id)
@@ -16,7 +17,14 @@ export const CreateMembershipModal: FC<ContextModalProps<{ user: User }>> = ({ c
       close()
     },
   })
-  return <FormComponent />
+  return (
+    <Stack gap="sm">
+      <Text size="sm" c="dimmed">
+        Rediger semesterverdien for å endre årstrinn.
+      </Text>
+      <FormComponent />
+    </Stack>
+  )
 }
 
 export const useCreateMembershipModal =

apps/dashboard/src/app/(internal)/brukere/components/edit-membership-modal.tsx

@@ -3,6 +3,7 @@ import { type ContextModalProps, modals } from "@mantine/modals"
 import type { FC } from "react"
 import { useUpdateMembershipMutation } from "../mutations"
 import { useMembershipWriteForm } from "./membership-form"
+import { Stack, Text } from "@mantine/core"
 
 export const EditMembershipModal: FC<ContextModalProps<{ membership: Membership }>> = ({
   context,
@@ -21,7 +22,14 @@ export const EditMembershipModal: FC<ContextModalProps<{ membership: Membership
       close()
     },
   })
-  return <FormComponent />
+  return (
+    <Stack gap="sm">
+      <Text size="sm" c="dimmed">
+        Rediger semesterverdien for å endre årstrinn.
+      </Text>
+      <FormComponent />
+    </Stack>
+  )
 }
 
 export const useEditMembershipModal =