@senior-gestao-relacionamento/angular-components 1.7.1 → 1.7.2-feat-crmdev-11520-b0d4e267

package/bundles/senior-gestao-relacionamento-angular-components.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms'), require('@seniorsistemas/angular-components'), require('@ngx-translate/core'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('primeng/api'), require('@angular/router'), require('@angular/common'), require('primeng/selectbutton'), require('primeng/dialog'), require('primeng/panel'), require('primeng/toast'), require('ngx-cookie-service'), require('@stomp/stompjs'), require('sockjs-client')) :
-    typeof define === 'function' && define.amd ? define('@senior-gestao-relacionamento/angular-components', ['exports', '@angular/core', '@angular/forms', '@seniorsistemas/angular-components', '@ngx-translate/core', 'rxjs', '@angular/common/http', 'rxjs/operators', 'primeng/api', '@angular/router', '@angular/common', 'primeng/selectbutton', 'primeng/dialog', 'primeng/panel', 'primeng/toast', 'ngx-cookie-service', '@stomp/stompjs', 'sockjs-client'], factory) :
-    (global = global || self, factory((global['senior-gestao-relacionamento'] = global['senior-gestao-relacionamento'] || {}, global['senior-gestao-relacionamento']['angular-components'] = {}), global.ng.core, global.ng.forms, global.angularComponents, global.core$1, global.rxjs, global.ng.common.http, global.rxjs.operators, global.api, global.ng.router, global.ng.common, global.selectbutton, global.dialog, global.panel, global.toast, global.ngxCookieService, global.stompjs, global.SockJS));
-}(this, (function (exports, core, forms, angularComponents, core$1, rxjs, http, operators, api, router, common, selectbutton, dialog, panel, toast, ngxCookieService, stompjs, SockJS) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms'), require('@seniorsistemas/angular-components'), require('@ngx-translate/core'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('primeng/api'), require('@angular/router'), require('@angular/common'), require('primeng/selectbutton'), require('primeng/dialog'), require('primeng/panel'), require('primeng/toast'), require('ngx-cookie-service'), require('@seniorsistemas/senior-platform-data'), require('@stomp/stompjs'), require('sockjs-client')) :
+    typeof define === 'function' && define.amd ? define('@senior-gestao-relacionamento/angular-components', ['exports', '@angular/core', '@angular/forms', '@seniorsistemas/angular-components', '@ngx-translate/core', 'rxjs', '@angular/common/http', 'rxjs/operators', 'primeng/api', '@angular/router', '@angular/common', 'primeng/selectbutton', 'primeng/dialog', 'primeng/panel', 'primeng/toast', 'ngx-cookie-service', '@seniorsistemas/senior-platform-data', '@stomp/stompjs', 'sockjs-client'], factory) :
+    (global = global || self, factory((global['senior-gestao-relacionamento'] = global['senior-gestao-relacionamento'] || {}, global['senior-gestao-relacionamento']['angular-components'] = {}), global.ng.core, global.ng.forms, global.angularComponents, global.core$1, global.rxjs, global.ng.common.http, global.rxjs.operators, global.api, global.ng.router, global.ng.common, global.selectbutton, global.dialog, global.panel, global.toast, global.ngxCookieService, global.seniorPlatformData, global.stompjs, global.SockJS));
+}(this, (function (exports, core, forms, angularComponents, core$1, rxjs, http, operators, api, router, common, selectbutton, dialog, panel, toast, ngxCookieService, seniorPlatformData, stompjs, SockJS) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation. All rights reserved.
@@ -970,12 +970,15 @@
             this.ngUnsubscribe = new rxjs.Subject();
             this.COLLABORATOR_KEY = 'CRMX_COLLABORATOR';
         }
-        CurrentCollaboratorService.prototype.validate = function () {
+        CurrentCollaboratorService.prototype.resolve = function () {
             var _this = this;
-            this.call(false).subscribe(function (collaborator) {
-                if (collaborator.active === false) {
-                    _this.redirect('collaborator-inactive');
-                }
+            return new rxjs.Observable(function (observer) {
+                seniorPlatformData.user.getUserData().then(function (userData) {
+                    _this.call(false).subscribe(function (collaborator) {
+                        observer.next(collaborator);
+                        observer.complete();
+                    });
+                });
             });
         };
         CurrentCollaboratorService.prototype.get = function () {
@@ -1000,6 +1003,7 @@
                 var collaboratorDto = _this.storageService.get(_this.COLLABORATOR_KEY);
                 if (collaboratorDto !== null && useCache) {
                     observer.next(Collaborator.fromDto(collaboratorDto));
+                    observer.complete();
                 }
                 else {
                     _this.http
@@ -1012,11 +1016,16 @@
                         throw err;
                     }))
                         .subscribe(function (collaboratorDto) {
-                        _this.storageService.store(_this.COLLABORATOR_KEY, collaboratorDto);
-                        observer.next(Collaborator.fromDto(collaboratorDto));
+                        if (collaboratorDto.active === false) {
+                            _this.redirect('collaborator-inactive');
+                        }
+                        else {
+                            _this.storageService.store(_this.COLLABORATOR_KEY, collaboratorDto);
+                            observer.next(Collaborator.fromDto(collaboratorDto));
+                            observer.complete();
+                        }
                     });
                 }
-                observer.complete();
             });
         };
         CurrentCollaboratorService.prototype.redirect = function (page) {
@@ -1109,6 +1118,7 @@
                 var moduleDto = _this.storageService.get(_this.ERPX_MODULE_KEY);
                 if (moduleDto !== null && useCache) {
                     observer.next(Modulo.fromDto(moduleDto));
+                    observer.complete();
                 }
                 else {
                     _this.http
@@ -1124,10 +1134,10 @@
                             var moduloDto = response.contents[0];
                             _this.storageService.store(_this.ERPX_MODULE_KEY, moduloDto);
                             observer.next(Modulo.fromDto(moduloDto));
+                            observer.complete();
                         }
                     });
                 }
-                observer.complete();
             });
         };
         CurrentTenantService.prototype.redirect = function (page) {
@@ -1347,7 +1357,10 @@
         StandardFiltersService.prototype.addFilterIn = function (filterQuery, alias, field, values) {
             var _this = this;
             var filters = values.map(function (value) { return _this.addAlias(alias, field) + " eq '" + value + "'"; });
-            return this.addFilter(filterQuery, "(" + filters.join(' or ') + ")");
+            if (filters.length > 0) {
+                return this.addFilter(filterQuery, "(" + filters.join(' or ') + ")");
+            }
+            return '';
         };
         StandardFiltersService.prototype.addAlias = function (alias, filter) {
             return (alias ? alias + "." : '') + filter;