bs-unified-ui 1.0.913 → 1.0.917

package/components/Notification/NotificationService.d.ts

@@ -83,7 +83,7 @@ declare class NotificationService {
     }>;
     markAsRead(notificationId: string): Promise<void>;
     markAllAsRead(bsOrgId?: string): Promise<void>;
-    getAudioRepeat(bsOrgId: string): Promise<any>;
+    getAudioRepeat(bsOrgId: string, warehousesConfig?: string[]): Promise<any>;
     getIndicators(bsOrgId: string, categories?: Record<string, string[]>): Promise<any>;
     updateIndicators(indicators: Partial<{
         order: boolean;

package/components/Notification/ObservableSet.d.ts

@@ -14,4 +14,6 @@ export declare class ObservableSet<T> {
     values(): IterableIterator<T>;
     entries(): IterableIterator<[T, T]>;
     keys(): IterableIterator<T>;
+    deleteBy(predicate: (value: T) => boolean): number;
+    filter(predicate: (value: T) => boolean): T[];
 }

package/components/Notification/useNotifications.d.ts

@@ -79,6 +79,7 @@ export interface UseNotificationsOptions extends NotificationConfig {
     navigate?: any;
     soundConfig?: SoundConfig;
     triggerEvents?: TriggerEvents;
+    warehousesConfig?: string[];
 }
 declare const useNotifications: (options?: UseNotificationsOptions) => UseNotificationsResult;
 export default useNotifications;

package/components/Notification/useNotificationsV2.d.ts

@@ -53,6 +53,7 @@ export interface UseNotificationsOptions extends NotificationConfig {
     navigate?: any;
     soundConfig?: SoundConfig;
     triggerEvents?: TriggerEvents;
+    warehousesConfig?: string[];
 }
 declare const useNotificationsV2: (options?: UseNotificationsOptions) => UseNotificationsV2Result;
 export default useNotificationsV2;

package/index.js

@@ -41890,7 +41890,7 @@ var NotificationService = /** @class */ (function () {
             });
         });
     };
