Merge branch 'main' into add_tiptap_doc_loading_indicator

jhodapp · web-flow · commit 901896310dba · 2025-06-19T23:19:31.000-05:00
diff --git a/src/app/organizations/[id]/members/layout.tsx b/src/app/organizations/[id]/members/layout.tsx
@@ -5,6 +5,7 @@ import { siteConfig } from "@/site.config.ts";
 import { SiteHeader } from "@/components/ui/site-header";
 import { AppSidebar } from "@/components/ui/app-sidebar";
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
+import { Toaster } from "@/components/ui/sonner";
 export const metadata: Metadata = {
   title: siteConfig.name,
   description: "Manage coaching members",
@@ -22,6 +23,7 @@ export default function MembersLayout({
         <SidebarInset>
           <SiteHeader />
           <main className="flex-1 p-6">{children}</main>
+          <Toaster />
         </SidebarInset>
       </div>
     </SidebarProvider>
diff --git a/src/components/ui/coaching-relationship-selector.tsx b/src/components/ui/coaching-relationship-selector.tsx
@@ -75,7 +75,7 @@ export default function CoachingRelationshipSelector({
     (action) => action
   );
 
-  const { setIsCoach } = useAuthStore((state) => state);
+  const { setIsCurrentCoach } = useAuthStore((state) => state);
 
   const handleSetCoachingRelationship = (relationshipId: Id) => {
     setCurrentCoachingRelationshipId(relationshipId);
@@ -91,7 +91,7 @@ export default function CoachingRelationshipSelector({
       ? getCurrentCoachingRelationship(currentCoachingRelationshipId)
       : null;
     if (currentRelationship) {
-      setIsCoach(currentRelationship.coach_id);
+      setIsCurrentCoach(currentRelationship.coach_id);
     }
   }, [currentCoachingRelationshipId]);
 
diff --git a/src/components/ui/coaching-session.tsx b/src/components/ui/coaching-session.tsx
@@ -32,7 +32,7 @@ const CoachingSession: React.FC<CoachingSessionProps> = ({
   const { setCurrentCoachingSessionId } = useCoachingSessionStateStore(
     (state) => state
   );
-  const { isCoach } = useAuthStore((state) => state);
+  const { isCurrentCoach } = useAuthStore((state) => state);
 
   return (
     <Card>
@@ -64,7 +64,7 @@ const CoachingSession: React.FC<CoachingSessionProps> = ({
                 <DropdownMenuItem onClick={onUpdate}>
                   Edit
                 </DropdownMenuItem>
-                {isCoach && (
+                {isCurrentCoach && (
                   <DropdownMenuItem onClick={onDelete} className="text-destructive">
                     Delete
                   </DropdownMenuItem>
diff --git a/src/components/ui/dashboard/add-entities.tsx b/src/components/ui/dashboard/add-entities.tsx
@@ -18,7 +18,7 @@ export default function AddEntities({
 }: AddEntitiesProps) {
   const router = useRouter();
   const { currentOrganizationId } = useOrganizationStateStore((state) => state);
-  const { isCoach } = useAuthStore((state) => state);
+  const { isCurrentCoach } = useAuthStore((state) => state);
 
   const onMemberButtonClicked = () => {
     router.push(`/organizations/${currentOrganizationId}/members`);
@@ -31,12 +31,12 @@ export default function AddEntities({
       </h3>
       <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
         <AddCoachingSessionButton
-          disabled={!isCoach || !currentOrganizationId}
+          disabled={!isCurrentCoach || !currentOrganizationId}
           onClick={onCreateSession}
         />
 
         <AddMemberButton
-          disabled={!isCoach || !currentOrganizationId}
+          disabled={!isCurrentCoach || !currentOrganizationId}
           onClick={onMemberButtonClicked}
         />
       </div>
diff --git a/src/components/ui/members/add-member-dialog.tsx b/src/components/ui/members/add-member-dialog.tsx
@@ -17,6 +17,7 @@ import { Input } from "@/components/ui/input";
 import { useUserMutation } from "@/lib/api/organizations/users";
 import { NewUser } from "@/types/user";
 import { useOrganizationStateStore } from "@/lib/providers/organization-state-store-provider";
+import { toast } from "sonner";
 
 interface AddMemberDialogProps {
   open: boolean;
@@ -85,10 +86,11 @@ export function AddMemberDialog({
       });
       setPasswordError("");
       onMemberAdded();
+      toast.success(`New Member ${formData.firstName} ${formData.lastName} added successfully`);
       onOpenChange(false);
     } catch (error) {
       console.error("Error creating user:", error);
-      // Handle error appropriately
+      toast.error("There was an error adding the member");
     }
   };
 
diff --git a/src/components/ui/members/member-card.tsx b/src/components/ui/members/member-card.tsx
@@ -14,6 +14,7 @@ import { MoreHorizontal, Trash2 } from "lucide-react";
 import {
   Dialog,
   DialogContent,
+  DialogDescription,
   DialogHeader,
   DialogFooter,
   DialogTitle,
@@ -25,11 +26,13 @@ import {
   SelectContent,
   SelectItem,
 } from "@/components/ui/select";
-import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
+import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship";
 import { OrganizationStateStore } from "@/lib/stores/organization-state-store";
 import { AuthStore } from "@/lib/stores/auth-store";
 import { Id } from "@/types/general";
 import { User, Role } from "@/types/user";
+import { useCoachingRelationshipMutation } from "@/lib/api/coaching-relationships";
+import { toast } from "sonner";
 
 interface MemberCardProps {
   firstName: string;
@@ -41,6 +44,12 @@ interface MemberCardProps {
   users: User[];
 }
 
+interface Member {
+  id: Id;
+  first_name: string;
+  last_name: string;
+}
+
 export function MemberCard({
   firstName,
   lastName,
@@ -53,27 +62,79 @@ export function MemberCard({
   const currentOrganizationId = useOrganizationStateStore(
     (state: OrganizationStateStore) => state.currentOrganizationId
   );
-  const { userSession } = useAuthStore((state: AuthStore) => state);
-  const { deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
+  const { isACoach, userSession } = useAuthStore((state: AuthStore) => state);
+  const { error: deleteError, deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
+  const { error: createError, createNested: createRelationship } = useCoachingRelationshipMutation(currentOrganizationId);
+
+  console.log("is a coach", isACoach);
 
   // Check if current user is a coach in any of this user's relationships
   // and make sure we can't delete ourselves. Admins can delete any user.
-  const canDeleteUser = userRelationships?.some(
+  const canDeleteUser = (userRelationships?.some(
     (rel) => rel.coach_id === userSession.id && userId !== userSession.id
-  ) || (userSession.role === Role.Admin && userSession.id !== userId);
+  ) || (userSession.role === Role.Admin)) && userSession.id !== userId;
 
   const handleDelete = async () => {
     if (!confirm("Are you sure you want to delete this member?")) {
       return;
     }
+    await deleteUser(currentOrganizationId, userId);
+    onRefresh();
 
-    try {
-      await deleteUser(currentOrganizationId, userId);
+    if (deleteError) {
+      console.error("Error deleting member:", deleteError);
+      toast.error("Error deleting member");
       onRefresh();
-    } catch (error) {
-      console.error("Error deleting user:", error);
-      // TODO: Show an error toast here once we start using toasts for showing operation results.
+      return;
     }
+    toast.success("Member deleted successfully");
+    onRefresh();
+  };
+
+  const handleAssignMember = (val: string) => {
+    const user = users.find((m) => m.id === val);
+    if (!user) return;
+    const member: Member = {
+      id: user.id,
+      first_name: user.first_name,
+      last_name: user.last_name,
+    };
+    setAssignedMember(member);
+  };
+
+  // Placeholder – actual UI flows will be implemented later
+  const [assignDialogOpen, setAssignDialogOpen] = useState(false);
+  const [assignMode, setAssignMode] = useState<"coach" | "coachee">("coach");
+  const [selectedMember, setSelectedMember] = useState<Member | null>(null);
+  const [assignedMember, setAssignedMember] = useState<Member | null>(null);
+
+  const handleCreateCoachingRelationship = () => {
+    if (!selectedMember || !assignedMember) return;
+
+    if (assignMode === "coach") {
+      console.log("Assign", selectedMember.id, "as coach for", userId);
+      createRelationship(currentOrganizationId, {
+        coach_id: assignedMember.id,
+        coachee_id: selectedMember.id,
+      });
+    } else {
+      console.log("Assign", selectedMember.id, "as coachee for", userId);
+      createRelationship(currentOrganizationId, {
+        coach_id: selectedMember.id,
+        coachee_id: assignedMember.id,
+      });
+    }
+
+    if (createError) {
+      toast.error(`Error assigning ${assignMode}`);
+      return;
+    }
+    
+    toast.success(`Successfully assigned ${assignedMember.first_name} ${assignedMember.last_name} as ${assignMode} for ${selectedMember.first_name} ${selectedMember.last_name}`);
+    onRefresh();
+    setAssignDialogOpen(false);
+    setSelectedMember(null);
+    setAssignedMember(null);
   };
 
   // Placeholder – actual UI flows will be implemented later
@@ -101,6 +162,7 @@ export function MemberCard({
         </h3>
         {email && <p className="text-sm text-muted-foreground">{email}</p>}
       </div>
+      {(isACoach || userSession.role === Role.Admin) && (
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button variant="ghost" size="icon" className="text-muted-foreground">
@@ -114,6 +176,7 @@ export function MemberCard({
                 onClick={() => {
                   setAssignMode("coach");
                   setAssignDialogOpen(true);
+                  setSelectedMember({id: userId, first_name: firstName, last_name: lastName});
                 }}
               >
                 Assign Coach
@@ -122,6 +185,7 @@ export function MemberCard({
                 onClick={() => {
                   setAssignMode("coachee");
                   setAssignDialogOpen(true);
+                  setSelectedMember({id: userId, first_name: firstName, last_name: lastName});
                 }}
               >
                 Assign Coachee
@@ -141,6 +205,7 @@ export function MemberCard({
           )}
         </DropdownMenuContent>
       </DropdownMenu>
+    )}
 
       {/* Assign Coach/Coachee Modal */}
       <Dialog open={assignDialogOpen} onOpenChange={setAssignDialogOpen}>
@@ -149,10 +214,13 @@ export function MemberCard({
             <DialogTitle>
               {assignMode === "coach" ? "Assign Coach" : "Assign Coachee"}
             </DialogTitle>
+            <DialogDescription>
+              Select a member to be their {assignMode === "coach" ? "coach" : "coachee"}
+            </DialogDescription>
           </DialogHeader>
           <Select
-            onValueChange={(val) => setSelectedMemberId(val as Id)}
-            value={selectedMemberId ?? undefined}
+            onValueChange={(val) => handleAssignMember(val)}
+            value={assignedMember?.id?.toString()}
           >
             <SelectTrigger className="w-full">
               <SelectValue placeholder="Select a member" />
diff --git a/src/components/ui/members/member-container.tsx b/src/components/ui/members/member-container.tsx
@@ -2,8 +2,10 @@ import { MemberList } from "./member-list";
 import { AddMemberButton } from "./add-member-button";
 import { User } from "@/types/user";
 import { Role } from "@/types/user";
-import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
+import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship";
 import { UserSession } from "@/types/user-session";
+import { useAuthStore } from "@/lib/providers/auth-store-provider";
+import { useEffect } from "react";
 
 interface MemberContainerProps {
   users: User[];
@@ -23,10 +25,14 @@ export function MemberContainer({
   /// Force the AddMemberDialog to open
   openAddMemberDialog,
 }: MemberContainerProps) {
+    const { setIsACoach, isACoach } = useAuthStore((state) => state);
+
     // Check if current user is a coach in any relationship
-    const isCoachInAnyRelationship = relationships.some(
-      (rel) => rel.coach_id === userSession.id
-    );
+    useEffect(() => {
+      setIsACoach(
+        relationships.some((rel) => rel.coach_id === userSession.id)
+      );
+    }, [relationships, userSession.id, setIsACoach]);
   
     // Find relationships where current user is either coach or coachee
     const userRelationships = relationships.filter(
@@ -58,7 +64,7 @@ export function MemberContainer({
         {/* Only show the button if user is a coach to _some_ user within the
         scope of the organization or if user is an admin. We may come back and add this directly to user
         data.  */}
-        {(isCoachInAnyRelationship || userSession.role === Role.Admin) && (
+        {(isACoach || userSession.role === Role.Admin) && (
           <AddMemberButton
             onMemberAdded={onRefresh}
             openAddMemberDialog={openAddMemberDialog}
diff --git a/src/components/ui/members/member-list.tsx b/src/components/ui/members/member-list.tsx
@@ -1,7 +1,7 @@
 import { Card, CardContent } from "@/components/ui/card";
 import { User } from "@/types/user";
 import { MemberCard } from "./member-card";
-import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
+import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship";
 import { Id } from "@/types/general";
 
 interface MemberListProps {
diff --git a/src/lib/api/coaching-relationships.ts b/src/lib/api/coaching-relationships.ts
@@ -3,9 +3,10 @@
 import { siteConfig } from "@/site.config";
 import { Id } from "@/types/general";
 import {
+  NewCoachingRelationship,
   CoachingRelationshipWithUserNames,
   defaultCoachingRelationshipWithUserNames,
-} from "@/types/coaching_relationship_with_user_names";
+} from "@/types/coaching_relationship";
 import { EntityApi } from "./entity-api";
 
 const ORGANIZATIONS_BASEURL: string = `${siteConfig.env.backendServiceURL}/organizations`;
@@ -53,7 +54,7 @@ export const CoachingRelationshipApi = {
    * Unimplemented
    */
   create: async (
-    _relationship: CoachingRelationshipWithUserNames
+    _relationship: NewCoachingRelationship
   ): Promise<CoachingRelationshipWithUserNames> => {
     throw new Error("Create operation not implemented");
   },
@@ -67,10 +68,10 @@ export const CoachingRelationshipApi = {
    */
   createNested: async (
     organizationId: Id,
-    entity: CoachingRelationshipWithUserNames
+    entity: NewCoachingRelationship
   ): Promise<CoachingRelationshipWithUserNames> => {
     return EntityApi.createFn<
-      CoachingRelationshipWithUserNames,
+      NewCoachingRelationship,
       CoachingRelationshipWithUserNames
     >(
       `${ORGANIZATIONS_BASEURL}/${organizationId}/${COACHING_RELATIONSHIPS_BASEURL}`,
@@ -81,7 +82,7 @@ export const CoachingRelationshipApi = {
   /**
    * Unimplemented
    */
-  update: async (_id: Id, entity: CoachingRelationshipWithUserNames) => {
+  update: async (_id: Id, entity: NewCoachingRelationship) => {
     throw new Error("Update operation not implemented");
   },
 
@@ -192,7 +193,7 @@ export const useCoachingRelationship = (
  * Provides methods to create, update, and delete coaching relationships.
  */
 export const useCoachingRelationshipMutation = (organizationId: Id) => {
-  return EntityApi.useEntityMutation<CoachingRelationshipWithUserNames>(
+  return EntityApi.useEntityMutation<NewCoachingRelationship, CoachingRelationshipWithUserNames>(
     `${ORGANIZATIONS_BASEURL}/${organizationId}/${COACHING_RELATIONSHIPS_BASEURL}`,
     {
       create: CoachingRelationshipApi.create,
diff --git a/src/lib/stores/auth-store.ts b/src/lib/stores/auth-store.ts
diff --git a/src/lib/stores/coaching-relationship-state-store.ts b/src/lib/stores/coaching-relationship-state-store.ts
diff --git a/src/types/coaching_relationship.ts b/src/types/coaching_relationship.ts
diff --git a/src/types/session-title.ts b/src/types/session-title.ts
