@rapidmx/web-client 0.20.0 → 0.22.0

package/apps/shared/components/admin/signOut.ts

@@ -2,7 +2,7 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { authApiFetch } from "@rapidmx/react-shared/util/api.js";
+import { authApiFetch } from "../../../../lib/util/api.js";
 
 /**
  * The cross-tab sign-out channel - must stay identical to `SIGN_OUT_CHANNEL` in

package/apps/shared/components/admin/usePagedList.tsx

@@ -1,129 +1,129 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 2026 Jean-Philippe Steinmetz
-// SPDX-License-Identifier: MPL-2.0
-///////////////////////////////////////////////////////////////////////////////
-import React, { useRef, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-
-/** Page size for the async-request lists (the server returns them newest first and caps `limit` at 500). */
-export const REQUEST_LIST_PAGE_SIZE = 50;
-
-export interface PagedList<T> {
-    items: T[];
-    /** `true` until the first page has loaded (or failed). */
-    loading: boolean;
-    loadError: string | null;
-    /** Whether the last page fetched was full, so another may follow. */
-    hasMore: boolean;
-    loadingMore: boolean;
-    /** Re-fetches from the first page, dropping anything loaded beyond it. */
-    reload: () => Promise<void>;
-    /** Fetches the next page and appends what's new in it. */
-    loadMore: () => Promise<void>;
-    /** Replaces one already-loaded item in place (e.g. with an action's response). */
-    replaceItem: (item: T) => void;
-}
-
-/**
- * A newest-first list fetched a page at a time with "Load more". Only the most recently started `reload()`'s
- * responses are applied, so a slow earlier fetch (e.g. the mount fetch racing a reload after a create) can't
- * overwrite a newer list, and a "Load more" that was in flight during a reload is dropped.
- *
- * Paging is by offset, so "Load more" re-reads the previous page alongside the next one and continues after the last
- * row already shown: rows created since shift older rows onto later pages (repeats are skipped), and rows deleted
- * since shift them onto earlier pages (which a plain next-page fetch would silently skip). If that row can't be found
- * in the two pages at all (it was deleted, or more than a page of rows came or went), the list reloads from the start.
- */
-export function usePagedList<T extends { uid: string }>(
-    fetchPage: (params: { limit: number; page: number }) => Promise<T[]>,
-    errorMessage: string,
-): PagedList<T> {
-    const pageSize = REQUEST_LIST_PAGE_SIZE;
-    const [items, setItems] = useState<T[]>([]);
-    const [loading, setLoading] = useState(true);
-    const [loadError, setLoadError] = useState<string | null>(null);
-    const [hasMore, setHasMore] = useState(false);
-    const [loadingMore, setLoadingMore] = useState(false);
-    const generation = useRef(0);
-    const nextPage = useRef(0);
-    const loaded = useRef<T[]>(items);
-    loaded.current = items;
-
-    function describe(err: unknown): string {
-        return err instanceof ApiRequestError ? err.message : errorMessage;
-    }
-
-    async function reload() {
-        const current = ++generation.current;
-        try {
-            const data = await fetchPage({ limit: pageSize, page: 0 });
-            if (current !== generation.current) return;
-            setItems(data);
-            setHasMore(data.length === pageSize);
-            setLoadError(null);
-            nextPage.current = 1;
-        } catch (err) {
-            if (current === generation.current) setLoadError(describe(err));
-        } finally {
-            if (current === generation.current) setLoading(false);
-        }
-    }
-
-    async function loadMore() {
-        const current = generation.current;
-        const page = nextPage.current;
-        setLoadingMore(true);
-        try {
-            const [previous, data] = await Promise.all([
-                fetchPage({ limit: pageSize, page: page - 1 }),
-                fetchPage({ limit: pageSize, page }),
-            ]);
-            if (current !== generation.current) return;
-            const window: T[] = [...previous, ...data];
-            // "Load more" is only offered after a full page, so at least one row is shown.
-            const lastShown: string = loaded.current[loaded.current.length - 1].uid;
-            const boundary: number = window.map((item) => item.uid).lastIndexOf(lastShown);
-            if (boundary === -1) {
-                await reload();
-                return;
-            }
-            const after: T[] = window.slice(boundary + 1);
-            setItems((prev) => [...prev, ...after.filter((item) => !prev.some((existing) => existing.uid === item.uid))]);
-            setHasMore(data.length === pageSize);
-            setLoadError(null);
-            nextPage.current = page + 1;
-        } catch (err) {
-            if (current === generation.current) setLoadError(describe(err));
-        } finally {
-            setLoadingMore(false);
-        }
-    }
-
-    function replaceItem(item: T) {
-        setItems((prev) => prev.map((existing) => (existing.uid === item.uid ? item : existing)));
-    }
-
-    return { items, loading, loadError, hasMore, loadingMore, reload, loadMore, replaceItem };
-}
-
-/** The "Load more" button for a `usePagedList()` list - renders nothing once there's nothing more to load. */
-export function LoadMoreButton({ list, label }: { list: Pick<PagedList<unknown>, "hasMore" | "loadingMore" | "loadMore">; label: string }) {
-    if (!list.hasMore) {
-        return null;
-    }
-    return (
-        <div className="mt-3">
-            <Button
-                type="button"
-                variant="secondary"
-                className="!w-auto"
-                loading={list.loadingMore}
-                disabled={list.loadingMore}
-                onClick={() => void list.loadMore()}
-            >
-                {label}
-            </Button>
-        </div>
-    );
-}
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+import React, { useRef, useState } from "react";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+
+/** Page size for the async-request lists (the server returns them newest first and caps `limit` at 500). */
+export const REQUEST_LIST_PAGE_SIZE = 50;
+
+export interface PagedList<T> {
+    items: T[];
+    /** `true` until the first page has loaded (or failed). */
+    loading: boolean;
+    loadError: string | null;
+    /** Whether the last page fetched was full, so another may follow. */
+    hasMore: boolean;
+    loadingMore: boolean;
+    /** Re-fetches from the first page, dropping anything loaded beyond it. */
+    reload: () => Promise<void>;
+    /** Fetches the next page and appends what's new in it. */
+    loadMore: () => Promise<void>;
+    /** Replaces one already-loaded item in place (e.g. with an action's response). */
+    replaceItem: (item: T) => void;
+}
+
+/**
+ * A newest-first list fetched a page at a time with "Load more". Only the most recently started `reload()`'s
+ * responses are applied, so a slow earlier fetch (e.g. the mount fetch racing a reload after a create) can't
+ * overwrite a newer list, and a "Load more" that was in flight during a reload is dropped.
+ *
+ * Paging is by offset, so "Load more" re-reads the previous page alongside the next one and continues after the last
+ * row already shown: rows created since shift older rows onto later pages (repeats are skipped), and rows deleted
+ * since shift them onto earlier pages (which a plain next-page fetch would silently skip). If that row can't be found
+ * in the two pages at all (it was deleted, or more than a page of rows came or went), the list reloads from the start.
+ */
+export function usePagedList<T extends { uid: string }>(
+    fetchPage: (params: { limit: number; page: number }) => Promise<T[]>,
+    errorMessage: string,
+): PagedList<T> {
+    const pageSize = REQUEST_LIST_PAGE_SIZE;
+    const [items, setItems] = useState<T[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [loadError, setLoadError] = useState<string | null>(null);
+    const [hasMore, setHasMore] = useState(false);
+    const [loadingMore, setLoadingMore] = useState(false);
+    const generation = useRef(0);
+    const nextPage = useRef(0);
+    const loaded = useRef<T[]>(items);
+    loaded.current = items;
+
+    function describe(err: unknown): string {
+        return err instanceof ApiRequestError ? err.message : errorMessage;
+    }
+
+    async function reload() {
+        const current = ++generation.current;
+        try {
+            const data = await fetchPage({ limit: pageSize, page: 0 });
+            if (current !== generation.current) return;
+            setItems(data);
+            setHasMore(data.length === pageSize);
+            setLoadError(null);
+            nextPage.current = 1;
+        } catch (err) {
+            if (current === generation.current) setLoadError(describe(err));
+        } finally {
+            if (current === generation.current) setLoading(false);
+        }
+    }
+
+    async function loadMore() {
+        const current = generation.current;
+        const page = nextPage.current;
+        setLoadingMore(true);
+        try {
+            const [previous, data] = await Promise.all([
+                fetchPage({ limit: pageSize, page: page - 1 }),
+                fetchPage({ limit: pageSize, page }),
+            ]);
+            if (current !== generation.current) return;
+            const window: T[] = [...previous, ...data];
+            // "Load more" is only offered after a full page, so at least one row is shown.
+            const lastShown: string = loaded.current[loaded.current.length - 1].uid;
+            const boundary: number = window.map((item) => item.uid).lastIndexOf(lastShown);
+            if (boundary === -1) {
+                await reload();
+                return;
+            }
+            const after: T[] = window.slice(boundary + 1);
+            setItems((prev) => [...prev, ...after.filter((item) => !prev.some((existing) => existing.uid === item.uid))]);
+            setHasMore(data.length === pageSize);
+            setLoadError(null);
+            nextPage.current = page + 1;
+        } catch (err) {
+            if (current === generation.current) setLoadError(describe(err));
+        } finally {
+            setLoadingMore(false);
+        }
+    }
+
+    function replaceItem(item: T) {
+        setItems((prev) => prev.map((existing) => (existing.uid === item.uid ? item : existing)));
+    }
+
+    return { items, loading, loadError, hasMore, loadingMore, reload, loadMore, replaceItem };
+}
+
+/** The "Load more" button for a `usePagedList()` list - renders nothing once there's nothing more to load. */
+export function LoadMoreButton({ list, label }: { list: Pick<PagedList<unknown>, "hasMore" | "loadingMore" | "loadMore">; label: string }) {
+    if (!list.hasMore) {
+        return null;
+    }
+    return (
+        <div className="mt-3">
+            <Button
+                type="button"
+                variant="secondary"
+                className="!w-auto"
+                loading={list.loadingMore}
+                disabled={list.loadingMore}
+                onClick={() => void list.loadMore()}
+            >
+                {label}
+            </Button>
+        </div>
+    );
+}

package/apps/shared/components/calendar/AppointmentQuickForm.tsx

@@ -4,9 +4,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, ReactNode, useState } from "react";
 import { HiOutlineArrowTopRightOnSquare, HiOutlineCalendar, HiOutlineCalendarDays, HiOutlineClock, HiOutlineLink, HiOutlineMapPin } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import CopyButton from "@rapidmx/react-shared/components/buttons/CopyButton.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import CopyButton from "../../../../lib/components/buttons/CopyButton.js";
 import {
     BookingLocationType,
     CreateBookingTypeInput,

package/apps/shared/components/calendar/CalendarListSidebar.tsx

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, useState } from "react";
-import { CALENDAR_COLOR_PALETTE, accentColorForMailbox, colorForFolder } from "@rapidmx/react-shared/calendar/calendarColors.js";
-import { Folder, Mailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import { CALENDAR_COLOR_PALETTE, accentColorForMailbox, colorForFolder } from "../../../../lib/calendar/calendarColors.js";
+import { Folder, Mailbox } from "../../../../lib/mail/mailApi.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
 import { notifyApiError } from "../../notifications/apiErrors.js";
 
 export interface CalendarListSidebarMailbox {

package/apps/shared/components/calendar/DescriptionEditor.tsx

@@ -8,7 +8,7 @@ import StarterKit from "@tiptap/starter-kit";
 import Placeholder from "@tiptap/extension-placeholder";
 import type { IconType } from "react-icons";
 import { BsEraser, BsLink45Deg, BsListOl, BsListUl, BsTypeBold, BsTypeItalic, BsTypeUnderline } from "react-icons/bs";
-import { safeDescriptionHref } from "@rapidmx/react-shared/calendar/eventDescription.js";
+import { safeDescriptionHref } from "../../../../lib/calendar/eventDescription.js";
 
 export interface DescriptionEditorProps {
     /** The description to start with, as HTML. Read once, when the editor is created: TipTap owns the document from then on. */

package/apps/shared/components/calendar/EventDescriptionView.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { ReactNode } from "react";
-import { DescriptionNode, htmlToPlainText, parseEventDescription } from "@rapidmx/react-shared/calendar/eventDescription.js";
+import { DescriptionNode, htmlToPlainText, parseEventDescription } from "../../../../lib/calendar/eventDescription.js";
 
 function renderNodes(nodes: DescriptionNode[]): ReactNode[] {
     return nodes.map((node, index) => {

package/apps/shared/components/calendar/EventDetails.tsx

@@ -15,15 +15,16 @@ import {
     HiOutlineVideoCamera,
     HiOutlineXMark,
 } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { AttendeeResponseInput, guestPermissionsOf, respondToEvent, visibilityOf } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { htmlToPlainText } from "@rapidmx/react-shared/calendar/eventDescription.js";
-import { deleteEventOccurrence, deleteEventSeries } from "@rapidmx/react-shared/calendar/calendarMutations.js";
-import { CalendarOccurrence, describeRecurrence } from "@rapidmx/react-shared/calendar/recurrence.js";
-import { getVideoMeeting } from "@rapidmx/react-shared/videoconf/videoMeetingsApi.js";
-import { deviceTimeZone } from "@rapidmx/react-shared/util/timeZone.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import { AttendeeResponseInput, guestPermissionsOf, respondToEvent, visibilityOf } from "../../../../lib/calendar/calendarApi.js";
+import { htmlToPlainText } from "../../../../lib/calendar/eventDescription.js";
+import { deleteEventOccurrence, deleteEventSeries } from "../../../../lib/calendar/calendarMutations.js";
+import { CalendarOccurrence, describeRecurrence } from "../../../../lib/calendar/recurrence.js";
+import { getVideoMeeting } from "../../../../lib/videoconf/videoMeetingsApi.js";
+import { deviceTimeZone } from "../../../../lib/util/timeZone.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import { joinMeetingUrl } from "../../calendar/calendarReminders.js";
 import EventDescriptionView from "./EventDescriptionView.js";
 import RequestChangeForm from "./RequestChangeForm.js";
@@ -84,6 +85,7 @@ export default function EventDetails({
     onSaved,
     onDeleted,
 }: EventDetailsProps) {
+    const client = useApiClient();
     const [error, setError] = useState<string | null>(null);
     const [busy, setBusy] = useState(false);
     const [confirmingDelete, setConfirmingDelete] = useState(false);
@@ -99,7 +101,7 @@ export default function EventDetails({
             return;
         }
         let cancelled = false;
-        void getVideoMeeting(videoMeetingUid)
+        void getVideoMeeting(videoMeetingUid, client)
             .then((meeting) => meeting.organizerJoinUrl ?? null)
             .catch(() => null)
             .then((url) => {
@@ -110,7 +112,7 @@ export default function EventDetails({
         return () => {
             cancelled = true;
         };
-    }, [videoMeetingUid]);
+    }, [videoMeetingUid, client]);
     // The same scheme allow-list a reminder's own location gets: a hostile or malformed join link never reaches `window.open()`.
     const joinUrl = joinMeetingUrl(organizerJoinUrl);
 
@@ -119,9 +121,9 @@ export default function EventDetails({
         setBusy(true);
         try {
             if (occurrence.isRecurringOccurrence && scope === "occurrence") {
-                await deleteEventOccurrence(occurrence);
+                await deleteEventOccurrence(occurrence, client);
             } else {
-                await deleteEventSeries(occurrence);
+                await deleteEventSeries(occurrence, client);
             }
             onDeleted();
         } catch (err) {
@@ -136,7 +138,7 @@ export default function EventDetails({
         setError(null);
         setBusy(true);
         try {
-            await respondToEvent(occurrence.uid, responseStatus);
+            await respondToEvent(occurrence.uid, responseStatus, client);
             // A decline soft-deletes the mailbox's own copy server-side - treat it the same as a
             // delete rather than a save so the calendar view drops it immediately.
             if (responseStatus === "declined") {

package/apps/shared/components/calendar/EventEditor.tsx

@@ -4,7 +4,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, MutableRefObject, useEffect, useMemo, useState } from "react";
 import { format } from "date-fns";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiClient, ApiRequestError } from "../../../../lib/util/api.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import {
     Attendee,
     CalendarEvent,
@@ -14,18 +15,18 @@ import {
     guestPermissionsOf,
     updateCalendarEvent,
     visibilityOf,
-} from "@rapidmx/react-shared/calendar/calendarApi.js";
+} from "../../../../lib/calendar/calendarApi.js";
 import {
     VideoMeetingInvitee,
     createVideoMeeting,
     getVideoMeeting,
     updateVideoMeeting,
-} from "@rapidmx/react-shared/videoconf/videoMeetingsApi.js";
-import { detachOccurrence, saveEventSeries } from "@rapidmx/react-shared/calendar/calendarMutations.js";
-import { toDatetimeLocal } from "@rapidmx/react-shared/util/dateInput.js";
-import { deviceTimeZone, timeZoneOptions } from "@rapidmx/react-shared/util/timeZone.js";
-import { Mailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import { CalendarOccurrence, fromEventWallClock, toEventWallClock } from "@rapidmx/react-shared/calendar/recurrence.js";
+} from "../../../../lib/videoconf/videoMeetingsApi.js";
+import { detachOccurrence, saveEventSeries } from "../../../../lib/calendar/calendarMutations.js";
+import { toDatetimeLocal } from "../../../../lib/util/dateInput.js";
+import { deviceTimeZone, timeZoneOptions } from "../../../../lib/util/timeZone.js";
+import { Mailbox } from "../../../../lib/mail/mailApi.js";
+import { CalendarOccurrence, fromEventWallClock, toEventWallClock } from "../../../../lib/calendar/recurrence.js";
 import { addDaysToKey, allDayDateKey, allDayInstant, recurrenceUntilDateKey, recurrenceUntilInstant, startWeekdayCode } from "./allDay.js";
 import { joinMeetingUrl } from "../../calendar/calendarReminders.js";
 import EventExpandedForm from "./EventExpandedForm.js";
@@ -81,7 +82,7 @@ function wallTimeOfDayMs(instantMs: number, timezone: string | undefined): numbe
  * hours later (into the next day), never 22 hours earlier. The master's new start is converted back from
  * that wall clock, so a master on the other side of a DST change keeps the chosen local time.
  */
-async function toSeriesFields(occurrence: CalendarOccurrence, fields: EventFields): Promise<EventFields> {
+async function toSeriesFields(occurrence: CalendarOccurrence, fields: EventFields, client?: ApiClient): Promise<EventFields> {
     const { startDate, endDate, ...rest } = fields;
     if (sameMinute(startDate as string, occurrence.startDate) && sameMinute(endDate as string, occurrence.endDate)) {
         // `saveEventSeries()` treats *any* `timezone`/`allDay` in the update as a possible reinterpretation of
@@ -90,7 +91,7 @@ async function toSeriesFields(occurrence: CalendarOccurrence, fields: EventField
         const { timezone, allDay, ...others } = rest;
         return timezone === occurrence.timezone && allDay === occurrence.allDay ? others : rest;
     }
-    const master = await getCalendarEvent(occurrence.uid);
+    const master = await getCalendarEvent(occurrence.uid, client);
     const timezone = fields.timezone as string;
     const newStart = new Date(startDate as string).getTime();
     const durationMs = new Date(endDate as string).getTime() - newStart;
@@ -173,6 +174,7 @@ export default function EventEditor({
     initialAllDay,
     quickCreate,
 }: EventEditorProps) {
+    const client = useApiClient();
     const [deviceZone] = useState(() => deviceTimeZone());
     const [values, setValues] = useState<EventFormValues>(() => {
         let start: string;
@@ -256,7 +258,7 @@ export default function EventEditor({
             return;
         }
         let cancelled = false;
-        void getVideoMeeting(uid)
+        void getVideoMeeting(uid, client)
             .then((meeting) => meeting.organizerJoinUrl ?? null)
             .catch(() => null)
             .then((url) => {
@@ -267,7 +269,7 @@ export default function EventEditor({
         return () => {
             cancelled = true;
         };
-    }, [occurrence?.videoMeetingUid]);
+    }, [occurrence?.videoMeetingUid, client]);
 
     // "This event only" detaches a standalone, non-repeating copy - the series' rule doesn't apply to it.
     const editingSingleOccurrence = !!occurrence?.isRecurringOccurrence && editScope === "occurrence";
@@ -407,32 +409,38 @@ export default function EventEditor({
                     setVideoError("Add at least one attendee other than yourself to add video conferencing.");
                     return { event: saved, failed: true };
                 }
-                const result = await createVideoMeeting({
-                    mailboxUid: saved.mailboxUid,
-                    title: saved.title.slice(0, MAX_MEETING_TITLE_LENGTH),
-                    visibility: "private",
-                    calendarEventUid: saved.uid,
-                    startTime: saved.startDate,
-                    endTime: saved.endDate,
-                    invitees,
-                });
-                const patched = await updateCalendarEvent({
-                    uid: saved.uid,
-                    version: saved.version,
-                    location: VIDEO_LOCATION_PLACEHOLDER,
-                    videoMeetingUid: result.meeting.uid,
-                });
+                const result = await createVideoMeeting(
+                    {
+                        mailboxUid: saved.mailboxUid,
+                        title: saved.title.slice(0, MAX_MEETING_TITLE_LENGTH),
+                        visibility: "private",
+                        calendarEventUid: saved.uid,
+                        startTime: saved.startDate,
+                        endTime: saved.endDate,
+                        invitees,
+                    },
+                    client,
+                );
+                const patched = await updateCalendarEvent(
+                    {
+                        uid: saved.uid,
+                        version: saved.version,
+                        location: VIDEO_LOCATION_PLACEHOLDER,
+                        videoMeetingUid: result.meeting.uid,
+                    },
+                    client,
+                );
                 setVideoMeetingUid(result.meeting.uid);
                 setOrganizerJoinUrl(result.organizerJoinUrl ?? null);
                 update({ location: VIDEO_LOCATION_PLACEHOLDER });
                 return { event: patched, failed: false };
             }
-            await updateVideoMeeting(videoMeetingUid!, { status: "cancelled" });
+            await updateVideoMeeting(videoMeetingUid!, { status: "cancelled" }, client);
             const restoredLocation = location.trim() === VIDEO_LOCATION_PLACEHOLDER ? "" : location.trim();
             // A stored event clears a field with an explicit `null` (see `EventFields`) - an omitted one would
             // leave the placeholder (and the link to the now-cancelled meeting) in place.
             const patch: EventFields = { location: restoredLocation || null, videoMeetingUid: null };
-            const patched = await updateCalendarEvent({ uid: saved.uid, version: saved.version, ...(patch as Partial<CalendarEventInput>) });
+            const patched = await updateCalendarEvent({ uid: saved.uid, version: saved.version, ...(patch as Partial<CalendarEventInput>) }, client);
             setVideoMeetingUid(undefined);
             setOrganizerJoinUrl(undefined);
             update({ location: restoredLocation });
@@ -536,23 +544,30 @@ export default function EventEditor({
                 // update exactly the record the first attempt left behind, whichever branch below created it.
                 // A series' own exception/detached-occurrence re-pointing already ran on that attempt and has
                 // nothing left to shift - the dates being sent again are the ones it moved everything to.
-                saved = await updateCalendarEvent({ uid: savedEvent.uid, version: savedEvent.version, ...(fields as Partial<CalendarEventInput>) });
+                saved = await updateCalendarEvent({ uid: savedEvent.uid, version: savedEvent.version, ...(fields as Partial<CalendarEventInput>) }, client);
             } else if (!occurrence) {
                 // The organizer is only ever set on create - an edit keeps the event's own organizer.
-                saved = await createCalendarEvent({
-                    mailboxUid: values.targetMailboxUid,
-                    folderUid: values.targetFolderUid,
-                    ...fields,
-                    organizer: { address: effectiveOrganizerAddress, type: "to" },
-                } as CalendarEventInput);
+                saved = await createCalendarEvent(
+                    {
+                        mailboxUid: values.targetMailboxUid,
+                        folderUid: values.targetFolderUid,
+                        ...fields,
+                        organizer: { address: effectiveOrganizerAddress, type: "to" },
+                    } as CalendarEventInput,
+                    client,
+                );
             } else if (editingSingleOccurrence) {
-                saved = await detachOccurrence(occurrence, fields as Partial<CalendarEventInput>);
+                saved = await detachOccurrence(occurrence, fields as Partial<CalendarEventInput>, client);
             } else if (occurrence.isRecurringOccurrence) {
-                const series = await saveEventSeries(occurrence, (await toSeriesFields(occurrence, fields)) as Partial<CalendarEventInput>);
+                const series = await saveEventSeries(
+                    occurrence,
+                    (await toSeriesFields(occurrence, fields, client)) as Partial<CalendarEventInput>,
+                    client,
+                );
                 saved = series;
                 detachedSyncFailed = !!series.detachedOccurrenceSyncFailed;
             } else {
-                saved = await updateCalendarEvent({ uid: occurrence.uid, version: occurrence.version, ...(fields as Partial<CalendarEventInput>) });
+                saved = await updateCalendarEvent({ uid: occurrence.uid, version: occurrence.version, ...(fields as Partial<CalendarEventInput>) }, client);
             }
             const video = await applyVideoConferencing(saved, merged.attendees);
             if (video.failed) {

package/apps/shared/components/calendar/EventExpandedForm.tsx

@@ -4,9 +4,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { KeyboardEvent, useRef, useState } from "react";
 import { HiOutlineBriefcase, HiOutlineCalendarDays, HiOutlineXMark } from "react-icons/hi2";
-import { BusyStatus } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import { BusyStatus } from "../../../../lib/calendar/calendarApi.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import FindATime from "./FindATime.js";
 import {
     CalendarField,

package/apps/shared/components/calendar/EventFormParts.tsx

@@ -4,8 +4,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { ReactNode, useRef, useState } from "react";
 import { HiOutlineBars3BottomLeft, HiOutlineBell, HiOutlineMapPin, HiOutlineUserGroup, HiOutlineVideoCamera, HiOutlineXMark } from "react-icons/hi2";
-import { AttendeeRole, EventVisibility, RecurrenceRule, WeekdayCode } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import { AttendeeRole, EventVisibility, RecurrenceRule, WeekdayCode } from "../../../../lib/calendar/calendarApi.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import GuestInput from "./GuestInput.js";
 import LazyDescriptionEditor from "./LazyDescriptionEditor.js";
 import RecurrenceEditor from "./RecurrenceEditor.js";