@jmruthers/pace-core 0.6.3 → 0.6.5

package/dist/{chunk-DWUBLJJM.js → chunk-IHB5DR3H.js}

@@ -1,7 +1,7 @@
 import {
   isRBACInitialized,
   setupRBAC
-} from "./chunk-RWEBCB47.js";
+} from "./chunk-EFN2EIMK.js";
 import {
   assertOrganisationId,
   assertUserId
@@ -126,11 +126,6 @@ var _AuthService = class _AuthService extends BaseService {
   }
   // Auth state getters
   getUser() {
-    if (this.user) {
-      logger.debug("AuthService", `getUser() [ID:${this.instanceId}] returning user: ${this.user.id}`);
-    } else {
-      logger.debug("AuthService", `getUser() [ID:${this.instanceId}] returning null`);
-    }
     return this.user;
   }
   getSession() {
@@ -1016,7 +1011,7 @@ var _OrganisationService = class _OrganisationService extends BaseService {
       let userIsSuperAdmin = false;
       if (this.user?.id) {
         try {
-          const { isSuperAdmin: checkSuperAdmin, isRBACInitialized: isRBACInitialized2, setupRBAC: setupRBAC2 } = await import("./api-IAGWF3ZG.js");
+          const { isSuperAdmin: checkSuperAdmin, isRBACInitialized: isRBACInitialized2, setupRBAC: setupRBAC2 } = await import("./api-O6HTBX5Y.js");
           if (!isRBACInitialized2() && this.supabaseClient) {
             setupRBAC2(this.supabaseClient);
           }
@@ -1275,6 +1270,8 @@ var _EventService = class _EventService extends BaseService {
       this.resetInitialization();
       this.isInitializedRef = false;
       this.isFetchingRef = false;
+      this.userClearedEventRef = false;
+      this.hasAutoSelectedRef = false;
       logger.debug("EventService", `User changed [ID:${this.instanceId}]`, {
         previousUserId,
         newUserId,
@@ -1289,7 +1286,7 @@ var _EventService = class _EventService extends BaseService {
     this.setSelectedEventId = setSelectedEventId;
     if (user?.id) {
       try {
-        const { isRBACInitialized: isRBACInitialized2, isSuperAdmin: checkSuperAdmin, setupRBAC: setupRBAC2 } = await import("./api-IAGWF3ZG.js");
+        const { isRBACInitialized: isRBACInitialized2, isSuperAdmin: checkSuperAdmin, setupRBAC: setupRBAC2 } = await import("./api-O6HTBX5Y.js");
         if (!isRBACInitialized2() && this.supabaseClient) {
           setupRBAC2(this.supabaseClient);
         }
@@ -1321,12 +1318,28 @@ var _EventService = class _EventService extends BaseService {
       this.isInitializedRef = false;
       this.isFetchingRef = false;
       const shouldClearEvents = !this.isSuperAdmin;
-      if (previousOrgId !== null && newOrgId !== null && previousOrgId !== newOrgId) {
+      const isFirstOrgSet = (previousOrgId === null || previousOrgId === void 0) && newOrgId !== null && newOrgId !== void 0;
+      if (isFirstOrgSet) {
+        const hadAutoSelectedEvent = this.hasAutoSelectedRef && !!this.selectedEvent;
+        this.userClearedEventRef = false;
+        if (!hadAutoSelectedEvent) {
+          this.hasAutoSelectedRef = false;
+        }
+        logger.debug("EventService", "Organisation first set - preserving event and resetting auto-selection flags", {
+          organisationId: newOrgId,
+          hasSelectedEvent: !!this.selectedEvent,
+          selectedEventId: this.selectedEvent?.event_id,
+          hadAutoSelectedEvent,
+          preservingEvent: hadAutoSelectedEvent,
+          previousOrgId,
+          newOrgId
+        });
+      } else if (previousOrgId !== null && previousOrgId !== void 0 && newOrgId !== null && newOrgId !== void 0 && previousOrgId !== newOrgId) {
         if (shouldClearEvents) {
           this.events = [];
           this.setSelectedEvent(null);
         }
-      } else if (previousOrgId !== null && newOrgId === null) {
+      } else if (previousOrgId !== null && previousOrgId !== void 0 && newOrgId === null) {
         if (shouldClearEvents) {
           this.events = [];
           this.setSelectedEvent(null);
@@ -1357,7 +1370,13 @@ var _EventService = class _EventService extends BaseService {
         logger.warn("EventService", "Failed to persist event selection:", error);
       });
       this.userClearedEventRef = false;
+      logger.debug("EventService", "Event selected", {
+        eventId: event.event_id,
+        eventName: event.event_name,
+        userClearedEventRef: this.userClearedEventRef
+      });
     } else {
+      const previousEventId = this.selectedEvent?.event_id;
       this.selectedEvent = null;
       this.setSelectedEventId?.(null);
       this.clearEventSelection().catch((error) => {
@@ -1365,6 +1384,11 @@ var _EventService = class _EventService extends BaseService {
       });
       this.hasAutoSelectedRef = false;
       this.userClearedEventRef = true;
+      logger.debug("EventService", "Event cleared via setSelectedEvent(null)", {
+        previousEventId,
+        userClearedEventRef: this.userClearedEventRef,
+        stackTrace: new Error().stack
+      });
     }
     this.notify();
   }
@@ -1504,7 +1528,7 @@ var _EventService = class _EventService extends BaseService {
       let organisationIdForRpc = null;
       let userIsSuperAdmin = this.isSuperAdmin;
       try {
-        const { isRBACInitialized: isRBACInitialized2, isSuperAdmin: checkSuperAdmin, setupRBAC: setupRBAC2 } = await import("./api-IAGWF3ZG.js");
+        const { isRBACInitialized: isRBACInitialized2, isSuperAdmin: checkSuperAdmin, setupRBAC: setupRBAC2 } = await import("./api-O6HTBX5Y.js");
         if (!isRBACInitialized2() && this.supabaseClient) {
           setupRBAC2(this.supabaseClient);
         }
@@ -1618,23 +1642,74 @@ var _EventService = class _EventService extends BaseService {
         });
         this.events = sortedEvents;
         this.error = null;
+        if (this.selectedEvent) {
+          const selectedEventId = this.selectedEvent.event_id;
+          const eventStillExists = transformedEvents.some(
+            (e) => e.event_id === selectedEventId
+          );
+          if (!eventStillExists) {
+            const previousUserClearedRef = this.userClearedEventRef;
+            this.selectedEvent = null;
+            this.setSelectedEventId?.(null);
+            this.userClearedEventRef = previousUserClearedRef;
+            logger.debug("EventService", "Cleared selected event - no longer in events list", {
+              previousEventId: selectedEventId,
+              eventsCount: transformedEvents.length
+            });
+          }
+        }
         this.hasAutoSelectedRef = false;
         if (!skipLoadPersisted) {
           const persistedEventLoaded = await this.loadPersistedEvent(transformedEvents);
+          logger.debug("EventService", "Event selection check", {
+            persistedEventLoaded,
+            userClearedEventRef: this.userClearedEventRef,
+            eventsCount: transformedEvents.length,
+            hasSelectedEvent: !!this.selectedEvent
+          });
           if (!persistedEventLoaded && !this.userClearedEventRef) {
             const nextEvent = this.getNextEventByDate(transformedEvents);
+            logger.debug("EventService", "Auto-selection attempt", {
+              nextEventFound: !!nextEvent,
+              nextEventId: nextEvent?.event_id,
+              nextEventDate: nextEvent?.event_date
+            });
             if (nextEvent) {
               this.hasAutoSelectedRef = true;
               this.setSelectedEvent(nextEvent);
+              logger.debug("EventService", "Auto-selected next event", {
+                eventId: nextEvent.event_id,
+                eventName: nextEvent.event_name,
+                eventDate: nextEvent.event_date
+              });
+            } else {
+              logger.debug("EventService", "No next event found for auto-selection", {
+                eventsCount: transformedEvents.length,
+                eventsWithDates: transformedEvents.filter((e) => e.event_date).length
+              });
             }
+          } else if (persistedEventLoaded) {
+            logger.debug("EventService", "Skipped auto-selection - persisted event loaded");
+          } else if (this.userClearedEventRef) {
+            logger.debug("EventService", "Skipped auto-selection - user explicitly cleared event");
           }
         } else {
           if (!this.userClearedEventRef) {
             const nextEvent = this.getNextEventByDate(transformedEvents);
+            logger.debug("EventService", "Auto-selection attempt (skip persisted)", {
+              nextEventFound: !!nextEvent,
+              nextEventId: nextEvent?.event_id
+            });
             if (nextEvent) {
               this.hasAutoSelectedRef = true;
               this.setSelectedEvent(nextEvent);
+              logger.debug("EventService", "Auto-selected next event (skip persisted)", {
+                eventId: nextEvent.event_id,
+                eventName: nextEvent.event_name
+              });
             }
+          } else {
+            logger.debug("EventService", "Skipped auto-selection (skip persisted) - user explicitly cleared event");
           }
         }
       }
@@ -1990,27 +2065,34 @@ var InactivityService = class extends BaseService {
   }
   setupEventHandlers() {
     if (typeof window === "undefined") return;
-    let idleTimer = null;
     let warningTimer = null;
+    let logoutTimer = null;
+    let countdownInterval = null;
     let lastActivity = Date.now();
-    let pollInterval = null;
     let prevIsIdle = false;
     let prevShowWarning = false;
     let prevShowInactivityWarning = false;
     let prevInactivityTimeRemaining = 0;
     let prevTimeRemaining = this.idleTimeoutMs;
-    const pollInactivityState = () => {
+    const getTimeUntilWarning = () => {
+      const timeSinceActivity = Date.now() - lastActivity;
+      return Math.max(0, this.idleTimeoutMs - this.warnBeforeMs - timeSinceActivity);
+    };
+    const getTimeUntilLogout = () => {
+      const timeSinceActivity = Date.now() - lastActivity;
+      return Math.max(0, this.idleTimeoutMs - timeSinceActivity);
+    };
+    const updateState = (forceNotify = false) => {
       const now = Date.now();
       const timeSinceActivity = now - lastActivity;
       const timeUntilIdle = this.idleTimeoutMs - timeSinceActivity;
-      const timeUntilWarning = this.idleTimeoutMs - this.warnBeforeMs - timeSinceActivity;
-      const newIsIdle = timeSinceActivity >= this.idleTimeoutMs - this.warnBeforeMs;
-      const newShowWarning = newIsIdle && timeSinceActivity < this.idleTimeoutMs;
+      const newIsIdle = timeSinceActivity >= this.idleTimeoutMs;
+      const newShowWarning = timeSinceActivity >= this.idleTimeoutMs - this.warnBeforeMs && !newIsIdle;
       const newShowInactivityWarning = newShowWarning;
-      const newInactivityTimeRemaining = newShowWarning ? Math.ceil((this.idleTimeoutMs - timeSinceActivity) / 1e3) : 0;
+      const newInactivityTimeRemaining = newShowWarning ? Math.ceil(timeUntilIdle / 1e3) : 0;
       const newTimeRemaining = Math.max(0, timeUntilIdle);
-      const stateChanged = prevIsIdle !== newIsIdle || prevShowWarning !== newShowWarning || prevShowInactivityWarning !== newShowInactivityWarning || prevInactivityTimeRemaining !== newInactivityTimeRemaining || prevTimeRemaining !== newTimeRemaining;
-      if (stateChanged) {
+      const stateChanged = prevIsIdle !== newIsIdle || prevShowWarning !== newShowWarning || prevShowInactivityWarning !== newShowInactivityWarning || newShowWarning && prevInactivityTimeRemaining !== newInactivityTimeRemaining || prevTimeRemaining !== newTimeRemaining;
+      if (stateChanged || forceNotify) {
         this._isIdle = newIsIdle;
         this._showWarning = newShowWarning;
         this._showInactivityWarning = newShowInactivityWarning;
@@ -2021,73 +2103,123 @@ var InactivityService = class extends BaseService {
         prevShowInactivityWarning = newShowInactivityWarning;
         prevInactivityTimeRemaining = newInactivityTimeRemaining;
         prevTimeRemaining = newTimeRemaining;
-        this.notify();
-        if (newIsIdle && timeSinceActivity >= this.idleTimeoutMs) {
+        if (stateChanged) {
+          this.notify();
+        }
+        if (newIsIdle) {
           this.handleIdleLogout();
         }
       }
-      if (idleTimer) {
-        clearTimeout(idleTimer);
-        idleTimer = null;
-      }
+    };
+    const scheduleNextCheck = () => {
       if (warningTimer) {
         clearTimeout(warningTimer);
         warningTimer = null;
       }
-      if (!newIsIdle && timeUntilIdle > 0) {
-        idleTimer = setTimeout(() => {
-          pollInactivityState();
-        }, Math.min(1e4, timeUntilIdle));
-      }
-      if (newShowWarning && timeUntilIdle > 0) {
-        warningTimer = setTimeout(() => {
+      if (logoutTimer) {
+        clearTimeout(logoutTimer);
+        logoutTimer = null;
+      }
+      if (countdownInterval) {
+        clearInterval(countdownInterval);
+        countdownInterval = null;
+      }
+      const timeUntilWarning = getTimeUntilWarning();
+      const timeUntilLogout = getTimeUntilLogout();
+      const timeSinceActivity = Date.now() - lastActivity;
+      if (timeSinceActivity >= this.idleTimeoutMs) {
+        return;
+      }
+      if (timeSinceActivity >= this.idleTimeoutMs - this.warnBeforeMs) {
+        updateState();
+        countdownInterval = setInterval(() => {
+          updateState();
+          if (Date.now() - lastActivity >= this.idleTimeoutMs) {
+            if (countdownInterval) {
+              clearInterval(countdownInterval);
+              countdownInterval = null;
+            }
+            this.handleIdleLogout();
+          }
+        }, 1e3);
+        logoutTimer = setTimeout(() => {
+          if (countdownInterval) {
+            clearInterval(countdownInterval);
+            countdownInterval = null;
+          }
           this.handleIdleLogout();
-        }, timeUntilIdle);
+        }, timeUntilLogout);
+      } else {
+        const timeUntilWarningMs = timeUntilWarning;
+        const adaptiveInterval = timeUntilWarningMs > 5 * 60 * 1e3 ? 60 * 1e3 : timeUntilWarningMs > 60 * 1e3 ? 10 * 1e3 : 1e3;
+        warningTimer = setTimeout(() => {
+          updateState();
+          scheduleNextCheck();
+        }, Math.min(adaptiveInterval, timeUntilWarningMs));
       }
     };
     const resetTimers = () => {
       lastActivity = Date.now();
-      if (idleTimer) {
-        clearTimeout(idleTimer);
-        idleTimer = null;
-      }
       if (warningTimer) {
         clearTimeout(warningTimer);
         warningTimer = null;
       }
+      if (logoutTimer) {
+        clearTimeout(logoutTimer);
+        logoutTimer = null;
+      }
+      if (countdownInterval) {
+        clearInterval(countdownInterval);
+        countdownInterval = null;
+      }
+      const hadWarning = this._showWarning || this._showInactivityWarning;
       this._showInactivityWarning = false;
       this._inactivityTimeRemaining = 0;
       this._isIdle = false;
       this._showWarning = false;
+      this._timeRemaining = this.idleTimeoutMs;
       prevIsIdle = false;
       prevShowWarning = false;
       prevShowInactivityWarning = false;
       prevInactivityTimeRemaining = 0;
       prevTimeRemaining = this.idleTimeoutMs;
+      if (hadWarning) {
+        this.notify();
+      }
+      scheduleNextCheck();
     };
     const activityEvents = ["mousedown", "mousemove", "keypress", "scroll", "touchstart", "click"];
+    let activityThrottleTimer = null;
     const handleActivity = () => {
-      resetTimers();
+      if (activityThrottleTimer) {
+        return;
+      }
+      activityThrottleTimer = setTimeout(() => {
+        activityThrottleTimer = null;
+        resetTimers();
+      }, 1e3);
     };
     activityEvents.forEach((event) => {
       document.addEventListener(event, handleActivity, true);
     });
-    pollInterval = setInterval(() => {
-      pollInactivityState();
-    }, 1e4);
-    pollInactivityState();
+    updateState(true);
+    scheduleNextCheck();
     this.cleanupHandlers = () => {
-      if (idleTimer) {
-        clearTimeout(idleTimer);
-        idleTimer = null;
-      }
       if (warningTimer) {
         clearTimeout(warningTimer);
         warningTimer = null;
       }
-      if (pollInterval) {
-        clearInterval(pollInterval);
-        pollInterval = null;
+      if (logoutTimer) {
+        clearTimeout(logoutTimer);
+        logoutTimer = null;
+      }
+      if (countdownInterval) {
+        clearInterval(countdownInterval);
+        countdownInterval = null;
+      }
+      if (activityThrottleTimer) {
+        clearTimeout(activityThrottleTimer);
+        activityThrottleTimer = null;
       }
       activityEvents.forEach((event) => {
         document.removeEventListener(event, handleActivity, true);
@@ -2100,7 +2232,6 @@ var InactivityService = class extends BaseService {
       this._inactivityTimeRemaining = 0;
     };
     this._isTracking = true;
-    this.notify();
   }
 };
 
@@ -2414,7 +2545,7 @@ function UnifiedAuthContextProvider({
       resolvedUserIdRef.current = currentUserId;
       const userId = currentUserId;
       const appNameValue = appName;
-      import("./api-IAGWF3ZG.js").then(async ({ resolveAppContext, setupRBAC: setupRBAC2 }) => {
+      import("./api-O6HTBX5Y.js").then(async ({ resolveAppContext, setupRBAC: setupRBAC2 }) => {
         try {
           setupRBAC2(supabase);
           const result = await resolveAppContext({
@@ -2881,4 +3012,4 @@ export {
   useUnifiedAuth,
   UnifiedAuthProvider
 };
-//# sourceMappingURL=chunk-DWUBLJJM.js.map
+//# sourceMappingURL=chunk-IHB5DR3H.js.map