@qrvey/utils 1.4.0-0 → 1.4.0-3
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.
- package/README.md +1 -1
- package/dist/charts/helpers/isSimpleTableChart.js +2 -1
- package/dist/cjs/charts/helpers/isSimpleTableChart.js +2 -1
- package/dist/cjs/column_format/helpers/defineTableChartFormat.js +10 -26
- package/dist/cjs/column_format/helpers/defineXYChartFormat.js +7 -11
- package/dist/cjs/columns/constants/COLUMN_INFO.js +23 -49
- package/dist/cjs/columns/constants/COLUMN_LABEL.js +1 -29
- package/dist/cjs/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
- package/dist/cjs/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
- package/dist/cjs/columns/helpers/getColumnsLabel.js +0 -5
- package/dist/cjs/columns/helpers/getDatasetColumn.js +1 -1
- package/dist/cjs/columns/helpers/getModelColumn.js +0 -1
- package/dist/cjs/dates/relative/RelativeStatementAdapter.js +6 -24
- package/dist/cjs/filters/adapters/FDToFlatUI.js +8 -18
- package/dist/cjs/filters/adapters/FDToLogic.js +1 -1
- package/dist/cjs/filters/adapters/FDToUI.js +12 -24
- package/dist/cjs/filters/adapters/UIToFlatUI.js +4 -14
- package/dist/cjs/filters/adapters/UIToOldLogic.js +2 -1
- package/dist/cjs/filters/adapters/adaptFilterValues.js +1 -6
- package/dist/cjs/filters/adapters/flatUIToFD.js +3 -14
- package/dist/cjs/filters/adapters/flatUIToOldLogic.js +15 -49
- package/dist/cjs/filters/adapters/flatUIToUI.js +3 -14
- package/dist/cjs/filters/adapters/logicToFlatUI.js +20 -32
- package/dist/cjs/filters/adapters/transformFilters.js +4 -19
- package/dist/cjs/filters/classes/FilterInputErrorHandler.js +0 -8
- package/dist/cjs/filters/helpers/applyHierarchyForAggFilters.js +2 -11
- package/dist/cjs/filters/helpers/backend/buildExpression.js +2 -1
- package/dist/cjs/filters/helpers/backend/buildFilters.js +2 -1
- package/dist/cjs/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
- package/dist/cjs/filters/helpers/backend/getLogicByDatasets.js +5 -7
- package/dist/cjs/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
- package/dist/cjs/filters/helpers/common/areFiltersEquals.js +3 -2
- package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js +17 -22
- package/dist/cjs/filters/helpers/common/getFilterid.js +9 -8
- package/dist/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
- package/dist/cjs/filters/helpers/common/getFiltersByParams.js +12 -18
- package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js +4 -3
- package/dist/cjs/filters/helpers/common/getMergeValuesSettings.js +2 -1
- package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
- package/dist/cjs/filters/helpers/common/mergeFilters.js +7 -30
- package/dist/cjs/filters/helpers/common/mergeValues.js +9 -6
- package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +9 -8
- package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js +2 -42
- package/dist/cjs/filters/helpers/ui/getUIValues.js +14 -12
- package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
- package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
- package/dist/cjs/filters/helpers/ui/transformFilterValues.js +3 -14
- package/dist/cjs/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
- package/dist/cjs/filters/services/Filters.api.js +44 -45
- package/dist/cjs/filters/services/UChartApi.js +246 -257
- package/dist/cjs/filters/services/UChartPaginationApi.js +289 -301
- package/dist/cjs/format/definition.js +1 -1
- package/dist/cjs/format/duration/durationFormatter.js +7 -12
- package/dist/cjs/format/format.js +8 -7
- package/dist/cjs/format/localization.d.ts +2 -1
- package/dist/cjs/format/localization.js +8 -7
- package/dist/cjs/general/array/addPropertyToArrayOfObjects.js +1 -1
- package/dist/cjs/general/object/getAttribute.js +2 -6
- package/dist/cjs/general/object/mergeDeep.js +3 -2
- package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/cjs/globalization/service/i18nextBuilder.js +31 -19
- package/dist/cjs/globalization/service/initI18n.js +13 -2
- package/dist/cjs/qrvey/helpers/getCategorizableExpression.js +2 -1
- package/dist/cjs/qrvey/helpers/getDataAnswersByColumn.js +1 -4
- package/dist/cjs/qrvey/helpers/getDropdownAnswers.js +1 -1
- package/dist/cjs/qrvey/helpers/getImageAnswers.js +2 -2
- package/dist/cjs/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
- package/dist/cjs/qrvey/helpers/getLookupAnswers.js +4 -4
- package/dist/cjs/qrvey/helpers/getLookupDisplays.js +1 -1
- package/dist/cjs/qrvey/helpers/getSlidebarAnswers.js +2 -1
- package/dist/cjs/qrvey/helpers/getYesNoAnswers.js +1 -5
- package/dist/cjs/qrvey/helpers/transformValue.js +2 -1
- package/dist/cjs/services/api/Charts.api.js +3 -9
- package/dist/cjs/services/api/getAllDatasets.api.js +1 -1
- package/dist/cjs/services/api/getAllQrveys.api.js +1 -1
- package/dist/cjs/services/api/getDatasetColumns.api.js +1 -1
- package/dist/cjs/services/api/getDatasetsByIds.api.js +2 -2
- package/dist/cjs/services/api/getModel.api.js +1 -4
- package/dist/cjs/services/helpers/Request.js +16 -5
- package/dist/column_format/helpers/defineTableChartFormat.js +10 -26
- package/dist/column_format/helpers/defineXYChartFormat.js +7 -11
- package/dist/columns/constants/COLUMN_INFO.js +23 -49
- package/dist/columns/constants/COLUMN_LABEL.js +1 -29
- package/dist/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
- package/dist/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
- package/dist/columns/helpers/getColumnsLabel.js +0 -5
- package/dist/columns/helpers/getDatasetColumn.js +1 -1
- package/dist/columns/helpers/getModelColumn.js +0 -1
- package/dist/dates/relative/RelativeStatementAdapter.js +6 -24
- package/dist/filters/adapters/FDToFlatUI.js +8 -18
- package/dist/filters/adapters/FDToLogic.js +1 -1
- package/dist/filters/adapters/FDToUI.js +12 -24
- package/dist/filters/adapters/UIToFlatUI.js +4 -14
- package/dist/filters/adapters/UIToOldLogic.js +2 -1
- package/dist/filters/adapters/adaptFilterValues.js +1 -6
- package/dist/filters/adapters/flatUIToFD.js +3 -14
- package/dist/filters/adapters/flatUIToOldLogic.js +15 -49
- package/dist/filters/adapters/flatUIToUI.js +3 -14
- package/dist/filters/adapters/logicToFlatUI.js +20 -32
- package/dist/filters/adapters/transformFilters.js +4 -19
- package/dist/filters/classes/FilterInputErrorHandler.js +0 -8
- package/dist/filters/helpers/applyHierarchyForAggFilters.js +2 -11
- package/dist/filters/helpers/backend/buildExpression.js +2 -1
- package/dist/filters/helpers/backend/buildFilters.js +2 -1
- package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
- package/dist/filters/helpers/backend/getLogicByDatasets.js +5 -7
- package/dist/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
- package/dist/filters/helpers/common/areFiltersEquals.js +3 -2
- package/dist/filters/helpers/common/excludeFiltersByParams.js +17 -22
- package/dist/filters/helpers/common/getFilterid.js +9 -8
- package/dist/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
- package/dist/filters/helpers/common/getFiltersByParams.js +12 -18
- package/dist/filters/helpers/common/getMergeFiltersSettings.js +4 -3
- package/dist/filters/helpers/common/getMergeValuesSettings.js +2 -1
- package/dist/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
- package/dist/filters/helpers/common/mergeFilters.js +7 -30
- package/dist/filters/helpers/common/mergeValues.js +9 -6
- package/dist/filters/helpers/common/resolveFilterConditions.js +9 -8
- package/dist/filters/helpers/getAggFiltersFromFilterData.js +2 -42
- package/dist/filters/helpers/ui/getUIValues.js +14 -12
- package/dist/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
- package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
- package/dist/filters/helpers/ui/transformFilterValues.js +3 -14
- package/dist/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
- package/dist/filters/services/Filters.api.js +44 -45
- package/dist/filters/services/UChartApi.js +246 -257
- package/dist/filters/services/UChartPaginationApi.js +289 -301
- package/dist/format/definition.js +1 -1
- package/dist/format/duration/durationFormatter.js +7 -12
- package/dist/format/format.js +8 -7
- package/dist/format/localization.d.ts +2 -1
- package/dist/format/localization.js +7 -6
- package/dist/general/array/addPropertyToArrayOfObjects.js +1 -1
- package/dist/general/object/getAttribute.js +2 -6
- package/dist/general/object/mergeDeep.js +3 -2
- package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/globalization/service/i18nextBuilder.js +31 -19
- package/dist/globalization/service/initI18n.js +13 -2
- package/dist/qrvey/helpers/getCategorizableExpression.js +2 -1
- package/dist/qrvey/helpers/getDataAnswersByColumn.js +1 -4
- package/dist/qrvey/helpers/getDropdownAnswers.js +1 -1
- package/dist/qrvey/helpers/getImageAnswers.js +2 -2
- package/dist/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
- package/dist/qrvey/helpers/getLookupAnswers.js +4 -4
- package/dist/qrvey/helpers/getLookupDisplays.js +1 -1
- package/dist/qrvey/helpers/getSlidebarAnswers.js +2 -1
- package/dist/qrvey/helpers/getYesNoAnswers.js +1 -5
- package/dist/qrvey/helpers/transformValue.js +2 -1
- package/dist/services/api/Charts.api.js +3 -9
- package/dist/services/api/getAllDatasets.api.js +1 -1
- package/dist/services/api/getAllQrveys.api.js +1 -1
- package/dist/services/api/getDatasetColumns.api.js +1 -1
- package/dist/services/api/getDatasetsByIds.api.js +2 -2
- package/dist/services/api/getModel.api.js +1 -4
- package/dist/services/helpers/Request.js +16 -5
- package/package.json +5 -4
|
@@ -66,6 +66,7 @@ function buildFilters(datasetSection, scope) {
|
|
|
66
66
|
}
|
|
67
67
|
function buildExpressions(filterSection, scope, dataset) {
|
|
68
68
|
return filterSection.reduce((expressions, filter) => {
|
|
69
|
+
var _a;
|
|
69
70
|
const expression = {
|
|
70
71
|
enabled: filter.enabled,
|
|
71
72
|
formulaType: filter.column.formulaType,
|
|
@@ -80,7 +81,7 @@ function buildExpressions(filterSection, scope, dataset) {
|
|
|
80
81
|
uiExtras: getFilterDetail(filter, scope, dataset),
|
|
81
82
|
};
|
|
82
83
|
expression["enabled"] =
|
|
83
|
-
filter.selectAll || expression.value
|
|
84
|
+
filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0
|
|
84
85
|
? filter.enabled
|
|
85
86
|
: false;
|
|
86
87
|
expressions.push(expression);
|
|
@@ -7,12 +7,7 @@ import { COLUMN } from "../../columns/constants/COLUMN";
|
|
|
7
7
|
* @returns A new value array with the filled properties.
|
|
8
8
|
*/
|
|
9
9
|
export function adaptFilterValues(filter) {
|
|
10
|
-
const setValue = (value) => ({
|
|
11
|
-
...value,
|
|
12
|
-
value: isEmpty(value.value) ? undefined : value.value,
|
|
13
|
-
displayed: isEmpty(value.displayed) ? true : value.displayed,
|
|
14
|
-
enabled: isEmpty(value.enabled) ? true : value.enabled,
|
|
15
|
-
});
|
|
10
|
+
const setValue = (value) => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, displayed: isEmpty(value.displayed) ? true : value.displayed, enabled: isEmpty(value.enabled) ? true : value.enabled }));
|
|
16
11
|
if (filter.column.type === COLUMN.RANKING &&
|
|
17
12
|
isEmpty(filter.column.aggregate)) {
|
|
18
13
|
return (filter.values || []).map((rValues) => rValues.map(setValue));
|
|
@@ -35,13 +35,10 @@ function buildScopes(uFilters) {
|
|
|
35
35
|
? scopes[scopeIndex].datasets.findIndex((dt) => dt.qrveyid === uFilter.extras.dataset.qrveyid)
|
|
36
36
|
: -1;
|
|
37
37
|
if (scopeIndex === -1) {
|
|
38
|
-
scopes.push({
|
|
39
|
-
...uiScope,
|
|
40
|
-
datasets: [{ ...uiDataset, filters: [uiFilter] }],
|
|
41
|
-
});
|
|
38
|
+
scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
|
|
42
39
|
}
|
|
43
40
|
else if (datasetIndex === -1) {
|
|
44
|
-
scopes[scopeIndex].datasets.push({
|
|
41
|
+
scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
|
|
45
42
|
}
|
|
46
43
|
else {
|
|
47
44
|
scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
|
|
@@ -106,15 +103,7 @@ function buildFilter(uFilter) {
|
|
|
106
103
|
displayed: uFilter.displayed,
|
|
107
104
|
filterid: uFilter.filterid,
|
|
108
105
|
enabled: uFilter.enabled,
|
|
109
|
-
extras: {
|
|
110
|
-
...uFilter.extras,
|
|
111
|
-
panelid: uFilter.extras.panelid,
|
|
112
|
-
filterLabel: uFilter.extras.filterLabel,
|
|
113
|
-
info,
|
|
114
|
-
scope: uFilter.extras.scope,
|
|
115
|
-
scopeid: uFilter.extras.scopeid,
|
|
116
|
-
section: uFilter.extras.section,
|
|
117
|
-
},
|
|
106
|
+
extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
|
|
118
107
|
lookupDisplayIndex: uFilter.lookupDisplayIndex,
|
|
119
108
|
nullValues: uFilter.nullValues,
|
|
120
109
|
operator: uFilter.operator,
|
|
@@ -72,7 +72,7 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
|
|
|
72
72
|
uiValue: getUIValues(filter, { addEnableds: true }),
|
|
73
73
|
validator: filter.validator,
|
|
74
74
|
values: filter.values,
|
|
75
|
-
_newFilters: {
|
|
75
|
+
_newFilters: Object.assign({}, filter),
|
|
76
76
|
};
|
|
77
77
|
});
|
|
78
78
|
};
|
|
@@ -122,7 +122,7 @@ function getExpressions(props) {
|
|
|
122
122
|
expressions.push(getRegularExpression(props));
|
|
123
123
|
}
|
|
124
124
|
if (props.nullValues) {
|
|
125
|
-
expressions.push(getNullValueExpression({
|
|
125
|
+
expressions.push(getNullValueExpression(Object.assign({}, props)));
|
|
126
126
|
}
|
|
127
127
|
return expressions;
|
|
128
128
|
}
|
|
@@ -132,21 +132,12 @@ export function getExpressionId(props) {
|
|
|
132
132
|
function getRankingExpressions(props) {
|
|
133
133
|
const values = props.values || [];
|
|
134
134
|
return values.map((_value, index) => {
|
|
135
|
-
const expression = {
|
|
136
|
-
|
|
137
|
-
...props,
|
|
138
|
-
values: [props.values[index]],
|
|
139
|
-
}),
|
|
140
|
-
validationType: getBackendValidator(props),
|
|
141
|
-
};
|
|
142
|
-
return {
|
|
143
|
-
...expression,
|
|
144
|
-
value: getValues(props, index),
|
|
145
|
-
uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) },
|
|
146
|
-
};
|
|
135
|
+
const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props) });
|
|
136
|
+
return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
|
|
147
137
|
});
|
|
148
138
|
}
|
|
149
139
|
function getRegularExpression(props) {
|
|
140
|
+
var _a;
|
|
150
141
|
const uiValue = getUIValuess(props);
|
|
151
142
|
const expression = {
|
|
152
143
|
groupValue: getBackendGroupValue(props),
|
|
@@ -158,13 +149,10 @@ function getRegularExpression(props) {
|
|
|
158
149
|
formulaType: props.column.formulaType,
|
|
159
150
|
validationType: getBackendValidator(props),
|
|
160
151
|
value: getValues(props),
|
|
161
|
-
uiExtras: {
|
|
162
|
-
...props,
|
|
163
|
-
uiValue,
|
|
164
|
-
},
|
|
152
|
+
uiExtras: Object.assign(Object.assign({}, props), { uiValue }),
|
|
165
153
|
};
|
|
166
154
|
expression["enabled"] =
|
|
167
|
-
props.selectAll || expression.value
|
|
155
|
+
props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
|
|
168
156
|
return expression;
|
|
169
157
|
}
|
|
170
158
|
function getNullValueExpression(props) {
|
|
@@ -235,64 +223,42 @@ function getValues(props, rankingGroupIndex) {
|
|
|
235
223
|
}
|
|
236
224
|
}
|
|
237
225
|
function getUIValuess(props, rankingGroupIndex) {
|
|
226
|
+
var _a, _b;
|
|
238
227
|
const values = props.values || [];
|
|
239
228
|
switch (props.validator) {
|
|
240
229
|
case FILTER_VALIDATOR.AFTER:
|
|
241
230
|
case FILTER_VALIDATOR.GREATER_THAN:
|
|
242
231
|
case FILTER_VALIDATOR.AFTER_ON:
|
|
243
232
|
case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
|
|
244
|
-
return values.map((value) => ({
|
|
245
|
-
...value,
|
|
246
|
-
value: value.min,
|
|
247
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
248
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
249
|
-
}));
|
|
233
|
+
return values.map((value) => (Object.assign(Object.assign({}, value), { value: value.min, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
|
|
250
234
|
case FILTER_VALIDATOR.BEFORE_ON:
|
|
251
235
|
case FILTER_VALIDATOR.LESS_THAN_EQUAL:
|
|
252
236
|
case FILTER_VALIDATOR.BEFORE:
|
|
253
237
|
case FILTER_VALIDATOR.LESS_THAN:
|
|
254
|
-
return values.map((value) => ({
|
|
255
|
-
...value,
|
|
256
|
-
value: value.max,
|
|
257
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
258
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
259
|
-
}));
|
|
238
|
+
return values.map((value) => (Object.assign(Object.assign({}, value), { value: value.max, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
|
|
260
239
|
case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
|
|
261
240
|
case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
|
|
262
|
-
return values.map((value) => ({
|
|
263
|
-
...value,
|
|
264
|
-
value: `${value.min} - ${value.max}`,
|
|
265
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
266
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
267
|
-
}));
|
|
241
|
+
return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
|
|
268
242
|
case FILTER_VALIDATOR.IS_NULL:
|
|
269
243
|
case FILTER_VALIDATOR.IS_NOT_NULL:
|
|
270
244
|
return [
|
|
271
245
|
{
|
|
272
246
|
value: FILTER_VALIDATOR_INFO[props.validator].label,
|
|
273
|
-
enabled: values[0]
|
|
247
|
+
enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled,
|
|
274
248
|
},
|
|
275
249
|
];
|
|
276
250
|
case FILTER_VALIDATOR.IN:
|
|
277
|
-
return values.map((value) => ({
|
|
278
|
-
...value,
|
|
279
|
-
value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1
|
|
251
|
+
return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1
|
|
280
252
|
? value.number
|
|
281
253
|
: ""} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS
|
|
282
254
|
? `from ${value.anchor || "current date"}`
|
|
283
|
-
: ""}`,
|
|
284
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
285
|
-
enabled: props.enabled,
|
|
286
|
-
}));
|
|
255
|
+
: ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
|
|
287
256
|
default:
|
|
288
257
|
if (props.column.type === COLUMN.RANKING &&
|
|
289
258
|
isEmpty(props.column.aggregate)) {
|
|
290
259
|
return getRankingUIValues(values, rankingGroupIndex);
|
|
291
260
|
}
|
|
292
|
-
return values.map((val) => ({
|
|
293
|
-
...val,
|
|
294
|
-
enabled: val.enabled != null ? val.enabled : true,
|
|
295
|
-
}));
|
|
261
|
+
return values.map((val) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
|
|
296
262
|
}
|
|
297
263
|
}
|
|
298
264
|
function getValueUiUnitRelativeDate(relative) {
|
|
@@ -41,13 +41,10 @@ function buildScopes(uFilters) {
|
|
|
41
41
|
uf.column.qrveyid === uFilter.column.qrveyid)
|
|
42
42
|
: -1;
|
|
43
43
|
if (scopeIndex === -1) {
|
|
44
|
-
scopes.push({
|
|
45
|
-
...uiScope,
|
|
46
|
-
datasets: [{ ...uiDataset, filters: [uiFilter] }],
|
|
47
|
-
});
|
|
44
|
+
scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
|
|
48
45
|
}
|
|
49
46
|
else if (datasetIndex === -1) {
|
|
50
|
-
scopes[scopeIndex].datasets.push({
|
|
47
|
+
scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
|
|
51
48
|
}
|
|
52
49
|
else if (lastUiFilterIndex === -1) {
|
|
53
50
|
scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
|
|
@@ -124,15 +121,7 @@ function buildFilter(uFilter) {
|
|
|
124
121
|
displayed: uFilter.displayed,
|
|
125
122
|
filterid: uFilter.filterid,
|
|
126
123
|
enabled: uFilter.enabled,
|
|
127
|
-
extras: {
|
|
128
|
-
...uFilter.extras,
|
|
129
|
-
panelid: uFilter.extras.panelid,
|
|
130
|
-
filterLabel: uFilter.extras.filterLabel,
|
|
131
|
-
info,
|
|
132
|
-
scope: uFilter.extras.scope,
|
|
133
|
-
scopeid: uFilter.extras.scopeid,
|
|
134
|
-
section: uFilter.extras.section,
|
|
135
|
-
},
|
|
124
|
+
extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
|
|
136
125
|
lookupDisplayIndex: uFilter.lookupDisplayIndex,
|
|
137
126
|
nullValues: uFilter.nullValues,
|
|
138
127
|
operator: uFilter.operator,
|
|
@@ -61,6 +61,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
function getFilterByExpression(expression, scopeItem) {
|
|
64
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
64
65
|
const uiExtras = expression.uiExtras;
|
|
65
66
|
const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
|
|
66
67
|
? _get(scopeItem, "uiExtras.scopeid")
|
|
@@ -72,49 +73,40 @@ function getFilterByExpression(expression, scopeItem) {
|
|
|
72
73
|
return {
|
|
73
74
|
collapsed: uiExtras.collapsed,
|
|
74
75
|
column: {
|
|
75
|
-
id: uiExtras.column
|
|
76
|
-
formulaType: uiExtras.column
|
|
77
|
-
linkid: uiExtras.column
|
|
78
|
-
linked: uiExtras.column
|
|
79
|
-
qrveyid: uiExtras.column
|
|
80
|
-
aggregate: uiExtras.column
|
|
81
|
-
uiExtras.column
|
|
82
|
-
calculation: uiExtras.column
|
|
83
|
-
uiExtras.column
|
|
76
|
+
id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
|
|
77
|
+
formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
|
|
78
|
+
linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
|
|
79
|
+
linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
|
|
80
|
+
qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
|
|
81
|
+
aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) ||
|
|
82
|
+
((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
|
|
83
|
+
calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) ||
|
|
84
|
+
((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
|
|
84
85
|
label: _get(uiExtras.column, "text") || _get(uiExtras.column, "label"),
|
|
85
86
|
property: uiExtras.column.property,
|
|
86
87
|
sorting: uiExtras.column.sorting,
|
|
87
|
-
outputFormat: uiExtras.column
|
|
88
|
-
type: uiExtras.column
|
|
88
|
+
outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
|
|
89
|
+
type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
|
|
89
90
|
},
|
|
90
91
|
dateSection: uiExtras.dateSection,
|
|
91
92
|
displayed: true,
|
|
92
93
|
enabled: uiExtras.enabled,
|
|
93
|
-
extras: {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
filterLabel: uiExtras.panelName,
|
|
97
|
-
info,
|
|
98
|
-
scopeid,
|
|
99
|
-
scope: scopeItem.scope,
|
|
100
|
-
section: uiExtras.section,
|
|
101
|
-
scopeInfo: {
|
|
102
|
-
collapsed: scopeItem.uiExtras?.collapsed,
|
|
94
|
+
extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
|
|
95
|
+
scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
|
|
96
|
+
collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
|
|
103
97
|
enabled: scopeItem.enabled,
|
|
104
98
|
displayed: true,
|
|
105
99
|
scope: scopeItem.scope,
|
|
106
100
|
scopeid,
|
|
107
|
-
},
|
|
108
|
-
dataset: {
|
|
101
|
+
}, dataset: {
|
|
109
102
|
collapsed: false,
|
|
110
103
|
enabled: true,
|
|
111
104
|
displayed: true,
|
|
112
|
-
qrveyid: uiExtras.column
|
|
105
|
+
qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
|
|
113
106
|
label: _get(uiExtras.column, "dataset.name") ||
|
|
114
107
|
_get(uiExtras.column, "label"),
|
|
115
|
-
linkid: uiExtras.column
|
|
116
|
-
},
|
|
117
|
-
},
|
|
108
|
+
linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
|
|
109
|
+
} }),
|
|
118
110
|
filterid: undefined,
|
|
119
111
|
lookupDisplayIndex: uiExtras.lookupDisplayIndex,
|
|
120
112
|
nullValues: uiExtras.nullValues,
|
|
@@ -173,11 +165,7 @@ function refineRankingValues(values = [], uiValues = []) {
|
|
|
173
165
|
return [
|
|
174
166
|
...valueGroup.map((value) => {
|
|
175
167
|
const rValue = uiValues.find((uiV) => uiV.valueid === value.value.valueid);
|
|
176
|
-
return {
|
|
177
|
-
...value,
|
|
178
|
-
displayed: rValue && rValue.displayed != null ? rValue.displayed : true,
|
|
179
|
-
enabled: rValue && rValue.enabled != null ? rValue.enabled : true,
|
|
180
|
-
};
|
|
168
|
+
return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
|
|
181
169
|
}),
|
|
182
170
|
];
|
|
183
171
|
});
|
|
@@ -129,7 +129,7 @@ function validateComplexTypes(oldFiltersItem, validations) {
|
|
|
129
129
|
"USADDRESS",
|
|
130
130
|
].includes(oldFiltersItem.type))
|
|
131
131
|
return oldFiltersItem;
|
|
132
|
-
const complexFiltersItem = {
|
|
132
|
+
const complexFiltersItem = Object.assign(Object.assign({}, oldFiltersItem), { values: [{}] });
|
|
133
133
|
validations.forEach((valKey) => {
|
|
134
134
|
oldFiltersItem.values[0][valKey].forEach((value) => {
|
|
135
135
|
const newKey = `${valKey}|${(value.targetFilter || value.property || "")
|
|
@@ -257,11 +257,7 @@ function getDateProperty(validationKey, columnType, formulaType) {
|
|
|
257
257
|
: "day";
|
|
258
258
|
}
|
|
259
259
|
function getFilterRangeValue(range, minProp = "min", maxProp = "max", extras = {}) {
|
|
260
|
-
return {
|
|
261
|
-
[minProp]: range.from || range.gte,
|
|
262
|
-
[maxProp]: range.to || range.lte,
|
|
263
|
-
...extras,
|
|
264
|
-
};
|
|
260
|
+
return Object.assign({ [minProp]: range.from || range.gte, [maxProp]: range.to || range.lte }, extras);
|
|
265
261
|
}
|
|
266
262
|
function getUiRangeValue(oldValue) {
|
|
267
263
|
if (oldValue.label)
|
|
@@ -272,10 +268,7 @@ function getUiRangeValue(oldValue) {
|
|
|
272
268
|
function getRankingFBvalues(values) {
|
|
273
269
|
const returnValues = [];
|
|
274
270
|
values
|
|
275
|
-
.map((vItem) => ({
|
|
276
|
-
...vItem,
|
|
277
|
-
position: +vItem.position + 1,
|
|
278
|
-
}))
|
|
271
|
+
.map((vItem) => (Object.assign(Object.assign({}, vItem), { position: +vItem.position + 1 })))
|
|
279
272
|
.forEach((vItem) => {
|
|
280
273
|
const groupIndex = returnValues.findIndex((group) => group.every((groupItem) => groupItem.value.value !== vItem.value) &&
|
|
281
274
|
group.every((groupItem) => groupItem.position !== vItem.position));
|
|
@@ -430,15 +423,7 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
|
|
|
430
423
|
section,
|
|
431
424
|
},
|
|
432
425
|
};
|
|
433
|
-
expressions.push({
|
|
434
|
-
...expressionItem,
|
|
435
|
-
value: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "value", formulaType && formulaType.toUpperCase()),
|
|
436
|
-
uiExtras: {
|
|
437
|
-
...expressionItem.uiExtras,
|
|
438
|
-
values: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "values", formulaType && formulaType.toUpperCase()),
|
|
439
|
-
uiValue: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "uiValue", formulaType && formulaType.toUpperCase()),
|
|
440
|
-
},
|
|
441
|
-
});
|
|
426
|
+
expressions.push(Object.assign(Object.assign({}, expressionItem), { value: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "value", formulaType && formulaType.toUpperCase()), uiExtras: Object.assign(Object.assign({}, expressionItem.uiExtras), { values: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "values", formulaType && formulaType.toUpperCase()), uiValue: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "uiValue", formulaType && formulaType.toUpperCase()) }) }));
|
|
442
427
|
});
|
|
443
428
|
return expressions;
|
|
444
429
|
}
|
|
@@ -3,14 +3,6 @@
|
|
|
3
3
|
* @todo Finish the class
|
|
4
4
|
*/
|
|
5
5
|
export class FilterInputErrorHandler {
|
|
6
|
-
_column;
|
|
7
|
-
_locale;
|
|
8
|
-
_property;
|
|
9
|
-
_validator;
|
|
10
|
-
_value;
|
|
11
|
-
_dateFormat;
|
|
12
|
-
_valueKeys;
|
|
13
|
-
_error;
|
|
14
6
|
constructor(config) {
|
|
15
7
|
this._column = config.column;
|
|
16
8
|
this._locale = config.locale;
|
|
@@ -14,16 +14,7 @@ export function applyHierarchyForAggFilters(chartSettings, scopes = [], currentS
|
|
|
14
14
|
return;
|
|
15
15
|
const availableScopes = getScopesByHierarchy(scopes, currentScope);
|
|
16
16
|
const charts = (chartSettings.chart || [])
|
|
17
|
-
.map((chart) => ({
|
|
18
|
-
...chart,
|
|
19
|
-
aggFilters: chart.aggFilters && {
|
|
20
|
-
...chart.aggFilters,
|
|
21
|
-
expressions: filterNestedTree(chart.aggFilters.expressions || [], "expressions", (expression) => availableScopes.find((scope) => expression.scope === scope.label)),
|
|
22
|
-
},
|
|
23
|
-
}))
|
|
17
|
+
.map((chart) => (Object.assign(Object.assign({}, chart), { aggFilters: chart.aggFilters && Object.assign(Object.assign({}, chart.aggFilters), { expressions: filterNestedTree(chart.aggFilters.expressions || [], "expressions", (expression) => availableScopes.find((scope) => expression.scope === scope.label)) }) })))
|
|
24
18
|
.filter((chart) => chart.aggFilters);
|
|
25
|
-
return {
|
|
26
|
-
...chartSettings,
|
|
27
|
-
chart: charts.length ? charts : chartSettings.chart,
|
|
28
|
-
};
|
|
19
|
+
return Object.assign(Object.assign({}, chartSettings), { chart: charts.length ? charts : chartSettings.chart });
|
|
29
20
|
}
|
|
@@ -9,6 +9,7 @@ import { getBackendValues } from "./getBackendValues";
|
|
|
9
9
|
* @returns a filter expression
|
|
10
10
|
*/
|
|
11
11
|
export function buildExpression(filter) {
|
|
12
|
+
var _a;
|
|
12
13
|
const expression = {
|
|
13
14
|
groupValue: getBackendGroupValue(filter),
|
|
14
15
|
questionid: filter.column.id,
|
|
@@ -18,6 +19,6 @@ export function buildExpression(filter) {
|
|
|
18
19
|
value: getBackendValues(filter),
|
|
19
20
|
};
|
|
20
21
|
expression["enabled"] =
|
|
21
|
-
filter.selectAll || expression.value
|
|
22
|
+
filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
|
|
22
23
|
return expression;
|
|
23
24
|
}
|
|
@@ -66,8 +66,9 @@ function logicToNumeric(operator, priority = false) {
|
|
|
66
66
|
function numericExpression(filters, groupColumns = false) {
|
|
67
67
|
let expression = "";
|
|
68
68
|
filters.forEach((item, index) => {
|
|
69
|
+
var _a;
|
|
69
70
|
const nextColumn = (filters[index + 1] || {}).column;
|
|
70
|
-
const operator = logicToNumeric(item.operator, groupColumns && item.column
|
|
71
|
+
const operator = logicToNumeric(item.operator, groupColumns && ((_a = item.column) === null || _a === void 0 ? void 0 : _a.id) === (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.id));
|
|
71
72
|
expression += `${item.filterid}${operator}`;
|
|
72
73
|
});
|
|
73
74
|
return expression.substr(0, expression.length - 1);
|
|
@@ -14,21 +14,19 @@ export function getLogicByDatasets(logic, datasets = [], settings) {
|
|
|
14
14
|
if (isEmpty(datasets))
|
|
15
15
|
return logic;
|
|
16
16
|
settings = getGetLogicByDatasetsSettings(settings);
|
|
17
|
-
return logic.map((_l) => ({
|
|
18
|
-
..._l,
|
|
19
|
-
filters: filterNestedTree(_l.filters, "expressions", (expression) => {
|
|
17
|
+
return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: filterNestedTree(_l.filters, "expressions", (expression) => {
|
|
20
18
|
const dataset = datasets.find((_data) => _data === expression.qrveyid);
|
|
21
19
|
return ((settings.letPassUndefinedProperties.qrveyid &&
|
|
22
20
|
!_hasProperty(expression, "qrveyid")) ||
|
|
23
21
|
!isEmpty(dataset));
|
|
24
|
-
})
|
|
25
|
-
}));
|
|
22
|
+
}) })));
|
|
26
23
|
}
|
|
27
24
|
function getGetLogicByDatasetsSettings(settings) {
|
|
25
|
+
var _a, _b, _c;
|
|
28
26
|
return {
|
|
29
|
-
filterEmptyArrays: settings
|
|
27
|
+
filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
|
|
30
28
|
letPassUndefinedProperties: {
|
|
31
|
-
qrveyid: settings
|
|
29
|
+
qrveyid: (_c = (_b = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _b === void 0 ? void 0 : _b.qrveyid) !== null && _c !== void 0 ? _c : true,
|
|
32
30
|
},
|
|
33
31
|
};
|
|
34
32
|
}
|
|
@@ -15,9 +15,7 @@ export function getLogicByDatasetsColumns(logic, datasets = [], settings) {
|
|
|
15
15
|
if (isEmpty(datasets))
|
|
16
16
|
return logic;
|
|
17
17
|
settings = getGetLogicByDatasetsSettings(settings);
|
|
18
|
-
return logic.map((_l) => ({
|
|
19
|
-
..._l,
|
|
20
|
-
filters: filterNestedTree(_l.filters, "expressions", (expression) => {
|
|
18
|
+
return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: filterNestedTree(_l.filters, "expressions", (expression) => {
|
|
21
19
|
const letQrveyidPass = settings.letPassUndefinedProperties.qrveyid ||
|
|
22
20
|
_hasProperty(expression, "qrveyid");
|
|
23
21
|
let letQuestionidPass = settings.letPassUndefinedProperties.questionid ||
|
|
@@ -32,8 +30,7 @@ export function getLogicByDatasetsColumns(logic, datasets = [], settings) {
|
|
|
32
30
|
letQuestionidPass = letQuestionidPass || !isEmpty(column);
|
|
33
31
|
}
|
|
34
32
|
return letQrveyidPass && !isEmpty(dataset) && letQuestionidPass;
|
|
35
|
-
})
|
|
36
|
-
}));
|
|
33
|
+
}) })));
|
|
37
34
|
}
|
|
38
35
|
/**
|
|
39
36
|
* Gets the default settings for the getLogicByDatasetsColumn function
|
|
@@ -41,11 +38,12 @@ export function getLogicByDatasetsColumns(logic, datasets = [], settings) {
|
|
|
41
38
|
* @returns an object with all properties set
|
|
42
39
|
*/
|
|
43
40
|
function getGetLogicByDatasetsSettings(settings) {
|
|
41
|
+
var _a, _b, _c, _d, _e;
|
|
44
42
|
return {
|
|
45
|
-
filterEmptyArrays: settings
|
|
43
|
+
filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
|
|
46
44
|
letPassUndefinedProperties: {
|
|
47
|
-
qrveyid: settings
|
|
48
|
-
questionid: settings
|
|
45
|
+
qrveyid: (_c = (_b = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _b === void 0 ? void 0 : _b.qrveyid) !== null && _c !== void 0 ? _c : true,
|
|
46
|
+
questionid: (_e = (_d = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _d === void 0 ? void 0 : _d.questionid) !== null && _e !== void 0 ? _e : true,
|
|
49
47
|
},
|
|
50
48
|
};
|
|
51
49
|
}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
* @returns true: the filters are equal; false: the filters are NOT equal
|
|
6
6
|
*/
|
|
7
7
|
export function areFiltersEquals(filter1, filter2) {
|
|
8
|
+
var _a, _b, _c, _d;
|
|
8
9
|
return (filter1.extras.scopeid === filter2.extras.scopeid &&
|
|
9
10
|
filter1.column.qrveyid === filter2.column.qrveyid &&
|
|
10
11
|
filter1.extras.panelid === filter2.extras.panelid &&
|
|
11
12
|
filter1.column.id === filter2.column.id &&
|
|
12
|
-
filter1.column
|
|
13
|
-
filter1.column
|
|
13
|
+
((_a = filter1.column) === null || _a === void 0 ? void 0 : _a.aggregate) === ((_b = filter2.column) === null || _b === void 0 ? void 0 : _b.aggregate) &&
|
|
14
|
+
((_c = filter1.column) === null || _c === void 0 ? void 0 : _c.calculation) === ((_d = filter2.column) === null || _d === void 0 ? void 0 : _d.calculation));
|
|
14
15
|
}
|
|
@@ -22,19 +22,13 @@ export function excludeFiltersByParams(filterData, params) {
|
|
|
22
22
|
filterData.scopes = filterData.scopes
|
|
23
23
|
.map((scope) => {
|
|
24
24
|
if (resolveScopeConditions(scope, params)) {
|
|
25
|
-
return {
|
|
26
|
-
...scope,
|
|
27
|
-
datasets: scope.datasets
|
|
25
|
+
return Object.assign(Object.assign({}, scope), { datasets: scope.datasets
|
|
28
26
|
.map((dataset) => {
|
|
29
27
|
if (resolveDatasetConditions(dataset, params)) {
|
|
30
|
-
return {
|
|
31
|
-
...dataset,
|
|
32
|
-
filters: dataset.filters
|
|
28
|
+
return Object.assign(Object.assign({}, dataset), { filters: dataset.filters
|
|
33
29
|
.map((filter) => {
|
|
34
30
|
if (resolveFilterConditions(filter, params)) {
|
|
35
|
-
return {
|
|
36
|
-
...filter,
|
|
37
|
-
values: (filter.values || [])
|
|
31
|
+
return Object.assign(Object.assign({}, filter), { values: (filter.values || [])
|
|
38
32
|
.map((value) => {
|
|
39
33
|
if (Array.isArray(value) && value.length > 0) {
|
|
40
34
|
const rankingValues = value;
|
|
@@ -53,18 +47,18 @@ export function excludeFiltersByParams(filterData, params) {
|
|
|
53
47
|
return value;
|
|
54
48
|
}
|
|
55
49
|
})
|
|
56
|
-
.filter(Boolean)
|
|
57
|
-
};
|
|
50
|
+
.filter(Boolean) });
|
|
58
51
|
}
|
|
59
52
|
})
|
|
60
|
-
.filter((filter) =>
|
|
61
|
-
|
|
62
|
-
filter
|
|
63
|
-
|
|
53
|
+
.filter((filter) => {
|
|
54
|
+
var _a;
|
|
55
|
+
return !isEmpty(filter) &&
|
|
56
|
+
filter.selectAll &&
|
|
57
|
+
((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0;
|
|
58
|
+
}) });
|
|
64
59
|
}
|
|
65
60
|
})
|
|
66
|
-
.filter((dataset) => !isEmpty(dataset) && dataset.filters.length > 0)
|
|
67
|
-
};
|
|
61
|
+
.filter((dataset) => !isEmpty(dataset) && dataset.filters.length > 0) });
|
|
68
62
|
}
|
|
69
63
|
})
|
|
70
64
|
.filter((scope) => !isEmpty(scope) && scope.datasets.length > 0);
|
|
@@ -82,6 +76,7 @@ function resolveDatasetConditions(dataset, params) {
|
|
|
82
76
|
dataset.filters.length > 0);
|
|
83
77
|
}
|
|
84
78
|
function resolveFilterConditions(filter, params) {
|
|
79
|
+
var _a, _b, _c, _d, _e;
|
|
85
80
|
return ((params.enableds == null || params.enableds !== filter.enabled) &&
|
|
86
81
|
(isEmpty(params.dateSection) ||
|
|
87
82
|
params.dateSection !== filter.dateSection) &&
|
|
@@ -89,9 +84,9 @@ function resolveFilterConditions(filter, params) {
|
|
|
89
84
|
(isEmpty(params.property) || params.property !== filter.property) &&
|
|
90
85
|
(isEmpty(params.validator) || params.validator !== filter.validator) &&
|
|
91
86
|
(isEmpty(params.column) ||
|
|
92
|
-
(params.column
|
|
93
|
-
params.column
|
|
94
|
-
params.column
|
|
95
|
-
params.column
|
|
96
|
-
filter.values
|
|
87
|
+
(((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) !== filter.column.id &&
|
|
88
|
+
((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) !== filter.column.qrveyid &&
|
|
89
|
+
((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) !== filter.column.linkid &&
|
|
90
|
+
((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) !== filter.column.aggregate)) &&
|
|
91
|
+
((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0);
|
|
97
92
|
}
|
|
@@ -15,23 +15,24 @@
|
|
|
15
15
|
* @returns a text to identify the filter
|
|
16
16
|
*/
|
|
17
17
|
export function getFilterid(filter, index) {
|
|
18
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
18
19
|
const filterid = [];
|
|
19
20
|
if (filter.extras.scopeid != null)
|
|
20
21
|
filterid.push(filter.extras.scopeid);
|
|
21
|
-
if (filter.column
|
|
22
|
-
filterid.push(filter.column
|
|
22
|
+
if (((_a = filter.column) === null || _a === void 0 ? void 0 : _a.qrveyid) != null)
|
|
23
|
+
filterid.push((_b = filter.column) === null || _b === void 0 ? void 0 : _b.qrveyid);
|
|
23
24
|
if (filter.extras.panelid != null)
|
|
24
25
|
filterid.push(filter.extras.panelid);
|
|
25
|
-
if (filter.column
|
|
26
|
-
filterid.push(filter.column
|
|
26
|
+
if (((_c = filter.column) === null || _c === void 0 ? void 0 : _c.id) != null)
|
|
27
|
+
filterid.push((_d = filter.column) === null || _d === void 0 ? void 0 : _d.id);
|
|
27
28
|
if (filter.validator != null)
|
|
28
29
|
filterid.push(filter.validator);
|
|
29
30
|
if (filter.property != null)
|
|
30
31
|
filterid.push(filter.property);
|
|
31
|
-
if (filter.column
|
|
32
|
-
filterid.push(filter.column
|
|
33
|
-
if (filter.column
|
|
34
|
-
filterid.push(filter.column
|
|
32
|
+
if (((_e = filter.column) === null || _e === void 0 ? void 0 : _e.aggregate) != null)
|
|
33
|
+
filterid.push((_f = filter.column) === null || _f === void 0 ? void 0 : _f.aggregate);
|
|
34
|
+
if (((_g = filter.column) === null || _g === void 0 ? void 0 : _g.calculation) != null)
|
|
35
|
+
filterid.push((_h = filter.column) === null || _h === void 0 ? void 0 : _h.calculation);
|
|
35
36
|
if (index != null)
|
|
36
37
|
filterid.push(index.toString());
|
|
37
38
|
return filterid.length > 0 ? filterid.join("|") : "";
|