npm - @bnsights/bbsf-admin-portal - Versions diffs - 1.0.5 → 1.0.6 - Mend

@bnsights/bbsf-admin-portal 1.0.5 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

package/fesm2015/bnsights-bbsf-admin-portal.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import * as i1$1 from '@angular/router';
 import { NavigationEnd, NavigationCancel, ResolveEnd, RouterModule, Router } from '@angular/router';
 import * as i1 from '@bnsights/bbsf-utilities';
-import { RequestOptionsModel, UtilityService, EnvironmentService, AuthService as AuthService$2, BBSFTranslateService, BBSFUtilitiesModule, TranslationResolverService, StylesBundleService as StylesBundleService$1, RequestHandlerService, MasterLayoutService } from '@bnsights/bbsf-utilities';
+import { RequestOptionsModel, UtilityService, EnvironmentService, AuthService as AuthService$2, BBSFTranslateService, BBSFUtilitiesModule, RequestHandlerService, TranslationResolverService, StylesBundleService as StylesBundleService$1, MasterLayoutService } from '@bnsights/bbsf-utilities';
 import { __awaiter, __decorate } from 'tslib';
 import * as i1$2 from 'ng-block-ui';
 import { BlockUI, BlockUIModule } from 'ng-block-ui';
@@ -3386,12 +3386,18 @@ class AuthGuard$1 {
         this.router = router;
         this.authService = authService;
         this.allowedPermission = [];
+        this.homeURL = "";
     }
     canActivate(route, state) {
         return __awaiter(this, void 0, void 0, function* () {
-            debugger;
-            if (yield this.authService.isAuthenticated(this.allowedPermission))
-                return true;
+            if (yield this.authService.isAuthenticated()) {
+                if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
+                    return true;
+                else if (this.homeURL) {
+                    this.router.navigate([this.homeURL]);
+                    return true;
+                }
+            }
             this.authService.setUrl(state.url);
             this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
             return false;
@@ -3762,10 +3768,10 @@ class LocalizationsComponent$1 {
             let AddModel = new EditResourceModel$1();
             AddModel.ResourceId = ResultModel.ResourceId;
             AddModel.ResourceSet = ResultModel.ResourceSet.value;
-            AddModel.ValueEN = ResultModel.Value.EnglishTextAreaValue;
-            AddModel.ValueAR = ResultModel.Value.ArabicTextAreaValue;
-            AddModel.CommentAr = ResultModel.Comment.ArabicTextAreaValue;
-            AddModel.CommentEn = ResultModel.Comment.EnglishTextAreaValue;
+            AddModel.ValueEN = ResultModel.Value.English;
+            AddModel.ValueAR = ResultModel.Value.English;
+            AddModel.CommentAr = ResultModel.Comment.English;
+            AddModel.CommentEn = ResultModel.Comment.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -3778,10 +3784,10 @@ class LocalizationsComponent$1 {
             let EditModel = new EditResourceModel$1();
             EditModel.ResourceId = this.editResourceId;
             EditModel.ResourceSet = this.editResourceSet;
-            EditModel.ValueEN = ResultModel.Value.EnglishTextAreaValue;
-            EditModel.ValueAR = ResultModel.Value.ArabicTextAreaValue;
-            EditModel.CommentEn = ResultModel.Comment.EnglishTextAreaValue;
-            EditModel.CommentAr = ResultModel.Comment.ArabicTextAreaValue;
+            EditModel.ValueEN = ResultModel.Value.English;
+            EditModel.ValueAR = ResultModel.Value.English;
+            EditModel.CommentEn = ResultModel.Comment.English;
+            EditModel.CommentAr = ResultModel.Comment.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -4359,8 +4365,8 @@ class PermissionsComponent$1 {
             let AddPermissionModel = new PermissionModel$1();
             if (this.ProductionMode == false)
                 AddPermissionModel.SysName = ResultModel.SysName;
-            AddPermissionModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddPermissionModel.Name.English = ResultModel.Name.EnglishValue;
+            AddPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddPermissionModel.Name.English = ResultModel.Name.English;
             AddPermissionModel.OrganizationID = Number(ResultModel.Organization);
             paramArray.push(AddPermissionModel);
             return paramArray;
@@ -4373,8 +4379,8 @@ class PermissionsComponent$1 {
             let ResultModel = this.editPermissionForm.value;
             let EditPermissionModel = new PermissionModel$1();
             EditPermissionModel.Id = this.editPermissionId;
-            EditPermissionModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditPermissionModel.Name.English = ResultModel.Name.EnglishValue;
+            EditPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditPermissionModel.Name.English = ResultModel.Name.English;
             if (this.ProductionMode == false)
                 EditPermissionModel.SysName = ResultModel.SysName;
             EditPermissionModel.OrganizationID = Number(ResultModel.Organization);
@@ -4630,8 +4636,8 @@ class PermissionsetsComponent$1 {
             let AddPermissionSetModel = new PermissionSetModel$1();
             if (this.ProductionMode == false)
                 AddPermissionSetModel.SysName = ResultModel.SysName;
-            AddPermissionSetModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddPermissionSetModel.Name.English = ResultModel.Name.EnglishValue;
+            AddPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddPermissionSetModel.Name.English = ResultModel.Name.English;
             AddPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
             let Ids = [];
             if (ResultModel.Permissions != null) {
@@ -4652,8 +4658,8 @@ class PermissionsetsComponent$1 {
             let ResultModel = this.editPermissionSetForm.value;
             let EditPermissionSetModel = new PermissionSetModel$1();
             EditPermissionSetModel.Id = this.editPermissionSetId;
-            EditPermissionSetModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditPermissionSetModel.Name.English = ResultModel.Name.EnglishValue;
+            EditPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditPermissionSetModel.Name.English = ResultModel.Name.English;
             if (this.ProductionMode == false)
                 EditPermissionSetModel.SysName = ResultModel.SydName;
             EditPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
@@ -5462,16 +5468,16 @@ class AddComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddForm.value;
             let AddModel = new EmailHeaderAndFooterTemplate$1();
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Header.English = ResultModel.Header.EnglishHtmlEditorValue;
-            AddModel.Header.Arabic = ResultModel.Header.ArabicHtmlEditorValue;
-            AddModel.Footer.English = ResultModel.Footer.EnglishHtmlEditorValue;
-            AddModel.Footer.Arabic = ResultModel.Footer.ArabicHtmlEditorValue;
-            AddModel.HeadSection.English = ResultModel.HtmlHeadSection.EnglishHtmlEditorValue;
-            AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.ArabicHtmlEditorValue;
-            AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.EnglishValue;
-            AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.ArabicValue;
+            AddModel.Name.English = ResultModel.Name.English;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Header.English = ResultModel.Header.English;
+            AddModel.Header.Arabic = ResultModel.Header.Arabic;
+            AddModel.Footer.English = ResultModel.Footer.English;
+            AddModel.Footer.Arabic = ResultModel.Footer.Arabic;
+            AddModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
+            AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
+            AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
+            AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -5568,16 +5574,16 @@ class EditComponent$1 {
             let ResultModel = this.EditForm.value;
             let EditModel = new EmailHeaderAndFooterTemplate$1();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Header.English = ResultModel.Header.EnglishHtmlEditorValue;
-            EditModel.Header.Arabic = ResultModel.Header.ArabicHtmlEditorValue;
-            EditModel.Footer.English = ResultModel.Footer.EnglishHtmlEditorValue;
-            EditModel.Footer.Arabic = ResultModel.Footer.ArabicHtmlEditorValue;
-            EditModel.HeadSection.English = ResultModel.HtmlHeadSection.EnglishHtmlEditorValue;
-            EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.ArabicHtmlEditorValue;
-            EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.EnglishValue;
-            EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.ArabicValue;
+            EditModel.Name.English = ResultModel.Name.English;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Header.English = ResultModel.Header.English;
+            EditModel.Header.Arabic = ResultModel.Header.Arabic;
+            EditModel.Footer.English = ResultModel.Footer.English;
+            EditModel.Footer.Arabic = ResultModel.Footer.Arabic;
+            EditModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
+            EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
+            EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
+            EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -5811,11 +5817,11 @@ class TemplatesComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddTemplateForm.value;
             let AddModel = new TemplateDTO$1();
-            AddModel.Name.Arabic = ResultModel.AddName.ArabicValue;
-            AddModel.Name.English = ResultModel.AddName.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.AddName.Arabic;
+            AddModel.Name.English = ResultModel.AddName.English;
             AddModel.SysName = ResultModel.AddSysName;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
+            AddModel.Description.English = ResultModel.AddDescription.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
             AddModel.OrganizationID = Number(ResultModel.AddOrganization);
             AddModel.CategoryItemID = Number(ResultModel.AddCategory);
             AddModel.LanguageModeItemID = Number(ResultModel.AddLanguageMode);
@@ -5834,11 +5840,11 @@ class TemplatesComponent$1 {
             let ResultModel = this.EditTemplateForm.value;
             let EditModel = new TemplateDTO$1();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
+            EditModel.Name.English = ResultModel.EditName.English;
             EditModel.SysName = ResultModel.EditSysName;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.OrganizationID = Number(ResultModel.EditOrganization);
             EditModel.CategoryItemID = Number(ResultModel.EditCategory);
             EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
@@ -6309,11 +6315,11 @@ class TemplateInfoComponent$1 {
             let ResultModel = this.EditTemplateForm.value;
             let EditModel = new TemplateDTO$1();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
+            EditModel.Name.English = ResultModel.EditName.English;
             EditModel.SysName = ResultModel.EditSysName ? ResultModel.EditSysName : this.EditSysNameValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.OrganizationID = Number(ResultModel.EditOrganization);
             EditModel.CategoryItemID = Number(ResultModel.EditCategory);
             EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
@@ -7149,14 +7155,14 @@ class LookupComponent$1 {
             let paramArray = [];
             let ResultModel = this.addLookupForm.value;
             let AddModel = new LookupModel$1();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             if (!this.ProductionMode) {
                 AddModel.SysName = ResultModel.SysName;
             }
             AddModel.Manageable = this.ProductionMode == true ? true : ResultModel.IsManageable;
-            AddModel.Description.English = ResultModel.Description.EnglishTextAreaValue;
-            AddModel.Description.Arabic = ResultModel.Description.ArabicTextAreaValue;
+            AddModel.Description.English = ResultModel.Description.English;
+            AddModel.Description.Arabic = ResultModel.Description.English;
             AddModel.LookupGroupID = ResultModel.LookupGroups != null ? Number(ResultModel.LookupGroups) : null;
             paramArray.push(AddModel);
             return paramArray;
@@ -7170,8 +7176,8 @@ class LookupComponent$1 {
             console.log(ResultModel);
             let EditModel = new LookupModel$1();
             EditModel.ID = Number(this.lookupId);
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
+            EditModel.Name.English = ResultModel.EditName.English;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
             if (!this.ProductionMode) {
                 EditModel.SysName = ResultModel.EditSysName;
                 EditModel.Manageable = ResultModel.EditIsManageable;
@@ -7182,8 +7188,8 @@ class LookupComponent$1 {
                 EditModel.Manageable = this.Lookup.manageable;
                 EditModel.LookupGroupID = this.Lookup.lookupGroupID;
             }
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -7532,8 +7538,8 @@ class LookupGroupComponent$1 {
             let paramArray = [];
             let ResultModel = this.addLookupGroupForm.value;
             let AddModel = new LookupGroupModel$1();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -7545,8 +7551,8 @@ class LookupGroupComponent$1 {
             let ResultModel = this.editLookupGroupForm.value;
             let EditModel = new LookupGroupModel$1();
             EditModel.Id = this.lookupGroupId;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
+            EditModel.Name.English = ResultModel.EditName.English;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -7728,8 +7734,8 @@ class LookupItemComponent$1 {
             let paramArray = [];
             let ResultModel = this.addLookupItemForm.value;
             let AddModel = new LookUpItem$1();
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
+            AddModel.Name.English = ResultModel.Name.English;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
             if (!this.ProductionMode) {
                 AddModel.SysName = ResultModel.SysName;
             }
@@ -7749,8 +7755,8 @@ class LookupItemComponent$1 {
             let EditModel = new LookUpItem$1();
             EditModel.ID = Number(this.lookupItemId);
             EditModel.LookupID = Number(this.editLookupId);
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
+            EditModel.Name.English = ResultModel.Name.English;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
             if (!this.ProductionMode) {
                 EditModel.SysName = ResultModel.EditSysName;
             }
@@ -8239,6 +8245,7 @@ class DepartmentComponent$1 {
     }
     //Paging functions
     setDepartmentListResult(result) {
+        console.log(result);
         this.DepartmentPagingResult = result;
         this.DepartmentFilteredList = this.DepartmentPagingResult;
         this.utilityService.stopBlockUI();
@@ -8267,6 +8274,7 @@ class DepartmentComponent$1 {
         this.AddSamAccount.Value = null;
         this.modalService.open(addDepartmentModal);
         this.utilityService.stopBlockUI();
+        console.log(this.AddSamAccount);
     }
     //Edit department
     showEditDepartmentModal(departmentId, departmentIDEnc, editDepartmentModal) {
@@ -8279,6 +8287,7 @@ class DepartmentComponent$1 {
         this.EditDepartmentFormOptions.OnErrorHandler = this.onEditDepartmentError;
         this.EditDepartmentFormOptions.PagingReference = this.pagingElement;
         this.DepartmentId = departmentId;
+        this.requestHandlerService.getLuckyNumber().subscribe(() => { });
         this.departmentService.getEditDepartment(departmentIDEnc).subscribe((result) => {
             let department = result.model;
             let name = new EnglishArabicDTO();
@@ -8324,7 +8333,7 @@ class DepartmentComponent$1 {
             this.DepartmentFilteredList = this.DepartmentPagingResult;
     }
     ngOnDestroy() {
-        this.requestHandlerService.destroyHandler();
+        this.requestHandlerService.onDestroy$.next();
     }
 }
 DepartmentComponent$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: DepartmentComponent$1, deps: [{ token: i1.EnvironmentService }, { token: DepartmentService$1 }, { token: i5.NgbModal }, { token: i1.AuthService }, { token: i1.UtilityService }, { token: PageInfoService }, { token: i1.RequestHandlerService }], target: i0.ɵɵFactoryTarget.Component });
@@ -8567,7 +8576,8 @@ DepartmentsModule$1.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", ver
         UtilityService,
         AuthService$2,
         BBSFTranslateService,
-        DepartmentService$1
+        DepartmentService$1,
+        RequestHandlerService
     ], imports: [[
             DepartmentsRoutingModule$1,
             CommonModule,
@@ -8612,7 +8622,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImpo
                         UtilityService,
                         AuthService$2,
                         BBSFTranslateService,
-                        DepartmentService$1
+                        DepartmentService$1,
+                        RequestHandlerService
                     ]
                 }]
         }] });
@@ -8690,8 +8701,8 @@ class SectorComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddSectorForm.value;
             let AddModel = new SectorModel$1();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -8703,8 +8714,8 @@ class SectorComponent$1 {
             let ResultModel = this.EditSectorForm.value;
             let EditModel = new SectorModel$1();
             EditModel.Id = this.SectorId;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Name.English = ResultModel.Name.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -11931,7 +11942,7 @@ class TabsComponent$1 {
             //console.log(ResultModel)
             let addModel = new WFVariableModel$1();
             addModel.Name.English = ResultModel.NameInEnglish;
-            addModel.Name.Arabic = ResultModel.EnglishValue;
+            addModel.Name.Arabic = ResultModel.English;
             addModel.SysName = ResultModel.SysName;
             addModel.WorkflowVersionID = Number(this.VersionId);
             addModel.DataTypeItemID = ResultModel.DataType != null ? Number(ResultModel.DataType) : null;
@@ -12407,8 +12418,8 @@ class PublicHolidayComponent$1 {
             let AddModel = new PublicHolidayModel$1();
             if (!this.ProductionMode)
                 AddModel.SysName = ResultModel.SysName;
-            AddModel.Name.Arabic = ResultModel.AddName.ArabicValue;
-            AddModel.Name.English = ResultModel.AddName.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.AddName.Arabic;
+            AddModel.Name.English = ResultModel.AddName.English;
             AddModel.Description.Arabic = ResultModel.DescriptionInArabic;
             AddModel.Description.English = ResultModel.DescriptionInEnglish;
             AddModel.CountryID = ResultModel.CountryOptions != null ? Number(ResultModel.CountryOptions) : null;
@@ -12426,8 +12437,8 @@ class PublicHolidayComponent$1 {
             let ResultModel = this.EditPublicHolidayForm.value;
             let EditModel = new PublicHolidayModel$1();
             EditModel.ID = Number(this.PublicHolidayId);
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Name.English = ResultModel.Name.English;
             if (!this.ProductionMode)
                 EditModel.SysName = ResultModel.EditSysName;
             EditModel.Description.English = ResultModel.EditDescriptionInEnglish;
@@ -12895,10 +12906,10 @@ class HelpCenterComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel$1();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
+            AddModel.Description.English = ResultModel.AddDescription.English;
             let arr = ResultModel.AddPermissionSetsOptions;
             let permissionSets = [];
             const toNumbers = arr => arr.map(Number);
@@ -12923,10 +12934,10 @@ class HelpCenterComponent$1 {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel$1();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue; //(##1)
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             EditModel.LogoFileDTO = ResultModel.EditLogo == "" ? null : ResultModel.EditLogo;
             EditModel.LogoFileID = this.EditLogoFileID;
@@ -13205,10 +13216,10 @@ class HelpCenterSecondlevelComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel$1();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
+            AddModel.Description.English = ResultModel.AddDescription.English;
             AddModel.IsHidden = ResultModel.AddIsHidden;
             AddModel.ParentIDEncrypted = this.ParentId;
             paramArray.push(AddModel);
@@ -13222,10 +13233,10 @@ class HelpCenterSecondlevelComponent$1 {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel$1();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue;
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Title.English = ResultModel.EditTitle.English;
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             paramArray.push(EditModel);
             return paramArray;
@@ -13436,10 +13447,10 @@ class HelpCenterThirdlevelComponent$1 {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel$1();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Html.Arabic = ResultModel.AddContent.ArabicHtmlEditorValue;
-            AddModel.Html.English = ResultModel.AddContent.EnglishHtmlEditorValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Html.Arabic = ResultModel.AddContent.Arabic;
+            AddModel.Html.English = ResultModel.AddContent.English;
             AddModel.IsHidden = ResultModel.AddIsHidden;
             AddModel.ParentIDEncrypted = this.ParentId;
             AddModel.IsParent = true;
@@ -13455,10 +13466,10 @@ class HelpCenterThirdlevelComponent$1 {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel$1();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue; //(##1)
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Html.English = ResultModel.EditContent.EnglishHtmlEditorValue;
-            EditModel.Html.Arabic = ResultModel.EditContent.ArabicHtmlEditorValue;
+            EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Html.English = ResultModel.EditContent.English;
+            EditModel.Html.Arabic = ResultModel.EditContent.Arabic;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             paramArray.push(EditModel);
             return paramArray;
@@ -14850,8 +14861,8 @@ class UsersComponent$1 {
             let ResultModel = this.AddUserForm.value;
             let AddModel = new AddUserModel$1();
             AddModel.Username = ResultModel.AddUsername;
-            AddModel.NameAR = ResultModel.AddName.ArabicValue;
-            AddModel.NameEN = ResultModel.AddName.EnglishValue;
+            AddModel.NameAR = ResultModel.AddName.Arabic;
+            AddModel.NameEN = ResultModel.AddName.English;
             AddModel.SamAccount = ResultModel.AddSamAccount;
             AddModel.OrganizationID = 1;
             if (ResultModel.AddDepartmentID != undefined)
@@ -14878,8 +14889,8 @@ class UsersComponent$1 {
             EditModel.ID = this.UserId;
             EditModel.Username = ResultModel.EditUsername;
             EditModel.Email = ResultModel.EditEmail;
-            EditModel.NameAR = ResultModel.EditName.ArabicValue;
-            EditModel.NameEN = ResultModel.EditName.EnglishValue;
+            EditModel.NameAR = ResultModel.EditName.Arabic;
+            EditModel.NameEN = ResultModel.EditName.English;
             EditModel.SamAccount = ResultModel.EditSamAccount;
             if (ResultModel.EditDepartmentID != undefined)
                 EditModel.DepartmentID = Number(ResultModel.EditDepartmentID);
@@ -17240,7 +17251,6 @@ MasterlayoutModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", vers
         StylesBundleService$1,
         EnvironmentService,
         AuthService$2,
-        RequestHandlerService,
         UtilityService,
         AuthGuard$1,
         BBSFTranslateService,
@@ -17316,7 +17326,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImpo
                         StylesBundleService$1,
                         EnvironmentService,
                         AuthService$2,
-                        RequestHandlerService,
                         UtilityService,
                         AuthGuard$1,
                         BBSFTranslateService,
@@ -17806,8 +17815,8 @@ class UsersComponent {
             let ResultModel = this.AddUserForm.value;
             let AddModel = new AddUserModel();
             AddModel.Username = ResultModel.AddUsername;
-            AddModel.NameAR = ResultModel.AddName.ArabicValue;
-            AddModel.NameEN = ResultModel.AddName.EnglishValue;
+            AddModel.NameAR = ResultModel.AddName.Arabic;
+            AddModel.NameEN = ResultModel.AddName.English;
             AddModel.SamAccount = ResultModel.AddSamAccount;
             AddModel.OrganizationID = 1;
             if (ResultModel.AddDepartmentID != undefined)
@@ -17834,8 +17843,8 @@ class UsersComponent {
             EditModel.ID = this.UserId;
             EditModel.Username = ResultModel.EditUsername;
             EditModel.Email = ResultModel.EditEmail;
-            EditModel.NameAR = ResultModel.EditName.ArabicValue;
-            EditModel.NameEN = ResultModel.EditName.EnglishValue;
+            EditModel.NameAR = ResultModel.EditName.Arabic;
+            EditModel.NameEN = ResultModel.EditName.English;
             EditModel.SamAccount = ResultModel.EditSamAccount;
             if (ResultModel.EditDepartmentID != undefined)
                 EditModel.DepartmentID = Number(ResultModel.EditDepartmentID);
@@ -19103,10 +19112,10 @@ class LocalizationsComponent {
             let AddModel = new EditResourceModel();
             AddModel.ResourceId = ResultModel.ResourceId;
             AddModel.ResourceSet = ResultModel.ResourceSet.value;
-            AddModel.ValueEN = ResultModel.Value.EnglishTextAreaValue;
-            AddModel.ValueAR = ResultModel.Value.ArabicTextAreaValue;
-            AddModel.CommentAr = ResultModel.Comment.ArabicTextAreaValue;
-            AddModel.CommentEn = ResultModel.Comment.EnglishTextAreaValue;
+            AddModel.ValueEN = ResultModel.Value.English;
+            AddModel.ValueAR = ResultModel.Value.English;
+            AddModel.CommentAr = ResultModel.Comment.English;
+            AddModel.CommentEn = ResultModel.Comment.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -19119,10 +19128,10 @@ class LocalizationsComponent {
             let EditModel = new EditResourceModel();
             EditModel.ResourceId = this.editResourceId;
             EditModel.ResourceSet = this.editResourceSet;
-            EditModel.ValueEN = ResultModel.Value.EnglishTextAreaValue;
-            EditModel.ValueAR = ResultModel.Value.ArabicTextAreaValue;
-            EditModel.CommentEn = ResultModel.Comment.EnglishTextAreaValue;
-            EditModel.CommentAr = ResultModel.Comment.ArabicTextAreaValue;
+            EditModel.ValueEN = ResultModel.Value.English;
+            EditModel.ValueAR = ResultModel.Value.English;
+            EditModel.CommentEn = ResultModel.Comment.English;
+            EditModel.CommentAr = ResultModel.Comment.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -19735,12 +19744,18 @@ class AuthGuard {
         this.router = router;
         this.authService = authService;
         this.allowedPermission = [];
+        this.homeURL = "";
     }
     canActivate(route, state) {
         return __awaiter(this, void 0, void 0, function* () {
-            debugger;
-            if (yield this.authService.isAuthenticated(this.allowedPermission))
-                return true;
+            if (yield this.authService.isAuthenticated()) {
+                if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
+                    return true;
+                else if (this.homeURL) {
+                    this.router.navigate([this.homeURL]);
+                    return true;
+                }
+            }
             this.authService.setUrl(state.url);
             this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
             return false;
@@ -19877,8 +19892,8 @@ class PermissionsComponent {
             let AddPermissionModel = new PermissionModel();
             if (this.ProductionMode == false)
                 AddPermissionModel.SysName = ResultModel.SysName;
-            AddPermissionModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddPermissionModel.Name.English = ResultModel.Name.EnglishValue;
+            AddPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddPermissionModel.Name.English = ResultModel.Name.English;
             AddPermissionModel.OrganizationID = Number(ResultModel.Organization);
             paramArray.push(AddPermissionModel);
             return paramArray;
@@ -19891,8 +19906,8 @@ class PermissionsComponent {
             let ResultModel = this.editPermissionForm.value;
             let EditPermissionModel = new PermissionModel();
             EditPermissionModel.Id = this.editPermissionId;
-            EditPermissionModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditPermissionModel.Name.English = ResultModel.Name.EnglishValue;
+            EditPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditPermissionModel.Name.English = ResultModel.Name.English;
             if (this.ProductionMode == false)
                 EditPermissionModel.SysName = ResultModel.SysName;
             EditPermissionModel.OrganizationID = Number(ResultModel.Organization);
@@ -20148,8 +20163,8 @@ class PermissionsetsComponent {
             let AddPermissionSetModel = new PermissionSetModel();
             if (this.ProductionMode == false)
                 AddPermissionSetModel.SysName = ResultModel.SysName;
-            AddPermissionSetModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddPermissionSetModel.Name.English = ResultModel.Name.EnglishValue;
+            AddPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddPermissionSetModel.Name.English = ResultModel.Name.English;
             AddPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
             let Ids = [];
             if (ResultModel.Permissions != null) {
@@ -20170,8 +20185,8 @@ class PermissionsetsComponent {
             let ResultModel = this.editPermissionSetForm.value;
             let EditPermissionSetModel = new PermissionSetModel();
             EditPermissionSetModel.Id = this.editPermissionSetId;
-            EditPermissionSetModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditPermissionSetModel.Name.English = ResultModel.Name.EnglishValue;
+            EditPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditPermissionSetModel.Name.English = ResultModel.Name.English;
             if (this.ProductionMode == false)
                 EditPermissionSetModel.SysName = ResultModel.SydName;
             EditPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
@@ -20899,16 +20914,16 @@ class AddComponent {
             let paramArray = [];
             let ResultModel = this.AddForm.value;
             let AddModel = new EmailHeaderAndFooterTemplate();
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Header.English = ResultModel.Header.EnglishHtmlEditorValue;
-            AddModel.Header.Arabic = ResultModel.Header.ArabicHtmlEditorValue;
-            AddModel.Footer.English = ResultModel.Footer.EnglishHtmlEditorValue;
-            AddModel.Footer.Arabic = ResultModel.Footer.ArabicHtmlEditorValue;
-            AddModel.HeadSection.English = ResultModel.HtmlHeadSection.EnglishHtmlEditorValue;
-            AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.ArabicHtmlEditorValue;
-            AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.EnglishValue;
-            AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.ArabicValue;
+            AddModel.Name.English = ResultModel.Name.English;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Header.English = ResultModel.Header.English;
+            AddModel.Header.Arabic = ResultModel.Header.Arabic;
+            AddModel.Footer.English = ResultModel.Footer.English;
+            AddModel.Footer.Arabic = ResultModel.Footer.Arabic;
+            AddModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
+            AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
+            AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
+            AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -21005,16 +21020,16 @@ class EditComponent {
             let ResultModel = this.EditForm.value;
             let EditModel = new EmailHeaderAndFooterTemplate();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Header.English = ResultModel.Header.EnglishHtmlEditorValue;
-            EditModel.Header.Arabic = ResultModel.Header.ArabicHtmlEditorValue;
-            EditModel.Footer.English = ResultModel.Footer.EnglishHtmlEditorValue;
-            EditModel.Footer.Arabic = ResultModel.Footer.ArabicHtmlEditorValue;
-            EditModel.HeadSection.English = ResultModel.HtmlHeadSection.EnglishHtmlEditorValue;
-            EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.ArabicHtmlEditorValue;
-            EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.EnglishValue;
-            EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.ArabicValue;
+            EditModel.Name.English = ResultModel.Name.English;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Header.English = ResultModel.Header.English;
+            EditModel.Header.Arabic = ResultModel.Header.Arabic;
+            EditModel.Footer.English = ResultModel.Footer.English;
+            EditModel.Footer.Arabic = ResultModel.Footer.Arabic;
+            EditModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
+            EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
+            EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
+            EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -21248,11 +21263,11 @@ class TemplatesComponent {
             let paramArray = [];
             let ResultModel = this.AddTemplateForm.value;
             let AddModel = new TemplateDTO();
-            AddModel.Name.Arabic = ResultModel.AddName.ArabicValue;
-            AddModel.Name.English = ResultModel.AddName.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.AddName.Arabic;
+            AddModel.Name.English = ResultModel.AddName.English;
             AddModel.SysName = ResultModel.AddSysName;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
+            AddModel.Description.English = ResultModel.AddDescription.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
             AddModel.OrganizationID = Number(ResultModel.AddOrganization);
             AddModel.CategoryItemID = Number(ResultModel.AddCategory);
             AddModel.LanguageModeItemID = Number(ResultModel.AddLanguageMode);
@@ -21271,11 +21286,11 @@ class TemplatesComponent {
             let ResultModel = this.EditTemplateForm.value;
             let EditModel = new TemplateDTO();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
+            EditModel.Name.English = ResultModel.EditName.English;
             EditModel.SysName = ResultModel.EditSysName;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.OrganizationID = Number(ResultModel.EditOrganization);
             EditModel.CategoryItemID = Number(ResultModel.EditCategory);
             EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
@@ -21746,11 +21761,11 @@ class TemplateInfoComponent {
             let ResultModel = this.EditTemplateForm.value;
             let EditModel = new TemplateDTO();
             EditModel.ID = Number(this.TemplateId);
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
+            EditModel.Name.English = ResultModel.EditName.English;
             EditModel.SysName = ResultModel.EditSysName ? ResultModel.EditSysName : this.EditSysNameValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.OrganizationID = Number(ResultModel.EditOrganization);
             EditModel.CategoryItemID = Number(ResultModel.EditCategory);
             EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
@@ -22586,14 +22601,14 @@ class LookupComponent {
             let paramArray = [];
             let ResultModel = this.addLookupForm.value;
             let AddModel = new LookupModel();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             if (!this.ProductionMode) {
                 AddModel.SysName = ResultModel.SysName;
             }
             AddModel.Manageable = this.ProductionMode == true ? true : ResultModel.IsManageable;
-            AddModel.Description.English = ResultModel.Description.EnglishTextAreaValue;
-            AddModel.Description.Arabic = ResultModel.Description.ArabicTextAreaValue;
+            AddModel.Description.English = ResultModel.Description.English;
+            AddModel.Description.Arabic = ResultModel.Description.English;
             AddModel.LookupGroupID = ResultModel.LookupGroups != null ? Number(ResultModel.LookupGroups) : null;
             paramArray.push(AddModel);
             return paramArray;
@@ -22607,8 +22622,8 @@ class LookupComponent {
             console.log(ResultModel);
             let EditModel = new LookupModel();
             EditModel.ID = Number(this.lookupId);
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
+            EditModel.Name.English = ResultModel.EditName.English;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
             if (!this.ProductionMode) {
                 EditModel.SysName = ResultModel.EditSysName;
                 EditModel.Manageable = ResultModel.EditIsManageable;
@@ -22619,8 +22634,8 @@ class LookupComponent {
                 EditModel.Manageable = this.Lookup.manageable;
                 EditModel.LookupGroupID = this.Lookup.lookupGroupID;
             }
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -22969,8 +22984,8 @@ class LookupGroupComponent {
             let paramArray = [];
             let ResultModel = this.addLookupGroupForm.value;
             let AddModel = new LookupGroupModel();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -22982,8 +22997,8 @@ class LookupGroupComponent {
             let ResultModel = this.editLookupGroupForm.value;
             let EditModel = new LookupGroupModel();
             EditModel.Id = this.lookupGroupId;
-            EditModel.Name.English = ResultModel.EditName.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.EditName.ArabicValue;
+            EditModel.Name.English = ResultModel.EditName.English;
+            EditModel.Name.Arabic = ResultModel.EditName.Arabic;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -23165,8 +23180,8 @@ class LookupItemComponent {
             let paramArray = [];
             let ResultModel = this.addLookupItemForm.value;
             let AddModel = new LookUpItem();
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
+            AddModel.Name.English = ResultModel.Name.English;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
             if (!this.ProductionMode) {
                 AddModel.SysName = ResultModel.SysName;
             }
@@ -23186,8 +23201,8 @@ class LookupItemComponent {
             let EditModel = new LookUpItem();
             EditModel.ID = Number(this.lookupItemId);
             EditModel.LookupID = Number(this.editLookupId);
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
+            EditModel.Name.English = ResultModel.Name.English;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
             if (!this.ProductionMode) {
                 EditModel.SysName = ResultModel.EditSysName;
             }
@@ -23676,6 +23691,7 @@ class DepartmentComponent {
     }
     //Paging functions
     setDepartmentListResult(result) {
+        console.log(result);
         this.DepartmentPagingResult = result;
         this.DepartmentFilteredList = this.DepartmentPagingResult;
         this.utilityService.stopBlockUI();
@@ -23704,6 +23720,7 @@ class DepartmentComponent {
         this.AddSamAccount.Value = null;
         this.modalService.open(addDepartmentModal);
         this.utilityService.stopBlockUI();
+        console.log(this.AddSamAccount);
     }
     //Edit department
     showEditDepartmentModal(departmentId, departmentIDEnc, editDepartmentModal) {
@@ -23716,6 +23733,7 @@ class DepartmentComponent {
         this.EditDepartmentFormOptions.OnErrorHandler = this.onEditDepartmentError;
         this.EditDepartmentFormOptions.PagingReference = this.pagingElement;
         this.DepartmentId = departmentId;
+        this.requestHandlerService.getLuckyNumber().subscribe(() => { });
         this.departmentService.getEditDepartment(departmentIDEnc).subscribe((result) => {
             let department = result.model;
             let name = new EnglishArabicDTO();
@@ -23761,7 +23779,7 @@ class DepartmentComponent {
             this.DepartmentFilteredList = this.DepartmentPagingResult;
     }
     ngOnDestroy() {
-        this.requestHandlerService.destroyHandler();
+        this.requestHandlerService.onDestroy$.next();
     }
 }
 DepartmentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: DepartmentComponent, deps: [{ token: i1.EnvironmentService }, { token: DepartmentService }, { token: i5.NgbModal }, { token: i1.AuthService }, { token: i1.UtilityService }, { token: PageInfoService }, { token: i1.RequestHandlerService }], target: i0.ɵɵFactoryTarget.Component });
@@ -24004,7 +24022,8 @@ DepartmentsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", versi
         UtilityService,
         AuthService$2,
         BBSFTranslateService,
-        DepartmentService
+        DepartmentService,
+        RequestHandlerService
     ], imports: [[
             DepartmentsRoutingModule,
             CommonModule,
@@ -24049,7 +24068,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImpo
                         UtilityService,
                         AuthService$2,
                         BBSFTranslateService,
-                        DepartmentService
+                        DepartmentService,
+                        RequestHandlerService
                     ]
                 }]
         }] });
@@ -24127,8 +24147,8 @@ class SectorComponent {
             let paramArray = [];
             let ResultModel = this.AddSectorForm.value;
             let AddModel = new SectorModel();
-            AddModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            AddModel.Name.English = ResultModel.Name.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.Name.Arabic;
+            AddModel.Name.English = ResultModel.Name.English;
             paramArray.push(AddModel);
             return paramArray;
         };
@@ -24140,8 +24160,8 @@ class SectorComponent {
             let ResultModel = this.EditSectorForm.value;
             let EditModel = new SectorModel();
             EditModel.Id = this.SectorId;
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Name.English = ResultModel.Name.English;
             paramArray.push(EditModel);
             return paramArray;
         };
@@ -27368,7 +27388,7 @@ class TabsComponent {
             //console.log(ResultModel)
             let addModel = new WFVariableModel();
             addModel.Name.English = ResultModel.NameInEnglish;
-            addModel.Name.Arabic = ResultModel.EnglishValue;
+            addModel.Name.Arabic = ResultModel.English;
             addModel.SysName = ResultModel.SysName;
             addModel.WorkflowVersionID = Number(this.VersionId);
             addModel.DataTypeItemID = ResultModel.DataType != null ? Number(ResultModel.DataType) : null;
@@ -27844,8 +27864,8 @@ class PublicHolidayComponent {
             let AddModel = new PublicHolidayModel();
             if (!this.ProductionMode)
                 AddModel.SysName = ResultModel.SysName;
-            AddModel.Name.Arabic = ResultModel.AddName.ArabicValue;
-            AddModel.Name.English = ResultModel.AddName.EnglishValue;
+            AddModel.Name.Arabic = ResultModel.AddName.Arabic;
+            AddModel.Name.English = ResultModel.AddName.English;
             AddModel.Description.Arabic = ResultModel.DescriptionInArabic;
             AddModel.Description.English = ResultModel.DescriptionInEnglish;
             AddModel.CountryID = ResultModel.CountryOptions != null ? Number(ResultModel.CountryOptions) : null;
@@ -27863,8 +27883,8 @@ class PublicHolidayComponent {
             let ResultModel = this.EditPublicHolidayForm.value;
             let EditModel = new PublicHolidayModel();
             EditModel.ID = Number(this.PublicHolidayId);
-            EditModel.Name.Arabic = ResultModel.Name.ArabicValue;
-            EditModel.Name.English = ResultModel.Name.EnglishValue;
+            EditModel.Name.Arabic = ResultModel.Name.Arabic;
+            EditModel.Name.English = ResultModel.Name.English;
             if (!this.ProductionMode)
                 EditModel.SysName = ResultModel.EditSysName;
             EditModel.Description.English = ResultModel.EditDescriptionInEnglish;
@@ -28332,10 +28352,10 @@ class HelpCenterComponent {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
+            AddModel.Description.English = ResultModel.AddDescription.English;
             let arr = ResultModel.AddPermissionSetsOptions;
             let permissionSets = [];
             const toNumbers = arr => arr.map(Number);
@@ -28360,10 +28380,10 @@ class HelpCenterComponent {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue; //(##1)
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             EditModel.LogoFileDTO = ResultModel.EditLogo == "" ? null : ResultModel.EditLogo;
             EditModel.LogoFileID = this.EditLogoFileID;
@@ -28642,10 +28662,10 @@ class HelpCenterSecondlevelComponent {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Description.Arabic = ResultModel.AddDescription.ArabicTextAreaValue;
-            AddModel.Description.English = ResultModel.AddDescription.EnglishTextAreaValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Description.Arabic = ResultModel.AddDescription.English;
+            AddModel.Description.English = ResultModel.AddDescription.English;
             AddModel.IsHidden = ResultModel.AddIsHidden;
             AddModel.ParentIDEncrypted = this.ParentId;
             paramArray.push(AddModel);
@@ -28659,10 +28679,10 @@ class HelpCenterSecondlevelComponent {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue;
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Description.English = ResultModel.EditDescription.EnglishTextAreaValue;
-            EditModel.Description.Arabic = ResultModel.EditDescription.ArabicTextAreaValue;
+            EditModel.Title.English = ResultModel.EditTitle.English;
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Description.English = ResultModel.EditDescription.English;
+            EditModel.Description.Arabic = ResultModel.EditDescription.English;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             paramArray.push(EditModel);
             return paramArray;
@@ -28873,10 +28893,10 @@ class HelpCenterThirdlevelComponent {
             let paramArray = [];
             let ResultModel = this.AddHelpCenterForm.value;
             let AddModel = new HelpCenterItemModel();
-            AddModel.Title.Arabic = ResultModel.AddTitle.ArabicValue;
-            AddModel.Title.English = ResultModel.AddTitle.EnglishValue;
-            AddModel.Html.Arabic = ResultModel.AddContent.ArabicHtmlEditorValue;
-            AddModel.Html.English = ResultModel.AddContent.EnglishHtmlEditorValue;
+            AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
+            AddModel.Title.English = ResultModel.AddTitle.English;
+            AddModel.Html.Arabic = ResultModel.AddContent.Arabic;
+            AddModel.Html.English = ResultModel.AddContent.English;
             AddModel.IsHidden = ResultModel.AddIsHidden;
             AddModel.ParentIDEncrypted = this.ParentId;
             AddModel.IsParent = true;
@@ -28892,10 +28912,10 @@ class HelpCenterThirdlevelComponent {
             let ResultModel = this.EditHelpCenterForm.value;
             let EditModel = new HelpCenterItemModel();
             EditModel.ID = Number(this.HelpCenterItemId);
-            EditModel.Title.English = ResultModel.EditTitle.EnglishValue; //(##1)
-            EditModel.Title.Arabic = ResultModel.EditTitle.ArabicValue;
-            EditModel.Html.English = ResultModel.EditContent.EnglishHtmlEditorValue;
-            EditModel.Html.Arabic = ResultModel.EditContent.ArabicHtmlEditorValue;
+            EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
+            EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
+            EditModel.Html.English = ResultModel.EditContent.English;
+            EditModel.Html.Arabic = ResultModel.EditContent.Arabic;
             EditModel.IsHidden = ResultModel.EditIsHidden;
             paramArray.push(EditModel);
             return paramArray;
@@ -31088,5 +31108,5 @@ class UserRegistration {
  * Generated bundle index. Do not edit.
  */
-export { AccountComponent, AccountModule, AuthCallbackComponent, AuthGuard, AuthModule$1 as AuthModule, AuthService, AuthenticationModule, BaseService, DataSecretService$1 as DataSecretService, DefaultLayoutConfig, GlobalErrorHandler, HomeComponent$1 as HomeComponent, HomeModule, IndexComponent, InjectedModule, LayoutInitService, LayoutService, LocalizationsComponent, LocalizationsModule, LoginComponent, MasterlayoutComponent, MasterlayoutModule, PageInfo, PageInfoService, RegisterComponent, SharedModule, StartModule, StylesBundleService, SubheaderComponent, SubheaderModule$1 as SubheaderModule, UserRegistration, UsersComponent, UsersModule, createTranslateLoader, getClientSettings, getEmptyCSSVariables, getEmptyCssClasses, getEmptyHTMLAttributes, injectionModuleService, localizationsService };
+export { AccountComponent, AccountModule, AuthCallbackComponent, AuthGuard, AuthModule$1 as AuthModule, AuthService, AuthenticationModule, BaseService, DataSecretService$1 as DataSecretService, DefaultLayoutConfig, DepartmentModel$1 as DepartmentModel, GlobalErrorHandler, HomeComponent$1 as HomeComponent, HomeModule, IndexComponent, InjectedModule, LayoutInitService, LayoutService, LocalizationsComponent, LocalizationsModule, LoginComponent, MasterlayoutComponent, MasterlayoutModule, PageInfo, PageInfoService, RegisterComponent, SharedModule, StartModule, StylesBundleService, SubheaderComponent, SubheaderModule$1 as SubheaderModule, UserRegistration, UsersComponent, UsersModule, createTranslateLoader, getClientSettings, getEmptyCSSVariables, getEmptyCssClasses, getEmptyHTMLAttributes, injectionModuleService, localizationsService };
 //# sourceMappingURL=bnsights-bbsf-admin-portal.js.map