@csmart/ngc-smart-core 0.7.87 → 0.7.91

package/fesm5/csmart-ngc-smart-core.js

@@ -6,8 +6,8 @@ import { __spread, __awaiter, __generator } from 'tslib';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { MsalService } from '@azure/msal-angular';
 import { Router, ActivatedRoute } from '@angular/router';
-import { Subject, of, from, EMPTY, throwError, concat } from 'rxjs';
-import { InjectionToken, Injectable, Inject, isDevMode, Component, Input, ViewChild, ViewEncapsulation, Directive, ElementRef, NgModule, NgZone, defineInjectable, inject } from '@angular/core';
+import { Subject, of, from, throwError, EMPTY, concat } from 'rxjs';
+import { InjectionToken, Injectable, Inject, isDevMode, Directive, Input, ElementRef, Component, ViewChild, ViewEncapsulation, NgModule, NgZone, defineInjectable, inject } from '@angular/core';
 import { map, switchMap, take, catchError, mergeMap, retryWhen, delay } from 'rxjs/operators';
 
 /**
@@ -160,6 +160,7 @@ var XdmService = /** @class */ (function () {
      * Offender
      * ************************************
      * @param {?} selectedOffender
+     * @param {?=} redirectFunction
      * @return {?}
      */
     XdmService.prototype.setSelectedOffender = /**
@@ -167,10 +168,12 @@ var XdmService = /** @class */ (function () {
      * Offender
      * ************************************
      * @param {?} selectedOffender
+     * @param {?=} redirectFunction
      * @return {?}
      */
-    function (selectedOffender) {
+    function (selectedOffender, redirectFunction) {
         var _this = this;
+        if (redirectFunction === void 0) { redirectFunction = null; }
         this.connection.promise.then((/**
          * @param {?} child
          * @return {?}
@@ -178,6 +181,9 @@ var XdmService = /** @class */ (function () {
         function (child) {
             child.setSelectedOffender(selectedOffender);
             _this.offenderSubject.next(selectedOffender);
+            if (redirectFunction) {
+                redirectFunction();
+            }
         }));
     };
     /**
@@ -561,8 +567,7 @@ var SmartOffenderHeaderComponent = /** @class */ (function () {
             //       : false,
             //   } as SelectedOffender;
             this.selectedOffender = offender;
-            this.xdmService.setSelectedOffender(this.selectedOffender);
-            this.reloadCurrentRoute();
+            this.xdmService.setSelectedOffender(this.selectedOffender, this.reloadCurrentRoute);
         }
     };
     /**
@@ -1759,10 +1764,10 @@ var SmartAuthService = /** @class */ (function () {
          * @return {?}
          */
         function (p) {
-            return (p.appModuleId === accessControlConfig.appModuleId
-                && p.resource === resource
-                && (!roleId || p.roleId === roleId)
-                && p.assignmentStaffRelationId === assignmentStaffRelationId);
+            return (p.appModuleId === accessControlConfig.appModuleId &&
+                p.resource === resource &&
+                (!roleId || p.roleId === roleId) &&
+                p.assignmentStaffRelationId === assignmentStaffRelationId);
         }));
         if (permission) {
             if (accessType === 'read') {
@@ -1807,35 +1812,38 @@ var SmartAuthService = /** @class */ (function () {
      */
     function (loginStaff, feature, appModuleId) {
         if (appModuleId === void 0) { appModuleId = null; }
-        if (!this.isAuthEnable(loginStaff.roles, appModuleId)) {
-            return true;
-        }
+        // if (!this.isAuthEnable(loginStaff.roles, appModuleId)) {
+        //   return true;
+        // }
         return this.hasAppFeaturePermission(loginStaff.permissions, feature, appModuleId);
     };
+    // public isAuthEnable(roles: Role[], appModuleId: string) {
+    //   if (roles && roles.length > 0) {
+    //     return roles.map(r => r.roleId).findIndex(this.isExternalRole) > -1 || appModuleId === 'RR';
+    //   }
+    //   return false;
+    // }
+    // public isAuthEnable(roles: Role[], appModuleId: string) {
+    //   if (roles && roles.length > 0) {
+    //     return roles.map(r => r.roleId).findIndex(this.isExternalRole) > -1 || appModuleId === 'RR';
+    //   }
+    //   return false;
+    // }
     /**
      * @param {?} roles
-     * @param {?} appModuleId
-     * @return {?}
-     */
-    SmartAuthService.prototype.isAuthEnable = /**
-     * @param {?} roles
-     * @param {?} appModuleId
      * @return {?}
      */
-    function (roles, appModuleId) {
-        if (roles && roles.length > 0) {
-            return (roles.findIndex(this.isExternalRole) > -1 || appModuleId === 'RR');
-        }
-        return false;
-    };
+    SmartAuthService.prototype.hasIntakeRole = 
+    // public isAuthEnable(roles: Role[], appModuleId: string) {
+    //   if (roles && roles.length > 0) {
+    //     return roles.map(r => r.roleId).findIndex(this.isExternalRole) > -1 || appModuleId === 'RR';
+    //   }
+    //   return false;
+    // }
     /**
      * @param {?} roles
      * @return {?}
      */
-    SmartAuthService.prototype.hasIntakeRole = /**
-     * @param {?} roles
-     * @return {?}
-     */
     function (roles) {
         if (roles && roles.length > 0) {
             return roles.findIndex(this.isIntakeRole) > -1;
@@ -1859,36 +1867,34 @@ var SmartAuthService = /** @class */ (function () {
     function (permissions, feature, appModuleId) {
         if (permissions && permissions.length > 0) {
             if (appModuleId) {
-                return permissions.findIndex((/**
+                return (permissions.findIndex((/**
                  * @param {?} p
                  * @return {?}
                  */
-                function (p) {
-                    return p.resource === feature && p.appModuleId === appModuleId;
-                })) > -1;
+                function (p) { return p.resource === feature && p.appModuleId === appModuleId; })) > -1);
             }
             else {
-                return (permissions.findIndex((/**
+                return permissions.findIndex((/**
                  * @param {?} p
                  * @return {?}
                  */
-                function (p) { return p.resource === feature; })) > -1);
+                function (p) { return p.resource === feature; })) > -1;
             }
         }
         return false;
     };
     /**
      * @private
-     * @param {?} role
+     * @param {?} roleId
      * @return {?}
      */
     SmartAuthService.prototype.isExternalRole = /**
      * @private
-     * @param {?} role
+     * @param {?} roleId
      * @return {?}
      */
-    function (role) {
-        switch (role.roleId) {
+    function (roleId) {
+        switch (roleId) {
             case 'EUDTL':
             case 'EUDUSM':
             case 'EUJDG':
@@ -2045,6 +2051,47 @@ var SmartAuthService = /** @class */ (function () {
             return null;
         })));
     };
+    /**
+     * @private
+     * @param {?} appModuleId
+     * @param {?} resource
+     * @return {?}
+     */
+    SmartAuthService.prototype.getRolePermissions = /**
+     * @private
+     * @param {?} appModuleId
+     * @param {?} resource
+     * @return {?}
+     */
+    function (appModuleId, resource) {
+        /** @type {?} */
+        var queryString = "\n           query findvRolePermissionPivots{\n            findvRolePermissionPivots(input: {where: {appModuleId: " + appModuleId + ", resource: " + resource + "}}){\n              totalCount\n              message\n            }\n          }";
+        return this.http
+            .post(this.smartDataServiceUrl, { query: queryString })
+            .pipe(take(1), map((/**
+         * @param {?} result
+         * @return {?}
+         */
+        function (result) {
+            if (isDevMode) {
+                console.log('##### findvRolePermissionPivots() from service ', result);
+            }
+            if (result.data.findvRolePermissionPivots.totalCount > 0) {
+                return true;
+            }
+            else {
+                return false;
+                // return throwError('No access right.');
+            }
+        })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        function (error) {
+            console.log('error ' + error);
+            return throwError(error);
+        })));
+    };
     SmartAuthService.decorators = [
         { type: Injectable, args: [{
                     providedIn: 'root',
@@ -2095,11 +2142,10 @@ var SmartAccessControlDirective = /** @class */ (function () {
             !this.accessControlConfig.route.data.selectedOffender) {
             return;
         }
-        /** @type {?} */
-        var loginStaff = this.accessControlConfig.route.data.loginStaff;
-        if (!this.auth.isAuthEnable(loginStaff.roles, this.accessControlConfig.appModuleId)) {
-            return;
-        }
+        // const loginStaff = this.accessControlConfig.route.data.loginStaff;
+        // if (!this.auth.isAuthEnable(loginStaff.roles, this.accessControlConfig.appModuleId)) {
+        //   return;
+        // }
         this.elementRef.nativeElement.style.display = this.auth.checkPermission(this.accessControlConfig)
             ? 'block'
             : 'none';
@@ -2147,9 +2193,9 @@ var SmartAuthorizationGuard = /** @class */ (function () {
             if (!loginStaff || !route || !route.routeConfig) {
                 return of(false);
             }
-            if (!_this.authnService.isAuthEnable(loginStaff.roles, null)) {
-                return of(true);
-            }
+            // if (!this.authnService.isAuthEnable(loginStaff.roles, null)) {
+            //   return of(true);
+            // }
             /** @type {?} */
             var resource = route.routeConfig.path
                 ? route.routeConfig.path.split('/')[0]