@blazeo.com/appointment-client 1.0.10 → 1.0.11

package/dist/calendar/buildUnifiedCalendarView.js

@@ -63,18 +63,33 @@ function dayOrderIndex(d) {
     const i = DAY_NAMES.indexOf(u);
     return i >= 0 ? i : 999;
 }
-/** Merge rows that share participant + time span + off into one row with combined `days`. */
+/** Merge rows that share participant + time span into one row with combined active `days`. */
 function mergeOpeningHoursBySlot(rows) {
     const map = new Map();
     for (const r of rows) {
-        const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute, r.off].join("|");
+        // Key excludes 'off' because we want to merge ON and OFF records for the same time slot
+        const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute].join("|");
         const existing = map.get(key);
+        // We only want to add the day to the 'days' array if it is NOT marked as OFF.
+        // If the whole record was marked as OFF, we still process it to establish the slot,
+        // but its days won't be listed as 'active'.
+        const activeDaysFromThisRow = r.off ? [] : r.days;
         if (!existing) {
-            map.set(key, { ...r, days: [...r.days] });
+            map.set(key, { ...r, days: [...activeDaysFromThisRow], off: false });
         }
         else {
-            const set = new Set([...existing.days, ...r.days]);
+            const set = new Set([...existing.days, ...activeDaysFromThisRow]);
             existing.days = Array.from(set).sort((a, b) => dayOrderIndex(a) - dayOrderIndex(b));
+            // If we encounter any record that is NOT off, the whole merged slot is NOT off.
+            if (!r.off)
+                existing.off = false;
+        }
+    }
+    // Final Pass: If a slot has NO active days, it should be marked as off: true 
+    // (though in Plan V2, these usually just disappear from the UI's 'days' list)
+    for (const group of map.values()) {
+        if (group.days.length === 0) {
+            group.off = true;
         }
     }
     rows.length = 0;

package/dist/calendar/calendarCreation.js

@@ -120,7 +120,10 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
                 endHour: oh.endHour,
                 endMinute: oh.endMinute,
                 off: isOff,
-                openingHourId: openingHourId,
+                // Plan V2 Optimization: Generate a unique ID for EVERY day record.
+                // This prevents the backend from deduplicating/overwriting when multiple 
+                // records for the same participant + slot are sent in one batch.
+                openingHourId: newOpeningHourId(),
             });
         }
     }
@@ -128,6 +131,10 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
     for (const [participantId, payload] of hoursByParticipant.entries()) {
         if (payload.length === 0)
             continue;
+        // Plan V2 Optimization: Clear existing records for this participant first.
+        // This ensures that when we save the new batch (with unique per-day IDs), 
+        // we don't leak orphaned records or create duplicates during updates.
+        await calendarNode.removeParticipantOpeningHours(participantId);
         // Use the batch save method (plural)
         const res = await saveCalendarOpeningHoursBatch(calendarNode, payload);
         if (isFailureStatus(res)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazeo.com/appointment-client",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "publishConfig": {
     "access": "public"
   },

package/src/calendar/buildUnifiedCalendarView.ts

@@ -91,19 +91,37 @@ function dayOrderIndex(d: string): number {
   return i >= 0 ? i : 999;
 }
 
-/** Merge rows that share participant + time span + off into one row with combined `days`. */
+/** Merge rows that share participant + time span into one row with combined active `days`. */
 function mergeOpeningHoursBySlot(rows: UnifiedOpeningHourRow[]) {
   const map = new Map<string, UnifiedOpeningHourRow>();
   for (const r of rows) {
-    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute, r.off].join("|");
+    // Key excludes 'off' because we want to merge ON and OFF records for the same time slot
+    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute].join("|");
     const existing = map.get(key);
+    
+    // We only want to add the day to the 'days' array if it is NOT marked as OFF.
+    // If the whole record was marked as OFF, we still process it to establish the slot,
+    // but its days won't be listed as 'active'.
+    const activeDaysFromThisRow = r.off ? [] : r.days;
+
     if (!existing) {
-      map.set(key, { ...r, days: [...r.days] });
+      map.set(key, { ...r, days: [...activeDaysFromThisRow], off: false });
     } else {
-      const set = new Set([...existing.days, ...r.days]);
+      const set = new Set([...existing.days, ...activeDaysFromThisRow]);
       existing.days = Array.from(set).sort((a, b) => dayOrderIndex(a) - dayOrderIndex(b));
+      // If we encounter any record that is NOT off, the whole merged slot is NOT off.
+      if (!r.off) existing.off = false;
+    }
+  }
+  
+  // Final Pass: If a slot has NO active days, it should be marked as off: true 
+  // (though in Plan V2, these usually just disappear from the UI's 'days' list)
+  for (const group of map.values()) {
+    if (group.days.length === 0) {
+      group.off = true;
     }
   }
+
   rows.length = 0;
   rows.push(...map.values());
 }

package/src/calendar/calendarCreation.ts

@@ -132,7 +132,10 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
         endHour: oh.endHour,
         endMinute: oh.endMinute,
         off: isOff,
-        openingHourId: openingHourId,
+        // Plan V2 Optimization: Generate a unique ID for EVERY day record.
+        // This prevents the backend from deduplicating/overwriting when multiple 
+        // records for the same participant + slot are sent in one batch.
+        openingHourId: newOpeningHourId(),
       });
     }
   }
@@ -141,6 +144,11 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
   for (const [participantId, payload] of hoursByParticipant.entries()) {
     if (payload.length === 0) continue;
 
+    // Plan V2 Optimization: Clear existing records for this participant first.
+    // This ensures that when we save the new batch (with unique per-day IDs), 
+    // we don't leak orphaned records or create duplicates during updates.
+    await (calendarNode as any).removeParticipantOpeningHours(participantId);
+
     // Use the batch save method (plural)
     const res = await saveCalendarOpeningHoursBatch(calendarNode, payload);