@senior-gestao-pessoas/hcm-entity-lookups 5.2.1 → 5.3.0-develop-5bf4eb10

package/bundles/senior-gestao-pessoas-hcm-entity-lookups.umd.js

@@ -1005,12 +1005,22 @@
         PisPasepTaxationLookupService.prototype.getPisPasepTaxationSearchFields = function () {
             return [
                 new angularComponents.FormField({
-                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_code"),
+                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_group_code_grid"),
+                    name: "pisPasepTaxationGroup.code",
+                    type: angularComponents.FieldType.Integer
+                }),
+                new angularComponents.FormField({
+                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_group_name_grid"),
+                    name: "pisPasepTaxationGroup.description",
+                    type: angularComponents.FieldType.String
+                }),
+                new angularComponents.FormField({
+                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_code_grid"),
                     name: "code",
                     type: angularComponents.FieldType.Integer
                 }),
                 new angularComponents.FormField({
-                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_description"),
+                    label: this.translate.instant(this.configService.getTranslationPrefix() + ".pis_pasep_taxation_description_grid"),
                     name: "description",
                     type: angularComponents.FieldType.String
                 }),
@@ -5702,8 +5712,8 @@
                 recordsLabel: this.translate.instant(this.configService.getTranslationPrefix() + ".records_found"),
                 required: function () { return true; },
                 searchEmptyTitle: this.translate.instant(this.configService.getTranslationPrefix() + ".nothing_found"),
-                searchFields: this.getCalculationDefinitionSearchFields(),
-                searchGridFields: this.getCalculationDefinitionSearchFields(),
+                searchFields: this.getCalculationDefinitionSearchFields(this.calculationDefinitionLookupDisplayFields),
+                searchGridFields: this.getCalculationDefinitionSearchFields(this.calculationDefinitionLookupDisplayFields),
                 searchObservable: this.calculationDefinitionSearchSubject,
                 searchTitle: this.translate.instant(this.configService.getTranslationPrefix() + ".calculation_definition_search_title"),
                 selectLabel: this.translate.instant(this.configService.getTranslationPrefix() + ".select"),
@@ -5776,8 +5786,7 @@
                 field: field,
                 order: 1
             }); });
-            var filterQuery = createLookupRequestFilter(value, this.getCalculationDefinitionSearchFields());
-            filterQuery = getFiltersForCustomDisplayFields(filterQuery, filter);
+            var filterQuery = createLookupRequestFilter(value, this.getCalculationDefinitionSearchFields(this.calculationDefinitionLookupDisplayFields));
             var displayFields = this.calculationDefinitionLookupDisplayFields;
             return this.calculationDefinitionService
                 .list({ sort: sort, filterQuery: filterQuery, displayFields: displayFields })
@@ -5793,8 +5802,7 @@
             var first = event.first, rows = event.rows, multiSortMeta = event.multiSortMeta, filterData = event.filterData;
             var page = first / rows;
             var sort = multiSortMeta;
-            var filterQuery = createSearchRequestFilter(filterData, this.getCalculationDefinitionSearchFields());
-            filterQuery = getFiltersForCustomDisplayFields(filterQuery, filter);
+            var filterQuery = createSearchRequestFilter(filterData, this.getCalculationDefinitionSearchFields(this.calculationDefinitionLookupDisplayFields));
             var displayFields = this.calculationDefinitionLookupDisplayFields;
             return this.calculationDefinitionService
                 .list({ page: page, sort: sort, filterQuery: filterQuery, displayFields: displayFields })
@@ -9404,10 +9412,10 @@
             this.translate = translate;
             this.configService = configService;
             this.fgtsTaxationService = fgtsTaxationService;
-            this.fgtsTaxationDisplayFields = ["code", "description", "fgtsTaxationGroup.code", "fgtsTaxationGroup.description"];
             this.accumulatorTypeOptions = getAccumulatorTypeOptions(this.configService, this.translate);
             this.lookupServiceConfig = {
-                lookupDisplayFields: this.fgtsTaxationDisplayFields,
+                lookupDisplayFields: ["code", "description", "fgtsTaxationGroup.code", "fgtsTaxationGroup.description"],
+                lookupSuggestionFields: ["code", "description"],
                 lookupSeparator: " - ",
                 searchSubject: new rxjs.Subject(),
                 lookupSubject: new rxjs.Subject(),
@@ -9442,9 +9450,6 @@
             };
             this.ngUnsubscribe = new rxjs.Subject();
         }
