@blazeo.com/appointment-client 1.0.4 → 1.0.5

package/dist/calendar/fetchCalendarDetails.d.ts

@@ -0,0 +1,18 @@
+export declare function fetchCalendarDetails(calendarId: string, options?: {
+    includeParticipantsInfo?: boolean;
+}): Promise<{
+    calendar: (Record<string, unknown> & {
+        openingHours: unknown[];
+    }) | null;
+    /** Live MST calendar node (same as `CalendarModel.get`) — use for instance calls. */
+    cal: unknown;
+    openingHours: unknown[];
+    participants: unknown[];
+    participantsInfo: unknown;
+    openingHoursApiResponse: unknown;
+    meta: {
+        ok: boolean;
+        reason?: string;
+    };
+}>;
+

package/dist/calendar/fetchCalendarDetails.js

@@ -0,0 +1,51 @@
+import { CalendarModel } from "@blazeo.com/calendar-client";
+import { getSnapshot } from "mobx-state-tree";
+import { normalizeParticipantOpeningHoursResponse } from "./fetchCalendarWithOpeningHours.js";
+
+/**
+ * Loads calendar + opening hours + participants and returns a single bundle.
+ *
+ * Network calls (when calendar exists):
+ * - GET /Calendar/Get
+ * - GET /Calendar/Participant/OpeningHours/Get
+ * - GET /Calendar/Participant/All
+ */
+export async function fetchCalendarDetails(calendarId, options = {}) {
+  const { includeParticipantsInfo = false } = options;
+
+  const cal = await CalendarModel.get(calendarId);
+  if (cal == null) {
+    return {
+      calendar: null,
+      cal: null,
+      openingHours: [],
+      participants: [],
+      participantsInfo: null,
+      openingHoursApiResponse: null,
+      meta: { ok: false, reason: "calendar_not_found" }
+    };
+  }
+
+  const [openingHoursRes, participants, participantsInfo] = await Promise.all([
+    cal.getParticipantOpeningHours({}),
+    cal.getParticipants(),
+    includeParticipantsInfo ? cal.getParticipantsInfo() : Promise.resolve(null)
+  ]);
+
+  const { list: openingHoursList } = normalizeParticipantOpeningHoursResponse(openingHoursRes);
+  const openingHours = Array.isArray(openingHoursList) ? openingHoursList : [];
+
+  const snap = getSnapshot(cal);
+  const calendar = { ...snap, openingHours };
+
+  return {
+    calendar,
+    cal,
+    openingHours,
+    participants: Array.isArray(participants) ? participants : [],
+    participantsInfo,
+    openingHoursApiResponse: openingHoursRes,
+    meta: { ok: true }
+  };
+}
+

package/dist/index.d.ts

@@ -18,6 +18,7 @@ export { mapCalendarBOToSnapshot } from "./calendar/mapCalendarToBlazeoSnapshot.
 export type { CalendarInput as CalendarBOInput, MemberBOInput, OpeningHourBOInput, } from "./types/calendar.js";
 export type { ApexAppointmentInput } from "./types/appointment.js";
 export { fetchCalendarWithOpeningHours, normalizeParticipantOpeningHoursResponse, pickOpeningHoursArrayFromCalendarPayload, unwrapCalendarGetData, } from "./calendar/fetchCalendarWithOpeningHours.js";
+export { fetchCalendarDetails } from "./calendar/fetchCalendarDetails.js";
 export { CalendarModel, EventModel, ParticipantModel, OpeningHourModel, } from "@blazeo.com/calendar-client";
 export { configure, getConfig } from "@blazeo.com/calendar-client";
 export { getExampleCalendarRoot, getExampleCalendarRootSnapshot, getExampleEvents, getExampleParticipants, getExampleSlots, } from "./exampleData.js";

package/dist/index.js

