🔤 typing (App Frontend): Fixes

branch: dashboard
DeutscheModelUnitedNations · Sep 15, 2024 · b8a7e80 · b8a7e80
1 parent 819a0f2
commit b8a7e80
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/api/auth/abilities/abilities.ts b/src/api/auth/abilities/abilities.ts
@@ -10,7 +10,7 @@ import type { Capitalize } from '@sinclair/typebox';
 import { defineAbilitiesForDelegationMemberEntity } from './entities/delegationMember';
 import { defineAbilitiesForCommittee } from './entities/committee';
 
-const actions = ['list', 'create', 'read', 'update', 'delete'] as const;
+const actions = ['list', 'create', 'read', 'update', 'delete', 'join'] as const;
 export const oidcRoles = ['admin', 'member', 'service_user'] as const;
 
 /**

diff --git a/src/api/routes/delegation.ts b/src/api/routes/delegation.ts
@@ -267,7 +267,7 @@ export const delegation = new Elysia()
 					where: {
 						conferenceId_userId: {
 							conferenceId: delegation.conferenceId,
-							userId: user.sub
+							userId: user.sub!
 						}
 					}
 				});
@@ -431,7 +431,7 @@ export const delegation = new Elysia()
 					where: {
 						delegationId_userId: {
 							delegationId: delegation.id,
-							userId: user.sub
+							userId: user.sub!
 						}
 					},
 					data: {
@@ -472,7 +472,7 @@ export const delegation = new Elysia()
 					where: {
 						delegationId_userId: {
 							delegationId: delegation.id,
-							userId: user.sub
+							userId: user.sub!
 						}
 					},
 					select: {
@@ -485,7 +485,7 @@ export const delegation = new Elysia()
 				where: {
 					delegationId_userId: {
 						delegationId: delegation.id,
-						userId: user.sub
+						userId: user.sub!
 					}
 				}
 			});

diff --git a/src/api/routes/singleParticipant.ts b/src/api/routes/singleParticipant.ts
@@ -48,7 +48,7 @@ export const singleParticipant = new Elysia()
 				where: {
 					conferenceId_userId: {
 						conferenceId: body.conference.connect.id,
-						userId: user.sub
+						userId: user.sub!
 					}
 				},
 				create: {

diff --git a/src/routes/(authenticated)/dashboard/+page.svelte b/src/routes/(authenticated)/dashboard/+page.svelte
@@ -20,7 +20,7 @@
 	<div
 		class="carousel carousel-center bg-base-200 dark:bg-base-300 shadow-inner rounded-box w-full space-x-6 p-6"
 	>
-		{#each data.conferences.filter((x) => x.status === ('PRE' || 'ACTIVE')) as conference}
+		{#each data.conferences.filter((x) => x.status === 'PRE' || x.status === 'ACTIVE') as conference}
 			<ConferenceCard {...conference} btnText="Zur Konferenz" baseSlug="/dashboard" />
 		{/each}
 		<a href="/registration" class="carousel-item max-w-96 w-[90%]">

diff --git a/src/routes/(authenticated)/dashboard/[conferenceId]/DelegationRegistrationStage.svelte b/src/routes/(authenticated)/dashboard/[conferenceId]/DelegationRegistrationStage.svelte
@@ -64,7 +64,7 @@
 		},
 		{
 			title: m.todoEnterDelegationPreferences(),
-			completed: data.delegationData.appliedForRoles?.length >= 3 ?? undefined,
+			completed: data.delegationData.appliedForRoles.length >= 3,
 			help: m.todoEnterDelegationPreferencesHelp()
 		},
 		{
@@ -384,7 +384,7 @@
 			<TodoTable {todos} />
 			<button
 				class="btn btn-success mt-4"
-				disabled={(todos.filter((x) => x.completed === false).length > 1 ?? true) ||
+				disabled={(todos.filter((x) => x.completed === false).length > 1) ||
 					!userIsHeadDelegate}
 				onclick={completeRegistration}
 			>

diff --git a/src/routes/(authenticated)/my-account/+page.svelte b/src/routes/(authenticated)/my-account/+page.svelte
@@ -32,7 +32,7 @@
 	const onPersonalDataFormSubmit = async (e: Event) => {
 		e.preventDefault();
 
-		await api.user.me.patch({
+		await api.user({ id: data.user.sub }).patch({
 			phone,
 			street,
 			apartment,