add concept of user roles

Author: calebbourg

src/components/ui/members/member-card.tsx

@@ -6,7 +6,7 @@ import { Trash2 } from "lucide-react";
 import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
 import { OrganizationStateStore } from "@/lib/stores/organization-state-store";
 import { AuthStore } from "@/lib/stores/auth-store";
-import { Id } from "@/types/general";
+import { Id, Role } from "@/types/general";
 
 interface MemberCardProps {
   firstName: string;
@@ -32,10 +32,10 @@ export function MemberCard({
   const { deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
 
   // Check if current user is a coach in any of this user's relationships
-  // and make sure we can't delete ourselves
-  const canDeleteUser = userRelationships.some(
+  // and make sure we can't delete ourselves. Admins can delete any user.
+  const canDeleteUser = userRelationships?.some(
     (rel) => rel.coach_id === userSession.id && userId !== userSession.id
-  );
+  ) || userSession.role === Role.Admin;
 
   const handleDelete = async () => {
     if (!confirm("Are you sure you want to delete this member?")) {

src/components/ui/members/member-container.tsx

@@ -1,6 +1,7 @@
 import { MemberList } from "./member-list";
 import { AddMemberButton } from "./add-member-button";
 import { User } from "@/types/user";
+import { Role } from "@/types/general";
 import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
 import { UserSession } from "@/types/user-session";
 
@@ -22,26 +23,27 @@ export function MemberContainer({
   /// Force the AddMemberDialog to open
   openAddMemberDialog,
 }: MemberContainerProps) {
-  // Check if current user is a coach in any relationship
-  const isCoachInAnyRelationship = relationships.some(
-    (rel) => rel.coach_id === userSession.id
-  );
-
-  // Find relationships where current user is either coach or coachee
-  const userRelationships = relationships.filter(
-    (rel) =>
-      rel.coach_id === userSession.id || rel.coachee_id === userSession.id
-  );
+    // Check if current user is a coach in any relationship
+    const isCoachInAnyRelationship = relationships.some(
+      (rel) => rel.coach_id === userSession.id
+    );
+  
+    // Find relationships where current user is either coach or coachee
+    const userRelationships = relationships.filter(
+      (rel) =>
+        rel.coach_id === userSession.id || rel.coachee_id === userSession.id
+    );
 
   // Get IDs of users in these relationships
   const associatedUserIds = new Set(
     userRelationships.flatMap((rel) => [rel.coach_id, rel.coachee_id])
   );
 
-  // Filter users to only include those in the relationships
-  const associatedUsers = users.filter((user) =>
-    associatedUserIds.has(user.id)
-  );
+  // If the current user is an admin, show all users. Otherwise, only show users
+  // that are associated with the current user in a coaching relationship.
+  const displayUsers = (userSession.role === Role.Admin) ? users : users.filter((user) =>
+      associatedUserIds.has(user.id)
+    );
 
   if (isLoading) {
     return (
@@ -54,17 +56,17 @@ export function MemberContainer({
       <div className="flex justify-between items-center">
         <h3 className="text-2xl font-semibold">Members</h3>
         {/* Only show the button if user is a coach to _some_ user within the
-        scope of the organization. We may come back and add this directly to user
+        scope of the organization or if user is an admin. We may come back and add this directly to user
         data.  */}
-        {isCoachInAnyRelationship && (
+        {(isCoachInAnyRelationship || userSession.role === Role.Admin) && (
           <AddMemberButton
             onMemberAdded={onRefresh}
             openAddMemberDialog={openAddMemberDialog}
           />
         )}
       </div>
       <MemberList
-        users={associatedUsers}
+        users={displayUsers}
         relationships={userRelationships}
         onRefresh={onRefresh}
       />

src/components/ui/members/profile-info-update-form.tsx

@@ -19,6 +19,7 @@ export function ProfileInfoUpdateForm({ user, onSubmit, isSubmitting }: ProfileI
         first_name: user.first_name,
         last_name: user.last_name,
         display_name: user.display_name,
+        role: user.role,
     })
     const [errors, setErrors] = useState<Record<string, string>>({})
 

src/types/general.ts

@@ -17,6 +17,11 @@ export enum ItemStatus {
   WontDo = "WontDo",
 }
 
+export enum Role {
+  User = "User",
+  Admin = "Admin"
+}
+
 export function stringToActionStatus(statusString: string): ItemStatus {
   const status = statusString.trim();
 

src/types/user-session.ts

@@ -1,4 +1,5 @@
 import { User } from "@/types/user";
+import { Role } from "@/types/general";
 /**
  * This is an intersection type that combines the User type with additional properties.
  * Currently, it does not add any new properties, but it can be extended in the future
@@ -26,6 +27,7 @@ export function defaultUserSession(): UserSession {
     first_name: "",
     last_name: "",
     display_name: "",
+    role: Role.User
   };
 }
 

src/types/user.ts

@@ -1,4 +1,4 @@
-import { Id } from "@/types/general";
+import { Id, Role } from "@/types/general";
 
 // This must always reflect the Rust struct on the backend entity::users::Model
 export interface User {
@@ -8,6 +8,7 @@ export interface User {
   first_name: string;
   last_name: string;
   display_name: string;
+  role: Role;
 }
 
 export interface NewUser {
@@ -35,6 +36,7 @@ export function parseUser(data: unknown): User {
     first_name: data.first_name,
     last_name: data.last_name,
     display_name: data.display_name,
+    role: data.role,
   };
 }
 
@@ -62,6 +64,7 @@ export function defaultUser(): User {
     first_name: "",
     last_name: "",
     display_name: "",
+    role: Role.User,
   };
 }