@blazeo.com/calendar-client 1.0.29 → 1.0.31

package/README.md

@@ -72,7 +72,7 @@ await LeadModel.requestExport('company-key');
 - **CalendarModel (static):** `get`, `getByCompany`, `getTimeZones`, `getTimeZone`, `getParticipants`, `getMonth`, `getEvents`, etc.
 - **EventModel (instance):** `get`, `create`, `cancel`, `getCancellable`, `getAvailability`, `setReminder`
 - **FlowModel:** Same pattern as Calendar — `FlowModel.create({}, { env })` with no fields; static `get`, `getRaw`, `list`, `createFlow`, `updateFlow`, `delete`, `duplicate`, appearance/embed/public/preview helpers; instance methods mirror those using `flowId` on the snapshot
-- **LeadModel:** `LeadModel.create({}, { env })`; static `get`, `getRaw`, `getByEmail`, `getByCompany`; instance `get`, `getByEmail`, `getByCompany` (uses `leadId` / `email` / `companyKey` on the snapshot)
+- **LeadModel:** `LeadModel.create({}, { env })`; static `get`, `getRaw`, `getByEmail`, `getByPhone`, `getByCompany`, `saveColumnSelection`, `getColumnSelection`, `allowedColumns`; instance `get`, `getByEmail`, `getByPhone`, `getByCompany`, `saveColumnSelection`, `getColumnSelection`. Pass `userId` in `getByCompany(companyKey, { userId })` to return only columns saved for that user.
 - **ParticipantModel:** static `get`, `getByEmail`, `getByIds`, `getAll`, …; instance `getByEmail` uses `email` + `companyKey` on the snapshot (see `GET /participant/getbyemail`)
 - **AuthModel (calendar OAuth / Connect Calendar):** `getCalendarProviders`, `getAuthorizationUrl`, `getAuthorizationStatus`, `openOAuthPopup`, `onCalendarAuthMessage` — see [Calendar authorization flow](#calendar-authorization-direct-ui)
 - **RootStore:** `addCalendar`, `addEvent`

package/dist/index.d.ts

@@ -230,6 +230,17 @@ export const LeadModel: {
   getRaw(leadId: string): Promise<{ status: string; data?: unknown; message?: string }>;
   get(leadId: string): Promise<unknown>;
   getByEmail(email: string, companyKey: string): Promise<unknown>;
+  getByPhone(phone: string, companyKey: string): Promise<unknown>;
+  allowedColumns: string[];
+  saveColumnSelection(
+    userId: string,
+    columns: string[]
+  ): Promise<{ status: string; data?: unknown; message?: string }>;
+  getColumnSelection(userId: string): Promise<{
+    status: string;
+    data?: { userId?: string; columns?: string[]; isDefault?: boolean };
+    message?: string;
+  }>;
   createLead(payload: {
     email: string;
     companyKey: string;
@@ -262,6 +273,8 @@ export const LeadModel: {
   getByCompany(
     companyKey: string,
     opts?: {
+      userId?: string;
+      user_id?: string;
       skip?: number;
       take?: number;
       /** Maps to API query `sort`. */
@@ -376,7 +389,9 @@ export const AuthModel: {
       type: string;
       status: 'success' | 'error';
       message?: string;
-    }) => void
+      closePopup?: boolean;
+    }) => void,
+    popup?: Window | null
   ): () => void;
 };
 

package/dist/index.js

@@ -2026,9 +2026,11 @@ var PreferenceScope = {
   Consumer: 1,
   Company: 2,
   Calendar: 3,
-  Event: 4
+  Event: 4,
+  Participant: 5,
+  User: 6
 };
-var SCOPE_NAMES = ["Global", "Consumer", "Company", "Calendar", "Event"];
+var SCOPE_NAMES = ["Global", "Consumer", "Company", "Calendar", "Event", "Participant", "User"];
 var PreferenceModel = import_mobx_state_tree17.types.model("Preference", {
   id: import_mobx_state_tree17.types.optional(import_mobx_state_tree17.types.maybeNull(import_mobx_state_tree17.types.number), null),
   preferenceId: import_mobx_state_tree17.types.optional(import_mobx_state_tree17.types.maybeNull(import_mobx_state_tree17.types.string), null),
@@ -2410,11 +2412,30 @@ var LeadModel = import_mobx_state_tree19.types.model("Lead", {
       }
       return { status: lead ? "success" : "failure", data: lead ?? void 0 };
     },
+    /** GET /lead/getbyphone – uses self.phone and self.companyKey */
+    async getByPhone() {
+      if (!self.phone || !self.companyKey) {
+        return { status: "failure", message: "phone and companyKey required on model" };
+      }
+      const lead = await LeadModel.getByPhone(self.phone, self.companyKey);
+      if (lead) {
+        (0, import_mobx_state_tree19.applySnapshot)(self, (0, import_mobx_state_tree19.getSnapshot)(lead));
+      }
+      return { status: lead ? "success" : "failure", data: lead ?? void 0 };
+    },
     /** GET /lead/company/get – uses self.companyKey; same result as LeadModel.getByCompany(companyKey, opts) */
     async getByCompany(opts = {}) {
       if (!self.companyKey) return null;
       return LeadModel.getByCompany(self.companyKey, opts);
     },
+    /** POST /lead/columns/save – saves user column selection to Preference (scope User). */
+    async saveColumnSelection(userId, columns) {
+      return LeadModel.saveColumnSelection(userId, columns);
+    },
+    /** GET /lead/columns/get – reads saved column selection for a user. */
+    async getColumnSelection(userId) {
+      return LeadModel.getColumnSelection(userId);
+    },
     /** POST /lead/create – create this lead */
     async createLead() {
       const payload = {
@@ -2492,10 +2513,52 @@ LeadModel.getByEmail = async (email, companyKey) => {
   }
   return null;
 };
+LeadModel.getByPhone = async (phone, companyKey) => {
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  const res = await reqGet("/lead/getbyphone", {
+    phone: phone != null ? String(phone).trim() : "",
+    company_key: companyKey != null ? String(companyKey).trim() : ""
+  });
+  if (res.status === "success" && res.data) {
+    return LeadModel.create(mapLeadFromApi(res.data), { env: getConfig() });
+  }
+  return null;
+};
+LeadModel.allowedColumns = [
+  "id",
+  "lead_id",
+  "email",
+  "name",
+  "phone",
+  "company_key",
+  "source",
+  "lead_type",
+  "referrer_link",
+  "created_on",
+  "modified_on"
+];
+LeadModel.saveColumnSelection = async (userId, columns) => {
+  const uid = userId != null ? String(userId).trim() : "";
+  if (!uid) return { status: "failure", message: "userId required" };
+  const cols = Array.isArray(columns) ? columns.map((c) => String(c).trim()).filter(Boolean) : [];
+  if (!cols.length) return { status: "failure", message: "columns required" };
+  const { reqPost } = createRequestHelpersFromEnv(getConfig());
+  return reqPost("/lead/columns/save", { user_id: uid, columns: cols });
+};
+LeadModel.getColumnSelection = async (userId) => {
+  const uid = userId != null ? String(userId).trim() : "";
+  if (!uid) return { status: "failure", message: "userId required" };
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  return reqGet("/lead/columns/get", { user_id: uid });
+};
 LeadModel.getByCompany = async (companyKey, opts = {}) => {
   var _a, _b;
   const { reqGet } = createRequestHelpersFromEnv(getConfig());
   const query = { company_key: companyKey };
+  const userId = opts.userId ?? opts.user_id;
+  if (userId != null && String(userId).trim() !== "") {
+    query.user_id = String(userId).trim();
+  }
   const sortBy = opts.sortBy ?? opts.sort ?? opts.sort_column;
   if (sortBy != null && sortBy !== "") query.sort = sortBy;
   const sortOrderRaw = opts.sortOrder ?? opts.sort_dir;
@@ -2888,16 +2951,25 @@ var AuthModel = {
    * Subscribe to calendar-authorization postMessage from OAuth popup (Authorized.html / Error.html).
    * Do not use popup.closed to detect completion — Cross-Origin-Opener-Policy on the parent app
    * blocks that check after the popup navigates to Google/Microsoft.
-   * @param {(payload: { type: string, status: 'success' | 'error', message?: string }) => void} handler
+   * Pass the Window returned from openOAuthPopup so this helper can close it; self-close from
+   * Authorized.html/Error.html is often blocked after OAuth redirects.
+   * @param {(payload: { type: string, status: 'success' | 'error', message?: string, closePopup?: boolean }) => void} handler
+   * @param {Window | null | undefined} [popup] — popup to close when auth completes
    * @returns {() => void} unsubscribe
    */
-  onCalendarAuthMessage(handler) {
+  onCalendarAuthMessage(handler, popup) {
     if (typeof window === "undefined") return () => {
     };
     const listener = (event) => {
       const payload = event == null ? void 0 : event.data;
       if (!payload || payload.type !== CALENDAR_AUTH_MESSAGE_TYPE) return;
       handler(payload);
+      if (popup) {
+        try {
+          popup.close();
+        } catch (_) {
+        }
+      }
     };
     window.addEventListener("message", listener);
     return () => window.removeEventListener("message", listener);

package/dist/index.mjs

@@ -1955,9 +1955,11 @@ var PreferenceScope = {
   Consumer: 1,
   Company: 2,
   Calendar: 3,
-  Event: 4
+  Event: 4,
+  Participant: 5,
+  User: 6
 };
-var SCOPE_NAMES = ["Global", "Consumer", "Company", "Calendar", "Event"];
+var SCOPE_NAMES = ["Global", "Consumer", "Company", "Calendar", "Event", "Participant", "User"];
 var PreferenceModel = types17.model("Preference", {
   id: types17.optional(types17.maybeNull(types17.number), null),
   preferenceId: types17.optional(types17.maybeNull(types17.string), null),
@@ -2339,11 +2341,30 @@ var LeadModel = types19.model("Lead", {
       }
       return { status: lead ? "success" : "failure", data: lead ?? void 0 };
     },
+    /** GET /lead/getbyphone – uses self.phone and self.companyKey */
+    async getByPhone() {
+      if (!self.phone || !self.companyKey) {
+        return { status: "failure", message: "phone and companyKey required on model" };
+      }
+      const lead = await LeadModel.getByPhone(self.phone, self.companyKey);
+      if (lead) {
+        applySnapshot8(self, getSnapshot(lead));
+      }
+      return { status: lead ? "success" : "failure", data: lead ?? void 0 };
+    },
     /** GET /lead/company/get – uses self.companyKey; same result as LeadModel.getByCompany(companyKey, opts) */
     async getByCompany(opts = {}) {
       if (!self.companyKey) return null;
       return LeadModel.getByCompany(self.companyKey, opts);
     },
+    /** POST /lead/columns/save – saves user column selection to Preference (scope User). */
+    async saveColumnSelection(userId, columns) {
+      return LeadModel.saveColumnSelection(userId, columns);
+    },
+    /** GET /lead/columns/get – reads saved column selection for a user. */
+    async getColumnSelection(userId) {
+      return LeadModel.getColumnSelection(userId);
+    },
     /** POST /lead/create – create this lead */
     async createLead() {
       const payload = {
@@ -2421,10 +2442,52 @@ LeadModel.getByEmail = async (email, companyKey) => {
   }
   return null;
 };
+LeadModel.getByPhone = async (phone, companyKey) => {
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  const res = await reqGet("/lead/getbyphone", {
+    phone: phone != null ? String(phone).trim() : "",
+    company_key: companyKey != null ? String(companyKey).trim() : ""
+  });
+  if (res.status === "success" && res.data) {
+    return LeadModel.create(mapLeadFromApi(res.data), { env: getConfig() });
+  }
+  return null;
+};
+LeadModel.allowedColumns = [
+  "id",
+  "lead_id",
+  "email",
+  "name",
+  "phone",
+  "company_key",
+  "source",
+  "lead_type",
+  "referrer_link",
+  "created_on",
+  "modified_on"
+];
+LeadModel.saveColumnSelection = async (userId, columns) => {
+  const uid = userId != null ? String(userId).trim() : "";
+  if (!uid) return { status: "failure", message: "userId required" };
+  const cols = Array.isArray(columns) ? columns.map((c) => String(c).trim()).filter(Boolean) : [];
+  if (!cols.length) return { status: "failure", message: "columns required" };
+  const { reqPost } = createRequestHelpersFromEnv(getConfig());
+  return reqPost("/lead/columns/save", { user_id: uid, columns: cols });
+};
+LeadModel.getColumnSelection = async (userId) => {
+  const uid = userId != null ? String(userId).trim() : "";
+  if (!uid) return { status: "failure", message: "userId required" };
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  return reqGet("/lead/columns/get", { user_id: uid });
+};
 LeadModel.getByCompany = async (companyKey, opts = {}) => {
   var _a, _b;
   const { reqGet } = createRequestHelpersFromEnv(getConfig());
   const query = { company_key: companyKey };
+  const userId = opts.userId ?? opts.user_id;
+  if (userId != null && String(userId).trim() !== "") {
+    query.user_id = String(userId).trim();
+  }
   const sortBy = opts.sortBy ?? opts.sort ?? opts.sort_column;
   if (sortBy != null && sortBy !== "") query.sort = sortBy;
   const sortOrderRaw = opts.sortOrder ?? opts.sort_dir;
@@ -2817,16 +2880,25 @@ var AuthModel = {
    * Subscribe to calendar-authorization postMessage from OAuth popup (Authorized.html / Error.html).
    * Do not use popup.closed to detect completion — Cross-Origin-Opener-Policy on the parent app
    * blocks that check after the popup navigates to Google/Microsoft.
-   * @param {(payload: { type: string, status: 'success' | 'error', message?: string }) => void} handler
+   * Pass the Window returned from openOAuthPopup so this helper can close it; self-close from
+   * Authorized.html/Error.html is often blocked after OAuth redirects.
+   * @param {(payload: { type: string, status: 'success' | 'error', message?: string, closePopup?: boolean }) => void} handler
+   * @param {Window | null | undefined} [popup] — popup to close when auth completes
    * @returns {() => void} unsubscribe
    */
-  onCalendarAuthMessage(handler) {
+  onCalendarAuthMessage(handler, popup) {
     if (typeof window === "undefined") return () => {
     };
     const listener = (event) => {
       const payload = event == null ? void 0 : event.data;
       if (!payload || payload.type !== CALENDAR_AUTH_MESSAGE_TYPE) return;
       handler(payload);
+      if (popup) {
+        try {
+          popup.close();
+        } catch (_) {
+        }
+      }
     };
     window.addEventListener("message", listener);
     return () => window.removeEventListener("message", listener);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazeo.com/calendar-client",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Blazeo Calendar / Appointment API client with MobX State Tree models",
   "exports": {
     ".": {