Prod release 6/3

README.md

@@ -31,7 +31,7 @@ cd booking-app/booking-app
 npm install
 ```
 
-4. 🔐 Obtain the `.env.local` file from a project administrator (Riho or Nima) and place it in the root directory of the project.
+4. 🔐 Obtain the `.env` file from a project administrator (Riho or Nima) and place it in the `booking-app` directory.
 
 ### Running the Application
 
@@ -52,7 +52,7 @@ Once the application is running, you should be able to:
 ## 🔒 Environment Variables
 
 This project relies on environment variables for secure configuration. Important notes:
-- Request the `.env.local` file from project admin or another dev
+- Request the `.env` file from project admin or another dev
 - Never commit the `.env` file to version control
 - Keep the environment variables secure and confidential
 
@@ -106,7 +106,7 @@ In the `package.json` file, the following test scripts are defined:
 3. View the results in the console. Fix any failing tests before proceeding with development or deployment.
 
 #### Notes
-- **Environment:** Ensure you have the **development** `.env.local` file properly configured for your testing environment.
+- **Environment:** Ensure you have the **development** `.env` file properly configured for your testing environment.
 - **Playwright Setup:** If running Playwright tests for the first time, install the required browsers:
   ```bash
   npx playwright install

booking-app/README.md

@@ -21,7 +21,7 @@ Follow these steps to run the application in your local environment.
    ```
 3. Install the dependencies:
    `npm install`
-4. Obtain the `.env` file from a project administrator and place it in the root directory of the project.
+4. Obtain the `.env` file from a project administrator and place it in the `booking-app` directory.
 
 ### Running the Application
 
@@ -31,7 +31,7 @@ The application should now be running on [http://localhost:3000](http://localhos
 
 ## Environment Variables
 
-This project uses environment variables for configuration. Make sure you have received the `.env` file from a project administrator and placed it in the root directory before running the application.
+This project uses environment variables for configuration. Make sure you have received the `.env` file from a project administrator and placed it in the `booking-app` directory before running the application.
 
 ## Deployment
 

booking-app/app/[tenant]/layout.tsx

@@ -27,24 +27,24 @@ export async function generateMetadata({
   const { tenant } = await params;
   try {
     const tenantSchema = await getCachedTenantSchema(tenant);
-    if (!tenantSchema?.name) {
+    if (!tenantSchema?.tenant?.name) {
       return {
         title: "NYU room booking",
         description: "NYU space reservation",
       };
     }
-    const title = `${tenantSchema.name} Booking`;
+    const title = `${tenantSchema.tenant.name} Booking`;
     const description =
-      tenantSchema.nameForPolicy?.trim() ||
+      tenantSchema.tenant.nameForPolicy?.trim() ||
       `${title} — NYU space reservation`;
     return {
       title,
       description,
-      ...(tenantSchema.logo
+      ...(tenantSchema.tenant.logo
         ? {
             icons: {
-              icon: tenantSchema.logo,
-              apple: tenantSchema.logo,
+              icon: tenantSchema.tenant.logo,
+              apple: tenantSchema.tenant.logo,
             },
           }
         : {}),
@@ -69,8 +69,8 @@ const Layout: React.FC<LayoutProps> = async ({ children, params }) => {
     const tenantSchema = await getCachedTenantSchema(tenant);
 
     console.log("Layout: Retrieved tenantSchema:", {
-      tenant: tenantSchema?.tenant,
-      name: tenantSchema?.name,
+      tenantId: tenantSchema?.tenantId,
+      name: tenantSchema?.tenant?.name,
       resourcesCount: tenantSchema?.resources?.length || 0,
     });
 
@@ -89,12 +89,12 @@ const Layout: React.FC<LayoutProps> = async ({ children, params }) => {
     const serializedTenantSchema: SchemaContextType = {
       ...tenantSchema,
       resources: resources ?? tenantSchema.resources,
-      tenant: tenantSchema.tenant || tenant,
+      tenantId: tenantSchema.tenantId || tenant,
     };
 
     console.log("Layout: Serialized tenantSchema:", {
-      tenant: serializedTenantSchema.tenant,
-      name: serializedTenantSchema.name,
+      tenantId: serializedTenantSchema.tenantId,
+      name: serializedTenantSchema.tenant.name,
       resourcesCount: serializedTenantSchema.resources?.length || 0,
     });
 
@@ -104,8 +104,10 @@ const Layout: React.FC<LayoutProps> = async ({ children, params }) => {
           <SchemaDriftBanner />
           <TenantEntitlementGuard>
             <TenantSiteBanner />
-            <NavBar />
-            {children}
+            <header>
+              <NavBar />
+            </header>
+            <main>{children}</main>
           </TenantEntitlementGuard>
         </ClientProvider>
       </SchemaProviderWrapper>

booking-app/app/api/bookings/edit/route.ts

@@ -69,7 +69,7 @@ async function sendEditNotificationEmails(
     email,
     startDate: bookingCalendarInfo?.startStr,
     endDate: bookingCalendarInfo?.endStr,
-    headerMessage: emailConfig.emailMessages.firstApprovalRequest,
+    headerMessage: emailConfig.emailNotifications.requestedNeedsApproval,
     requestNumber: existingContents.requestNumber,
     origin: existingContents.origin || BookingOrigin.USER,
   };
@@ -143,7 +143,7 @@ async function sendEditNotificationEmails(
   await serverSendBookingDetailEmail({
     calendarEventId,
     targetEmail: email,
-    headerMessage: emailConfig.emailMessages.requestConfirmation,
+    headerMessage: emailConfig.emailNotifications.requestedUser,
     status: BookingStatusLabel.REQUESTED,
     replyTo: email,
     tenant,

booking-app/app/api/bookings/route.ts

@@ -413,7 +413,7 @@ async function handleBookingApprovalEmails(
       email,
       startDate: bookingCalendarInfo?.startStr,
       endDate: bookingCalendarInfo?.endStr,
-      headerMessage: emailConfig.emailMessages.firstApprovalRequest,
+      headerMessage: emailConfig.emailNotifications.requestedNeedsApproval,
       requestNumber: sequentialId,
       origin: formatOrigin(data.origin) ?? BookingOrigin.USER,
     };
@@ -449,7 +449,7 @@ async function handleBookingApprovalEmails(
     await serverSendBookingDetailEmail({
       calendarEventId,
       targetEmail: email,
-      headerMessage: emailConfig.emailMessages.requestConfirmation,
+      headerMessage: emailConfig.emailNotifications.requestedUser,
       status: BookingStatusLabel.REQUESTED,
       replyTo: email,
       tenant,

booking-app/app/api/bookingsDirect/route.ts

@@ -620,8 +620,8 @@ export async function POST(request: NextRequest) {
     const emailConfig = await getTenantEmailConfig(tenant);
     const confirmationMessage =
       type === "vip"
-        ? emailConfig.emailMessages.vipConfirmation
-        : emailConfig.emailMessages.walkInConfirmation;
+        ? emailConfig.emailNotifications.approvedVIP
+        : emailConfig.emailNotifications.approvedWalkIn;
 
     const sendWalkInNofificationEmail = async (recipients: string[]) => {
       const emailPromises = recipients.map(recipient =>

booking-app/app/api/checkin-processing/route.ts

@@ -72,7 +72,7 @@ export async function POST(req: NextRequest) {
         await serverSendBookingDetailEmail({
           calendarEventId,
           targetEmail: guestEmail,
-          headerMessage: emailConfig.emailMessages.checkinConfirmation,
+          headerMessage: emailConfig.emailNotifications.checkedIn,
           status: BookingStatusLabel.CHECKED_IN,
           tenant,
         });

booking-app/app/api/checkout-processing/route.ts

@@ -72,7 +72,7 @@ export async function POST(req: NextRequest) {
         await serverSendBookingDetailEmail({
           calendarEventId,
           targetEmail: guestEmail,
-          headerMessage: emailConfig.emailMessages.checkoutConfirmation,
+          headerMessage: emailConfig.emailNotifications.checkedOut,
           status: BookingStatusLabel.CHECKED_OUT,
           tenant,
         });

booking-app/app/api/safety_training_form/route.ts

@@ -3,6 +3,7 @@ import { getFormsClient, getLoggingClient } from "@/lib/googleClient";
 import { serverGetDocumentById } from "@/lib/firebase/server/adminDb";
 import { TableNames } from "@/components/src/policy";
 import { extractGoogleFormId } from "@/components/src/utils/formUrlUtils";
+import { coerceTenantSchema } from "@/lib/tenant/coerceTenantSchema";
 
 export const dynamic = "force-dynamic";
 
@@ -19,31 +20,34 @@ export async function GET(request: NextRequest) {
     }
 
     // Get tenant schema (includes training form URL per resource and tenant-level fallback)
-    const schema = await serverGetDocumentById(
+    const raw = await serverGetDocumentById<Record<string, unknown>>(
       TableNames.TENANT_SCHEMA,
       tenant,
     );
-    if (!schema) {
+    if (!raw) {
       return NextResponse.json(
         { error: "Tenant schema not found" },
         { status: 404 },
       );
     }
 
+    const schema = coerceTenantSchema(raw, tenant);
+
     // Resolve training form from schema: resource by resourceId, then tenant-level fallback
     let formId: string | null = null;
 
     if (resourceId) {
       const resource = schema.resources?.find(
-        (r: any) => r.roomId?.toString() === resourceId.toString(),
+        (r) => r.roomId?.toString() === resourceId.toString(),
       );
-      if (resource?.trainingFormUrl) {
-        formId = extractGoogleFormId(resource.trainingFormUrl);
+      const resourceForm = resource?.training?.formId;
+      if (resourceForm) {
+        formId = extractGoogleFormId(resourceForm);
       }
     }
 
-    if (!formId && (schema as any).safetyTrainingGoogleFormId) {
-      formId = extractGoogleFormId((schema as any).safetyTrainingGoogleFormId);
+    if (!formId && schema.training?.formId) {
+      formId = extractGoogleFormId(schema.training.formId);
     }
 
     // If no form found, return error

booking-app/app/api/tenantSchema/[tenant]/route.ts

@@ -6,6 +6,7 @@ import {
 } from "@/lib/firebase/server/adminDb";
 import { TableNames } from "@/components/src/policy";
 import { applyEnvironmentCalendarIds } from "@/lib/utils/calendarEnvironment";
+import { coerceTenantSchema } from "@/lib/tenant/coerceTenantSchema";
 import { isValidTenant } from "@/components/src/constants/tenants";
 import admin from "@/lib/firebase/server/firebaseAdmin";
 
@@ -17,20 +18,29 @@ export async function GET(
     const { tenant } = await params;
 
     // Fetch the specific schema document using tenant as document ID
-    const schema = await serverGetDocumentById(
+    const rawDoc = await serverGetDocumentById<Record<string, unknown>>(
       TableNames.TENANT_SCHEMA,
       tenant,
     );
 
-    if (!schema) {
+    if (!rawDoc) {
       return NextResponse.json(
         { error: `Schema not found for tenant: ${tenant}` },
         { status: 404 },
       );
     }
 
-    // Skip environment calendar ID rewriting when raw=1 is requested
-    // (used by schema editor to avoid data corruption on round-trip)
+    // Always coerce to the canonical (nested) shape. The schema editor needs
+    // the nested shape to render its fields, so it consumes this coerced
+    // payload and persists it on save — which is the intended lazy migration of
+    // a legacy document to the canonical shape (no data is lost; coercion maps
+    // every legacy field across). It is NOT a way to fetch the un-coerced
+    // document.
+    const schema = coerceTenantSchema(rawDoc, tenant);
+
+    // `raw=1` only skips environment-specific calendar ID rewriting, so the
+    // editor saves back the stored calendar IDs rather than env-substituted
+    // ones. It does not bypass coercion.
     const raw = request.nextUrl.searchParams.get("raw") === "1";
     if (!raw && schema.resources && Array.isArray(schema.resources)) {
       schema.resources = applyEnvironmentCalendarIds(schema.resources);
@@ -86,8 +96,8 @@ export async function PUT(
 
     const newSchema = await request.json();
 
-    // Enforce tenant field consistency with URL param
-    newSchema.tenant = tenant;
+    // Enforce tenant id consistency with URL param
+    newSchema.tenantId = tenant;
 
     // Backup current schema before overwriting
     const existingSchema = await serverGetDocumentById(

booking-app/components/src/client/routes/admin/components/BookingActions.tsx

@@ -97,7 +97,7 @@ export default function BookingActions(props: Props) {
           value={reason}
           setValue={setReason}
         >
-          <IconButton color={"primary"}>
+          <IconButton color={"primary"} aria-label="Confirm decline">
             <Check />
           </IconButton>
         </DeclineReasonDialog>
@@ -116,7 +116,10 @@ export default function BookingActions(props: Props) {
           value={reason}
           setValue={setReason}
         >
-          <IconButton color={"primary"}>
+          <IconButton
+            color={"primary"}
+            aria-label={`Confirm ${selectedAction}`}
+          >
             <Check />
           </IconButton>
         </DeclineReasonDialog>
@@ -136,6 +139,7 @@ export default function BookingActions(props: Props) {
           <IconButton
             disabled={selectedAction === Actions.PLACEHOLDER}
             color={"primary"}
+            aria-label={`Confirm ${selectedAction}`}
           >
             <Check />
           </IconButton>
@@ -150,6 +154,7 @@ export default function BookingActions(props: Props) {
         onClick={() => {
           handleDialogChoice(true);
         }}
+        aria-label={`Confirm ${selectedAction}`}
       >
         <Check />
       </IconButton>