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

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

@@ -5712,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"),
@@ -5786,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 })
@@ -5803,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 })
@@ -12454,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: {
@@ -12484,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,] }] }
         ]; };