@csmart/ngc-smart-core 1.13.9 → 1.13.11

package/fesm2020/csmart-ngc-smart-core.mjs

@@ -522,6 +522,23 @@ class SmartNavbarComponent {
         }
         return false;
     }
+    checkDVIPPermission(config) {
+        return ((config.appModuleId !== 'DVIP') || (config.appModuleId === "DVIP" && this.hasDVIPRole));
+    }
+    get hasDVIPRole() {
+        if (this.loginStaff &&
+            this.loginStaff.roles &&
+            this.loginStaff.roles.length > 0) {
+            return this.loginStaff.roles.findIndex(this.isDVIPRole) > -1;
+        }
+        return false;
+    }
+    isDVIPRole(role) {
+        if (role.roleId == 'TSD' || role.roleId == 'TAD') {
+            return true;
+        }
+        return false;
+    }
     checkVictimPermission(config) {
         return ((config.appModuleId !== 'VICTIM') || (config.appModuleId === "VICTIM" && this.hasVictimRole));
     }
@@ -556,10 +573,10 @@ class SmartNavbarComponent {
     }
 }
 /** @nocollapse */ /** @nocollapse */ SmartNavbarComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: SmartNavbarComponent, deps: [{ token: SmartNavbarService }, { token: XdmService }, { token: i2.MsalService }], target: i0.ɵɵFactoryTarget.Component });
