@blazeo.com/appointment-client 1.0.7 → 1.0.8

package/Appointment-Client/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

package/dist/calendar/buildUnifiedCalendarView.js

@@ -40,9 +40,7 @@ function coerceMemberId(v) {
  * Canonical member id used in both `members[].id` and `openingHours[].member`.
  */
 function resolveParticipantMemberId(calPart) {
-    const n = pick(calPart, "id", "Id");
-    if (n != null && typeof n === "number" && !Number.isNaN(n))
-        return n;
+    // Prefer the participantId GUID when available — it is the stable cross-endpoint identifier.
     const sid = pick(calPart, "participantId", "ParticipantId", "participant_id");
     if (sid != null && String(sid).trim() !== "") {
         const t = String(sid).trim();
@@ -50,6 +48,14 @@ function resolveParticipantMemberId(calPart) {
             return Number(t);
         return t;
     }
+    // Fall back to id — accepts both numeric and string (e.g. a GUID stored as id).
+    const n = pick(calPart, "id", "Id");
+    if (n != null) {
+        if (typeof n === "number" && !Number.isNaN(n))
+            return n;
+        if (typeof n === "string" && n.trim() !== "")
+            return n.trim();
+    }
     return "";
 }
 function dayOrderIndex(d) {

package/dist/calendar/fetchCalendarDetails.js

@@ -153,7 +153,8 @@ export async function fetchCalendarDetails(calendarId, options = {}) {
     const infoList = unwrapModelList(participantsInfoRaw);
     // Merge participantList and infoList to ensure we have all members
     const mergedParticipantsMap = new Map();
-    const getAnyId = (obj) => obj.id ?? obj.Id ?? obj.participantId ?? obj.ParticipantId ?? obj.participant_id;
+    // Prefer the participantId GUID; fall back to numeric id.
+    const getAnyId = (obj) => obj.participantId ?? obj.ParticipantId ?? obj.participant_id ?? obj.id ?? obj.Id;
     // 1. Add from standard list
     participantList.forEach((p) => {
         const id = getAnyId(p);

package/package.json

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

package/sample/package-lock.json

@@ -6,6 +6,7 @@
     "": {
       "name": "appointment-client-sample",
       "dependencies": {
+        "@blazeo.com/appointment-client": "file:../blazeo.com-appointment-client-1.0.7.tgz",
         "appointment-client": "file:..",
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
@@ -17,7 +18,7 @@
     },
     "..": {
       "name": "@blazeo.com/appointment-client",
-      "version": "1.0.6",
+      "version": "1.0.7",
       "dependencies": {
         "@blazeo.com/calendar-client": "^1.0.18",
         "mobx": "^6.13.7",
@@ -319,6 +320,38 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@blazeo.com/appointment-client": {
+      "version": "1.0.7",
+      "resolved": "file:../blazeo.com-appointment-client-1.0.7.tgz",
+      "integrity": "sha512-b2E5TIdxvNJLH3oEvCQngDhzQ08iwXNolPcok3emAlGipO0f8iGDij5hnVUntt68c2Lr3IPz3cvr/BcUY6MofQ==",
+      "dependencies": {
+        "@blazeo.com/calendar-client": "^1.0.18",
+        "mobx": "^6.13.7",
+        "mobx-state-tree": "^7.0.2"
+      }
+    },
+    "node_modules/@blazeo.com/calendar-client": {
+      "version": "1.0.18",
+      "resolved": "https://registry.npmjs.org/@blazeo.com/calendar-client/-/calendar-client-1.0.18.tgz",
+      "integrity": "sha512-wHqOZKUAH4JDgsdwaktEG68H5YfArOW3LEouCXznIza4YqNrlkfdJEyqiwNf6KjY2nELi+s2tFM22/1MKaWf5Q==",
+      "license": "UNLICENSED",
+      "dependencies": {
+        "mobx": "^6.10.0",
+        "mobx-state-tree": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@blazeo.com/calendar-client/node_modules/mobx-state-tree": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/mobx-state-tree/-/mobx-state-tree-5.4.2.tgz",
+      "integrity": "sha512-SGXAh2KCBQbWVcxeQbZEr5pchTgcfNZmGVRL2a2Me+pSMH98bZWXD6EOuuijbTGbc0hOoOsbab3JdwJyr+fW7Q==",
+      "license": "MIT",
+      "peerDependencies": {
+        "mobx": "^6.3.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.12",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
@@ -1425,6 +1458,28 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/mobx": {
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.15.3.tgz",
+      "integrity": "sha512-6+ZSYDs5zgH5CdGfEU2q2Lsa5PztVryL1ys7kAImTU25n2A9LAMj/yneVsQpd03MfwMLDQF+7kakJR9Z+cQxSw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      }
+    },
+    "node_modules/mobx-state-tree": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mobx-state-tree/-/mobx-state-tree-7.2.0.tgz",
+      "integrity": "sha512-o46IsMI/lHITYCmkbQgNOCDT8M9Hd2WAgOlHt42hCg+XUZP21obF5ui5Vv9epIsQV8Wpp/GWNHu1YFhTx6iq0g==",
+      "license": "MIT",
+      "dependencies": {
+        "ts-essentials": "^9.4.1"
+      },
+      "peerDependencies": {
+        "mobx": "^6.3.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "dev": true,
@@ -1598,6 +1653,20 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/ts-essentials": {
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-9.4.2.tgz",
+      "integrity": "sha512-mB/cDhOvD7pg3YCLk2rOtejHjjdSi9in/IBYE13S+8WA5FBSraYf4V/ws55uvs0IvQ/l0wBOlXy5yBNZ9Bl8ZQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": ">=4.1.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "dev": true,

package/sample/package.json

@@ -10,6 +10,7 @@
     "participants:info": "node ./scripts/getInfoByCalendar.mjs"
   },
   "dependencies": {
+    "@blazeo.com/appointment-client": "file:../blazeo.com-appointment-client-1.0.7.tgz",
     "appointment-client": "file:..",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"

package/sample/src/FetchCalendarTab.jsx

@@ -304,23 +304,14 @@ export function FetchCalendarTab() {
             const id = c.calendarId ?? String(c.id ?? "");
             if (!id) return { calendar: getSnapshot(c), openingHours: [], meta: { error: "no id" } };
             try {
+              // fetchCalendarDetails now returns the flat unified view directly
               const b = await fetchCalendarDetails(id, {
                 ...connectionOpts,
                 baseUrl: effective.baseUrl,
                 ...(effective.consumer ? { consumer: effective.consumer } : {}),
               });
-              return {
-                calendarView: b.calendarView,
-                calendar: b.calendar ?? getSnapshot(c),
-                openingHours: b.openingHours,
-                participants: (b.participants ?? []).map((p) => (isStateTreeNode(p) ? getSnapshot(p) : p)),
-                __openingHoursMeta: {
-                  fromCalendarGet: b.fromCalendarGet,
-                  fromParticipantApi: b.fromParticipantApi,
-                  calendarViewUsedAllParticipantOpeningHours: b.meta?.calendarViewUsedAllParticipantOpeningHours,
-                },
-                meta: b.meta,
-              };
+              // b IS the unified calendarView: members/openingHours/participants at top level
+              return b ?? { calendar: getSnapshot(c), openingHours: [], meta: { error: "null response" } };
             } catch (err) {
               return {
                 calendar: getSnapshot(c),
@@ -469,29 +460,29 @@ export function FetchCalendarTab() {
       <div className="card">
         <h2>Fetch calendar · calendarView</h2>
         <p className="muted small">
-          Runs <code>fetchCalendarDetails(calendarId)</code>. JSON field <code>calendarView</code> is first: one object with
-          calendar snapshot fields + <code>members</code> + <code>openingHours</code>, and a **new** <code>participants</code> array
-          where each participant has their own <code>openingHours</code> nested inside.
+          Runs <code>fetchCalendarDetails(calendarId)</code>. The JSON shown below <strong>is</strong> the unified calendar view:
+          one object with calendar snapshot fields + <code>members</code> + <code>openingHours</code>, plus a{" "}
+          <code>participants</code> array where each participant may include nested <code>openingHours</code>. (
+          <code>fetchCalendarBundle(calendarId)</code> returns the same shape.)
         </p>
         <p className="muted small">
           Uses <code>fetchCalendarDetails</code>: legacy <code>openingHours</code> prefers embed on{" "}
           <code>CalendarModel.getRaw</code>, else <code>getParticipantOpeningHours</code>.{" "}
-          <code>calendarView.openingHours</code> prefers <code>getAllParticipantOpeningHours</code> (
+          Unified <code>openingHours</code> prefers <code>getAllParticipantOpeningHours</code> (
           <code>GET /Calendar/Participant/OpeningHours/All/Get</code>) when the API returns rows. Members combine{" "}
           <code>CalendarModel.getParticipants</code> + <code>CalendarModel.getParticipantsInfo</code> (each member may
           include <code>participantInfo</code>).
         </p>
         <p className="muted small">
-          <strong>Single object in code:</strong> <code>fetchCalendarBundle(calendarId)</code> after{" "}
-          <code>initializeAppointmentClient(&#123; baseUrl, consumer &#125;)</code> — same unified shape as{" "}
-          <code>calendarView</code> below. This tab runs <code>fetchCalendarDetails</code> so extra arrays stay visible.
+          <strong>In code:</strong> <code>fetchCalendarBundle(calendarId)</code> (after{" "}
+          <code>initializeAppointmentClient(&#123; baseUrl, consumer &#125;)</code>) is an alias for the same unified fetch;
+          use either alongside explicit <code>baseUrl</code> / <code>consumer</code> options when needed.
         </p>
         <p className="muted small">
           <strong>DevTools Network:</strong> Each fetch fires <code>/Calendar/Get</code> <strong>twice</strong> (
           <code>CalendarModel.get</code> + <code>getRaw</code>). Other calls use different URLs — filter by{" "}
-          <code>Participant</code>, <code>OpeningHours</code>, or <code>GetInfo</code>. Those power{" "}
-          <code>calendarView</code>. If you only see <code>Calendar/Get</code> yet the UI JSON has members/hours,
-          widen the Network filter (&quot;All&quot;) or disable search; if <code>calendarView</code> is empty/missing fields,
+          <code>Participant</code>, <code>OpeningHours</code>, or <code>GetInfo</code>. Those power the unified view. If you only see <code>Calendar/Get</code> yet the UI JSON has members/hours,
+          widen the Network filter (&quot;All&quot;) or disable search; if the unified object is empty/missing fields,
           check the <strong>Console</strong> for errors on the participant/opening-hours requests.
         </p>
         <p className="muted small">
@@ -567,11 +558,18 @@ export function FetchCalendarTab() {
       <div className="card">
         <h2>Fetch calendars by company</h2>
         <p className="muted small">
-          Calls <code>CalendarModel.getByCompany</code> → <code>GET /Calendar/All</code>. If the UI shows{" "}
-          <strong>Failed to fetch</strong> while Base URL points at Azure/production, that is usually{" "}
+          Step 1: <code>CalendarModel.getByCompany</code> → <code>GET /Calendar/All</code> (company key → calendar
+          list). Step 2: for each calendar id, this tab runs the same{" "}
+          <code>fetchCalendarDetails(calendarId)</code> pipeline as <strong>Fetch calendar · calendarView</strong>, so
+          the JSON below is an <strong>array</strong> of unified objects (members, openingHours, participants — same
+          shape as a single fetch). If an id is missing from the list row, that entry falls back to the raw snapshot
+          only.
+        </p>
+        <p className="muted small">
+          If the UI shows <strong>Failed to fetch</strong> while Base URL points at Azure/production, that is usually{" "}
           <strong>CORS</strong>: enable proxy via <code>VITE_DEV_PROXY_TARGET</code> in{" "}
-          <code>sample/.env.development</code> and Base URL <code>http://localhost:5173/blazeo-api</code>{" "}
-          (restart dev server).
+          <code>sample/.env.development</code> and Base URL <code>http://localhost:5173/blazeo-api</code> (restart dev
+          server).
         </p>
         <form onSubmit={handleFetchByCompany} className="form">
           <label className="form__label">

package/src/calendar/buildUnifiedCalendarView.ts

@@ -37,14 +37,19 @@ function coerceMemberId(v: unknown): number | string | null {
  * Canonical member id used in both `members[].id` and `openingHours[].member`.
  */
 function resolveParticipantMemberId(calPart: Record<string, any>): number | string {
-  const n = pick<number | null>(calPart, "id", "Id");
-  if (n != null && typeof n === "number" && !Number.isNaN(n)) return n;
+  // Prefer the participantId GUID when available — it is the stable cross-endpoint identifier.
   const sid = pick<string>(calPart, "participantId", "ParticipantId", "participant_id");
   if (sid != null && String(sid).trim() !== "") {
     const t = String(sid).trim();
     if (/^\d+$/.test(t)) return Number(t);
     return t;
   }
+  // Fall back to id — accepts both numeric and string (e.g. a GUID stored as id).
+  const n = pick<number | string | null>(calPart, "id", "Id");
+  if (n != null) {
+    if (typeof n === "number" && !Number.isNaN(n)) return n;
+    if (typeof n === "string" && n.trim() !== "") return n.trim();
+  }
   return "";
 }
 

package/src/calendar/fetchCalendarDetails.ts

@@ -194,7 +194,9 @@ export async function fetchCalendarDetails(
   // Merge participantList and infoList to ensure we have all members
   const mergedParticipantsMap = new Map<string, any>();
   
-  const getAnyId = (obj: any) => obj.id ?? obj.Id ?? obj.participantId ?? obj.ParticipantId ?? obj.participant_id;
+  // Prefer the participantId GUID; fall back to numeric id.
+  const getAnyId = (obj: any) =>
+    obj.participantId ?? obj.ParticipantId ?? obj.participant_id ?? obj.id ?? obj.Id;
 
   // 1. Add from standard list
   participantList.forEach((p: any) => {