-        FgtsTaxationLookupService.prototype.setDisplayFields = function (fields) {
-            this.fgtsTaxationDisplayFields = fields;
-        };
         FgtsTaxationLookupService.prototype.updateSuggestions = function (value) {
             if (value === null || value === void 0 ? void 0 : value[this.lookupServiceConfig.entityName]) {
                 value[this.lookupServiceConfig.entityName].label = this.getSuggestionValue(this.lookupServiceConfig.lookupDisplayFields, this.lookupServiceConfig.entityName, value, this.lookupServiceConfig.lookupSeparator);
@@ -9529,7 +9534,7 @@
         };
         FgtsTaxationLookupService.prototype.getLabelForMaping = function (item) {
             var _this = this;
-            return this.lookupServiceConfig.lookupDisplayFields
+            return this.lookupServiceConfig.lookupSuggestionFields
                 .map(function (field) {
                 if (field === "name" && !(item === null || item === void 0 ? void 0 : item.name)) {
                     item.name = _this.translate
@@ -9549,7 +9554,7 @@
         };
         FgtsTaxationLookupService.prototype.onFgtsTaxationLookupRequestObservable = function (value, additionalFilter, filter) {
             var _this = this;
-            var sort = this.fgtsTaxationDisplayFields.map(function (field) { return ({
+            var sort = this.lookupServiceConfig.lookupDisplayFields.map(function (field) { return ({
                 field: field,
                 order: 1
             }); });
@@ -9617,7 +9622,6 @@
             _this.configService = configService;
             _this.structerService = structerService;
             _this.fgtsTaxationLookupService = fgtsTaxationLookupService;
-            _this.displayFields = ["fgtsTaxationGroup.code", "fgtsTaxationGroup.description", "code", "description", "accumulatorType"];
             _this.controlName = "fgtsTaxation";
             _this.entity = "fgtsTaxation";
             _this.domain = "tax_obligation";
@@ -9626,9 +9630,8 @@
             return _this;
         }
         FgtsTaxationLookupComponent.prototype.ngOnInit = function () {
-            this.fgtsTaxationLookupService.setDisplayFields(this.displayFields);
-            this.fgtsTaxationSearchFields = this.fgtsTaxationLookupService.getFgtsTaxationSearchFields(this.displayFields);
-            this.fgtsTaxationSearchGridFields = this.fgtsTaxationLookupService.getFgtsTaxationSearchFields(this.displayFields);
+            this.fgtsTaxationSearchFields = this.fgtsTaxationLookupService.getFgtsTaxationSearchFields(this.fgtsTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
+            this.fgtsTaxationSearchGridFields = this.fgtsTaxationLookupService.getFgtsTaxationSearchFields(this.fgtsTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
         };
         FgtsTaxationLookupComponent.prototype.onFgtsTaxationLookupRequest = function (value) {
             var _this = this;
@@ -9654,9 +9657,6 @@
             { type: StructureFilterService },
             { type: FgtsTaxationLookupService }
         ]; };
-        __decorate([
-            core.Input()
-        ], FgtsTaxationLookupComponent.prototype, "displayFields", void 0);
         FgtsTaxationLookupComponent = __decorate([
             core.Component({
                 selector: "hcm-fgts-taxation-lookup",
@@ -9724,10 +9724,10 @@
             this.translate = translate;
             this.configService = configService;
             this.inssTaxationService = inssTaxationService;
-            this.inssTaxationDisplayFields = ["code", "description", "inssTaxationGroup.code", "inssTaxationGroup.description"];
             this.accumulatorTypeOptions = getAccumulatorTypeOptions(this.configService, this.translate);
             this.lookupServiceConfig = {
-                lookupDisplayFields: this.inssTaxationDisplayFields,
+                lookupDisplayFields: ["code", "description", "inssTaxationGroup.code", "inssTaxationGroup.description", "accumulatorType"],
+                lookupSuggestionFields: ["code", "description"],
                 lookupSeparator: " - ",
                 searchSubject: new rxjs.Subject(),
                 lookupSubject: new rxjs.Subject(),
@@ -9762,9 +9762,6 @@
             };
             this.ngUnsubscribe = new rxjs.Subject();
         }
-        InssTaxationLookupService.prototype.setDisplayFields = function (fields) {
-            this.inssTaxationDisplayFields = fields;
-        };
         InssTaxationLookupService.prototype.updateSuggestions = function (value) {
             if (value === null || value === void 0 ? void 0 : value[this.lookupServiceConfig.entityName]) {
                 value[this.lookupServiceConfig.entityName].label = this.getSuggestionValue(this.lookupServiceConfig.lookupDisplayFields, this.lookupServiceConfig.entityName, value, this.lookupServiceConfig.lookupSeparator);
@@ -9849,7 +9846,7 @@
         };
         InssTaxationLookupService.prototype.getLabelForMaping = function (item) {
             var _this = this;
-            return this.lookupServiceConfig.lookupDisplayFields
+            return this.lookupServiceConfig.lookupSuggestionFields
                 .map(function (field) {
                 if (field === "name" && !(item === null || item === void 0 ? void 0 : item.name)) {
                     item.name = _this.translate
@@ -9869,7 +9866,7 @@
         };
         InssTaxationLookupService.prototype.onInssTaxationLookupRequestObservable = function (value, additionalFilter, filter) {
             var _this = this;
-            var sort = this.inssTaxationDisplayFields.map(function (field) { return ({
+            var sort = this.lookupServiceConfig.lookupDisplayFields.map(function (field) { return ({
                 field: field,
                 order: 1
             }); });
@@ -9937,7 +9934,6 @@
             _this.configService = configService;
             _this.structerService = structerService;
             _this.inssTaxationLookupService = inssTaxationLookupService;
-            _this.displayFields = ["inssTaxationGroup.code", "inssTaxationGroup.description", "code", "description"];
             _this.controlName = "inssTaxation";
             _this.entity = "inssTaxation";
             _this.domain = "tax_obligation";
@@ -9946,9 +9942,8 @@
             return _this;
         }
         InssTaxationLookupComponent.prototype.ngOnInit = function () {
-            this.inssTaxationLookupService.setDisplayFields(this.displayFields);
-            this.inssTaxationSearchFields = this.inssTaxationLookupService.getInssTaxationSearchFields(this.displayFields);
-            this.inssTaxationSearchGridFields = this.inssTaxationLookupService.getInssTaxationSearchFields(this.displayFields);
+            this.inssTaxationSearchFields = this.inssTaxationLookupService.getInssTaxationSearchFields(this.inssTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
+            this.inssTaxationSearchGridFields = this.inssTaxationLookupService.getInssTaxationSearchFields(this.inssTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
         };
         InssTaxationLookupComponent.prototype.onInssTaxationLookupRequest = function (value) {
             var _this = this;
@@ -9974,9 +9969,6 @@
             { type: StructureFilterService },
             { type: InssTaxationLookupService }
         ]; };
-        __decorate([
-            core.Input()
-        ], InssTaxationLookupComponent.prototype, "displayFields", void 0);
         InssTaxationLookupComponent = __decorate([
             core.Component({
                 selector: "hcm-inss-taxation-lookup",
@@ -10044,10 +10036,10 @@
             this.translate = translate;
             this.configService = configService;
             this.irrfTaxationService = irrfTaxationService;
-            this.irrfTaxationDisplayFields = ["code", "description", "irrfTaxationGroup.code", "irrfTaxationGroup.description"];
             this.accumulatorTypeOptions = getAccumulatorTypeOptions(this.configService, this.translate);
             this.lookupServiceConfig = {
-                lookupDisplayFields: this.irrfTaxationDisplayFields,
+                lookupDisplayFields: ["code", "description", "irrfTaxationGroup.code", "irrfTaxationGroup.description"],
+                lookupSuggestionFields: ["code", "description"],
                 lookupSeparator: " - ",
                 searchSubject: new rxjs.Subject(),
                 lookupSubject: new rxjs.Subject(),
@@ -10082,9 +10074,6 @@
             };
             this.ngUnsubscribe = new rxjs.Subject();
         }
-        IrrfTaxationLookupService.prototype.setDisplayFields = function (fields) {
-            this.irrfTaxationDisplayFields = fields;
-        };
         IrrfTaxationLookupService.prototype.updateSuggestions = function (value) {
             if (value === null || value === void 0 ? void 0 : value[this.lookupServiceConfig.entityName]) {
                 value[this.lookupServiceConfig.entityName].label = this.getSuggestionValue(this.lookupServiceConfig.lookupDisplayFields, this.lookupServiceConfig.entityName, value, this.lookupServiceConfig.lookupSeparator);
@@ -10169,7 +10158,7 @@
         };
         IrrfTaxationLookupService.prototype.getLabelForMaping = function (item) {
             var _this = this;
-            return this.lookupServiceConfig.lookupDisplayFields
+            return this.lookupServiceConfig.lookupSuggestionFields
                 .map(function (field) {
                 if (field === "name" && !(item === null || item === void 0 ? void 0 : item.name)) {
                     item.name = _this.translate
@@ -10189,7 +10178,7 @@
         };
         IrrfTaxationLookupService.prototype.onIrrfTaxationLookupRequestObservable = function (value, additionalFilter, filter) {
             var _this = this;
-            var sort = this.irrfTaxationDisplayFields.map(function (field) { return ({
+            var sort = this.lookupServiceConfig.lookupDisplayFields.map(function (field) { return ({
                 field: field,
                 order: 1
             }); });
@@ -10257,7 +10246,6 @@
             _this.configService = configService;
             _this.structerService = structerService;
             _this.irrfTaxationLookupService = irrfTaxationLookupService;
-            _this.displayFields = ["irrfTaxationGroup.code", "irrfTaxationGroup.description", "code", "description", "accumulatorType"];
             _this.controlName = "irrfTaxation";
             _this.entity = "irrfTaxation";
             _this.domain = "tax_obligation";
@@ -10266,9 +10254,8 @@
             return _this;
         }
         IrrfTaxationLookupComponent.prototype.ngOnInit = function () {
-            this.irrfTaxationLookupService.setDisplayFields(this.displayFields);
-            this.irrfTaxationSearchFields = this.irrfTaxationLookupService.getIrrfTaxationSearchFields(this.displayFields);
-            this.irrfTaxationSearchGridFields = this.irrfTaxationLookupService.getIrrfTaxationSearchFields(this.displayFields);
+            this.irrfTaxationSearchFields = this.irrfTaxationLookupService.getIrrfTaxationSearchFields(this.irrfTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
+            this.irrfTaxationSearchGridFields = this.irrfTaxationLookupService.getIrrfTaxationSearchFields(this.irrfTaxationLookupService.lookupServiceConfig.lookupDisplayFields);
         };
         IrrfTaxationLookupComponent.prototype.onIrrfTaxationLookupRequest = function (value) {
             var _this = this;
@@ -10294,9 +10281,6 @@
             { type: StructureFilterService },
             { type: IrrfTaxationLookupService }
         ]; };
-        __decorate([
-            core.Input()
-        ], IrrfTaxationLookupComponent.prototype, "displayFields", void 0);
         IrrfTaxationLookupComponent = __decorate([
             core.Component({
                 selector: "hcm-irrf-taxation-lookup",
@@ -12468,20 +12452,20 @@
     // Core Module
 
     var FILTER_KEY = 'filter';
-    var EMPLOYEE_URL = "/hcm_contract/employment_contract/entities/employee";
     var FILTER_MODULE_TYPES = new core.InjectionToken('FILTER_MODULE_TYPES');
+    var EMPLOYEE_URL_PATTERN = /\/hcm_contract\/employment_contract\/entities\/employee(\/.*|\?.*)?$/;
     var FilterModuleInterceptor = /** @class */ (function () {
         function FilterModuleInterceptor(moduleTypes) {
             this.moduleTypes = moduleTypes;
         }
         FilterModuleInterceptor.prototype.intercept = function (request, next) {
-            var _a, _b, _c;
-            if (!((_a = request === null || request === void 0 ? void 0 : request.url) === null || _a === void 0 ? void 0 : _a.includes(EMPLOYEE_URL)) || !((_b = this.moduleTypes) === null || _b === void 0 ? void 0 : _b.length)) {
+            var _a, _b;
+            if (!this.isEmployeeUrl(request === null || request === void 0 ? void 0 : request.url) || !((_a = this.moduleTypes) === null || _a === void 0 ? void 0 : _a.length)) {
                 return next.handle(request);
             }
             var filterQuery = "(" + this.moduleTypes.map(function (m) { return "modules.moduleType eq '" + m + "'"; }).join(' or ') + ")";
             var updatedRequest;
-            if ((_c = request === null || request === void 0 ? void 0 : request.params) === null || _c === void 0 ? void 0 : _c.has(FILTER_KEY)) {
+            if ((_b = request === null || request === void 0 ? void 0 : request.params) === null || _b === void 0 ? void 0 : _b.has(FILTER_KEY)) {
                 var actualFilter = "(" + request.params.get(FILTER_KEY) + ")";
                 updatedRequest = request.clone({
                     setParams: {
@@ -12498,6 +12482,9 @@
             }
             return next.handle(updatedRequest);
         };
+        FilterModuleInterceptor.prototype.isEmployeeUrl = function (url) {
+            return EMPLOYEE_URL_PATTERN.test(url);
+        };
         FilterModuleInterceptor.ctorParameters = function () { return [
             { type: Array, decorators: [{ type: core.Optional }, { type: core.Inject, args: [FILTER_MODULE_TYPES,] }] }
         ]; };