-/** @nocollapse */ /** @nocollapse */ SmartNavbarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.2.5", type: SmartNavbarComponent, selector: "app-smart-navbar", inputs: { serviceApiUrl: "serviceApiUrl", appModuleId: "appModuleId" }, viewQueries: [{ propertyName: "tabGroup", first: true, predicate: ["tabs"], descendants: true }], usesOnChanges: true, ngImport: i0, template: "<!--\r\n<a class=\"smart-navbar-toggle open\" href=\"#nav\">\r\n  <i class=\"material-icons\">menu</i>\r\n</a>\r\n\r\n<nav id=\"nav\" role=\"navigation\" class=\"smart-navbar-container\">\r\n  <a class=\"smart-navbar-toggle close\" href=\"#\">\r\n    <i class=\"material-icons\">close</i>\r\n  </a>\r\n\r\n  <span *ngFor=\"let config of navbarConfigs\">\r\n    <a mat-button class=\"smart-navbar-item\" \r\n      *ngIf=\"(config.offenderSpecificFlag === false || selectedOffender) && isAuthenticated && loginStaff\" href=\"{{config.url}}\">{{config.name}}</a>\r\n  </span>\r\n\r\n  <button mat-button class=\"smart-navbar-item\" [matMenuTriggerFor]=\"menuTheme\">Set Theme</button>\r\n  <mat-menu #menuTheme=\"matMenu\">\r\n    <button mat-menu-item (click)=\"onSetTheme('blue-theme')\">Blue</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('red-theme')\">Red</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('green-theme')\">Green</button>\r\n  </mat-menu>\r\n  <button mat-button class=\"smart-navbar-item smart-navbar-last-item\" [matMenuTriggerFor]=\"menu\"\r\n    *ngIf=\"isAuthenticated && loginStaff\">{{loginStaff.firstName + ' ' + loginStaff.lastName}}</button>\r\n  <mat-menu #menu=\"matMenu\">\r\n    <button mat-menu-item>Profile</button>\r\n    <button mat-menu-item (click)=\"logout()\">Sign Out</button>\r\n  </mat-menu>\r\n</nav>\r\n-->\r\n\r\n<!-- <nav mat-tab-nav-bar>\r\n  <a mat-tab-link mat-flat-button *ngFor=\"let config of navbarConfigs\" [active]=\"appModuleId == config.appModuleId\" href=\"{{config.url}}\">{{config.name}}</a>\r\n</nav> -->\r\n\r\n<mat-tab-group class=\"nav-tab-group\" [selectedIndex]=\"null\">\r\n  <ng-container *ngFor=\"let config of navbarConfigs\">\r\n    <mat-tab\r\n      *ngIf=\"\r\n        ((hasExternalUserRole && hasAppModulePermission(config.appModuleId)) ||\r\n        (!hasExternalUserRole && \r\n        (config.offenderSpecificFlag === false || selectedOffender))) &&\r\n        checkVictimPermission(config) &&\r\n        isAuthenticated &&\r\n        loginStaff \r\n      \"\r\n      label=\"config.name\"\r\n    >\r\n      <ng-template mat-tab-label>\r\n        <a\r\n          mat-flat-button\r\n          [ngClass]=\"{ 'main-menu-active': appModuleId == config.appModuleId }\"\r\n          [href]=\"getAppModuleUrl(config)\"\r\n          >{{ config.name }}</a\r\n        >\r\n      </ng-template>\r\n    </mat-tab>\r\n  </ng-container>\r\n</mat-tab-group>\r\n", styles: [".smart-navbar-container{display:flex;flex-wrap:wrap;flex-direction:column}.smart-navbar-item{font-size:1.2rem;line-height:1.2rem;padding:.5rem;background-color:var(--primary-color, #9fa8da);-webkit-text-decoration-line:none;text-decoration-line:none;display:block;text-align:left;border-radius:.3rem;margin:.1rem}.smart-navbar-last-item{margin-left:auto}.main-menu-active{border-bottom:3px solid darkblue!important;border-radius:0!important}.nav-tab-group.mat-primary .mat-ink-bar{background-color:inherit!important}.mat-tab-links{flex-direction:row;margin:4px;flex-wrap:wrap;font-family:Roboto,arial,sans-serif;font-size:13px}.mat-tab-link{min-width:16px!important}@media only screen and (min-width: 768px){.smart-navbar-container{flex-direction:row}.smart-navbar-item{text-align:center}.smart-navbar-toggle{display:none}}@media only screen and (max-width: 767px){#nav{position:fixed;top:0;bottom:0;width:300px;left:-340px;transition:transform .3s ease-in-out}#nav:target{transform:translate(340px)}}.mat-tab-labels{display:flex!important;justify-content:flex-start!important}.mat-tab-label,.mat-tab-label.mat-tab-label-active{min-width:25px!important;padding:0 5px!important;justify-content:flex-start!important;font-weight:700}\n"], components: [{ type: i4.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple"], exportAs: ["matTabGroup"] }, { type: i4.MatTab, selector: "mat-tab", inputs: ["disabled", "label", "aria-label", "aria-labelledby", "labelClass", "bodyClass"], exportAs: ["matTab"] }, { type: i5$1.MatAnchor, selector: "a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab],             a[mat-mini-fab], a[mat-stroked-button], a[mat-flat-button]", inputs: ["disabled", "disableRipple", "color", "tabIndex"], exportAs: ["matButton", "matAnchor"] }], directives: [{ type: i8.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i8.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i4.MatTabLabel, selector: "[mat-tab-label], [matTabLabel]" }, { type: i8.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }], encapsulation: i0.ViewEncapsulation.None });
+/** @nocollapse */ /** @nocollapse */ SmartNavbarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.2.5", type: SmartNavbarComponent, selector: "app-smart-navbar", inputs: { serviceApiUrl: "serviceApiUrl", appModuleId: "appModuleId" }, viewQueries: [{ propertyName: "tabGroup", first: true, predicate: ["tabs"], descendants: true }], usesOnChanges: true, ngImport: i0, template: "<!--\r\n<a class=\"smart-navbar-toggle open\" href=\"#nav\">\r\n  <i class=\"material-icons\">menu</i>\r\n</a>\r\n\r\n<nav id=\"nav\" role=\"navigation\" class=\"smart-navbar-container\">\r\n  <a class=\"smart-navbar-toggle close\" href=\"#\">\r\n    <i class=\"material-icons\">close</i>\r\n  </a>\r\n\r\n  <span *ngFor=\"let config of navbarConfigs\">\r\n    <a mat-button class=\"smart-navbar-item\" \r\n      *ngIf=\"(config.offenderSpecificFlag === false || selectedOffender) && isAuthenticated && loginStaff\" href=\"{{config.url}}\">{{config.name}}</a>\r\n  </span>\r\n\r\n  <button mat-button class=\"smart-navbar-item\" [matMenuTriggerFor]=\"menuTheme\">Set Theme</button>\r\n  <mat-menu #menuTheme=\"matMenu\">\r\n    <button mat-menu-item (click)=\"onSetTheme('blue-theme')\">Blue</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('red-theme')\">Red</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('green-theme')\">Green</button>\r\n  </mat-menu>\r\n  <button mat-button class=\"smart-navbar-item smart-navbar-last-item\" [matMenuTriggerFor]=\"menu\"\r\n    *ngIf=\"isAuthenticated && loginStaff\">{{loginStaff.firstName + ' ' + loginStaff.lastName}}</button>\r\n  <mat-menu #menu=\"matMenu\">\r\n    <button mat-menu-item>Profile</button>\r\n    <button mat-menu-item (click)=\"logout()\">Sign Out</button>\r\n  </mat-menu>\r\n</nav>\r\n-->\r\n\r\n<!-- <nav mat-tab-nav-bar>\r\n  <a mat-tab-link mat-flat-button *ngFor=\"let config of navbarConfigs\" [active]=\"appModuleId == config.appModuleId\" href=\"{{config.url}}\">{{config.name}}</a>\r\n</nav> -->\r\n\r\n<mat-tab-group class=\"nav-tab-group\" [selectedIndex]=\"null\">\r\n  <ng-container *ngFor=\"let config of navbarConfigs\">\r\n    <mat-tab\r\n      *ngIf=\"\r\n        ((hasExternalUserRole && hasAppModulePermission(config.appModuleId)) ||\r\n        (!hasExternalUserRole && \r\n        (config.offenderSpecificFlag === false || selectedOffender))) &&\r\n        checkVictimPermission(config) &&\r\n        checkDVIPPermission(config) &&\r\n        isAuthenticated &&\r\n        loginStaff \r\n      \"\r\n      label=\"config.name\"\r\n    >\r\n      <ng-template mat-tab-label>\r\n        <a\r\n          mat-flat-button\r\n          [ngClass]=\"{ 'main-menu-active': appModuleId == config.appModuleId }\"\r\n          [href]=\"getAppModuleUrl(config)\"\r\n          >{{ config.name }}</a\r\n        >\r\n      </ng-template>\r\n    </mat-tab>\r\n  </ng-container>\r\n</mat-tab-group>\r\n", styles: [".smart-navbar-container{display:flex;flex-wrap:wrap;flex-direction:column}.smart-navbar-item{font-size:1.2rem;line-height:1.2rem;padding:.5rem;background-color:var(--primary-color, #9fa8da);-webkit-text-decoration-line:none;text-decoration-line:none;display:block;text-align:left;border-radius:.3rem;margin:.1rem}.smart-navbar-last-item{margin-left:auto}.main-menu-active{border-bottom:3px solid darkblue!important;border-radius:0!important}.nav-tab-group.mat-primary .mat-ink-bar{background-color:inherit!important}.mat-tab-links{flex-direction:row;margin:4px;flex-wrap:wrap;font-family:Roboto,arial,sans-serif;font-size:13px}.mat-tab-link{min-width:16px!important}@media only screen and (min-width: 768px){.smart-navbar-container{flex-direction:row}.smart-navbar-item{text-align:center}.smart-navbar-toggle{display:none}}@media only screen and (max-width: 767px){#nav{position:fixed;top:0;bottom:0;width:300px;left:-340px;transition:transform .3s ease-in-out}#nav:target{transform:translate(340px)}}.mat-tab-labels{display:flex!important;justify-content:flex-start!important}.mat-tab-label,.mat-tab-label.mat-tab-label-active{min-width:25px!important;padding:0 5px!important;justify-content:flex-start!important;font-weight:700}\n"], components: [{ type: i4.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple"], exportAs: ["matTabGroup"] }, { type: i4.MatTab, selector: "mat-tab", inputs: ["disabled", "label", "aria-label", "aria-labelledby", "labelClass", "bodyClass"], exportAs: ["matTab"] }, { type: i5$1.MatAnchor, selector: "a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab],             a[mat-mini-fab], a[mat-stroked-button], a[mat-flat-button]", inputs: ["disabled", "disableRipple", "color", "tabIndex"], exportAs: ["matButton", "matAnchor"] }], directives: [{ type: i8.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i8.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i4.MatTabLabel, selector: "[mat-tab-label], [matTabLabel]" }, { type: i8.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }], encapsulation: i0.ViewEncapsulation.None });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: SmartNavbarComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'app-smart-navbar', encapsulation: ViewEncapsulation.None, template: "<!--\r\n<a class=\"smart-navbar-toggle open\" href=\"#nav\">\r\n  <i class=\"material-icons\">menu</i>\r\n</a>\r\n\r\n<nav id=\"nav\" role=\"navigation\" class=\"smart-navbar-container\">\r\n  <a class=\"smart-navbar-toggle close\" href=\"#\">\r\n    <i class=\"material-icons\">close</i>\r\n  </a>\r\n\r\n  <span *ngFor=\"let config of navbarConfigs\">\r\n    <a mat-button class=\"smart-navbar-item\" \r\n      *ngIf=\"(config.offenderSpecificFlag === false || selectedOffender) && isAuthenticated && loginStaff\" href=\"{{config.url}}\">{{config.name}}</a>\r\n  </span>\r\n\r\n  <button mat-button class=\"smart-navbar-item\" [matMenuTriggerFor]=\"menuTheme\">Set Theme</button>\r\n  <mat-menu #menuTheme=\"matMenu\">\r\n    <button mat-menu-item (click)=\"onSetTheme('blue-theme')\">Blue</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('red-theme')\">Red</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('green-theme')\">Green</button>\r\n  </mat-menu>\r\n  <button mat-button class=\"smart-navbar-item smart-navbar-last-item\" [matMenuTriggerFor]=\"menu\"\r\n    *ngIf=\"isAuthenticated && loginStaff\">{{loginStaff.firstName + ' ' + loginStaff.lastName}}</button>\r\n  <mat-menu #menu=\"matMenu\">\r\n    <button mat-menu-item>Profile</button>\r\n    <button mat-menu-item (click)=\"logout()\">Sign Out</button>\r\n  </mat-menu>\r\n</nav>\r\n-->\r\n\r\n<!-- <nav mat-tab-nav-bar>\r\n  <a mat-tab-link mat-flat-button *ngFor=\"let config of navbarConfigs\" [active]=\"appModuleId == config.appModuleId\" href=\"{{config.url}}\">{{config.name}}</a>\r\n</nav> -->\r\n\r\n<mat-tab-group class=\"nav-tab-group\" [selectedIndex]=\"null\">\r\n  <ng-container *ngFor=\"let config of navbarConfigs\">\r\n    <mat-tab\r\n      *ngIf=\"\r\n        ((hasExternalUserRole && hasAppModulePermission(config.appModuleId)) ||\r\n        (!hasExternalUserRole && \r\n        (config.offenderSpecificFlag === false || selectedOffender))) &&\r\n        checkVictimPermission(config) &&\r\n        isAuthenticated &&\r\n        loginStaff \r\n      \"\r\n      label=\"config.name\"\r\n    >\r\n      <ng-template mat-tab-label>\r\n        <a\r\n          mat-flat-button\r\n          [ngClass]=\"{ 'main-menu-active': appModuleId == config.appModuleId }\"\r\n          [href]=\"getAppModuleUrl(config)\"\r\n          >{{ config.name }}</a\r\n        >\r\n      </ng-template>\r\n    </mat-tab>\r\n  </ng-container>\r\n</mat-tab-group>\r\n", styles: [".smart-navbar-container{display:flex;flex-wrap:wrap;flex-direction:column}.smart-navbar-item{font-size:1.2rem;line-height:1.2rem;padding:.5rem;background-color:var(--primary-color, #9fa8da);-webkit-text-decoration-line:none;text-decoration-line:none;display:block;text-align:left;border-radius:.3rem;margin:.1rem}.smart-navbar-last-item{margin-left:auto}.main-menu-active{border-bottom:3px solid darkblue!important;border-radius:0!important}.nav-tab-group.mat-primary .mat-ink-bar{background-color:inherit!important}.mat-tab-links{flex-direction:row;margin:4px;flex-wrap:wrap;font-family:Roboto,arial,sans-serif;font-size:13px}.mat-tab-link{min-width:16px!important}@media only screen and (min-width: 768px){.smart-navbar-container{flex-direction:row}.smart-navbar-item{text-align:center}.smart-navbar-toggle{display:none}}@media only screen and (max-width: 767px){#nav{position:fixed;top:0;bottom:0;width:300px;left:-340px;transition:transform .3s ease-in-out}#nav:target{transform:translate(340px)}}.mat-tab-labels{display:flex!important;justify-content:flex-start!important}.mat-tab-label,.mat-tab-label.mat-tab-label-active{min-width:25px!important;padding:0 5px!important;justify-content:flex-start!important;font-weight:700}\n"] }]
+            args: [{ selector: 'app-smart-navbar', encapsulation: ViewEncapsulation.None, template: "<!--\r\n<a class=\"smart-navbar-toggle open\" href=\"#nav\">\r\n  <i class=\"material-icons\">menu</i>\r\n</a>\r\n\r\n<nav id=\"nav\" role=\"navigation\" class=\"smart-navbar-container\">\r\n  <a class=\"smart-navbar-toggle close\" href=\"#\">\r\n    <i class=\"material-icons\">close</i>\r\n  </a>\r\n\r\n  <span *ngFor=\"let config of navbarConfigs\">\r\n    <a mat-button class=\"smart-navbar-item\" \r\n      *ngIf=\"(config.offenderSpecificFlag === false || selectedOffender) && isAuthenticated && loginStaff\" href=\"{{config.url}}\">{{config.name}}</a>\r\n  </span>\r\n\r\n  <button mat-button class=\"smart-navbar-item\" [matMenuTriggerFor]=\"menuTheme\">Set Theme</button>\r\n  <mat-menu #menuTheme=\"matMenu\">\r\n    <button mat-menu-item (click)=\"onSetTheme('blue-theme')\">Blue</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('red-theme')\">Red</button>\r\n    <button mat-menu-item (click)=\"onSetTheme('green-theme')\">Green</button>\r\n  </mat-menu>\r\n  <button mat-button class=\"smart-navbar-item smart-navbar-last-item\" [matMenuTriggerFor]=\"menu\"\r\n    *ngIf=\"isAuthenticated && loginStaff\">{{loginStaff.firstName + ' ' + loginStaff.lastName}}</button>\r\n  <mat-menu #menu=\"matMenu\">\r\n    <button mat-menu-item>Profile</button>\r\n    <button mat-menu-item (click)=\"logout()\">Sign Out</button>\r\n  </mat-menu>\r\n</nav>\r\n-->\r\n\r\n<!-- <nav mat-tab-nav-bar>\r\n  <a mat-tab-link mat-flat-button *ngFor=\"let config of navbarConfigs\" [active]=\"appModuleId == config.appModuleId\" href=\"{{config.url}}\">{{config.name}}</a>\r\n</nav> -->\r\n\r\n<mat-tab-group class=\"nav-tab-group\" [selectedIndex]=\"null\">\r\n  <ng-container *ngFor=\"let config of navbarConfigs\">\r\n    <mat-tab\r\n      *ngIf=\"\r\n        ((hasExternalUserRole && hasAppModulePermission(config.appModuleId)) ||\r\n        (!hasExternalUserRole && \r\n        (config.offenderSpecificFlag === false || selectedOffender))) &&\r\n        checkVictimPermission(config) &&\r\n        checkDVIPPermission(config) &&\r\n        isAuthenticated &&\r\n        loginStaff \r\n      \"\r\n      label=\"config.name\"\r\n    >\r\n      <ng-template mat-tab-label>\r\n        <a\r\n          mat-flat-button\r\n          [ngClass]=\"{ 'main-menu-active': appModuleId == config.appModuleId }\"\r\n          [href]=\"getAppModuleUrl(config)\"\r\n          >{{ config.name }}</a\r\n        >\r\n      </ng-template>\r\n    </mat-tab>\r\n  </ng-container>\r\n</mat-tab-group>\r\n", styles: [".smart-navbar-container{display:flex;flex-wrap:wrap;flex-direction:column}.smart-navbar-item{font-size:1.2rem;line-height:1.2rem;padding:.5rem;background-color:var(--primary-color, #9fa8da);-webkit-text-decoration-line:none;text-decoration-line:none;display:block;text-align:left;border-radius:.3rem;margin:.1rem}.smart-navbar-last-item{margin-left:auto}.main-menu-active{border-bottom:3px solid darkblue!important;border-radius:0!important}.nav-tab-group.mat-primary .mat-ink-bar{background-color:inherit!important}.mat-tab-links{flex-direction:row;margin:4px;flex-wrap:wrap;font-family:Roboto,arial,sans-serif;font-size:13px}.mat-tab-link{min-width:16px!important}@media only screen and (min-width: 768px){.smart-navbar-container{flex-direction:row}.smart-navbar-item{text-align:center}.smart-navbar-toggle{display:none}}@media only screen and (max-width: 767px){#nav{position:fixed;top:0;bottom:0;width:300px;left:-340px;transition:transform .3s ease-in-out}#nav:target{transform:translate(340px)}}.mat-tab-labels{display:flex!important;justify-content:flex-start!important}.mat-tab-label,.mat-tab-label.mat-tab-label-active{min-width:25px!important;padding:0 5px!important;justify-content:flex-start!important;font-weight:700}\n"] }]
         }], ctorParameters: function () { return [{ type: SmartNavbarService }, { type: XdmService }, { type: i2.MsalService }]; }, propDecorators: { serviceApiUrl: [{
                 type: Input
             }], appModuleId: [{
@@ -888,7 +905,7 @@ class SmartAuthService {
             this.loginStaff = await this.xdmService.getLoginStaff();
         }
         const permissions = this.loginStaff.permissions;
-        const resource = (route.url && route.url.length > 0) ? route.url[0].path : '';
+        const resource = route.url && route.url.length > 0 ? route.url[0].path : '';
         if (!this.selectedOffender) {
             this.selectedOffender = await this.xdmService.getSelectedOffender();
         }
@@ -904,8 +921,7 @@ class SmartAuthService {
             this.xdmService.setSelectedOffender(this.selectedOffender);
             // }
         }
-        const assignmentStaffRelationId = this.selectedOffender
-            .assignmentStaffRelationId;
+        const assignmentStaffRelationId = this.selectedOffender.assignmentStaffRelationId;
         const elements = document.querySelectorAll('[class^="sac-"]');
         const pattern = /^sac-(\S+)-(\S+)$/i;
         Array.from(elements).forEach((element) => {
@@ -1006,7 +1022,8 @@ class SmartAuthService {
         this.loginStaff = selData.loginStaff;
         this.selectedOffender = selData.selectedOffender;
         let routePath = '';
-        if (accessControlConfig.route.url && accessControlConfig.route.url.length > 0) {
+        if (accessControlConfig.route.url &&
+            accessControlConfig.route.url.length > 0) {
             routePath = accessControlConfig.route.url[0].path;
         }
         const permissions = this.loginStaff.permissions;
@@ -1020,10 +1037,10 @@ class SmartAuthService {
             ? 'N/A'
             : this.selectedOffender.assignmentStaffRelationId;
         const permission = permissions.find((p) => {
-            return (p.appModuleId === accessControlConfig.appModuleId
-                && p.resource === resource
-                && (!roleId || p.roleId === roleId)
-                && (p.assignmentStaffRelationId === 'N/A' ||
+            return (p.appModuleId === accessControlConfig.appModuleId &&
+                p.resource === resource &&
+                (!roleId || p.roleId === roleId) &&
+                (p.assignmentStaffRelationId === 'N/A' ||
                     p.assignmentStaffRelationId === assignmentStaffRelationId));
         });
         if (permission) {
@@ -1126,72 +1143,87 @@ class SmartAuthService {
         element.setAttribute('style', 'display: none;');
     }
     getStaff(userName) {
-        const httpOptions = {
-            headers: new HttpHeaders({
-                'Content-Type': 'application/json',
-                'No-Auth': 'True',
-            }),
-        };
-        const queryString = `
-            {
-              findvStaffs(input: {where: {userName: "${userName}", activeFlag: true}}) {
-                totalCount
-                message
-                data {
-                  staffId
-                  userName
-                  lastName
-                  firstName
-                  phone
-                  email
-                  roles {
-                    roleId
-                    role
-                  }
-                  permissions {
-                    roleId
-                    appModuleId
-                    resource
-                    assignmentStaffRelationId
-                    readFlag
-                    createFlag
-                    updateFlag
-                    deleteFlag
-                    assignFlag
-                    reopenFlag
-                    closeFlag
-                    expungeFlag
-                  }
-                  options {
-                    offenderListOptionId
-                    name
-                    serviceApiFieldName
-                    selectedFlag
-                  }
-                }
-              }
-            }`;
-        return this.http
-            .post(this.smartDataServiceUrl, { query: queryString }, httpOptions)
-            .pipe(take(1), map((result) => {
+        return this.query({
+            query: this.findStaffQuery,
+            variables: {
+                where: {
+                    userName: userName,
+                    activeFlag: true,
+                },
+            },
+        }).pipe(take(1), map((result) => {
             if (isDevMode) {
                 console.log('##### getStaff() from service ', result);
             }
-            if (result.data.findvStaffs.data.length > 0) {
-                const data = result.data.findvStaffs.data[0];
+            if (result.findvStaffs.data.length > 0) {
+                const data = result.findvStaffs.data[0];
                 this.xdmService.setLoginStaff(data);
                 this.loginStaff = data;
                 return data;
             }
             else {
                 return of(null);
-                // return throwError('No access right.');
             }
         }), catchError((error) => {
             console.log('error ' + error);
             return of(null);
         }));
     }
+    query(options) {
+        return this.http
+            .post(this.smartDataServiceUrl, {
+            query: options.query,
+            variables: options.variables,
+        }, {
+            headers: new HttpHeaders({
+                'Content-Type': 'application/json',
+                'No-Auth': 'True',
+            }),
+        })
+            .pipe(map((d) => d.data));
+    }
+    get findStaffQuery() {
+        return `
+     query findvStaffs($input: vStaffMultiInput) {
+        findvStaffs(input: $input) {
+          totalCount
+          message
+          data {
+            staffId
+            userName
+            lastName
+            firstName
+            phone
+            email
+            roles {
+              roleId
+              role
+            }
+            permissions {
+              roleId
+              appModuleId
+              resource
+              assignmentStaffRelationId
+              readFlag
+              createFlag
+              updateFlag
+              deleteFlag
+              assignFlag
+              reopenFlag
+              closeFlag
+              expungeFlag
+            }
+            options {
+              offenderListOptionId
+              name
+              serviceApiFieldName
+              selectedFlag
+            }
+          }
+        }
+      }
+    `;
+    }
     getStaffOffenderRelation(staffId, offenderId) {
         const queryString = `
             {