@timardex/cluemart-shared 2.2.41 → 2.3.0

package/dist/hooks/index.mjs

@@ -1,18 +1,18 @@
-import "../chunk-QIF4ZGMY.mjs";
+import "../chunk-KMS64DE2.mjs";
 import "../chunk-VA5YN2K3.mjs";
 import "../chunk-VPANTTZI.mjs";
 import "../chunk-DWO35OY4.mjs";
-import "../chunk-2GUAD63W.mjs";
+import "../chunk-PBW5K54C.mjs";
 import {
   SCHOOL_MIN_STUDENT_COUNT,
   isValidIrdNumber,
   normalizeUrl
-} from "../chunk-VHNCSCQU.mjs";
+} from "../chunk-DV3K3JDE.mjs";
 import "../chunk-RE4NZPYY.mjs";
 import {
   dateFormat,
   timeFormat
-} from "../chunk-PJY7OAQ2.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

@@ -303,6 +303,7 @@ __export(index_exports, {
   icons: () => icons,
   isFutureDatesBeforeThreshold: () => isFutureDatesBeforeThreshold,
   isFutureEventDateStatus: () => isFutureEventDateStatus,
+  isFutureStartDate: () => isFutureStartDate,
   isInternalErrorMessage: () => isInternalErrorMessage,
   isIsoDateString: () => isIsoDateString,
   isNonVisitorResourceType: () => isNonVisitorResourceType,
@@ -1321,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;
@@ -5746,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
     }
   }
@@ -7122,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 };
@@ -10583,6 +10604,7 @@ function canAccessAdminPath(roles, pathname) {
   icons,
   isFutureDatesBeforeThreshold,
   isFutureEventDateStatus,
+  isFutureStartDate,
   isInternalErrorMessage,
   isIsoDateString,
   isNonVisitorResourceType,