@blazeo.com/appointment-client 1.0.6 → 1.0.8

package/sample/src/blazeoDemoError.js

@@ -0,0 +1,14 @@
+/**
+ * Maps low-level Blazeo / calendar-client errors to actionable copy for this sample.
+ */
+export function mapBlazeoDemoError(message) {
+  const m = String(message ?? "");
+  if (
+    /Model env requires baseUrl|requires baseUrl\. Call configure|baseUrl is missing|Blazeo base URL is not set/i.test(
+      m
+    )
+  ) {
+    return "Blazeo Base URL is not set for API calls. Enter **Base URL** (and optional Consumer) in the **Blazeo connection** card at the top of this page, or set `blazeoClientConfig` / `VITE_BLAZEO_BASE_URL`.";
+  }
+  return m;
+}

package/sample/src/blazeoPushConnection.js

@@ -0,0 +1,23 @@
+import { ensureBlazeoHttpReady, initializeAppointmentClient } from "appointment-client";
+import { configure } from "@blazeo.com/calendar-client";
+
+function normalizeBase(u) {
+  const t = (u ?? "").trim();
+  if (!t) return "";
+  return t.replace(/\/+$/, "");
+}
+
+/**
+ * Applies Base URL from the connection card. With Vite `resolve.alias` pointing
+ * `@blazeo.com/calendar-client` at one file, `configure` here matches `CalendarModel`'s store.
+ * `initializeAppointmentClient` + `ensureBlazeoHttpReady` keep `appointment-client` helpers aligned.
+ */
+export function pushBlazeoConnection(effective) {
+  const baseUrl = normalizeBase(effective?.baseUrl ?? "");
+  if (!baseUrl) return;
+  const consumer = (effective?.consumer ?? "").trim() || undefined;
+  const cfg = { baseUrl, ...(consumer ? { consumer } : {}) };
+  initializeAppointmentClient(cfg);
+  configure(cfg);
+  ensureBlazeoHttpReady(cfg);
+}

package/sample/src/main.jsx

@@ -1,11 +1,11 @@
-import { applyBlazeoClientConfig } from "appointment-client";
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { App } from "./App2.jsx";
+import { bootstrapBlazeoClient } from "./blazeoBootstrap.js";
 import "./style.css";
 
-/** Apply file defaults (`blazeoClientDefaults.ts`) before React mounts. */
-applyBlazeoClientConfig();
+/** Blazeo: `blazeoClientDefaults.ts` + optional `VITE_BLAZEO_*` (.env) → `configure()` for calendar-client. */
+bootstrapBlazeoClient();
 
 const rootEl = document.getElementById("app");
 if (!rootEl) {

package/sample/vite.config.js

@@ -1,10 +1,23 @@
 import react from "@vitejs/plugin-react";
 import { defineConfig, loadEnv } from "vite";
 import path from "path";
+import fs from "fs";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+/** Single physical entry for `@blazeo.com/calendar-client` (hoisted or nested under `file:..` parent). */
+function calendarClientEntry() {
+  const candidates = [
+    path.resolve(__dirname, "node_modules/@blazeo.com/calendar-client/dist/index.mjs"),
+    path.resolve(__dirname, "../node_modules/@blazeo.com/calendar-client/dist/index.mjs"),
+  ];
+  for (const p of candidates) {
+    if (fs.existsSync(p)) return p;
+  }
+  return candidates[0];
+}
+
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, path.resolve(__dirname, "."), "");
   const proxyTarget = (env.VITE_DEV_PROXY_TARGET ?? "").trim().replace(/\/+$/, "");
