@timardex/cluemart-shared 2.2.40 → 2.3.0

package/dist/hooks/index.mjs

@@ -1,18 +1,18 @@
-import "../chunk-NMJ2CR2F.mjs";
+import "../chunk-KMS64DE2.mjs";
 import "../chunk-VA5YN2K3.mjs";
 import "../chunk-VPANTTZI.mjs";
 import "../chunk-DWO35OY4.mjs";
-import "../chunk-VL275KFW.mjs";
+import "../chunk-PBW5K54C.mjs";
 import {
   SCHOOL_MIN_STUDENT_COUNT,
   isValidIrdNumber,
   normalizeUrl
-} from "../chunk-BCMBTEGJ.mjs";
+} from "../chunk-DV3K3JDE.mjs";
 import "../chunk-RE4NZPYY.mjs";
 import {
   dateFormat,
   timeFormat
-} from "../chunk-T5ZOYS3L.mjs";
+} from "../chunk-HKTBJOB7.mjs";
 import {
   EnumAdShowOn,
   EnumAdStatus,
@@ -24,7 +24,7 @@ import {
 } from "../chunk-5AAYX364.mjs";
 import "../chunk-RAYUJODN.mjs";
 import "../chunk-DQ7ZHIXW.mjs";
-import "../chunk-MKHXXZWF.mjs";
+import "../chunk-YTRRTC2S.mjs";
 import "../chunk-TKSBCN3N.mjs";
 import "../chunk-7DQBUZXY.mjs";
 import {

package/dist/index.cjs

@@ -209,7 +209,7 @@ __export(index_exports, {
   cluiFiles: () => cluiFiles,
   cluiIds: () => cluiIds,
   cluiImages: () => cluiImages,
-  collectStallholderStartDates: () => collectStallholderStartDates,
+  collectStallholderDateTimes: () => collectStallholderDateTimes,
   collectVendorEventRelationDateTimes: () => collectVendorEventRelationDateTimes,
   companyContactFields: () => companyContactFields,
   computeDailyClueState: () => computeDailyClueState,
@@ -272,7 +272,6 @@ __export(index_exports, {
   getDistanceInMeters: () => getDistanceInMeters,
   getErrorMessage: () => getErrorMessage,
   getEventCalendarIsoDates: () => getEventCalendarIsoDates,
-  getEventDatesWithStallholders: () => getEventDatesWithStallholders,
   getEventScheduleStatusLabel: () => getEventScheduleStatusLabel,
   getEventScheduleStatusPresentation: () => getEventScheduleStatusPresentation,
   getEventScheduleStatusTone: () => getEventScheduleStatusTone,
@@ -284,6 +283,8 @@ __export(index_exports, {
   getRegisteredVendorStartDates: () => getRegisteredVendorStartDates,
   getStallholderCategoryNames: () => getStallholderCategoryNames,
   getStallholderCategoryOptions: () => getStallholderCategoryOptions,
+  getUniqueStallholderStartDates: () => getUniqueStallholderStartDates,
+  getUniqueStartDates: () => getUniqueStartDates,
   getUnregisteredVendorCategoryNames: () => getUnregisteredVendorCategoryNames,
   getUnregisteredVendorStartDates: () => getUnregisteredVendorStartDates,
   getUsableAdminContexts: () => getUsableAdminContexts,
@@ -302,6 +303,7 @@ __export(index_exports, {
   icons: () => icons,
   isFutureDatesBeforeThreshold: () => isFutureDatesBeforeThreshold,
   isFutureEventDateStatus: () => isFutureEventDateStatus,
+  isFutureStartDate: () => isFutureStartDate,
   isInternalErrorMessage: () => isInternalErrorMessage,
   isIsoDateString: () => isIsoDateString,
   isNonVisitorResourceType: () => isNonVisitorResourceType,
@@ -1320,19 +1322,34 @@ var formatDate = (dateStr, display = "datetime", timeStr) => {
       return formattedDate;
   }
 };
+var SLOT_FORMATS = [
+  `${dateFormat} ${timeFormat}`,
+  `${dateFormat} H:mm`,
+  `${dateFormat} ${timeFormat}:ss`,
+  `${dateFormat} H:mm:ss`
+];
+var parseSlot = (date) => {
+  if (!date.startDate || !date.startTime) {
+    return null;
+  }
+  const value = `${date.startDate} ${date.startTime}`;
+  for (const format of SLOT_FORMATS) {
+    const parsed = (0, import_dayjs2.default)(value, format, true);
+    if (parsed.isValid()) {
+      return parsed;
+    }
+  }
+  return null;
+};
+var isFutureDateTime = (date, now) => {
+  const slot = parseSlot(date);
+  return slot ? slot.isSameOrAfter(now) : false;
+};
 var getCurrentAndFutureDates = (dates) => {
   const now = (0, import_dayjs2.default)();
-  return dates.filter((dateObj) => {
-    if (!dateObj.startDate || !dateObj.startTime) {
-      return false;
-    }
-    const dateTime = (0, import_dayjs2.default)(
-      `${dateObj.startDate} ${dateObj.startTime}`,
-      `${dateFormat} ${timeFormat}`
-    );
-    return dateTime.isSameOrAfter(now);
-  });
+  return dates.filter((dateObj) => isFutureDateTime(dateObj, now));
 };
+var isFutureStartDate = (date) => isFutureDateTime(date, (0, import_dayjs2.default)());
 var isFutureDatesBeforeThreshold = (date, minHoursFromNow) => {
   if (!date.startDate || !date.startTime) {
     return false;
@@ -1371,6 +1388,18 @@ function sortDatesChronologically(dates) {
     return 0;
   });
 }
+function getUniqueStartDates(dates) {
+  const seenStartDates = /* @__PURE__ */ new Set();
+  const uniqueStartDates = [];
+  for (const { startDate } of sortDatesChronologically(dates ?? [])) {
+    if (!startDate || seenStartDates.has(startDate)) {
+      continue;
+    }
+    seenStartDates.add(startDate);
+    uniqueStartDates.push(startDate);
+  }
+  return uniqueStartDates;
+}
 var futureTimePeriods = FUTURE_EVENT_DATE_STATUSES.filter(
   (status) => status !== "Starting_Soon" /* STARTING_SOON */
 ).map((status) => ({
@@ -3184,21 +3213,23 @@ function filterUnregisteredVendorsByEventDatesOnly(vendors, eventStartDates) {
     )
   );
 }
-function collectStallholderStartDates(registeredVendors, unregisteredVendors = []) {
+function collectStallholderDateTimes(registeredVendors, unregisteredVendors = []) {
   return [
-    ...registeredVendors.flatMap(getRegisteredVendorStartDates),
-    ...unregisteredVendors.flatMap(getUnregisteredVendorStartDates)
+    ...registeredVendors.flatMap(
+      (vendor) => (vendor.relations ?? []).flatMap(
+        (relation) => (relation.relationDates ?? []).map(
+          (relationDate) => relationDate.dateTime
+        )
+      )
+    ),
+    ...unregisteredVendors.flatMap(
+      (vendor) => (vendor.invitations ?? []).flatMap((invitation) => invitation.dateTime)
+    )
   ];
 }
-function getEventDatesWithStallholders(eventDateTime, stallholderStartDates) {
-  if (!eventDateTime?.length) {
-    return [];
-  }
-  const startDates = new Set(stallholderStartDates);
-  return sortDatesChronologically(
-    eventDateTime.filter(
-      (date) => Boolean(date.startDate) && startDates.has(date.startDate)
-    )
+function getUniqueStallholderStartDates(registeredVendors, unregisteredVendors = []) {
+  return getUniqueStartDates(
+    collectStallholderDateTimes(registeredVendors, unregisteredVendors)
   );
 }
 function getStallholderCategoryNames(registeredVendors, unregisteredVendors = []) {
@@ -3254,16 +3285,7 @@ function collectVendorEventRelationDateTimes(events) {
   );
 }
 function getVendorEventRelationStartDates(events) {
-  const sortedDates = sortDatesChronologically(
-    collectVendorEventRelationDateTimes(events)
-  );
-  const uniqueStartDates = [];
-  for (const dateTime of sortedDates) {
-    if (dateTime.startDate && !uniqueStartDates.includes(dateTime.startDate)) {
-      uniqueStartDates.push(dateTime.startDate);
-    }
-  }
-  return uniqueStartDates;
+  return getUniqueStartDates(collectVendorEventRelationDateTimes(events));
 }
 function getVendorEventRelationDateOptions(events) {
   return getVendorEventRelationStartDates(events).map((startDate) => ({
@@ -3528,12 +3550,12 @@ function getEventStallholdersData({
     registeredForSelectedDate,
     unregisteredForSelectedDate
   );
-  const futureEventStartDates = getEventDatesWithStallholders(
-    eventDateTime,
-    collectStallholderStartDates(registeredForEvent, unregisteredForEvent)
-  ).map((date) => ({
-    label: formatDate(date.startDate, "date"),
-    value: date.startDate
+  const futureEventStartDates = getUniqueStallholderStartDates(
+    registeredForEvent,
+    unregisteredForEvent
+  ).map((startDate) => ({
+    label: formatDate(startDate, "date"),
+    value: startDate
   }));
   const hasDatePills = futureEventStartDates.length > 0;
   const hasStallholders = vendorList.length > 0 || unregisteredVendorList.length > 0;
@@ -5740,8 +5762,8 @@ var RELATION_FIELDS_FRAGMENT = import_client11.gql`
   ${RELATION_DATES_FRAGMENT}
 `;
 var GET_RELATION = import_client11.gql`
-  query getRelation($_id: ID!) {
-    relation(_id: $_id) {
+  query getRelation($_id: ID!, $futureOnly: Boolean = false) {
+    relation(_id: $_id, futureOnly: $futureOnly) {
       ...RelationFields
     }
   }
@@ -7116,11 +7138,16 @@ var useDeleteRelation = () => {
 
 // src/graphql/hooks/relation/hooksQuery.ts
 var import_client38 = require("@apollo/client");
-var useGetRelation = (_id) => {
+var useGetRelation = (_id, options) => {
   const { loading, error, data, refetch } = (0, import_client38.useQuery)(GET_RELATION, {
-    fetchPolicy: "network-only",
+    // `relation(futureOnly)` is a projection-specific view of RelationType.
+    // If this writes into the normalized RelationType cache, a full-history
+    // read (e.g. the statistics screen's `futureOnly: false`) and this one can
+    // overwrite each other's `relationDates` for the same entity id. Keep it
+    // uncached.
+    fetchPolicy: "no-cache",
     skip: !_id,
-    variables: _id ? { _id } : void 0
+    variables: _id ? { _id, futureOnly: options?.futureOnly ?? false } : void 0
   });
   const relation = data?.relation;
   return { error, loading, refetch, relation };
@@ -10483,7 +10510,7 @@ function canAccessAdminPath(roles, pathname) {
   cluiFiles,
   cluiIds,
   cluiImages,
-  collectStallholderStartDates,
+  collectStallholderDateTimes,
   collectVendorEventRelationDateTimes,
   companyContactFields,
   computeDailyClueState,
@@ -10546,7 +10573,6 @@ function canAccessAdminPath(roles, pathname) {
   getDistanceInMeters,
   getErrorMessage,
   getEventCalendarIsoDates,
-  getEventDatesWithStallholders,
   getEventScheduleStatusLabel,
   getEventScheduleStatusPresentation,
   getEventScheduleStatusTone,
@@ -10558,6 +10584,8 @@ function canAccessAdminPath(roles, pathname) {
   getRegisteredVendorStartDates,
   getStallholderCategoryNames,
   getStallholderCategoryOptions,
+  getUniqueStallholderStartDates,
+  getUniqueStartDates,
   getUnregisteredVendorCategoryNames,
   getUnregisteredVendorStartDates,
   getUsableAdminContexts,
@@ -10576,6 +10604,7 @@ function canAccessAdminPath(roles, pathname) {
   icons,
   isFutureDatesBeforeThreshold,
   isFutureEventDateStatus,
+  isFutureStartDate,
   isInternalErrorMessage,
   isIsoDateString,
   isNonVisitorResourceType,