@bnsights/bbsf-utilities 1.0.3 → 1.0.7

package/bundles/bnsights-bbsf-utilities.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/common'), require('@angular/core'), require('@angular/router'), require('@ngx-translate/core'), require('ng-block-ui'), require('ngx-toastr'), require('@angular/http'), require('@angular/common/http'), require('oidc-client'), require('rxjs'), require('rxjs/operators')) :
-    typeof define === 'function' && define.amd ? define('@bnsights/bbsf-utilities', ['exports', '@angular/common', '@angular/core', '@angular/router', '@ngx-translate/core', 'ng-block-ui', 'ngx-toastr', '@angular/http', '@angular/common/http', 'oidc-client', 'rxjs', 'rxjs/operators'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.bnsights = global.bnsights || {}, global.bnsights["bbsf-utilities"] = {}), global.ng.common, global.ng.core, global.ng.router, global.i1, global.ngBlockUi, global.ngxToastr, global.ng.http, global.ng.common.http, global.oidcClient, global.rxjs, global.rxjs.operators));
-})(this, (function (exports, i1$2, i0, i1$3, i1, ngBlockUi, ngxToastr, http, i1$1, oidcClient, rxjs, operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/common'), require('@angular/core'), require('@angular/router'), require('@ngx-translate/core'), require('ng-block-ui'), require('ngx-toastr'), require('@angular/http'), require('@angular/common/http'), require('oidc-client'), require('rxjs'), require('rxjs/operators'), require('class-transformer')) :
+    typeof define === 'function' && define.amd ? define('@bnsights/bbsf-utilities', ['exports', '@angular/common', '@angular/core', '@angular/router', '@ngx-translate/core', 'ng-block-ui', 'ngx-toastr', '@angular/http', '@angular/common/http', 'oidc-client', 'rxjs', 'rxjs/operators', 'class-transformer'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.bnsights = global.bnsights || {}, global.bnsights["bbsf-utilities"] = {}), global.ng.common, global.ng.core, global.ng.router, global.i1, global.ngBlockUi, global.ngxToastr, global.ng.http, global.ng.common.http, global.oidcClient, global.rxjs, global.rxjs.operators, global.classTransformer));
+})(this, (function (exports, i1$2, i0, i4, i1, ngBlockUi, ngxToastr, http, i1$1, oidcClient, rxjs, operators, classTransformer) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -24,7 +24,7 @@
 
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
-    var i1__namespace$3 = /*#__PURE__*/_interopNamespace(i1$3);
+    var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
     var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1$1);
 
@@ -386,6 +386,7 @@
         };
         return EnvironmentService;
     }());