@@ -26,13 +39,14 @@ export default defineConfig(({ mode }) => {
     plugins: [react()],
     /** Ensure one instance so `configure()` and models share the same store. */
     resolve: {
-      preserveSymlinks: true,
+      // `file:..` appointment-client is symlinked; `true` can resolve the same dep twice → two `getConfig()` stores.
+      preserveSymlinks: false,
       dedupe: ["@blazeo.com/calendar-client", "mobx", "mobx-state-tree"],
       alias: {
-        "@blazeo.com/calendar-client": path.resolve(
-          __dirname,
-          "../node_modules/@blazeo.com/calendar-client/dist/index.mjs"
-        ),
+        // Ensure Vite/Rollup can always resolve the local workspace package.
+        // (Avoids `Failed to resolve import "appointment-client"` during dev/build.)
+        "appointment-client": path.resolve(__dirname, "../dist/index.js"),
+        "@blazeo.com/calendar-client": calendarClientEntry(),
       },
     },
     optimizeDeps: {

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 "";
 }
 
@@ -56,6 +61,7 @@ export interface UnifiedCalendarMember {
   status: number | null;
   /** Full row from Participants/GetInfo (plain object). */
   participantInfo?: Record<string, unknown> | null;
+  __typename?: string;
 }
 
 export interface UnifiedParticipantWithHours extends UnifiedCalendarMember {
@@ -63,13 +69,20 @@ export interface UnifiedParticipantWithHours extends UnifiedCalendarMember {
 }
 
 export interface UnifiedOpeningHourRow {
+  id?: number | string;
+  createdOn?: string;
+  modifiedOn?: string;
   member: number | string;
+  openingHourId?: string;
+  calendarId?: string;
+  participantId?: string;
   days: string[];
   startHour: number;
   startMinute: number;
   endHour: number;
   endMinute: number;
   off: boolean;
+  __typename?: string;
 }
 
 function dayOrderIndex(d: string): number {
@@ -253,6 +266,7 @@ export function buildUnifiedCalendarView(
         email: email ?? null,
         status: deriveMemberStatus({}, inf),
         participantInfo: participantInfoPlain,
+        __typename: "Member",
       });
     }
   }
@@ -277,13 +291,20 @@ export function buildUnifiedCalendarView(
     const off = Boolean(pick(row, "off", "Off"));
 
     openingHours.push({
+      id: pick(row, "id", "Id") ?? 0,
+      createdOn: pick(row, "createdOn", "CreatedOn", "created_on") ?? "0001-01-01T00:00:00.000Z",
+      modifiedOn: pick(row, "modifiedOn", "ModifiedOn", "modified_on") ?? "0001-01-01T00:00:00.000Z",
       member: memberId,
+      openingHourId: pick(row, "openingHourId", "OpeningHourId", "opening_hour_id") ?? "",
+      calendarId: pick(row, "calendarId", "CalendarId", "calendar_id") ?? "",
+      participantId: pick(row, "participantId", "ParticipantId", "participant_id") ?? "",
       days,
       startHour,
       startMinute,
       endHour,
       endMinute,
       off,
+      __typename: "OpeningHour",
     });
   }
 
@@ -294,6 +315,7 @@ export function buildUnifiedCalendarView(
     members,
     openingHours,
     participants: buildNestedParticipants(members, openingHours),
+    __typename: "Calendar",
   } as UnifiedCalendarView;
 
   return view;
@@ -306,17 +328,23 @@ function buildNestedParticipants(
   members: UnifiedCalendarMember[],
   openingHours: UnifiedOpeningHourRow[]
 ): UnifiedParticipantWithHours[] {
-  return members.map((m) => {
-    const hours = openingHours.filter((oh) => {
+  const nested: UnifiedParticipantWithHours[] = [];
+  members.forEach((m) => {
+    const hoursForThisMember = openingHours.filter((oh) => {
       const mid = String(oh.member).trim().toLowerCase();
       const pid = String(m.id).trim().toLowerCase();
       return mid === pid;
     });
     // Remove the 'member' field from the nested opening hours as it's redundant.
-    const nestedHours = hours.map(({ member, ...rest }) => rest as any);
-    return {
+    const nestedHours = hoursForThisMember.map(({ member, ...rest }) => ({
+      ...rest,
+      __typename: "OpeningHour"
+    }));
+    nested.push({
       ...m,
       openingHours: nestedHours,
-    };
+      __typename: "Member",
+    } as UnifiedParticipantWithHours);
   });
+  return nested;
 }