Merge pull request #46 from j-h-scheufen/develop

Prod Update - GroupMembers title sort

.husky/pre-commit

@@ -1,4 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
 yarn lint

packages/quilombo/components/GroupMembers/GroupMembers.tsx

@@ -3,9 +3,10 @@
 import { Spinner } from '@nextui-org/spinner';
 import { Table, TableBody, TableCell, TableColumn, TableHeader, TableRow } from '@nextui-org/table';
 import { useAtomValue } from 'jotai';
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import { GroupMembersSkeleton } from '@/components/skeletons/GroupSkeletons';
+import { TitleEnum } from '@/config/constants';
 import {
   groupAdminIdsAtom,
   groupFounderAtom,
@@ -27,6 +28,16 @@ const GroupMembers = () => {
     (userId: string): GroupMemberRole[] => getGroupMemberRoles(userId, groupFounder, groupLeader, groupAdminIds),
     [groupFounder, groupLeader, groupAdminIds],
   );
+  const sortedGroupMembers = useMemo(
+    () =>
+      groupMembers?.sort((a, b) => {
+        if (!a.title && !b.title) return 0;
+        if (!a.title) return -1;
+        if (!b.title) return 1;
+        return TitleEnum[a.title] - TitleEnum[b.title];
+      }) ?? [],
+    [groupMembers],
+  );
 
   const filteredColumns = [...COLUMNS].filter((column) => (isGroupAdmin ? true : column.uid !== 'actions'));
 
@@ -42,7 +53,7 @@ const GroupMembers = () => {
         )}
       </TableHeader>
       <TableBody
-        items={groupMembers}
+        items={sortedGroupMembers}
         isLoading={isPending}
         loadingContent={<Spinner label="Loading..." size="sm" color="default" />}
         emptyContent="No members found"

packages/quilombo/config/constants.ts

@@ -3,23 +3,29 @@ import { ImageType } from '@/types/model';
 import { ResizeOptions } from 'sharp';
 
 export const titles = [
-  'mestre',
   'mestra',
-  'contra-mestre',
+  'mestre',
   'contra-mestra',
-  'mestrando',
+  'contra-mestre',
   'mestranda',
-  'professor',
+  'mestrando',
   'professora',
-  'instrutor',
+  'professor',
   'instrutora',
-  'monitor',
+  'instrutor',
   'monitora',
-  'aluno',
+  'monitor',
   'aluna',
+  'aluno',
   'iniciante',
 ] as const;
 
+// used to sort titles in the UI
+export const TitleEnum = titles.reduce<Record<string, number>>((acc, title, index) => {
+  acc[title] = index;
+  return acc;
+}, {});
+
 export const styles = ['angola', 'regional', 'contemporânea'] as const;
 
 export const linkTypes = ['twitter', 'facebook', 'instagram', 'linkedin'] as const;

packages/quilombo/db/migrations/0011_overrated_cloak.sql

@@ -0,0 +1,4 @@
+ALTER TABLE "public"."users" ALTER COLUMN "title" SET DATA TYPE text;--> statement-breakpoint
+DROP TYPE "public"."title";--> statement-breakpoint
+CREATE TYPE "public"."title" AS ENUM('mestra', 'mestre', 'contra-mestra', 'contra-mestre', 'mestranda', 'mestrando', 'professora', 'professor', 'instrutora', 'instrutor', 'monitora', 'monitor', 'aluna', 'aluno', 'iniciante');--> statement-breakpoint
+ALTER TABLE "public"."users" ALTER COLUMN "title" SET DATA TYPE "public"."title" USING "title"::"public"."title";