successfully set Coaching Relationships

Author: calebbourg

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>

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("Member created successfully");
       onOpenChange(false);
     } catch (error) {
       console.error("Error creating user:", error);
-      // Handle error appropriately
+      toast.error("Error creating member");
     }
   };
 

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

@@ -25,11 +25,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;
@@ -54,7 +56,8 @@ export function MemberCard({
     (state: OrganizationStateStore) => state.currentOrganizationId
   );
   const { userSession } = useAuthStore((state: AuthStore) => state);
-  const { deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
+  const { error: deleteError, deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
+  const { error: createError, createNested: createRelationship } = useCoachingRelationshipMutation(currentOrganizationId);
 
   // 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.
@@ -66,29 +69,49 @@ export function MemberCard({
     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();
   };
 
   // Placeholder – actual UI flows will be implemented later
   const [assignDialogOpen, setAssignDialogOpen] = useState(false);
   const [assignMode, setAssignMode] = useState<"coach" | "coachee">("coach");
   const [selectedMemberId, setSelectedMemberId] = useState<Id | null>(null);
+  const [assignedMemberId, setAssignedMemberId] = useState<Id | null>(null);
 
   const handleCreateCoachingRelationship = () => {
-    if (!selectedMemberId) return;
+    if (!selectedMemberId || !assignedMemberId) return;
+
     if (assignMode === "coach") {
       console.log("Assign", selectedMemberId, "as coach for", userId);
+      createRelationship(currentOrganizationId, {
+        coach_id: assignedMemberId,
+        coachee_id: selectedMemberId,
+      });
     } else {
       console.log("Assign", selectedMemberId, "as coachee for", userId);
+      createRelationship(currentOrganizationId, {
+        coach_id: selectedMemberId,
+        coachee_id: assignedMemberId,
+      });
+    }
+
+    if (createError) {
+      toast.error("Error creating Coaching Relationship");
+      return;
     }
-    // TODO: call mutation
+    
+    toast.success("Coaching Relationship created successfully");
+    onRefresh();
     setAssignDialogOpen(false);
     setSelectedMemberId(null);
   };
@@ -114,6 +137,7 @@ export function MemberCard({
                 onClick={() => {
                   setAssignMode("coach");
                   setAssignDialogOpen(true);
+                  setSelectedMemberId(userId);
                 }}
               >
                 Assign Coach
@@ -122,6 +146,7 @@ export function MemberCard({
                 onClick={() => {
                   setAssignMode("coachee");
                   setAssignDialogOpen(true);
+                  setSelectedMemberId(userId);
                 }}
               >
                 Assign Coachee
@@ -151,8 +176,8 @@ export function MemberCard({
             </DialogTitle>
           </DialogHeader>
           <Select
-            onValueChange={(val) => setSelectedMemberId(val as Id)}
-            value={selectedMemberId ?? undefined}
+            onValueChange={(val) => setAssignedMemberId(val as Id)}
+            value={assignedMemberId ?? undefined}
           >
             <SelectTrigger className="w-full">
               <SelectValue placeholder="Select a member" />

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

@@ -2,7 +2,7 @@ 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";
 
 interface MemberContainerProps {

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 {

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,

src/lib/stores/coaching-relationship-state-store.ts

@@ -3,7 +3,7 @@ import {
   defaultCoachingRelationshipsWithUserNames,
   defaultCoachingRelationshipWithUserNames,
   getCoachingRelationshipById,
-} from "@/types/coaching_relationship_with_user_names";
+} from "@/types/coaching_relationship";
 import { Id } from "@/types/general";
 import { create } from "zustand";
 import { createJSONStorage, devtools, persist } from "zustand/middleware";

…coaching_relationship_with_user_names.ts src/types/coaching_relationship.tssrc/types/coaching_relationship_with_user_names.ts renamed to src/types/coaching_relationship.ts src/types/coaching_relationship_with_user_names.ts renamed to src/types/coaching_relationship.ts

@@ -1,18 +1,27 @@
 import { DateTime } from "ts-luxon";
 import { Id } from "@/types/general";
 
-// This must always reflect the Rust struct on the backend
-// entity_api::coaching_relationship::CoachingRelationshipWithUserNames
-export interface CoachingRelationshipWithUserNames {
+export interface CoachingRelationship {
   id: Id;
   coach_id: Id;
   coachee_id: Id;
+  organization_id: Id;
+  created_at: DateTime;
+  updated_at: DateTime;
+}
+
+// This must always reflect the Rust struct on the backend
+// entity_api::coaching_relationship::CoachingRelationshipWithUserNames
+export type CoachingRelationshipWithUserNames = CoachingRelationship & {
   coach_first_name: string;
   coach_last_name: string;
   coachee_first_name: string;
   coachee_last_name: string;
-  created_at: DateTime;
-  updated_at: DateTime;
+};
+
+export interface NewCoachingRelationship {
+  coach_id: Id;
+  coachee_id: Id;
 }
 
 export function isCoachingRelationshipWithUserNames(
@@ -64,6 +73,7 @@ export function defaultCoachingRelationshipWithUserNames(): CoachingRelationship
     coachee_id: "",
     coach_first_name: "",
     coach_last_name: "",
+    organization_id: "",
     coachee_first_name: "",
     coachee_last_name: "",
     created_at: now,

src/types/session-title.ts

@@ -1,5 +1,5 @@
 import { DateTime } from "ts-luxon";
-import { CoachingRelationshipWithUserNames } from "./coaching_relationship_with_user_names";
+import { CoachingRelationshipWithUserNames } from "./coaching_relationship";
 import { CoachingSession } from "./coaching-session";
 import { siteConfig } from "@/site.config";
 import { getDateTimeFromString } from "./general";