@timardex/cluemart-shared 2.2.11 → 2.2.13

package/dist/hooks/index.mjs

@@ -1,18 +1,18 @@
-import "../chunk-VWGCXGEL.mjs";
+import "../chunk-YKJAOTF7.mjs";
 import "../chunk-VA5YN2K3.mjs";
 import "../chunk-VPANTTZI.mjs";
 import "../chunk-DWO35OY4.mjs";
-import "../chunk-576YBZYO.mjs";
+import "../chunk-4DFWOUOT.mjs";
 import {
   SCHOOL_MIN_STUDENT_COUNT,
   isValidIrdNumber,
   normalizeUrl
-} from "../chunk-UIG4A4U3.mjs";
+} from "../chunk-KGYLNZQW.mjs";
 import "../chunk-RE4NZPYY.mjs";
 import {
   dateFormat,
   timeFormat
-} from "../chunk-2DTCLBHT.mjs";
+} from "../chunk-MTBH5LMV.mjs";
 import {
   EnumAdShowOn,
   EnumAdStatus,
@@ -24,7 +24,7 @@ import {
 } from "../chunk-MRBTCICB.mjs";
 import "../chunk-RAYUJODN.mjs";
 import "../chunk-DQ7ZHIXW.mjs";
-import "../chunk-GOWIY4NZ.mjs";
+import "../chunk-QSBAN3V5.mjs";
 import "../chunk-OSSBKFNH.mjs";
 import "../chunk-7DQBUZXY.mjs";
 import {

package/dist/index.cjs

@@ -271,6 +271,7 @@ __export(index_exports, {
   getEventScheduleStatusPresentation: () => getEventScheduleStatusPresentation,
   getEventScheduleStatusTone: () => getEventScheduleStatusTone,
   getEventStallholderEmptyMessage: () => getEventStallholderEmptyMessage,
+  getFutureEventStatus: () => getFutureEventStatus,
   getPermissionsForRoles: () => getPermissionsForRoles,
   getRegisteredVendorCategoryNames: () => getRegisteredVendorCategoryNames,
   getRegisteredVendorStartDates: () => getRegisteredVendorStartDates,
@@ -361,6 +362,7 @@ __export(index_exports, {
   toShareSocialImageCacheVersion: () => toShareSocialImageCacheVersion,
   toUserFacingErrorMessage: () => toUserFacingErrorMessage,
   truncateText: () => truncateText,
+  updateSingleDateTimeStatus: () => updateSingleDateTimeStatus,
   useActivateVendorClaim: () => useActivateVendorClaim,
   useAddParticipantToChat: () => useAddParticipantToChat,
   useAddUserFavouriteResource: () => useAddUserFavouriteResource,
@@ -1125,13 +1127,22 @@ var gameScreenIdentifierList = [
 ];
 
 // src/utils/date.ts
-var import_dayjs = __toESM(require("dayjs"));
-var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat.js"));
+var import_dayjs2 = __toESM(require("dayjs"));
+var import_customParseFormat2 = __toESM(require("dayjs/plugin/customParseFormat.js"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter.js"));
 var import_timezone = __toESM(require("dayjs/plugin/timezone.js"));
 var import_utc = __toESM(require("dayjs/plugin/utc.js"));
 
+// src/utils/dateFormats.ts
+var dateFormat = "DD-MM-YYYY";
+var timeFormat = "HH:mm";
+
 // src/utils/eventDateStatus.ts
+var import_dayjs = __toESM(require("dayjs"));
+var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat.js"));
+var import_isoWeek = __toESM(require("dayjs/plugin/isoWeek.js"));
+import_dayjs.default.extend(import_customParseFormat.default);
+import_dayjs.default.extend(import_isoWeek.default);
 var EVENT_DATE_STATUS_PERIOD_MAP = {
   ["Today" /* TODAY */]: [
     "Started" /* STARTED */,
@@ -1172,27 +1183,90 @@ function isFutureEventDateStatus(dateStatus) {
 function filterDatesByFutureStatus(dates) {
   return dates.filter((date) => isFutureEventDateStatus(date.dateStatus));
 }
+var MANUAL_DATE_STATUSES = /* @__PURE__ */ new Set([
+  "Canceled" /* CANCELED */,
+  "Rescheduled" /* RE_SCHEDULED */
+]);
+function getFutureEventStatus(startDateTime, now) {
+  const hoursUntilStart = startDateTime.diff(now, "hour", true);
+  if (hoursUntilStart > 0 && hoursUntilStart <= 4) {
+    return "Starting_Soon" /* STARTING_SOON */;
+  }
+  if (startDateTime.isSame(now, "day")) {
+    return "Today" /* TODAY */;
+  }
+  if (startDateTime.isSame(now.add(1, "day"), "day")) {
+    return "Tomorrow" /* TOMORROW */;
+  }
+  if (startDateTime.isSame(now, "isoWeek")) {
+    return "This_Week" /* THIS_WEEK */;
+  }
+  if (startDateTime.isSame(now.add(1, "week"), "isoWeek")) {
+    return "Next_Week" /* NEXT_WEEK */;
+  }
+  return "Upcoming" /* UPCOMING */;
+}
+function updateSingleDateTimeStatus(dateTime, now = (0, import_dayjs.default)()) {
+  if (MANUAL_DATE_STATUSES.has(dateTime.dateStatus)) {
+    return dateTime;
+  }
+  const dateTimeFormat = `${dateFormat} ${timeFormat}`;
+  const startDateTime = (0, import_dayjs.default)(
+    `${dateTime.startDate} ${dateTime.startTime}`,
+    dateTimeFormat,
+    true
+  );
+  const endDateTime = (0, import_dayjs.default)(
+    `${dateTime.endDate} ${dateTime.endTime}`,
+    dateTimeFormat,
+    true
+  );
+  if (!startDateTime.isValid() || !endDateTime.isValid()) {
+    return {
+      ...dateTime,
+      dateStatus: "Invalid" /* INVALID */
+    };
+  }
+  if (endDateTime.isBefore(startDateTime)) {
+    return {
+      ...dateTime,
+      dateStatus: "Invalid" /* INVALID */
+    };
+  }
+  let dateStatus;
+  if (endDateTime.isAfter(now)) {
+    if (startDateTime.isAfter(now)) {
+      dateStatus = getFutureEventStatus(startDateTime, now);
+    } else {
+      dateStatus = "Started" /* STARTED */;
+    }
+  } else {
+    dateStatus = "Ended" /* ENDED */;
+  }
+  return {
+    ...dateTime,
+    dateStatus
+  };
+}
 
 // src/utils/date.ts
-var dateFormat = "DD-MM-YYYY";
-var timeFormat = "HH:mm";
-import_dayjs.default.extend(import_customParseFormat.default);
-import_dayjs.default.extend(import_utc.default);
-import_dayjs.default.extend(import_timezone.default);
-import_dayjs.default.extend(import_isSameOrAfter.default);
+import_dayjs2.default.extend(import_customParseFormat2.default);
+import_dayjs2.default.extend(import_utc.default);
+import_dayjs2.default.extend(import_timezone.default);
+import_dayjs2.default.extend(import_isSameOrAfter.default);
 var NZ_TZ = "Pacific/Auckland";
 function toNZTime(date) {
-  return date ? (0, import_dayjs.default)(date).tz(NZ_TZ) : (0, import_dayjs.default)().tz(NZ_TZ);
+  return date ? (0, import_dayjs2.default)(date).tz(NZ_TZ) : (0, import_dayjs2.default)().tz(NZ_TZ);
 }
 function nzStartOfDay(input) {
   if (input == null) {
-    return (0, import_dayjs.default)().tz(NZ_TZ).startOf("day");
+    return (0, import_dayjs2.default)().tz(NZ_TZ).startOf("day");
   }
-  return import_dayjs.default.tz(input, NZ_TZ).startOf("day");
+  return import_dayjs2.default.tz(input, NZ_TZ).startOf("day");
 }
 var formatDate = (dateStr, display = "datetime", timeStr) => {
   const dateTimeStr = timeStr ? `${dateStr} ${timeStr}` : dateStr;
-  const dateTime = timeStr ? (0, import_dayjs.default)(dateTimeStr, `${dateFormat} ${timeFormat}`) : (0, import_dayjs.default)(dateStr, dateFormat);
+  const dateTime = timeStr ? (0, import_dayjs2.default)(dateTimeStr, `${dateFormat} ${timeFormat}`) : (0, import_dayjs2.default)(dateStr, dateFormat);
   const formattedDate = dateTime.format("dddd, D MMMM, YYYY");
   const formattedTime = dateTime.format("h:mm a");
   switch (display) {
@@ -1207,12 +1281,12 @@ var formatDate = (dateStr, display = "datetime", timeStr) => {
   }
 };
 var getCurrentAndFutureDates = (dates) => {
-  const now = (0, import_dayjs.default)();
+  const now = (0, import_dayjs2.default)();
   return dates.filter((dateObj) => {
     if (!dateObj.startDate || !dateObj.startTime) {
       return false;
     }
-    const dateTime = (0, import_dayjs.default)(
+    const dateTime = (0, import_dayjs2.default)(
       `${dateObj.startDate} ${dateObj.startTime}`,
       `${dateFormat} ${timeFormat}`
     );
@@ -1223,8 +1297,8 @@ var isFutureDatesBeforeThreshold = (date, minHoursFromNow) => {
   if (!date.startDate || !date.startTime) {
     return false;
   }
-  const threshold = minHoursFromNow ? (0, import_dayjs.default)().add(minHoursFromNow, "hour") : (0, import_dayjs.default)().startOf("day");
-  const dateTime = (0, import_dayjs.default)(
+  const threshold = minHoursFromNow ? (0, import_dayjs2.default)().add(minHoursFromNow, "hour") : (0, import_dayjs2.default)().startOf("day");
+  const dateTime = (0, import_dayjs2.default)(
     `${date.startDate} ${date.startTime}`,
     `${dateFormat} ${timeFormat}`
   );
@@ -1243,8 +1317,8 @@ function sortDatesChronologically(dates) {
   }
   return [...dates].sort((a, b) => {
     const dateTimeFormat = `${dateFormat} ${timeFormat}`;
-    const dateA = a.startDate && a.startTime ? (0, import_dayjs.default)(`${a.startDate} ${a.startTime}`, dateTimeFormat) : null;
-    const dateB = b.startDate && b.startTime ? (0, import_dayjs.default)(`${b.startDate} ${b.startTime}`, dateTimeFormat) : null;
+    const dateA = a.startDate && a.startTime ? (0, import_dayjs2.default)(`${a.startDate} ${a.startTime}`, dateTimeFormat) : null;
+    const dateB = b.startDate && b.startTime ? (0, import_dayjs2.default)(`${b.startDate} ${b.startTime}`, dateTimeFormat) : null;
     if (dateA && dateB) {
       return dateA.valueOf() - dateB.valueOf();
     }
@@ -1873,13 +1947,13 @@ var SCHOOL_MIN_STUDENT_COUNT = 300;
 var SCHOOL_MAX_STUDENT_COUNT = 0;
 
 // src/calendar/eventCalendar.ts
-var import_dayjs2 = __toESM(require("dayjs"));
+var import_dayjs3 = __toESM(require("dayjs"));
 function toCalendarIsoDate(startDate) {
-  const formatted = (0, import_dayjs2.default)(startDate, dateFormat).format("YYYY-MM-DD");
-  return (0, import_dayjs2.default)(formatted, "YYYY-MM-DD", true).isValid() ? formatted : null;
+  const formatted = (0, import_dayjs3.default)(startDate, dateFormat).format("YYYY-MM-DD");
+  return (0, import_dayjs3.default)(formatted, "YYYY-MM-DD", true).isValid() ? formatted : null;
 }
 function fromCalendarIsoDate(isoDate) {
-  return (0, import_dayjs2.default)(isoDate, "YYYY-MM-DD").format(dateFormat);
+  return (0, import_dayjs3.default)(isoDate, "YYYY-MM-DD").format(dateFormat);
 }
 function getEventCalendarIsoDates(dateTimes) {
   return dateTimes?.map(
@@ -6202,14 +6276,22 @@ var UPDATE_EVENT_INFO_MUTATION = import_client23.gql`
 // src/graphql/hooks/event/hooksMutation.ts
 var useCreateEvent = () => {
   const [createEvent, { loading, error }] = (0, import_client24.useMutation)(CREATE_EVENT_MUTATION, {
+    // The mutation response is a live-only view of EventType. Don't write it
+    // into the normalized EventType cache, where it would overwrite the full
+    // (live + archived) `dateTime` that `getEvent` fetches for the detail page.
     awaitRefetchQueries: true,
+    fetchPolicy: "no-cache",
     refetchQueries: [{ query: GET_USER_EVENTS }]
   });
   return { createEvent, error, loading };
 };
 var useUpdateEvent = () => {
   const [updateEvent, { loading, error }] = (0, import_client24.useMutation)(UPDATE_EVENT_MUTATION, {
+    // See useCreateEvent: the update response only carries the live schedule,
+    // so keep it out of the normalized EventType cache to avoid clobbering the
+    // archived dates merged by `getEvent`.
     awaitRefetchQueries: true,
+    fetchPolicy: "no-cache",
     refetchQueries: (mutationResult) => {
       const eventId = mutationResult?.data?.updateEvent?.data?._id;
       if (!eventId) return [];
@@ -10259,6 +10341,7 @@ function canAccessAdminPath(roles, pathname) {
   getEventScheduleStatusPresentation,
   getEventScheduleStatusTone,
   getEventStallholderEmptyMessage,
+  getFutureEventStatus,
   getPermissionsForRoles,
   getRegisteredVendorCategoryNames,
   getRegisteredVendorStartDates,
@@ -10349,6 +10432,7 @@ function canAccessAdminPath(roles, pathname) {
   toShareSocialImageCacheVersion,
   toUserFacingErrorMessage,
   truncateText,
+  updateSingleDateTimeStatus,
   useActivateVendorClaim,
   useAddParticipantToChat,
   useAddUserFavouriteResource,