@hmcts/rpx-xui-common-lib 1.7.22 → 1.7.28

package/fesm5/hmcts-rpx-xui-common-lib.js

@@ -10,9 +10,9 @@ import { Title } from '@angular/platform-browser';
 import { DocumentInterruptSource, Idle } from '@ng-idle/core';
 import { Keepalive } from '@ng-idle/keepalive';
 import { RouterModule, Router, NavigationEnd } from '@angular/router';
-import { Component, EventEmitter, Input, Output, ViewEncapsulation, Injectable, Directive, TemplateRef, ViewContainerRef, ElementRef, Inject, ViewChild, ChangeDetectorRef, InjectionToken, defineInjectable, inject, NgModule, ChangeDetectionStrategy } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ViewEncapsulation, Injectable, Directive, TemplateRef, ViewContainerRef, ElementRef, Inject, ViewChild, ChangeDetectorRef, InjectionToken, defineInjectable, inject, ChangeDetectionStrategy, NgModule } from '@angular/core';
 import { BehaviorSubject, of, zip, Subject, combineLatest } from 'rxjs';
-import { distinctUntilChanged, map, debounceTime, filter, mergeMap, tap, catchError, switchMap, delay } from 'rxjs/operators';
+import { distinctUntilChanged, map, debounceTime, filter, mergeMap, tap, catchError, switchMap, delay, skipWhile } from 'rxjs/operators';
 
 /**
  * @fileoverview added by tsickle
@@ -7694,21 +7694,20 @@ var TimeoutNotificationsService = /** @class */ (function () {
  */
 var RoleService = /** @class */ (function () {
     function RoleService() {
-        this.pRoles = [];
-    }
-    Object.defineProperty(RoleService.prototype, "roles", {
-        get: /**
+        this.pRoles = new BehaviorSubject(null);
+        this.roles$ = this.pRoles.asObservable().pipe(skipWhile((/**
+         * @param {?} item
          * @return {?}
          */
-        function () {
-            return this.pRoles;
-        },
+        function (item) { return item === null; })));
+    }
+    Object.defineProperty(RoleService.prototype, "roles", {
         set: /**
          * @param {?} roles
          * @return {?}
          */
         function (roles) {
-            this.pRoles = roles;
+            this.pRoles.next(roles);
         },
         enumerable: true,
         configurable: true
@@ -7749,25 +7748,31 @@ var RoleGuard = /** @class */ (function () {
      */
     function (route) {
         var _this = this;
-        /** @type {?} */
-        var roles = ((/** @type {?} */ (route.data.needsRole)));
-        /** @type {?} */
-        var check = (/**
-         * @param {?} roleRegEx
+        return this.roleService.roles$.pipe(map((/**
+         * @param {?} roles
          * @return {?}
          */
-        function (roleRegEx) {
+        function (roles) {
+            /** @type {?} */
+            var canActivateRoles = ((/** @type {?} */ (route.data.needsRole)));
             /** @type {?} */
-            var regex = new RegExp(roleRegEx);
-            return _this.roleService.roles.some((/**
-             * @param {?} role
+            var check = (/**
+             * @param {?} roleRegEx
              * @return {?}
              */
-            function (role) { return regex.test(role); }));
-        });
-        /** @type {?} */
-        var match = route.data.roleMatching === RoleMatching.ALL ? roles.every(check) : roles.some(check);
-        return match || this.router.parseUrl((/** @type {?} */ (route.data.noRoleMatchRedirect)));
+            function (roleRegEx) {
+                /** @type {?} */
+                var regex = new RegExp(roleRegEx);
+                return roles.some((/**
+                 * @param {?} role
+                 * @return {?}
+                 */
+                function (role) { return regex.test(role); }));
+            });
+            /** @type {?} */
+            var match = route.data.roleMatching === RoleMatching.ALL ? canActivateRoles.every(check) : canActivateRoles.some(check);
+            return match || _this.router.parseUrl((/** @type {?} */ (route.data.noRoleMatchRedirect)));
+        })));
     };
     RoleGuard.decorators = [
         { type: Injectable, args: [{