From ddb798f2b65d45decdeebc75c008e8335bbd6619 Mon Sep 17 00:00:00 2001
From: Teddy Roncin <teddy.roncin@proton.me>
Date: Sat, 14 Sep 2024 14:22:32 +0200
Subject: [PATCH 1/2] fix: fixes (#381)

* fix: password confirmation was removed if api did not accept account creation

* fix: cleaner fix than the previous one
---
 src/modules/register.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/register.ts b/src/modules/register.ts
index 8defd87e..2befeeec 100644
--- a/src/modules/register.ts
+++ b/src/modules/register.ts
@@ -37,9 +37,7 @@ export const registerUser = async (user: RegisterUser) => {
     return;
   }
 
-  delete user.passwordConfirmation;
-  delete user.legalRepresentativeAccepted;
-  await API.post('auth/register', user);
+  await API.post('auth/register', { ...user, passwordConfirmation: undefined, legalRepresentativeAccepted: undefined });
   toast.success('Inscription réussie, vérifie tes emails');
   return true;
 };

From 28e63eb14218324d7198d08831fa63a4beba716f Mon Sep 17 00:00:00 2001
From: Antoine D <106921102+Suboyyy@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:55:16 +0200
Subject: [PATCH 2/2] feat: add the user.type column (#383)

Co-authored-by: Antoine D <antoine.dufils@yahoo.fr>
---
 src/app/(dashboard)/admin/users/page.tsx |  2 ++
 src/modules/users.ts                     | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/app/(dashboard)/admin/users/page.tsx b/src/app/(dashboard)/admin/users/page.tsx
index b8dd04eb..f78415b0 100644
--- a/src/app/(dashboard)/admin/users/page.tsx
+++ b/src/app/(dashboard)/admin/users/page.tsx
@@ -17,6 +17,7 @@ const columnTitles = {
   scannedLabel: 'Scanné',
   permissionsLabel: 'Permissions',
   teamName: 'Équipe',
+  status: 'Rôle',
   tournamentName: 'Tournoi',
   place: 'Place',
 };
@@ -79,6 +80,7 @@ const Users = () => {
     lockedLabel: true,
     paidLabel: true,
     scannedLabel: true,
+    status: true,
     permissionsLabel: true,
     teamName: true,
     tournamentName: true,
diff --git a/src/modules/users.ts b/src/modules/users.ts
index 1cd1a86e..d11b2dd9 100644
--- a/src/modules/users.ts
+++ b/src/modules/users.ts
@@ -39,15 +39,31 @@ const initialState: UsersAction = {
 };
 
 const format = (users: Array<UserWithTeamAndMessageAndTournamentInfo>) => {
+  function userType(type: string) {
+    switch (type) {
+      case UserType.player:
+        return 'Joueur';
+      case UserType.coach:
+        return 'Coach';
+      case UserType.spectator:
+        return 'Spectateur';
+      case UserType.attendant:
+        return 'Accompagnateur';
+      default:
+        return type;
+    }
+  }
+
   return users.map((user) => ({
     ...user,
     fullname: `${user.firstname} ${user.lastname}`,
     tournamentName: user.team ? user.team.tournament.name : '',
-    teamName: user.team ? user.team.name : user.type === UserType.spectator ? '(spectateur)' : '',
+    teamName: user.team ? user.team.name : '',
     lockedLabel: user.team && user.team.lockedAt ? '✔' : '✖',
     paidLabel: user.hasPaid ? '✔' : '✖',
     scannedLabel: user.scannedAt ? '✔' : '✖',
     permissionsLabel: user.permissions.join(', ') || '',
+    status: user.type ? userType(user.type) : '',
   }));
 };