-    NotificationService.prototype.getAudioRepeat = function (bsOrgId) {
+    NotificationService.prototype.getAudioRepeat = function (bsOrgId, warehousesConfig) {
         return __awaiter(this, void 0, void 0, function () {
             var headers, sessionToken, queryParams, url, response, res, error_8;
             return __generator(this, function (_a) {
@@ -41916,6 +41916,9 @@ var NotificationService = /** @class */ (function () {
                     case 3:
                         queryParams = new URLSearchParams();
                         queryParams.append('bsOrgId', bsOrgId);
+                        if (warehousesConfig && warehousesConfig.length > 0) {
+                            queryParams.append('warehouses', warehousesConfig.join(','));
+                        }
                         url = "".concat(this.config.apiBaseUrl, "/notifications/me/get-audio-repeat?").concat(queryParams.toString());
                         return [4 /*yield*/, fetch(url, { headers: headers })];
                     case 4:
@@ -45693,22 +45696,47 @@ var ObservableSet = /** @class */ (function () {
     ObservableSet.prototype.keys = function () {
         return this.set.keys();
     };
+    // Delete all items matching a predicate
+    ObservableSet.prototype.deleteBy = function (predicate) {
+        var _this = this;
+        var toDelete = [];
+        this.set.forEach(function (value) {
+            if (predicate(value)) {
+                toDelete.push(value);
+            }
+        });
+        toDelete.forEach(function (value) { return _this.set.delete(value); });
+        if (toDelete.length > 0) {
+            this.notifyListeners();
+        }
+        return toDelete.length;
+    };
+    // Find all items matching a predicate
+    ObservableSet.prototype.filter = function (predicate) {
+        var result = [];
+        this.set.forEach(function (value) {
+            if (predicate(value)) {
+                result.push(value);
+            }
+        });
+        return result;
+    };
     return ObservableSet;
 }());
 
 var useNotificationsV2 = function (options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if (options === void 0) { options = {}; }
-    var onNotification = options.onNotification, onConnectionChange = options.onConnectionChange, onError = options.onError, _k = options.timezone, timezone = _k === void 0 ? 'America/Vancouver' : _k, navigate = options.navigate, bsOrgId = options.bsOrgId, cfWsId = options.cfWsId, soundConfig = options.soundConfig, triggerEvents = options.triggerEvents;
-    var _l = React.useState([]), popoverNotifications = _l[0], setPopoverNotifications = _l[1];
-    var _m = React.useState(true), popoverLoading = _m[0], setPopoverLoading = _m[1];
-    var _o = React.useState(false), popoverHasNextPage = _o[0], setPopoverHasNextPage = _o[1];
-    var _p = React.useState(false), isUnreadPopover = _p[0], setIsUnreadPopover = _p[1];
-    var _q = React.useState(0), unreadCount = _q[0], setUnreadCount = _q[1];
-    var _r = React.useState(false), isActiveNotificationPage = _r[0], setIsActiveNotificationPage = _r[1];
-    var _s = React.useState([]), notifications = _s[0], setNotifications = _s[1];
-    var _t = React.useState(true), notificationLoading = _t[0], setNotificationLoading = _t[1];
-    var _u = React.useState({
+    var onNotification = options.onNotification, onConnectionChange = options.onConnectionChange, onError = options.onError, _k = options.timezone, timezone = _k === void 0 ? 'America/Vancouver' : _k, navigate = options.navigate, bsOrgId = options.bsOrgId, cfWsId = options.cfWsId, soundConfig = options.soundConfig, triggerEvents = options.triggerEvents, _l = options.warehousesConfig, warehousesConfig = _l === void 0 ? [] : _l;
+    var _m = React.useState([]), popoverNotifications = _m[0], setPopoverNotifications = _m[1];
+    var _o = React.useState(true), popoverLoading = _o[0], setPopoverLoading = _o[1];
+    var _p = React.useState(false), popoverHasNextPage = _p[0], setPopoverHasNextPage = _p[1];
+    var _q = React.useState(false), isUnreadPopover = _q[0], setIsUnreadPopover = _q[1];
+    var _r = React.useState(0), unreadCount = _r[0], setUnreadCount = _r[1];
+    var _s = React.useState(false), isActiveNotificationPage = _s[0], setIsActiveNotificationPage = _s[1];
+    var _t = React.useState([]), notifications = _t[0], setNotifications = _t[1];
+    var _u = React.useState(true), notificationLoading = _u[0], setNotificationLoading = _u[1];
+    var _v = React.useState({
         search: '',
         sortBy: '',
         sortOrder: '',
@@ -45718,19 +45746,19 @@ var useNotificationsV2 = function (options) {
         limit: 20,
         startDate: '',
         endDate: '',
-    }), filter = _u[0], setFilter = _u[1];
+    }), filter = _v[0], setFilter = _v[1];
     var filterRef = React.useRef(filter);
-    var _v = React.useState(true), hasNextPage = _v[0], setHasNextPage = _v[1];
-    var _w = React.useState(true), loading = _w[0], setLoading = _w[1];
-    var _x = React.useState(false), isConnected = _x[0], setIsConnected = _x[1];
-    var _y = React.useState(null), error = _y[0], setError = _y[1];
-    var _z = React.useState(false), isInitialized = _z[0], setIsInitialized = _z[1];
-    var _0 = React.useState({
+    var _w = React.useState(true), hasNextPage = _w[0], setHasNextPage = _w[1];
+    var _x = React.useState(true), loading = _x[0], setLoading = _x[1];
+    var _y = React.useState(false), isConnected = _y[0], setIsConnected = _y[1];
+    var _z = React.useState(null), error = _z[0], setError = _z[1];
+    var _0 = React.useState(false), isInitialized = _0[0], setIsInitialized = _0[1];
+    var _1 = React.useState({
         order: false,
         chat: false,
         task_update: false,
         new_driver: false,
-    }), indicators = _0[0], setIndicators = _0[1];
+    }), indicators = _1[0], setIndicators = _1[1];
     var serviceRef = React.useRef(null);
     var unsubscribeRef = React.useRef(null);
     var initPromiseRef = React.useRef(null);
@@ -46129,11 +46157,11 @@ var useNotificationsV2 = function (options) {
     }, []);
     // Helper: Stop audio for group if no reminders remain for that group
     var stopAudioRepeatForGroupIfNoReminders = React.useCallback(function (group) {
-        var hasRemindersForGroup = Array.from(allRemindersRef.current).some(function (key) {
+        var remindersForGroup = allRemindersRef.current.filter(function (key) {
             var eventType = key.includes(':') ? key.split(':')[0] : key;
             return getEventGroup(eventType) === group;
         });
-        if (!hasRemindersForGroup) {
+        if (remindersForGroup.length === 0) {
             stopAudioRepeatForGroup(group);
         }
     }, [stopAudioRepeatForGroup]);
@@ -46150,7 +46178,7 @@ var useNotificationsV2 = function (options) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, serviceRef.current.getAudioRepeat(bsOrgId)];
+                    return [4 /*yield*/, serviceRef.current.getAudioRepeat(bsOrgId, warehousesConfig)];
                 case 2:
                     response = _a.sent();
                     data = response === null || response === void 0 ? void 0 : response.data;
@@ -46443,14 +46471,11 @@ var useNotificationsV2 = function (options) {
                     });
                 setUnreadCount(0);
                 // Clear notification-based reminders (orders + delivery)
-                var remindersToDelete = Array.from(allRemindersRef.current).filter(function (key) {
+                allRemindersRef.current.deleteBy(function (key) {
                     return NOTIFICATION_BASED_REMINDER_EVENTS.some(function (subType) {
                         return key.startsWith("".concat(subType, ":"));
                     });
                 });
-                remindersToDelete.forEach(function (key) {
-                    return allRemindersRef.current.delete(key);
-                });
                 // Stop audio for online_store and delivery groups if no reminders remain
                 ['online_store', 'delivery'].forEach(stopAudioRepeatForGroupIfNoReminders);
                 break;
@@ -46481,15 +46506,11 @@ var useNotificationsV2 = function (options) {
                 // Handle special case: event without id but with metadata.ids (DELIVERY_REMINDER_EVENTS only)
                 if (((_k = incoming_notification === null || incoming_notification === void 0 ? void 0 : incoming_notification.metadata) === null || _k === void 0 ? void 0 : _k.ids) &&
                     Array.isArray((_l = incoming_notification === null || incoming_notification === void 0 ? void 0 : incoming_notification.metadata) === null || _l === void 0 ? void 0 : _l.ids)) {
-                    var idsToRemove = incoming_notification.metadata.ids;
-                    idsToRemove.forEach(function (notificationId) {
-                        // Try to map this id with each DELIVERY_REMINDER_EVENTS subType
-                        var deliverySubTypes = Object.values(DELIVERY_EVENTS);
-                        deliverySubTypes.forEach(function (deliverySubType) {
-                            var compositeKey = "".concat(deliverySubType, ":").concat(notificationId);
-                            if (allRemindersRef.current.has(compositeKey)) {
-                                allRemindersRef.current.delete(compositeKey);
-                            }
+                    var idsToRemove_1 = incoming_notification.metadata.ids;
+                    // Delete all reminders matching any of the notification IDs in one call
+                    allRemindersRef.current.deleteBy(function (key) {
+                        return idsToRemove_1.some(function (notificationId) {
+                            return key.includes(":".concat(notificationId));
                         });
                     });
                     // Check if we should stop audio for delivery group
@@ -46846,16 +46867,16 @@ var useNotificationsV2 = function (options) {
         if (!memoizedReminderEvents)
             return;
         // Find reminders for disabled events
-        var remindersToDelete = [];
-        allRemindersRef.current.forEach(function (key) {
+        var remindersToDelete = allRemindersRef.current.filter(function (key) {
             var subType = key.includes(':') ? key.split(':')[0] : key;
-            if (!memoizedReminderEvents[subType]) {
-                remindersToDelete.push(key);
-            }
+            return !memoizedReminderEvents[subType];
         });
         if (remindersToDelete.length > 0) {
             // Delete reminders
-            remindersToDelete.forEach(function (key) { return allRemindersRef.current.delete(key); });
+            allRemindersRef.current.deleteBy(function (key) {
+                var subType = key.includes(':') ? key.split(':')[0] : key;
+                return !memoizedReminderEvents[subType];
+            });
             // Get unique groups from deleted reminders and check if audio should stop
             var reminderGroupsToCheck = getReminderGroups(new Set(remindersToDelete));
             reminderGroupsToCheck.forEach(stopAudioRepeatForGroupIfNoReminders);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-unified-ui",
-  "version": "1.0.913",
+  "version": "1.0.917",
   "license": "MIT",
   "author": "Advesa",
   "description": "UI Components for Unified Breadstack UI",