@csmart/ngc-smart-core 0.7.87 → 0.7.91

package/bundles/csmart-ngc-smart-core.umd.js

@@ -284,6 +284,7 @@
          * Offender
          * ************************************
          * @param {?} selectedOffender
+         * @param {?=} redirectFunction
          * @return {?}
          */
         XdmService.prototype.setSelectedOffender = /**
@@ -291,16 +292,23 @@
          * 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 {?}
                  */function (child) {
                     child.setSelectedOffender(selectedOffender);
                     _this.offenderSubject.next(selectedOffender);
+                    if (redirectFunction) {
+                        redirectFunction();
+                    }
                 }));
             };
         /**
@@ -670,8 +678,7 @@
                     //       : false,
                     //   } as SelectedOffender;
                     this.selectedOffender = offender;
-                    this.xdmService.setSelectedOffender(this.selectedOffender);
-                    this.reloadCurrentRoute();
+                    this.xdmService.setSelectedOffender(this.selectedOffender, this.reloadCurrentRoute);
                 }
             };
         /**
@@ -1856,10 +1863,10 @@
                  * @param {?} p
                  * @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') {
@@ -1906,35 +1913,38 @@
                 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);
             };
-        /**
-         * @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;
-            };
+        // 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
          * @return {?}
          */
-        SmartAuthService.prototype.hasIntakeRole = /**
-         * @param {?} roles
-         * @return {?}
-         */
+        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 {?}
+             */
             function (roles) {
                 if (roles && roles.length > 0) {
                     return roles.findIndex(this.isIntakeRole) > -1;
@@ -1958,34 +1968,32 @@
             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':
@@ -2138,6 +2146,45 @@
                     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(operators.take(1), operators.map(( /**
+             * @param {?} result
+             * @return {?}
+             */function (result) {
+                    if (i0.isDevMode) {
+                        console.log('##### findvRolePermissionPivots() from service ', result);
+                    }
+                    if (result.data.findvRolePermissionPivots.totalCount > 0) {
+                        return true;
+                    }
+                    else {
+                        return false;
+                        // return throwError('No access right.');
+                    }
+                })), operators.catchError(( /**
+                 * @param {?} error
+                 * @return {?}
+                 */function (error) {
+                    console.log('error ' + error);
+                    return rxjs.throwError(error);
+                })));
+            };
         SmartAuthService.decorators = [
             { type: i0.Injectable, args: [{
                         providedIn: 'root',
@@ -2190,11 +2237,10 @@
                     !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';
@@ -2243,9 +2289,9 @@
                     if (!loginStaff || !route || !route.routeConfig) {
                         return rxjs.of(false);
                     }
-                    if (!_this.authnService.isAuthEnable(loginStaff.roles, null)) {
-                        return rxjs.of(true);
-                    }
+                    // if (!this.authnService.isAuthEnable(loginStaff.roles, null)) {
+                    //   return of(true);
+                    // }
                     /** @type {?} */
                     var resource = route.routeConfig.path
                         ? route.routeConfig.path.split('/')[0]