@posiwise/common-services 0.1.41 → 0.1.43

package/fesm2022/posiwise-common-services.mjs

@@ -868,7 +868,7 @@ class PermissionService {
     setCurrentSubscription(subscription) {
         PermissionService.selectedSubscription = subscription;
     }
-    isGranted(permissionName, productKey = null, permission_key = null) {
+    isGranted(permissionName, productKey = null, permission_key = null, productSlug = null) {
         if (this.user) {
             const { user } = this;
             // Admin have access to all the menus.
@@ -876,6 +876,20 @@ class PermissionService {
             if (this.isSuperAdmin()) {
                 return true;
             }
+            if (permissionName) {
+                const selectedProduct = PermissionService?.selectedProduct || this.getCurrentProduct();
+                const subscriptionSlug = selectedProduct?.subscription_slug;
+                let slugToCheck;
+                if (!productSlug) {
+                    slugToCheck = `Pages.Product.${subscriptionSlug}.`;
+                }
+                else {
+                    slugToCheck = productSlug;
+                }
+                if (!permissionName.includes(slugToCheck)) {
+                    permissionName = permissionName.replace('Pages.Product.', slugToCheck);
+                }
+            }
             // Returning true if user has a given permission
             // E.g., Pages.Role.CloudOlive.SalesManager
             // or Pages.Beta or Pages.Alpha
@@ -917,7 +931,7 @@ class PermissionService {
             grantedPermissionNames: Object.keys(data.granted)
         };
     }
-    evaluatePermissions(permission, productKey = null, permission_key = null) {
+    evaluatePermissions(permission, productKey = null, permission_key = null, productSlug = null) {
         if (!permission) {
             return false;
         }
@@ -956,7 +970,7 @@ class PermissionService {
             let raw = x;
             if (x.includes('Pages')) {
                 if (productKey) {
-                    raw = `this.isGranted('${x}', '${productKey}', '${permission_key}')`;
+                    raw = `this.isGranted('${x}', '${productKey}', '${permission_key}', '${productSlug}')`;
                 }
                 else {
                     raw = `this.isGranted('${x}')`;
@@ -987,7 +1001,9 @@ class PermissionService {
         if (!product) {
             product = this.getCurrentProduct();
         }
-        return !!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionOwner`];
+        const selectedProduct = PermissionService?.selectedProduct;
+        const subscriptionSlug = selectedProduct?.subscription_slug;
+        return !!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionOwner`];
     }
     /**
      * Any Product Admin regardless of the product being master product or not.
@@ -998,8 +1014,10 @@ class PermissionService {
         if (!product) {
             product = this.getCurrentProduct();
         }
-        return (!!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionAdmin`] ||
-            !!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionOwner`]);
+        const selectedProduct = PermissionService?.selectedProduct;
+        const subscriptionSlug = selectedProduct?.subscription_slug;
+        return (!!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionAdmin`] ||
+            !!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionOwner`]);
     }
     /**
      * Any Product Admin of the product being the master product
@@ -1008,8 +1026,16 @@ class PermissionService {
         if (!product) {
             product = this.getCurrentProduct();
         }
-        return (!!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionSuperAdmin`] ||
-            !!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionSuperOwner`]);
+        const selectedProduct = PermissionService?.selectedProduct;
+        const subscriptionSlug = selectedProduct?.subscription_slug;
+        return (!!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionSuperAdmin`] ||
+            !!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionSuperOwner`]);
+    }
+    isUserMasterSubscriptionSuperAdmin(product) {
+        if (!product) {
+            product = this.getCurrentProduct();
+        }
+        return !!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionSuperAdmin`];
     }
     /**
      * Any Product Admin of the product being the master product
@@ -1018,14 +1044,17 @@ class PermissionService {
         if (!product) {
             product = this.getCurrentProduct();
         }
-        return !!this.user.auth.granted[`Pages.Product.${product.permission_key}.${product.feature_key}.SubscriptionSuperOwner`];
+        const selectedProduct = PermissionService?.selectedProduct;
+        const subscriptionSlug = selectedProduct?.subscription_slug;
+        return !!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionSuperOwner`];
     }
     setCurrentProduct(product) {
         localStorage.setItem('product', JSON.stringify({
             id: product.id,
             permission_key: product.permission_key,
             feature_key: product.feature_key,
-            subscriptionId: product.subscriptionId
+            subscriptionId: product.subscriptionId,
+            subscription_slug: product.subscription_slug
         }));
     }
     getCurrentProduct() {
@@ -1585,10 +1614,10 @@ class CommonService {
             ...HelperService.getPagingParams(paging)
         });
     }
-    getIncidentsAdmin(paging, subsriptionId) {
+    getIncidentsAdmin(paging, subscriptionId) {
         return this.api.getWithParams(`${INCIDENTS_PATH_ADMIN}/get_all`, {
             ...HelperService.getPagingParams(paging),
-            subscription_id: subsriptionId
+            subscription_id: subscriptionId
         });
     }
     addIncident(data) {
@@ -1759,7 +1788,6 @@ class NgbDateCustomParserFormatter extends NgbDateParserFormatter {
         const day = isNumber(date.day) ? padNumber(date.day) : '';
         const month = isNumber(date.month) ? monthNames[date.month] : '';
         const year = date.year;
-        console.log("In thi");
         return `${day}-${month}-${year}`;
     }
     dateFormatForPicker(date) {
@@ -2169,11 +2197,15 @@ class NotificationService {
         this.endpoint = 'notes_read';
         this.notificationSubject$ = new BehaviorSubject([]);
     }
-    getNotifications() {
-        return this.api.get('/notes?show_on_dashboard=true');
+    getNotifications(paging) {
+        return this.api.getWithParams(`/notes?show_on_dashboard=true`, {
+            ...paging
+        });
     }
-    getDismissedNotifications() {
-        return this.api.get('/notes?dismissed=true');
+    getDismissedNotifications(paging) {
+        return this.api.getWithParams(`/notes?dismissed=true`, {
+            ...paging
+        });
     }
     showNotifications(data) {
         this.notificationSubject$.next(data);
@@ -2507,7 +2539,7 @@ class SentryErrorHandler {
         // Ensure all errors have a proper message
         this.errorMessageFormatter(error);
         // Existing Sentry initialization logic
-        this.sentryIntilization(error, incomingError);
+        this.sentryInitialization(error, incomingError);
     }
     handleNonHttpErrorResponse(error) {
         if (typeof error === 'object' && 'message' in error) {
@@ -2531,7 +2563,7 @@ class SentryErrorHandler {
             error = new Error(enhancedErrorMessage); // NOSONAR
         }
     }
-    sentryIntilization(error, incomingError) {
+    sentryInitialization(error, incomingError) {
         if (!SentryErrorHandler.sentryInitialized) {
             this.initializeSentryAsync()
                 .then(() => {
@@ -2576,6 +2608,9 @@ class SentryErrorHandler {
         });
     }
     handleNonStandardError(error) {
+        if ('isTrusted' in error) {
+            return;
+        }
         // If it's an object but not a standard Error, attempt to log its properties safely
         let errorMessage = 'Captured non-standard error with no message'; // NOSONAR
         // Try to extract any message-like property safely