@@ -17,6 +17,7 @@ export * from "./facades/index.js";
 export * from "./models/index.js";
 export { mapCalendarBOToSnapshot } from "./calendar/mapCalendarToBlazeoSnapshot.js";
 export { fetchCalendarWithOpeningHours, normalizeParticipantOpeningHoursResponse, pickOpeningHoursArrayFromCalendarPayload, unwrapCalendarGetData, } from "./calendar/fetchCalendarWithOpeningHours.js";
+export { fetchCalendarDetails } from "./calendar/fetchCalendarDetails.js";
 export { CalendarModel, EventModel, ParticipantModel, OpeningHourModel, } from "@blazeo.com/calendar-client";
 export { configure, getConfig } from "@blazeo.com/calendar-client";
 export { getExampleCalendarRoot, getExampleCalendarRootSnapshot, getExampleEvents, getExampleParticipants, getExampleSlots, } from "./exampleData.js";

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@blazeo.com/appointment-client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
-  },  
+  },
   "author": "Blazeo",
   "type": "module",
   "main": "./dist/index.js",
@@ -15,9 +15,8 @@
     }
   },
   "dependencies": {
-    "@blazeo.com/calendar-client": "^1.0.5",
+    "@blazeo.com/calendar-client": "^1.0.17",
     "mobx": "^6.13.7",
     "mobx-state-tree": "^7.0.2"
   }
 }
-

package/sample/package-lock.json

@@ -17,13 +17,61 @@
     },
     "..": {
       "name": "@blazeo.com/appointment-client",
-      "version": "1.0.3",
+      "version": "1.0.4",
       "dependencies": {
-        "@blazeo.com/calendar-client": "^1.0.5",
+        "@blazeo.com/calendar-client": "^1.0.17",
         "mobx": "^6.13.7",
         "mobx-state-tree": "^7.0.2"
       }
     },
