Merge pull request #36 from Jim-Hodapp-Coaching/store_full_organization_in_app_state_store

Author: jhodapp

src/components/ui/dashboard/select-coaching-session.tsx

@@ -34,7 +34,11 @@ import {
   getCoachingRelationshipById,
 } from "@/types/coaching_relationship_with_user_names";
 import { getDateTimeFromString, Id } from "@/types/general";
-import { Organization } from "@/types/organization";
+import {
+  getOrganizationById,
+  Organization,
+  organizationToString,
+} from "@/types/organization";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 import { DateTime } from "ts-luxon";
@@ -51,6 +55,7 @@ export function SelectCoachingSession({
   const { organizationId, setOrganizationId } = useAppStateStore(
     (state) => state
   );
+  const { organization, setOrganization } = useAppStateStore((state) => state);
   const { relationshipId, setRelationshipId } = useAppStateStore(
     (state) => state
   );
@@ -129,6 +134,13 @@ export function SelectCoachingSession({
     loadCoachingSessions();
   }, [relationshipId]);
 
+  const handleSetOrganization = (organizationId: Id) => {
+    setOrganizationId(organizationId);
+    const organization = getOrganizationById(organizationId, organizations);
+    console.debug("organization: " + organizationToString(organization));
+    setOrganization(organization);
+  };
+
   const handleSetCoachingRelationship = (coachingRelationshipId: string) => {
     setRelationshipId(coachingRelationshipId);
     const coachingRelationship = getCoachingRelationshipById(
@@ -168,7 +180,7 @@ export function SelectCoachingSession({
           <Select
             defaultValue="0"
             value={organizationId}
-            onValueChange={setOrganizationId}
+            onValueChange={handleSetOrganization}
           >
             <SelectTrigger id="organization">
               <SelectValue placeholder="Select organization" />

src/components/ui/main-nav-menu.tsx

@@ -49,9 +49,11 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
+import { useAppStateStore } from "@/lib/providers/app-state-store-provider";
 
 export function MainNavMenu() {
   const [open, setIsOpen] = React.useState(false);
+  const { organization } = useAppStateStore((state) => state);
 
   return (
     <>
@@ -60,8 +62,8 @@ export function MainNavMenu() {
           <NavigationMenuItem>
             <NavigationMenuTrigger>
               <span className="hidden font-bold sm:inline-block">
-                {/* TODO: Replace this with currently selected organization's name */}
-                Refactor Coaching
+                {/* FIXME: Replace "Refactor" with something from siteConfig or something else */}
+                {organization.name.length > 0 ? organization.name : "Refactor"}
               </span>
             </NavigationMenuTrigger>
             <NavigationMenuContent>

src/lib/stores/app-state-store.ts

@@ -1,70 +1,83 @@
-import { CoachingSession, defaultCoachingSession } from '@/types/coaching-session';
-import { CoachingRelationshipWithUserNames, defaultCoachingRelationshipWithUserNames } from '@/types/coaching_relationship_with_user_names';
-import { Id } from '@/types/general';
-import { create } from 'zustand';
-import { createJSONStorage, devtools, persist } from 'zustand/middleware';
+import {
+  CoachingSession,
+  defaultCoachingSession,
+} from "@/types/coaching-session";
+import {
+  CoachingRelationshipWithUserNames,
+  defaultCoachingRelationshipWithUserNames,
+} from "@/types/coaching_relationship_with_user_names";
+import { Id } from "@/types/general";
+import { defaultOrganization, Organization } from "@/types/organization";
+import { create } from "zustand";
+import { createJSONStorage, devtools, persist } from "zustand/middleware";
 
 interface AppState {
-    organizationId: Id;
-    relationshipId: Id;
-    coachingSessionId: Id;
-    coachingSession: CoachingSession;
-    coachingRelationship: CoachingRelationshipWithUserNames;
+  organizationId: Id;
+  relationshipId: Id;
+  coachingSessionId: Id;
+  organization: Organization;
+  coachingSession: CoachingSession;
+  coachingRelationship: CoachingRelationshipWithUserNames;
 }
 
 interface AppStateActions {
-    setOrganizationId: (organizationId: Id) => void;
-    setRelationshipId: (relationshipId: Id) => void;
-    setCoachingSessionId: (coachingSessionId: Id) => void;
-    setCoachingSession: (coachingSession: CoachingSession) => void;
-    setCoachingRelationship: (coachingRelationship: CoachingRelationshipWithUserNames) => void;
-    reset (): void;
+  setOrganizationId: (organizationId: Id) => void;
+  setRelationshipId: (relationshipId: Id) => void;
+  setCoachingSessionId: (coachingSessionId: Id) => void;
+  setOrganization: (organization: Organization) => void;
+  setCoachingSession: (coachingSession: CoachingSession) => void;
+  setCoachingRelationship: (
+    coachingRelationship: CoachingRelationshipWithUserNames
+  ) => void;
+  reset(): void;
 }
 
 export type AppStateStore = AppState & AppStateActions;
 
 export const defaultInitState: AppState = {
-    organizationId: "",
-    relationshipId: "",
-    coachingSessionId: "",
-    coachingSession: defaultCoachingSession(),
-    coachingRelationship: defaultCoachingRelationshipWithUserNames(),
-}
+  organizationId: "",
+  relationshipId: "",
+  coachingSessionId: "",
+  organization: defaultOrganization(),
+  coachingSession: defaultCoachingSession(),
+  coachingRelationship: defaultCoachingRelationshipWithUserNames(),
+};
 
-export const createAppStateStore = (
-    initState: AppState = defaultInitState,
-) => {
-    const appStateStore = create<AppStateStore>()(
-        devtools(
-            persist(
-                (set) => ({
-                    ... initState,
+export const createAppStateStore = (initState: AppState = defaultInitState) => {
+  const appStateStore = create<AppStateStore>()(
+    devtools(
+      persist(
+        (set) => ({
+          ...initState,
 
-                    setOrganizationId: (organizationId) => {
-                        set({ organizationId });
-                    },
-                    setRelationshipId: (relationshipId) => {
-                        set({ relationshipId });
-                    },
-                    setCoachingSessionId: (coachingSessionId) => {
-                        set({ coachingSessionId });
-                    },
-                    setCoachingSession: (coachingSession) => {
-                        set({ coachingSession });
-                    },
-                    setCoachingRelationship: (coachingRelationship) => {
-                        set({ coachingRelationship });
-                    },
-                    reset (): void {
-                        set(defaultInitState);
-                    }
-                }),
-                {
-                    name: 'app-state-store',
-                    storage: createJSONStorage(() => sessionStorage),
-                }
-            )
-        )
+          setOrganizationId: (organizationId) => {
+            set({ organizationId });
+          },
+          setRelationshipId: (relationshipId) => {
+            set({ relationshipId });
+          },
+          setCoachingSessionId: (coachingSessionId) => {
+            set({ coachingSessionId });
+          },
+          setOrganization: (organization) => {
+            set({ organization });
+          },
+          setCoachingSession: (coachingSession) => {
+            set({ coachingSession });
+          },
+          setCoachingRelationship: (coachingRelationship) => {
+            set({ coachingRelationship });
+          },
+          reset(): void {
+            set(defaultInitState);
+          },
+        }),
+        {
+          name: "app-state-store",
+          storage: createJSONStorage(() => sessionStorage),
+        }
+      )
     )
-    return appStateStore;
-}
+  );
+  return appStateStore;
+};

src/types/organization.ts

@@ -30,6 +30,16 @@ export function isOrganizationsArray(value: unknown): value is Organization[] {
   return Array.isArray(value) && value.every(isOrganization);
 }
 
+export function getOrganizationById(
+  id: string,
+  organizations: Organization[]
+): Organization {
+  const organization = organizations.find(
+    (organization) => organization.id === id
+  );
+  return organization ? organization : defaultOrganization();
+}
+
 export function defaultOrganization(): Organization {
   var now = DateTime.now();
   return {