@qrvey/utils 1.3.0-17 → 1.3.0-18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/cjs/filters/services/Filters.api.js +2 -1
  2. package/dist/filters/services/Filters.api.js +2 -1
  3. package/package.json +1 -1
  4. package/src/filters/services/Filters.api.ts +2 -1
package/dist/cjs/filters/services/Filters.api.js CHANGED
@@ -100,7 +100,8 @@ class FiltersApi {
100
100
  var _a;
101
101
  const scopes = this.getAvailableScopeIds(config);
102
102
  let filterData = (0, getFiltersByVisibility_1.getFiltersByVisibility)(config.filterData, scopes);
103
- filterData = (0, getFiltersByDatasetsColumns_1.getFiltersByDatasetsColumns)(filterData, config.datasets);
103
+ const dataset = config.datasets.find(d => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
104
+ filterData = (0, getFiltersByDatasetsColumns_1.getFiltersByDatasetsColumns)(filterData, (0, isEmpty_1.isEmpty)(dataset) ? [] : [dataset]);
104
105
  filterData = (0, excludeFiltersByAggregateColumn_1.excludeFiltersByAggregateColumn)(filterData);
105
106
  const logics = (0, FDToLogic_1.FDToLogic)(filterData);
106
107
  const hierarchyLogic = (0, getLogicByScopesHierarchy_1.getLogicByScopesHierarchy)(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
package/dist/filters/services/Filters.api.js CHANGED
@@ -94,7 +94,8 @@ export class FiltersApi {
94
94
  var _a;
95
95
  const scopes = this.getAvailableScopeIds(config);
96
96
  let filterData = getFiltersByVisibility(config.filterData, scopes);
97
- filterData = getFiltersByDatasetsColumns(filterData, config.datasets);
97
+ const dataset = config.datasets.find(d => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
98
+ filterData = getFiltersByDatasetsColumns(filterData, isEmpty(dataset) ? [] : [dataset]);
98
99
  filterData = excludeFiltersByAggregateColumn(filterData);
99
100
  const logics = FDToLogic(filterData);
100
101
  const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.3.0-17",
3
+ "version": "1.3.0-18",
4
4
  "description": "Helper, Utils for all Qrvey Projects",
5
5
  "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
6
6
  "main": "dist/index.js",
package/src/filters/services/Filters.api.ts CHANGED
@@ -109,7 +109,8 @@ export class FiltersApi {
109
109
  private getLogic(config: IFSGetDataValues) {
110
110
  const scopes = this.getAvailableScopeIds(config);
111
111
  let filterData = getFiltersByVisibility(config.filterData, scopes);
112
- filterData = getFiltersByDatasetsColumns(filterData as IFUData, config.datasets);
112
+ const dataset = config.datasets.find(d => d.qrveyid === config.filter?.column.qrveyid);
113
+ filterData = getFiltersByDatasetsColumns(filterData as IFUData, isEmpty(dataset) ? [] : [dataset]);
113
114
  filterData = excludeFiltersByAggregateColumn(filterData);
114
115
  const logics = FDToLogic(filterData);
115
116
  const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, config.filter?.extras.scope);