+    EnvironmentService.AreaList = [];
     EnvironmentService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function EnvironmentService_Factory() { return new EnvironmentService(); }, token: EnvironmentService, providedIn: "root" });
     EnvironmentService.decorators = [
         { type: i0.Injectable, args: [{
@@ -408,11 +409,12 @@
     ];
 
     var AuthService = /** @class */ (function () {
-        function AuthService(http, environmentService, translateService) {
+        function AuthService(http, environmentService, translateService, router) {
             var _this = this;
             this.http = http;
             this.environmentService = environmentService;
             this.translateService = translateService;
+            this.router = router;
             // Observable navItem source
             this._authNavStatusSource = new rxjs.BehaviorSubject(false);
             // Observable navItem stream
@@ -499,10 +501,11 @@
                         case 1:
                             _a.user = _d.sent();
                             AuthService.user = this.user;
-                            localStorage.setItem("language", this.user.profile.locale);
-                            if (!(this.translateService.currentLang != this.user.profile.locale)) return [3 /*break*/, 3];
+                            if (!localStorage.getItem("language") || localStorage.getItem("language") == this.user.profile.locale)
+                                localStorage.setItem("language", this.user.profile.locale);
+                            if (!(this.translateService.currentLang != localStorage.getItem("language"))) return [3 /*break*/, 3];
                             this.translateService.resetLang(this.translateService.currentLang);
-                            return [4 /*yield*/, this.translateService.reloadLang(this.user.profile.locale).subscribe(function (res) {
+                            return [4 /*yield*/, this.translateService.reloadLang(localStorage.getItem("language")).subscribe(function (res) {
                                     console.log(res);
                                 })];
                         case 2:
@@ -546,9 +549,9 @@
         AuthService.prototype.getCurrentUser = function () {
             return this.manager.getUser();
         };
-        AuthService.prototype.isAuthenticated = function (allowedPermission) {
+        AuthService.prototype.isAuthenticated = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var user, isUserInRole;
+                var user;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.manager.getUser().then(function (user) {
@@ -556,26 +559,14 @@
                             })];
                         case 1:
                             user = _a.sent();
-                            if (allowedPermission != null && allowedPermission != undefined) {
-                                if (allowedPermission.length == 0) {
-                                    return [2 /*return*/, this.user != null && !this.user.expired];
-                                }
-                                else {
-                                    isUserInRole = this.isUserInRole(allowedPermission);
-                                    return [2 /*return*/, this.user != null && !this.user.expired && isUserInRole];
-                                }
-                            }
-                            else
-                                return [2 /*return*/, this.user != null && !this.user.expired];
-                            return [2 /*return*/];
+                            return [2 /*return*/, this.user != null && !this.user.expired];
                     }
                 });
             });
         };
         AuthService.prototype.isUserInRole = function (allowedPermission) {
-            ;
-            var permissionSetSID = this.user.profile["permissionSetSID"].split(templateObject_1 || (templateObject_1 = __makeTemplateObject([","], [","]))).map(function (x) { return +x; });
-            return allowedPermission.every(function (i) { return permissionSetSID.includes(i); });
+            var selectedPermissionSetID = Number.parseInt(this.user.profile["selectedpermissionsetid"]);
+            return allowedPermission.includes(selectedPermissionSetID);
         };
         AuthService.prototype.authorizationHeaderValue = function () {
             return AuthService.user ? AuthService.user.token_type + " " + AuthService.user.access_token : "";
@@ -610,10 +601,13 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0:
-                            localStorage.clear();
-                            return [4 /*yield*/, this.manager.signoutRedirect()];
+                        case 0: return [4 /*yield*/, !this.isAuthenticated()];
                         case 1:
+                            if (_a.sent())
+                                this.router.navigate(['/Admin/account/login']),
+                                    localStorage.clear();
+                            return [4 /*yield*/, this.manager.signoutRedirect()];
+                        case 2:
                             _a.sent();
                             return [2 /*return*/];
                     }
@@ -623,7 +617,7 @@
         return AuthService;
     }());
     AuthService.user = null;
-    AuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(EnvironmentService), i0__namespace.ɵɵinject(BBSFTranslateService)); }, token: AuthService, providedIn: "root" });
+    AuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(EnvironmentService), i0__namespace.ɵɵinject(BBSFTranslateService), i0__namespace.ɵɵinject(i4__namespace.Router)); }, token: AuthService, providedIn: "root" });
     AuthService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
