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

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

@@ -970,12 +970,13 @@
             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) {
+                _this.call(false).subscribe(function (collaborator) {
+                    observer.next(collaborator);
+                    observer.complete();
+                });
             });
         };
         CurrentCollaboratorService.prototype.get = function () {
@@ -1012,8 +1013,13 @@
                         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();
@@ -1109,6 +1115,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 +1131,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 +1354,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;