+    "../node_modules/@blazeo.com/calendar-client": {
+      "version": "1.0.17",
+      "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",
+      "license": "MIT",
+      "peerDependencies": {
+        "mobx": "^6.3.0"
+      }
+    },
+    "../node_modules/mobx": {
+      "version": "6.15.0",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      }
+    },
+    "../node_modules/mobx-state-tree": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "ts-essentials": "^9.4.1"
+      },
+      "peerDependencies": {
+        "mobx": "^6.3.0"
+      }
+    },
+    "../node_modules/ts-essentials": {
+      "version": "9.4.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": ">=4.1.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.29.0",
       "dev": true,

package/sample/src/EventTab.jsx

@@ -2,6 +2,7 @@ import { useMemo, useState } from "react";
 import {
   cancelAppointmentEventAsync,
   createAppointmentEventAsync,
+  EventModel,
   rescheduleAppointmentEventAsync,
 } from "appointment-client";
 import { getSnapshot, isStateTreeNode } from "mobx-state-tree";
@@ -65,6 +66,14 @@ function resultToJson(result) {
   return JSON.stringify(result, null, 2);
 }
 
+function safeJsonParse(text, fallback) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return fallback;
+  }
+}
+
 export function EventTab() {
   const { effective } = useBlazeoConnection();
   const [offsetMinutes, setOffsetMinutes] = useState(-new Date().getTimezoneOffset());
@@ -74,6 +83,35 @@ export function EventTab() {
   const [rescheduleJson, setRescheduleJson] = useState(() =>
     JSON.stringify(getExampleReschedulePayload(), null, 2)
   );
+  const [searchCompanyKey, setSearchCompanyKey] = useState("");
+  const [searchFrom, setSearchFrom] = useState(() => new Date().toISOString().slice(0, 10));
+  const [searchTo, setSearchTo] = useState(() => {
+    const d = new Date();
+    d.setDate(d.getDate() + 7);
+    return d.toISOString().slice(0, 10);
+  });
+  const [searchFiltersJson, setSearchFiltersJson] = useState(() =>
+    JSON.stringify(
+      {
+        calendarId: "",
+        participantId: "",
+        leadId: "",
+        visitorName: "",
+        visitorEmail: "",
+        visitorPhone: "",
+        title: "",
+        search: "",
+        attendeeStatus: "",
+        eventSource: "",
+        sort: "",
+        sortOrder: "desc",
+        page: 1,
+        page_size: 25,
+      },
+      null,
+      2
+    )
+  );
   const [cancelEventId, setCancelEventId] = useState("");
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState("");
@@ -153,6 +191,42 @@ export function EventTab() {
     }
   }
 
+  async function handleSearchByDateRange(e) {
+    e.preventDefault();
+    setError("");
+    setOutput("");
+    const companyKey = searchCompanyKey.trim();
+    if (!companyKey) return setError("Enter company key.");
+    if (!searchFrom) return setError("Pick start date.");
+    if (!searchTo) return setError("Pick end date.");
+    if (!ensureBase()) return;
+    configureBlazeoFromEffective(effective);
+
+    const optsFromJson = safeJsonParse(searchFiltersJson, {});
+    const startDateFrom = new Date(`${searchFrom}T00:00:00.000Z`).toISOString();
+    const startDateTo = new Date(`${searchTo}T23:59:59.999Z`).toISOString();
+
+    setBusy(true);
+    try {
+      const res = await EventModel.getByDateRangeWithFilters(
+        companyKey,
+        startDateFrom,
+        startDateTo,
+        optsFromJson
+      );
+
+      const events = (res?.events ?? []).map((e) =>
+        isStateTreeNode(e) ? getSnapshot(e) : (e?.toJSON?.() ?? e)
+      );
+      const totalCount = res?.totalCount ?? events.length;
+      setOutput(JSON.stringify({ totalCount, events }, null, 2));
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setBusy(false);
+    }
+  }
+
   return (
     <>
       <div className="card">
@@ -171,6 +245,60 @@ export function EventTab() {
         </label>
       </div>
 
+      <div className="card">
+        <h2>Search events (date range + filters)</h2>
+        <p className="muted small">
+          Calls <code>EventModel.getByDateRangeWithFilters</code> →
+          <code> GET /event/search/daterange/get</code> (company scope). Offset header comes from the{" "}
+          <code>offset</code> field above.
+        </p>
+        <form onSubmit={handleSearchByDateRange} className="form">
+          <label className="form__label">
+            <span>Company key</span>
+            <input
+              className="form__input"
+              value={searchCompanyKey}
+              onChange={(e) => setSearchCompanyKey(e.target.value)}
+              placeholder="company_key"
+              autoComplete="off"
+            />
+          </label>
+          <div className="connection-card__row">
+            <label className="form__label">
+              <span>Start date (from)</span>
+              <input
+                type="date"
+                className="form__input"
+                value={searchFrom}
+                onChange={(e) => setSearchFrom(e.target.value)}
+              />
+            </label>
+            <label className="form__label">
+              <span>Start date (to)</span>
+              <input
+                type="date"
+                className="form__input"
+                value={searchTo}
+                onChange={(e) => setSearchTo(e.target.value)}
+              />
+            </label>
+          </div>
+          <label className="form__label">
+            <span>Filters (JSON)</span>
+            <textarea
+              className="form__textarea"
+              value={searchFiltersJson}
+              onChange={(e) => setSearchFiltersJson(e.target.value)}
+              spellCheck={false}
+              rows={10}
+            />
+          </label>
+          <button type="submit" className="btn btn--secondary" disabled={busy}>
+            {busy ? "Loading…" : "Search"}
+          </button>
+        </form>
+      </div>
+
       <div className="card">
         <h2>Create event</h2>
         <form onSubmit={handleCreate} className="form">

package/sample/src/FetchCalendarTab.jsx

@@ -2,6 +2,7 @@ import { useMemo, useState } from "react";
 import {
   CalendarModel,
   deleteCalendarAsync,
+  fetchCalendarDetails,
   fetchCalendarWithOpeningHours,
   updateCalendarAsync,
 } from "appointment-client";
@@ -217,49 +218,29 @@ export function FetchCalendarTab() {
 
     setBusy(true);
     try {
-      const bundle = await fetchCalendarWithOpeningHours(id);
+      const details = await fetchCalendarDetails(id, { includeParticipantsInfo: true });
 
-      if (bundle.cal == null) {
+      if (details.cal == null) {
         const raw = await CalendarModel.getRaw(id);
-        setNote(
-          "CalendarModel.get returned null. Showing CalendarModel.getRaw only (opening hours merge skipped)."
-        );
+        setNote("CalendarModel.get returned null. Showing CalendarModel.getRaw only.");
         setOutput(toDisplayJson(raw));
         return;
       }
 
-      const snap = getSnapshot(bundle.cal);
+      const snap = getSnapshot(details.cal);
       setLastFetchUpdatePayload(JSON.stringify(calendarSnapshotToUpdatePayload(snap), null, 2));
 
-      const [participants, participantsInfo] = await Promise.all([
-        bundle.cal.getParticipants(),
-        bundle.cal.getParticipantsInfo(),
-      ]);
-
       const payload = {
-        calendar: bundle.calendar,
-        openingHours: bundle.openingHours,
-        ...(bundle.participantOpeningHoursResponse != null
-          ? { participantOpeningHoursApiResponse: bundle.participantOpeningHoursResponse }
-          : {}),
-        participants,
-        participantsInfo,
-        __openingHoursMeta: {
-          fromCalendarGet: bundle.fromCalendarGet,
-          fromParticipantApi: bundle.fromParticipantApi,
-          embeddedCount: bundle.embeddedFromGet?.length ?? 0,
-          resolvedCount: bundle.openingHours?.length ?? 0,
-        },
+        calendar: details.calendar,
+        openingHours: details.openingHours,
+        openingHoursApiResponse: details.openingHoursApiResponse ?? null,
+        participants: details.participants,
+        participantsInfo: details.participantsInfo ?? null,
+        meta: details.meta,
       };
 
       setOutput(toDisplayJson(payload));
-      setNote(
-        bundle.fromCalendarGet
-          ? "Opening hours: embedded on GET /Calendar/Get (`appointment-client` fetchCalendarWithOpeningHours)."
-          : bundle.fromParticipantApi
-            ? "Opening hours: from GET /Calendar/Participant/OpeningHours/Get (calendar GET had none)."
-            : "Opening hours: none returned."
-      );
+      setNote("Loaded calendar + opening hours + participants (3 calls) → single response object.");
     } catch (err) {
       setError(explainFetchFailure(err, effective.baseUrl));
     } finally {
@@ -293,20 +274,18 @@ export function FetchCalendarTab() {
             const id = c.calendarId ?? String(c.id ?? "");
             if (!id) return { calendar: getSnapshot(c), openingHours: [], meta: { error: "no id" } };
             try {
-              const b = await fetchCalendarWithOpeningHours(id);
+              const b = await fetchCalendarDetails(id);
               return {
                 calendar: b.calendar ?? getSnapshot(c),
                 openingHours: b.openingHours,
-                __openingHoursMeta: {
-                  fromCalendarGet: b.fromCalendarGet,
-                  fromParticipantApi: b.fromParticipantApi,
-                },
+                participants: b.participants,
+                meta: b.meta,
               };
             } catch (err) {
               return {
                 calendar: getSnapshot(c),
                 openingHours: [],
-                __openingHoursMeta: {
+                meta: {
                   error: err instanceof Error ? err.message : String(err),
                 },
               };
@@ -314,7 +293,7 @@ export function FetchCalendarTab() {
           })
         );
         setNote(
-          `Loaded ${list.length} calendar(s); opening hours merged per calendar (GET embed → participant API fallback).`
+          `Loaded ${list.length} calendar(s); opening hours + participants loaded per calendar (single details bundle).`
         );
         setOutput(toDisplayJson(enriched));
       }