@@ -632,9 +626,9 @@
     AuthService.ctorParameters = function () { return [
         { type: i1$1.HttpClient },
         { type: EnvironmentService },
-        { type: BBSFTranslateService }
-    ]; };
-    var templateObject_1;
+        { type: BBSFTranslateService },
+        { type: i4.Router }
+    ]; };
 
     var UtilityService = /** @class */ (function () {
         function UtilityService(translator, authService, environmentService) {
@@ -657,10 +651,10 @@
             return currentLanguage;
         };
         UtilityService.prototype.isCurrentLanguageEnglish = function () {
-            this.getCurrentLanguage() == "en";
+            return this.getCurrentLanguage() == "en";
         };
         UtilityService.prototype.isCurrentLanguageArabic = function () {
-            this.getCurrentLanguage() == "ar";
+            return this.getCurrentLanguage() == "ar";
         };
         UtilityService.prototype.notifySuccessMessage = function (Message, title, time) {
             var MessageTemplate = this.getResourceValue("SuccessMessage");
@@ -731,48 +725,248 @@
         return RequestOptionsModel;
     }());
 
+    var RequestHandlerService = /** @class */ (function () {
+        function RequestHandlerService(http, authService, environmentService, utilityService, bbsfTranslateService) {
+            var _this = this;
+            //using localStorage  to avoid call getCurrentLanguage() because it is not all to use async in constructor
+            this.http = http;
+            this.authService = authService;
+            this.environmentService = environmentService;
+            this.utilityService = utilityService;
+            this.bbsfTranslateService = bbsfTranslateService;
+            this.requestOptions = new RequestOptionsModel();
+            this.currentLanguage = "";
+            this.onDestroy$ = new rxjs.Subject();
+            this.bbsfTranslateService.onLangChange.subscribe(function (event) {
+                if (_this.currentLanguage != event.lang) {
+                    _this.currentLanguage = event.lang;
+                }
+            });
+        }
+        RequestHandlerService.prototype.getLuckyNumber = function () {
+            return rxjs.Observable.create(function (subject) {
+                setInterval(function () {
+                    var number = Math.floor(Math.random() * 10);
+                    console.log(number);
+                    subject.next(number);
+                }, 1000);
+            }).pipe(operators.takeUntil(this.onDestroy$));
+        };
+        RequestHandlerService.prototype.get = function (Url, params, responseType, requestOptions) {
+            var _this = this;
+            if (requestOptions)
+                this.requestOptions = requestOptions;
+            var headers = new i1$1.HttpHeaders({
+                'Content-Type': 'application/json',
+                'Authorization': this.authService.authorizationHeaderValue(),
+            });
+            this.currentLanguage = localStorage.getItem('language');
+            headers = headers.set('Accept-Language', this.currentLanguage.toString());
+            headers = headers.set('ignore-cookies', 'true');
+            if (!this.requestOptions.disableBlockUI)
+                this.utilityService.startBlockUI();
+            var object;
+            return this.http.get(this.environmentService.getApiUrl() + Url, { headers: headers, params: params }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
+                if (!_this.requestOptions.disableBlockUI)
+                    _this.utilityService.stopBlockUI();
+            }), operators.map(function (data) {
+                return classTransformer.plainToClass(responseType, data, { excludeExtraneousValues: true });
+            }));
+        };
+        RequestHandlerService.prototype.post = function (Url, model, responseType, params, requestOptions) {
+            var _this = this;
+            if (requestOptions)
+                this.requestOptions = requestOptions;
+            var headers = new i1$1.HttpHeaders({
+                'Content-Type': 'application/json',
+                'Authorization': this.authService.authorizationHeaderValue(),
+            });
+            this.currentLanguage = localStorage.getItem('language');
+            headers = headers.set('Accept-Language', this.currentLanguage.toString());
+            headers = headers.set('ignore-cookies', 'true');
+            if (!this.requestOptions.disableBlockUI)
+                this.utilityService.startBlockUI();
+            return this.http.post(this.environmentService.getApiUrl() + Url, model, { headers: headers, params: params, responseType: this.requestOptions.responseType }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
+                if (!_this.requestOptions.disableBlockUI)
+                    _this.utilityService.stopBlockUI();
+            }), operators.map(function (data) {
+                return classTransformer.plainToClass(responseType, data, { excludeExtraneousValues: true });
+            }));
+        };
+        RequestHandlerService.prototype.delete = function (Url, deletedId, requestOptions, responseType, params) {
+            var _this = this;
+            if (requestOptions)
+                this.requestOptions = requestOptions;
+            var headers = new i1$1.HttpHeaders({
+                'Content-Type': 'application/json',
+                'Authorization': this.authService.authorizationHeaderValue(),
+            });
+            this.currentLanguage = localStorage.getItem('language');
+            headers = headers.set('Accept-Language', this.currentLanguage.toString());
+            headers = headers.set('ignore-cookies', 'true');
+            if (!this.requestOptions.disableBlockUI)
+                this.utilityService.startBlockUI();
+            return this.http.delete(this.environmentService.getApiUrl() + Url + ("/" + deletedId), { headers: headers, params: params }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
+                if (!_this.requestOptions.disableBlockUI)
+                    _this.utilityService.stopBlockUI();
+            }), operators.map(function (data) {
+                return classTransformer.plainToClass(responseType, data, { excludeExtraneousValues: true });
+            }));
+        };
+        RequestHandlerService.prototype.put = function (Url, model, params, responseType, requestOptions) {
+            var _this = this;
+            if (requestOptions)
+                this.requestOptions = requestOptions;
+            var headers = new i1$1.HttpHeaders({
+                'Content-Type': 'application/json',
+                'Authorization': this.authService.authorizationHeaderValue(),
+            });
+            this.currentLanguage = localStorage.getItem('language');
+            headers = headers.set('Accept-Language', this.currentLanguage.toString());
+            headers = headers.set('ignore-cookies', 'true');
+            if (!this.requestOptions.disableBlockUI)
+                this.utilityService.startBlockUI();
+            return this.http.put(this.environmentService.getApiUrl() + Url, model, { headers: headers, params: params, responseType: this.requestOptions.responseType }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
+                if (!_this.requestOptions.disableBlockUI)
+                    _this.utilityService.stopBlockUI();
+            }), operators.map(function (data) {
+                return classTransformer.plainToClass(responseType, data, { excludeExtraneousValues: true });
+            }));
+        };
+        RequestHandlerService.prototype.destroyHandler = function () {
+            this.onDestroy$.next();
+        };
+        RequestHandlerService.prototype.ngOnDestroy = function () {
+            console.log("clearInterval");
+            this.destroyHandler();
+        };
+        return RequestHandlerService;
+    }());
+    RequestHandlerService.decorators = [
+        { type: i0.Injectable }
+    ];
+    RequestHandlerService.ctorParameters = function () { return [
+        { type: i1$1.HttpClient },
+        { type: AuthService },
+        { type: EnvironmentService },
+        { type: UtilityService },
+        { type: BBSFTranslateService }
+    ]; };
+
+    var StylesBundleService = /** @class */ (function () {
+        function StylesBundleService(document, translateService) {
+            this.document = document;
+            this.translateService = translateService;
+        }
+        StylesBundleService.prototype.loadThemes = function (lang, bundleEnglishName, bundleArabicName) {
+            if (lang == "ar") {
+                this.loadStyleBundle(bundleArabicName.toString());
+                document.querySelector('html').setAttribute("lang", "ar");
+                document.querySelector('html').setAttribute("dir", "rtl");
+            }
+            else {
+                this.loadStyleBundle(bundleEnglishName.toString());
+                document.querySelector('html').setAttribute("lang", "en");
+                document.querySelector('html').setAttribute("dir", "ltr");
+            }
+        };
+        StylesBundleService.prototype.loadThemesColor = function (theme, bundleDarkName, bundleLightName) {
+            if (theme == "Light")
+                this.loadStyleBundle(bundleLightName.toString());
+            else
+                this.loadStyleBundle(bundleDarkName.toString());
+        };
+        StylesBundleService.prototype.loadStyleBundle = function (styleName) {
+            var head = this.document.getElementsByTagName('head')[0];
+            var themeLink = this.document.getElementById('client-theme');
+            if (themeLink && themeLink.href.includes(styleName)) {
+                return;
+            }
+            else if (themeLink && !themeLink.href.includes(styleName)) {
+                themeLink.remove();
+            }
+            var style = this.document.createElement('link');
+            style.id = 'client-theme';
+            style.rel = 'stylesheet';
+            style.href = "" + styleName;
+            head.appendChild(style);
+        };
+        return StylesBundleService;
+    }());
+    StylesBundleService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function StylesBundleService_Factory() { return new StylesBundleService(i0__namespace.ɵɵinject(i1__namespace$2.DOCUMENT), i0__namespace.ɵɵinject(BBSFTranslateService)); }, token: StylesBundleService, providedIn: "root" });
+    StylesBundleService.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    StylesBundleService.ctorParameters = function () { return [
+        { type: Document, decorators: [{ type: i0.Inject, args: [i1$2.DOCUMENT,] }] },
+        { type: BBSFTranslateService }
+    ]; };
+
     var ControlValidationService = /** @class */ (function () {
         function ControlValidationService(utilityService) {
             this.utilityService = utilityService;
             this.requestOptions = new RequestOptionsModel();
             this.isCreatedBefor = false;
         }
-        ControlValidationService.prototype.showGlobalError = function (errorMessage, formId) {
-            var globalErorrElement = document.getElementsByClassName('alert alert-danger alert-InvalidValidation');
+        ControlValidationService.prototype.showGlobalError = function (errorMessage, formId, deleteOld) {
+            var e_1, _a;
+            var globalErorrElement = document.getElementsByClassName('alert alert-InvalidValidation bg-light-danger text-danger');
             if (globalErorrElement.length > 0) {
-                this.removeElementsByClass('alert alert-danger alert-InvalidValidation');
+                this.removeElementsByClass('alert alert-InvalidValidation bg-light-danger text-danger');
             }
             if (this.isCreatedBefor == true) {
-                this.removeElementsByClass('alert alert-danger alert-InvalidValidation');
+                this.removeElementsByClass('alert alert-InvalidValidation bg-light-danger text-danger');
             }
             // tslint:disable-next-line: prefer-const
             if (!formId)
                 formId = "currentForm";
-            var objects = document.querySelectorAll("#" + formId);
+            var object = document.getElementById(formId);
             var tagName = 'div';
             // tslint:disable-next-line: prefer-const
             var elementToAppend = document.createElement(tagName); // Your tag name here
             var message = "";
-            if (localStorage.getItem('language') == "ar")
-                message = errorMessage ? errorMessage : "لديك بعص الأخطاء . من فضلك قم بالمراجعه ";
-            else
-                message = errorMessage ? errorMessage : "You have some validation errors. Please check below";
-            elementToAppend.innerHTML = "<ul><li>" + message + "</li></ul>";
-            elementToAppend.className += 'alert alert-danger alert-InvalidValidation';
-            elementToAppend.id += 'errorId';
-            // tslint:disable-next-line: prefer-for-of
-            for (var i = 0; i < objects.length; i++) {
-                // const elementToAppen = elementToAppend.cloneNode(true);
-                // objects[i].insertBefore(elementToAppen, objects[i].firstChild);
+            if (!errorMessage || (typeof errorMessage == "string")) {
+                if (localStorage.getItem('language') == "ar")
+                    message = errorMessage ? errorMessage : "لديك بعص الأخطاء . من فضلك قم بالمراجعه ";
+                else
+                    message = errorMessage ? errorMessage : "You have some validation errors. Please check below";
+                elementToAppend.innerHTML = "<ul class='list-unstyled m-0 py-3 d-flex align-items-center fs-6'><li><i class='fa fa-times-circle text-danger me-3 fs-2'></i>" + message + "</li></ul>";
+                elementToAppend.className += 'alert alert-InvalidValidation bg-light-danger text-danger';
+                elementToAppend.id += 'errorId';
+                // tslint:disable-next-line: prefer-for-of
+                var elementToAppen = elementToAppend.cloneNode(true);
+                // let targetElement = object.getElementsByClassName("b-control")[0];
+                object.insertBefore(elementToAppen, object.firstChild);
+            }
+            else {
+                elementToAppend.innerHTML = "<ul>";
+                try {
+                    for (var errorMessage_1 = __values(errorMessage), errorMessage_1_1 = errorMessage_1.next(); !errorMessage_1_1.done; errorMessage_1_1 = errorMessage_1.next()) {
+                        var iterator = errorMessage_1_1.value;
+                        elementToAppend.innerHTML = "<li>" + iterator + "</li>";
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (errorMessage_1_1 && !errorMessage_1_1.done && (_a = errorMessage_1.return)) _a.call(errorMessage_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                elementToAppend.innerHTML = "</ul>";
+                elementToAppend.className += 'alert alert-InvalidValidation bg-light-danger text-danger';
+                elementToAppend.id += 'errorId';
+                // tslint:disable-next-line: prefer-for-of
                 var elementToAppen = elementToAppend.cloneNode(true);
-                var targetElement = objects[i].getElementsByClassName("b-control")[0];
-                targetElement.parentNode.insertBefore(elementToAppen, targetElement);
-                this.isCreatedBefor = true;
-                break;
+                // let targetElement = object.getElementsByClassName("b-control")[0];
+                object.insertBefore(elementToAppen, object.firstChild);
             }
+            this.isCreatedBefor = true;
         };
         ControlValidationService.prototype.RemoveGlobalError = function () {
-            var removedList = document.getElementsByClassName('alert alert-danger alert-InvalidValidation');
+            var removedList = document.getElementsByClassName('alert alert-InvalidValidation bg-light-danger text-danger');
             // tslint:disable-next-line: prefer-for-of
             for (var index = 0; index < removedList.length; index++) {
                 var element = removedList[index];
@@ -781,7 +975,7 @@
             this.isCreatedBefor = false;
         };
         ControlValidationService.prototype.showInputErro = function (errors) {
-            var e_1, _a;
+            var e_2, _a;
             // show error on top of form 
             this.showGlobalError();
             // remove old error from server
@@ -790,7 +984,7 @@
             for (var key in errors) {
                 if (errors.hasOwnProperty(key)) {
                     try {
-                        for (var _b = (e_1 = void 0, __values(errors[key])), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        for (var _b = (e_2 = void 0, __values(errors[key])), _c = _b.next(); !_c.done; _c = _b.next()) {
                             var iterator = _c.value;
                             var input = document.querySelectorAll('[ng-reflect-name=' + key + ']')[0];
                             if (input.attributes['ng-reflect-name'].value === key) {
@@ -806,12 +1000,12 @@
                             }
                         }
                     }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
                         try {
                             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_2) throw e_2.error; }
                     }
                 }
             }
@@ -822,56 +1016,60 @@
                 elements[0].parentNode.removeChild(elements[0]);
             }
         };
-        ControlValidationService.prototype.renderServerErrors = function (form, err, requestOptions) {
+        ControlValidationService.prototype.renderServerErrors = function (form, err, requestOptions, formId) {
             var _this = this;
             if (err.error == null) {
                 return;
             }
+            var errorsArray = [];
             this.requestOptions = requestOptions;
             err.error.validation_errors.forEach(function (element) {
                 var fieldName = element.field;
-                var controlName = element.control_name;
+                var controlName = element.controlName;
                 var message = element.message;
                 if (form == null) {
                     _this.requestOptions.customErrorMessage ? _this.utilityService.notifyErrorMessage(_this.requestOptions.customErrorMessage) : _this.utilityService.notifyErrorMessage(fieldName + ": " + message);
                 }
-                else if (!_this.hasControlName(form, controlName)) {
-                    _this.showGlobalError(fieldName + ": " + message);
+                else if (controlName && !_this.hasControlName(form, controlName)) {
+                    errorsArray.push(fieldName + ": " + message);
+                    // this.showGlobalError(`${fieldName}: ${message}`,formId )
                 }
                 else {
                     _this.setFieldError(form, controlName, fieldName, message);
                 }
             });
+            if (errorsArray.length > 0)
+                this.showGlobalError(errorsArray, formId);
         };
         ControlValidationService.prototype.hasControlName = function (form, controlName) {
             var control = form.get(controlName);
             return control != null;
         };
         ControlValidationService.prototype.setFieldError = function (form, controlName, fieldName, message) {
-            var _a;
-            var control = form.get(controlName);
-            var errors = (_a = {}, _a[message] = true, _a);
+            var control = null;
+            if (controlName)
+                control = form.get(controlName);
+            else
+                control = form.get(fieldName.split('.')[0]);
+            var errors = { "errorMassage": message };
             var fieldNameArray = fieldName.split('.');
             if (fieldNameArray.length >= 1) {
-                switch (fieldNameArray[length - 1].toLocaleLowerCase()) {
+                switch (fieldNameArray[fieldNameArray.length - 1].toLocaleLowerCase()) {
                     case "english":
-                        var englishControl = control.get("EnglishValue");
+                        var englishControl = control.get("English");
                         englishControl.setErrors(errors);
-                        englishControl.markAsTouched();
-                        englishControl.updateValueAndValidity();
                         break;
                     case "arabic":
-                        var arabicControl = control.get("ArabicValue");
+                        var arabicControl = control.get("Arabic");
                         arabicControl.setErrors(errors);
-                        arabicControl.markAsTouched();
-                        arabicControl.updateValueAndValidity();
                         break;
                     default:
                         control.setErrors(errors);
-                        control.markAsTouched();
-                        control.updateValueAndValidity();
                 }
             }
+            else if (fieldNameArray.length == 1) {
+                control.setErrors(errors);
+            }
             else {
                 this.requestOptions.customErrorMessage ? this.utilityService.notifyErrorMessage(this.requestOptions.customErrorMessage) : this.utilityService.notifyErrorMessage(fieldName + ": " + message);
             }
@@ -891,124 +1089,6 @@
         ngBlockUi.BlockUI()
     ], ControlValidationService.prototype, "blockUI", void 0);
 
-    var RequestHandlerService = /** @class */ (function () {
-        function RequestHandlerService(http, authService, environmentService, utilityService, controlValidationService, bbsfTranslateService) {
-            var _this = this;
-            //using localStorage  to avoid call getCurrentLanguage() because it is not all to use async in constructor
-            this.http = http;
-            this.authService = authService;
-            this.environmentService = environmentService;
-            this.utilityService = utilityService;
-            this.controlValidationService = controlValidationService;
-            this.bbsfTranslateService = bbsfTranslateService;
-            this.requestOptions = new RequestOptionsModel();
-            this.currentLanguage = "";
-            this.onDestroy$ = new rxjs.Subject();
-            this.bbsfTranslateService.onLangChange.subscribe(function (event) {
-                if (_this.currentLanguage != event.lang) {
-                    _this.currentLanguage = event.lang;
-                }
-            });
-        }
-        RequestHandlerService.prototype.get = function (Url, params, requestOptions) {
-            var _this = this;
-            if (requestOptions)
-                this.requestOptions = requestOptions;
-            var headers = new i1$1.HttpHeaders({
-                'Content-Type': 'application/json',
-                'Authorization': this.authService.authorizationHeaderValue(),
-            });
-            this.currentLanguage = localStorage.getItem('language');
-            headers = headers.set('Accept-Language', this.currentLanguage.toString());
-            if (!this.requestOptions.disableBlockUI)
-                this.utilityService.startBlockUI();
-            return this.http.get(this.environmentService.getApiUrl() + Url, { headers: headers, params: params }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
-                if (!_this.requestOptions.disableBlockUI)
-                    _this.utilityService.stopBlockUI();
-            }));
-        };
-        RequestHandlerService.prototype.post = function (Url, model, params, requestOptions) {
-            var _this = this;
-            if (requestOptions)
-                this.requestOptions = requestOptions;
-            var headers = new i1$1.HttpHeaders({
-                'Content-Type': 'application/json',
-                'Authorization': this.authService.authorizationHeaderValue(),
-            });
-            this.currentLanguage = localStorage.getItem('language');
-            headers = headers.set('Accept-Language', this.currentLanguage.toString());
-            if (!this.requestOptions.disableBlockUI)
-                this.utilityService.startBlockUI();
-            return this.http.post(this.environmentService.getApiUrl() + Url, model, { headers: headers, params: params, responseType: this.requestOptions.responseType }).pipe(operators.takeUntil(this.onDestroy$), operators.tap(function (result) {
-                if (!_this.requestOptions.disableBlockUI)
-                    _this.utilityService.stopBlockUI();
-            }));
-        };
-        RequestHandlerService.prototype.destroyHandler = function () {
-            this.onDestroy$.next();
-        };
-        return RequestHandlerService;
-    }());
-    RequestHandlerService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function RequestHandlerService_Factory() { return new RequestHandlerService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(AuthService), i0__namespace.ɵɵinject(EnvironmentService), i0__namespace.ɵɵinject(UtilityService), i0__namespace.ɵɵinject(ControlValidationService), i0__namespace.ɵɵinject(BBSFTranslateService)); }, token: RequestHandlerService, providedIn: "root" });
-    RequestHandlerService.decorators = [
-        { type: i0.Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    RequestHandlerService.ctorParameters = function () { return [
-        { type: i1$1.HttpClient },
-        { type: AuthService },
-        { type: EnvironmentService },
-        { type: UtilityService },
-        { type: ControlValidationService },
-        { type: BBSFTranslateService }
-    ]; };
-
-    var StylesBundleService = /** @class */ (function () {
-        function StylesBundleService(document, translateService) {
-            this.document = document;
-            this.translateService = translateService;
-        }
-        StylesBundleService.prototype.loadThemes = function (lang, bundleEnglishName, bundleArabicName) {
-            if (lang == "ar") {
-                this.loadStyleBundle(bundleArabicName.toString());
-                document.querySelector('html').setAttribute("lang", "ar");
-                document.querySelector('html').setAttribute("dir", "rtl");
-            }
-            else {
-                this.loadStyleBundle(bundleEnglishName.toString());
-                document.querySelector('html').setAttribute("lang", "en");
-                document.querySelector('html').setAttribute("dir", "ltr");
-            }
-        };
-        StylesBundleService.prototype.loadStyleBundle = function (styleName) {
-            var head = this.document.getElementsByTagName('head')[0];
-            var themeLink = this.document.getElementById('client-theme');
-            if (themeLink && themeLink.href.includes(styleName)) {
-                return;
-            }
-            else if (themeLink && !themeLink.href.includes(styleName)) {
-                themeLink.remove();
-            }
-            var style = this.document.createElement('link');
-            style.id = 'client-theme';
-            style.rel = 'stylesheet';
-            style.href = "" + styleName;
-            head.appendChild(style);
-        };
-        return StylesBundleService;
-    }());
-    StylesBundleService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function StylesBundleService_Factory() { return new StylesBundleService(i0__namespace.ɵɵinject(i1__namespace$2.DOCUMENT), i0__namespace.ɵɵinject(BBSFTranslateService)); }, token: StylesBundleService, providedIn: "root" });
-    StylesBundleService.decorators = [
-        { type: i0.Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    StylesBundleService.ctorParameters = function () { return [
-        { type: Document, decorators: [{ type: i0.Inject, args: [i1$2.DOCUMENT,] }] },
-        { type: BBSFTranslateService }
-    ]; };
-
     var MasterLayoutService = /** @class */ (function () {
         function MasterLayoutService(router, http, authService, stylesBundleService, translate) {
             this.router = router;
@@ -1042,21 +1122,21 @@
             var params = new i1$1.HttpParams();
             params = params.append("UserId", this.authService.user.profile.id);
             params = params.append("LanguageKey", key);
-            return this.http.post(this.ApiUrl + 'updateLaguage', null, params);
+            return this.http.post(this.ApiUrl + 'updateLaguage', null, null, params);
         };
         MasterLayoutService.prototype.updateUserInfo = function () {
             return this.http.get('/connect/userinfo');
         };
         return MasterLayoutService;
     }());
-    MasterLayoutService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function MasterLayoutService_Factory() { return new MasterLayoutService(i0__namespace.ɵɵinject(i1__namespace$3.Router), i0__namespace.ɵɵinject(RequestHandlerService), i0__namespace.ɵɵinject(AuthService), i0__namespace.ɵɵinject(StylesBundleService), i0__namespace.ɵɵinject(i1__namespace.TranslateService)); }, token: MasterLayoutService, providedIn: "root" });
+    MasterLayoutService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function MasterLayoutService_Factory() { return new MasterLayoutService(i0__namespace.ɵɵinject(i4__namespace.Router), i0__namespace.ɵɵinject(RequestHandlerService), i0__namespace.ɵɵinject(AuthService), i0__namespace.ɵɵinject(StylesBundleService), i0__namespace.ɵɵinject(i1__namespace.TranslateService)); }, token: MasterLayoutService, providedIn: "root" });
     MasterLayoutService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
                 },] }
     ];
     MasterLayoutService.ctorParameters = function () { return [
-        { type: i1$3.Router },
+        { type: i4.Router },
         { type: RequestHandlerService },
         { type: AuthService },
         { type: StylesBundleService },
@@ -1078,7 +1158,7 @@
                         i1$2.CommonModule,
                         ngBlockUi.BlockUIModule.forRoot(),
                         http.HttpModule,
-                        i1$3.RouterModule,
+                        i4.RouterModule,
                         ngxToastr.ToastrModule.forRoot(),
                     ],
                     exports: [],