@qrvey/utils 1.4.0-1 → 1.4.0-4
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/getDatasetColumn.js +1 -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 +1 -1
- 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/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/interfaces/formula_builder/II18nFormulaBuilderListModal.d.ts +2 -1
- package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/cjs/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js +2 -1
- 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/getDatasetColumn.js +1 -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 +1 -1
- 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/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/interfaces/formula_builder/II18nFormulaBuilderListModal.d.ts +2 -1
- package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js +2 -1
- 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 +3 -3
|
@@ -60,7 +60,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
|
|
|
60
60
|
qrveyid: filter.column.qrveyid,
|
|
61
61
|
aggregate: filter.column.aggregate,
|
|
62
62
|
calculation: filter.column.calculation,
|
|
63
|
-
label: columnInfo
|
|
63
|
+
label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
|
|
64
64
|
linkid: filter.column.linkid,
|
|
65
65
|
linked: filter.column.linked,
|
|
66
66
|
outputFormat: filter.column.outputFormat,
|
|
@@ -69,31 +69,21 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
|
|
|
69
69
|
dateSection: filter.dateSection,
|
|
70
70
|
displayed: filter.displayed,
|
|
71
71
|
enabled: filter.enabled,
|
|
72
|
-
extras: {
|
|
73
|
-
...filter.extras,
|
|
74
|
-
panelid: filter.extras.panelid,
|
|
75
|
-
filterLabel: filter.extras.filterLabel,
|
|
76
|
-
info,
|
|
77
|
-
scope: filter.extras.scope,
|
|
78
|
-
scopeid: filter.extras.scopeid,
|
|
79
|
-
section: filter.extras.section,
|
|
80
|
-
scopeInfo: {
|
|
72
|
+
extras: Object.assign(Object.assign({}, filter.extras), { panelid: filter.extras.panelid, filterLabel: filter.extras.filterLabel, info, scope: filter.extras.scope, scopeid: filter.extras.scopeid, section: filter.extras.section, scopeInfo: {
|
|
81
73
|
collapsed: scope.collapsed,
|
|
82
74
|
enabled: scope.enabled,
|
|
83
75
|
displayed: scope.displayed,
|
|
84
76
|
label: scope.label,
|
|
85
77
|
scope: scope.scope,
|
|
86
78
|
scopeid: scope.scopeid,
|
|
87
|
-
},
|
|
88
|
-
dataset: {
|
|
79
|
+
}, dataset: {
|
|
89
80
|
qrveyid: dataset.qrveyid,
|
|
90
81
|
collapsed: dataset.collapsed,
|
|
91
82
|
enabled: dataset.enabled,
|
|
92
83
|
displayed: dataset.enabled,
|
|
93
84
|
label: dataset.label,
|
|
94
85
|
linkid: dataset.linkid,
|
|
95
|
-
},
|
|
96
|
-
},
|
|
86
|
+
} }),
|
|
97
87
|
filterid: filter.filterid,
|
|
98
88
|
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
99
89
|
nullValues: filter.nullValues,
|
|
@@ -70,6 +70,7 @@ function buildFilters(datasetSection, scope) {
|
|
|
70
70
|
}
|
|
71
71
|
function buildExpressions(filterSection, scope, dataset) {
|
|
72
72
|
return filterSection.reduce((expressions, filter) => {
|
|
73
|
+
var _a;
|
|
73
74
|
const expression = {
|
|
74
75
|
enabled: filter.enabled,
|
|
75
76
|
formulaType: filter.column.formulaType,
|
|
@@ -84,7 +85,7 @@ function buildExpressions(filterSection, scope, dataset) {
|
|
|
84
85
|
uiExtras: getFilterDetail(filter, scope, dataset),
|
|
85
86
|
};
|
|
86
87
|
expression["enabled"] =
|
|
87
|
-
filter.selectAll || expression.value
|
|
88
|
+
filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0
|
|
88
89
|
? filter.enabled
|
|
89
90
|
: false;
|
|
90
91
|
expressions.push(expression);
|
|
@@ -10,12 +10,7 @@ const COLUMN_1 = require("../../columns/constants/COLUMN");
|
|
|
10
10
|
* @returns A new value array with the filled properties.
|
|
11
11
|
*/
|
|
12
12
|
function adaptFilterValues(filter) {
|
|
13
|
-
const setValue = (value) => ({
|
|
14
|
-
...value,
|
|
15
|
-
value: (0, isEmpty_1.isEmpty)(value.value) ? undefined : value.value,
|
|
16
|
-
displayed: (0, isEmpty_1.isEmpty)(value.displayed) ? true : value.displayed,
|
|
17
|
-
enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled,
|
|
18
|
-
});
|
|
13
|
+
const setValue = (value) => (Object.assign(Object.assign({}, value), { value: (0, isEmpty_1.isEmpty)(value.value) ? undefined : value.value, displayed: (0, isEmpty_1.isEmpty)(value.displayed) ? true : value.displayed, enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled }));
|
|
19
14
|
if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
|
|
20
15
|
(0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
|
|
21
16
|
return (filter.values || []).map((rValues) => rValues.map(setValue));
|
|
@@ -39,13 +39,10 @@ function buildScopes(uFilters) {
|
|
|
39
39
|
? scopes[scopeIndex].datasets.findIndex((dt) => dt.qrveyid === uFilter.extras.dataset.qrveyid)
|
|
40
40
|
: -1;
|
|
41
41
|
if (scopeIndex === -1) {
|
|
42
|
-
scopes.push({
|
|
43
|
-
...uiScope,
|
|
44
|
-
datasets: [{ ...uiDataset, filters: [uiFilter] }],
|
|
45
|
-
});
|
|
42
|
+
scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
|
|
46
43
|
}
|
|
47
44
|
else if (datasetIndex === -1) {
|
|
48
|
-
scopes[scopeIndex].datasets.push({
|
|
45
|
+
scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
|
|
49
46
|
}
|
|
50
47
|
else {
|
|
51
48
|
scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
|
|
@@ -110,15 +107,7 @@ function buildFilter(uFilter) {
|
|
|
110
107
|
displayed: uFilter.displayed,
|
|
111
108
|
filterid: uFilter.filterid,
|
|
112
109
|
enabled: uFilter.enabled,
|
|
113
|
-
extras: {
|
|
114
|
-
...uFilter.extras,
|
|
115
|
-
panelid: uFilter.extras.panelid,
|
|
116
|
-
filterLabel: uFilter.extras.filterLabel,
|
|
117
|
-
info,
|
|
118
|
-
scope: uFilter.extras.scope,
|
|
119
|
-
scopeid: uFilter.extras.scopeid,
|
|
120
|
-
section: uFilter.extras.section,
|
|
121
|
-
},
|
|
110
|
+
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 }),
|
|
122
111
|
lookupDisplayIndex: uFilter.lookupDisplayIndex,
|
|
123
112
|
nullValues: uFilter.nullValues,
|
|
124
113
|
operator: uFilter.operator,
|
|
@@ -76,7 +76,7 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
|
|
|
76
76
|
uiValue: (0, getUIValues_1.getUIValues)(filter, { addEnableds: true }),
|
|
77
77
|
validator: filter.validator,
|
|
78
78
|
values: filter.values,
|
|
79
|
-
_newFilters: {
|
|
79
|
+
_newFilters: Object.assign({}, filter),
|
|
80
80
|
};
|
|
81
81
|
});
|
|
82
82
|
};
|
|
@@ -127,7 +127,7 @@ function getExpressions(props) {
|
|
|
127
127
|
expressions.push(getRegularExpression(props));
|
|
128
128
|
}
|
|
129
129
|
if (props.nullValues) {
|
|
130
|
-
expressions.push(getNullValueExpression({
|
|
130
|
+
expressions.push(getNullValueExpression(Object.assign({}, props)));
|
|
131
131
|
}
|
|
132
132
|
return expressions;
|
|
133
133
|
}
|
|
@@ -138,21 +138,12 @@ exports.getExpressionId = getExpressionId;
|
|
|
138
138
|
function getRankingExpressions(props) {
|
|
139
139
|
const values = props.values || [];
|
|
140
140
|
return values.map((_value, index) => {
|
|
141
|
-
const expression = {
|
|
142
|
-
|
|
143
|
-
...props,
|
|
144
|
-
values: [props.values[index]],
|
|
145
|
-
}),
|
|
146
|
-
validationType: (0, getBackendValidator_1.getBackendValidator)(props),
|
|
147
|
-
};
|
|
148
|
-
return {
|
|
149
|
-
...expression,
|
|
150
|
-
value: getValues(props, index),
|
|
151
|
-
uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) },
|
|
152
|
-
};
|
|
141
|
+
const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: (0, getBackendValidator_1.getBackendValidator)(props) });
|
|
142
|
+
return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
|
|
153
143
|
});
|
|
154
144
|
}
|
|
155
145
|
function getRegularExpression(props) {
|
|
146
|
+
var _a;
|
|
156
147
|
const uiValue = getUIValuess(props);
|
|
157
148
|
const expression = {
|
|
158
149
|
groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(props),
|
|
@@ -164,13 +155,10 @@ function getRegularExpression(props) {
|
|
|
164
155
|
formulaType: props.column.formulaType,
|
|
165
156
|
validationType: (0, getBackendValidator_1.getBackendValidator)(props),
|
|
166
157
|
value: getValues(props),
|
|
167
|
-
uiExtras: {
|
|
168
|
-
...props,
|
|
169
|
-
uiValue,
|
|
170
|
-
},
|
|
158
|
+
uiExtras: Object.assign(Object.assign({}, props), { uiValue }),
|
|
171
159
|
};
|
|
172
160
|
expression["enabled"] =
|
|
173
|
-
props.selectAll || expression.value
|
|
161
|
+
props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
|
|
174
162
|
return expression;
|
|
175
163
|
}
|
|
176
164
|
function getNullValueExpression(props) {
|
|
@@ -241,64 +229,42 @@ function getValues(props, rankingGroupIndex) {
|
|
|
241
229
|
}
|
|
242
230
|
}
|
|
243
231
|
function getUIValuess(props, rankingGroupIndex) {
|
|
232
|
+
var _a, _b;
|
|
244
233
|
const values = props.values || [];
|
|
245
234
|
switch (props.validator) {
|
|
246
235
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
|
|
247
236
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
|
|
248
237
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
|
|
249
238
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
|
|
250
|
-
return values.map((value) => ({
|
|
251
|
-
...value,
|
|
252
|
-
value: value.min,
|
|
253
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
254
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
255
|
-
}));
|
|
239
|
+
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 })));
|
|
256
240
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
|
|
257
241
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
|
|
258
242
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
|
|
259
243
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
|
|
260
|
-
return values.map((value) => ({
|
|
261
|
-
...value,
|
|
262
|
-
value: value.max,
|
|
263
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
264
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
265
|
-
}));
|
|
244
|
+
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 })));
|
|
266
245
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
|
|
267
246
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
|
|
268
|
-
return values.map((value) => ({
|
|
269
|
-
...value,
|
|
270
|
-
value: `${value.min} - ${value.max}`,
|
|
271
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
272
|
-
enabled: value.enabled != null ? value.enabled : true,
|
|
273
|
-
}));
|
|
247
|
+
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 })));
|
|
274
248
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
|
|
275
249
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
|
|
276
250
|
return [
|
|
277
251
|
{
|
|
278
252
|
value: FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[props.validator].label,
|
|
279
|
-
enabled: values[0]
|
|
253
|
+
enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled,
|
|
280
254
|
},
|
|
281
255
|
];
|
|
282
256
|
case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
|
|
283
|
-
return values.map((value) => ({
|
|
284
|
-
...value,
|
|
285
|
-
value: `${RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1
|
|
257
|
+
return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1
|
|
286
258
|
? value.number
|
|
287
259
|
: ""} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS
|
|
288
260
|
? `from ${value.anchor || "current date"}`
|
|
289
|
-
: ""}`,
|
|
290
|
-
displayed: value.displayed != null ? value.displayed : true,
|
|
291
|
-
enabled: props.enabled,
|
|
292
|
-
}));
|
|
261
|
+
: ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
|
|
293
262
|
default:
|
|
294
263
|
if (props.column.type === COLUMN_1.COLUMN.RANKING &&
|
|
295
264
|
(0, isEmpty_1.isEmpty)(props.column.aggregate)) {
|
|
296
265
|
return getRankingUIValues(values, rankingGroupIndex);
|
|
297
266
|
}
|
|
298
|
-
return values.map((val) => ({
|
|
299
|
-
...val,
|
|
300
|
-
enabled: val.enabled != null ? val.enabled : true,
|
|
301
|
-
}));
|
|
267
|
+
return values.map((val) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
|
|
302
268
|
}
|
|
303
269
|
}
|
|
304
270
|
function getValueUiUnitRelativeDate(relative) {
|
|
@@ -45,13 +45,10 @@ function buildScopes(uFilters) {
|
|
|
45
45
|
uf.column.qrveyid === uFilter.column.qrveyid)
|
|
46
46
|
: -1;
|
|
47
47
|
if (scopeIndex === -1) {
|
|
48
|
-
scopes.push({
|
|
49
|
-
...uiScope,
|
|
50
|
-
datasets: [{ ...uiDataset, filters: [uiFilter] }],
|
|
51
|
-
});
|
|
48
|
+
scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
|
|
52
49
|
}
|
|
53
50
|
else if (datasetIndex === -1) {
|
|
54
|
-
scopes[scopeIndex].datasets.push({
|
|
51
|
+
scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
|
|
55
52
|
}
|
|
56
53
|
else if (lastUiFilterIndex === -1) {
|
|
57
54
|
scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
|
|
@@ -128,15 +125,7 @@ function buildFilter(uFilter) {
|
|
|
128
125
|
displayed: uFilter.displayed,
|
|
129
126
|
filterid: uFilter.filterid,
|
|
130
127
|
enabled: uFilter.enabled,
|
|
131
|
-
extras: {
|
|
132
|
-
...uFilter.extras,
|
|
133
|
-
panelid: uFilter.extras.panelid,
|
|
134
|
-
filterLabel: uFilter.extras.filterLabel,
|
|
135
|
-
info,
|
|
136
|
-
scope: uFilter.extras.scope,
|
|
137
|
-
scopeid: uFilter.extras.scopeid,
|
|
138
|
-
section: uFilter.extras.section,
|
|
139
|
-
},
|
|
128
|
+
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 }),
|
|
140
129
|
lookupDisplayIndex: uFilter.lookupDisplayIndex,
|
|
141
130
|
nullValues: uFilter.nullValues,
|
|
142
131
|
operator: uFilter.operator,
|
|
@@ -65,6 +65,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
function getFilterByExpression(expression, scopeItem) {
|
|
68
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
68
69
|
const uiExtras = expression.uiExtras;
|
|
69
70
|
const scopeid = scopeItem.scope !== FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL
|
|
70
71
|
? (0, get_1._get)(scopeItem, "uiExtras.scopeid")
|
|
@@ -76,49 +77,40 @@ function getFilterByExpression(expression, scopeItem) {
|
|
|
76
77
|
return {
|
|
77
78
|
collapsed: uiExtras.collapsed,
|
|
78
79
|
column: {
|
|
79
|
-
id: uiExtras.column
|
|
80
|
-
formulaType: uiExtras.column
|
|
81
|
-
linkid: uiExtras.column
|
|
82
|
-
linked: uiExtras.column
|
|
83
|
-
qrveyid: uiExtras.column
|
|
84
|
-
aggregate: uiExtras.column
|
|
85
|
-
uiExtras.column
|
|
86
|
-
calculation: uiExtras.column
|
|
87
|
-
uiExtras.column
|
|
80
|
+
id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
|
|
81
|
+
formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
|
|
82
|
+
linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
|
|
83
|
+
linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
|
|
84
|
+
qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
|
|
85
|
+
aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) ||
|
|
86
|
+
((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
|
|
87
|
+
calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) ||
|
|
88
|
+
((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
|
|
88
89
|
label: (0, get_1._get)(uiExtras.column, "text") || (0, get_1._get)(uiExtras.column, "label"),
|
|
89
90
|
property: uiExtras.column.property,
|
|
90
91
|
sorting: uiExtras.column.sorting,
|
|
91
|
-
outputFormat: uiExtras.column
|
|
92
|
-
type: uiExtras.column
|
|
92
|
+
outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
|
|
93
|
+
type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
|
|
93
94
|
},
|
|
94
95
|
dateSection: uiExtras.dateSection,
|
|
95
96
|
displayed: true,
|
|
96
97
|
enabled: uiExtras.enabled,
|
|
97
|
-
extras: {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
filterLabel: uiExtras.panelName,
|
|
101
|
-
info,
|
|
102
|
-
scopeid,
|
|
103
|
-
scope: scopeItem.scope,
|
|
104
|
-
section: uiExtras.section,
|
|
105
|
-
scopeInfo: {
|
|
106
|
-
collapsed: scopeItem.uiExtras?.collapsed,
|
|
98
|
+
extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
|
|
99
|
+
scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
|
|
100
|
+
collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
|
|
107
101
|
enabled: scopeItem.enabled,
|
|
108
102
|
displayed: true,
|
|
109
103
|
scope: scopeItem.scope,
|
|
110
104
|
scopeid,
|
|
111
|
-
},
|
|
112
|
-
dataset: {
|
|
105
|
+
}, dataset: {
|
|
113
106
|
collapsed: false,
|
|
114
107
|
enabled: true,
|
|
115
108
|
displayed: true,
|
|
116
|
-
qrveyid: uiExtras.column
|
|
109
|
+
qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
|
|
117
110
|
label: (0, get_1._get)(uiExtras.column, "dataset.name") ||
|
|
118
111
|
(0, get_1._get)(uiExtras.column, "label"),
|
|
119
|
-
linkid: uiExtras.column
|
|
120
|
-
},
|
|
121
|
-
},
|
|
112
|
+
linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
|
|
113
|
+
} }),
|
|
122
114
|
filterid: undefined,
|
|
123
115
|
lookupDisplayIndex: uiExtras.lookupDisplayIndex,
|
|
124
116
|
nullValues: uiExtras.nullValues,
|
|
@@ -177,11 +169,7 @@ function refineRankingValues(values = [], uiValues = []) {
|
|
|
177
169
|
return [
|
|
178
170
|
...valueGroup.map((value) => {
|
|
179
171
|
const rValue = uiValues.find((uiV) => uiV.valueid === value.value.valueid);
|
|
180
|
-
return {
|
|
181
|
-
...value,
|
|
182
|
-
displayed: rValue && rValue.displayed != null ? rValue.displayed : true,
|
|
183
|
-
enabled: rValue && rValue.enabled != null ? rValue.enabled : true,
|
|
184
|
-
};
|
|
172
|
+
return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
|
|
185
173
|
}),
|
|
186
174
|
];
|
|
187
175
|
});
|
|
@@ -133,7 +133,7 @@ function validateComplexTypes(oldFiltersItem, validations) {
|
|
|
133
133
|
"USADDRESS",
|
|
134
134
|
].includes(oldFiltersItem.type))
|
|
135
135
|
return oldFiltersItem;
|
|
136
|
-
const complexFiltersItem = {
|
|
136
|
+
const complexFiltersItem = Object.assign(Object.assign({}, oldFiltersItem), { values: [{}] });
|
|
137
137
|
validations.forEach((valKey) => {
|
|
138
138
|
oldFiltersItem.values[0][valKey].forEach((value) => {
|
|
139
139
|
const newKey = `${valKey}|${(value.targetFilter || value.property || "")
|
|
@@ -261,11 +261,7 @@ function getDateProperty(validationKey, columnType, formulaType) {
|
|
|
261
261
|
: "day";
|
|
262
262
|
}
|
|
263
263
|
function getFilterRangeValue(range, minProp = "min", maxProp = "max", extras = {}) {
|
|
264
|
-
return {
|
|
265
|
-
[minProp]: range.from || range.gte,
|
|
266
|
-
[maxProp]: range.to || range.lte,
|
|
267
|
-
...extras,
|
|
268
|
-
};
|
|
264
|
+
return Object.assign({ [minProp]: range.from || range.gte, [maxProp]: range.to || range.lte }, extras);
|
|
269
265
|
}
|
|
270
266
|
function getUiRangeValue(oldValue) {
|
|
271
267
|
if (oldValue.label)
|
|
@@ -276,10 +272,7 @@ function getUiRangeValue(oldValue) {
|
|
|
276
272
|
function getRankingFBvalues(values) {
|
|
277
273
|
const returnValues = [];
|
|
278
274
|
values
|
|
279
|
-
.map((vItem) => ({
|
|
280
|
-
...vItem,
|
|
281
|
-
position: +vItem.position + 1,
|
|
282
|
-
}))
|
|
275
|
+
.map((vItem) => (Object.assign(Object.assign({}, vItem), { position: +vItem.position + 1 })))
|
|
283
276
|
.forEach((vItem) => {
|
|
284
277
|
const groupIndex = returnValues.findIndex((group) => group.every((groupItem) => groupItem.value.value !== vItem.value) &&
|
|
285
278
|
group.every((groupItem) => groupItem.position !== vItem.position));
|
|
@@ -434,15 +427,7 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
|
|
|
434
427
|
section,
|
|
435
428
|
},
|
|
436
429
|
};
|
|
437
|
-
expressions.push({
|
|
438
|
-
...expressionItem,
|
|
439
|
-
value: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "value", formulaType && formulaType.toUpperCase()),
|
|
440
|
-
uiExtras: {
|
|
441
|
-
...expressionItem.uiExtras,
|
|
442
|
-
values: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "values", formulaType && formulaType.toUpperCase()),
|
|
443
|
-
uiValue: getValues(oldFiltersItem.values[0][valKey], questionType, validationKey, "uiValue", formulaType && formulaType.toUpperCase()),
|
|
444
|
-
},
|
|
445
|
-
});
|
|
430
|
+
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()) }) }));
|
|
446
431
|
});
|
|
447
432
|
return expressions;
|
|
448
433
|
}
|
|
@@ -6,14 +6,6 @@ exports.FilterInputErrorHandler = void 0;
|
|
|
6
6
|
* @todo Finish the class
|
|
7
7
|
*/
|
|
8
8
|
class FilterInputErrorHandler {
|
|
9
|
-
_column;
|
|
10
|
-
_locale;
|
|
11
|
-
_property;
|
|
12
|
-
_validator;
|
|
13
|
-
_value;
|
|
14
|
-
_dateFormat;
|
|
15
|
-
_valueKeys;
|
|
16
|
-
_error;
|
|
17
9
|
constructor(config) {
|
|
18
10
|
this._column = config.column;
|
|
19
11
|
this._locale = config.locale;
|
|
@@ -17,17 +17,8 @@ function applyHierarchyForAggFilters(chartSettings, scopes = [], currentScope =
|
|
|
17
17
|
return;
|
|
18
18
|
const availableScopes = (0, getScopesByHierarchy_1.getScopesByHierarchy)(scopes, currentScope);
|
|
19
19
|
const charts = (chartSettings.chart || [])
|
|
20
|
-
.map((chart) => ({
|
|
21
|
-
...chart,
|
|
22
|
-
aggFilters: chart.aggFilters && {
|
|
23
|
-
...chart.aggFilters,
|
|
24
|
-
expressions: (0, filterNestedTree_1.filterNestedTree)(chart.aggFilters.expressions || [], "expressions", (expression) => availableScopes.find((scope) => expression.scope === scope.label)),
|
|
25
|
-
},
|
|
26
|
-
}))
|
|
20
|
+
.map((chart) => (Object.assign(Object.assign({}, chart), { aggFilters: chart.aggFilters && Object.assign(Object.assign({}, chart.aggFilters), { expressions: (0, filterNestedTree_1.filterNestedTree)(chart.aggFilters.expressions || [], "expressions", (expression) => availableScopes.find((scope) => expression.scope === scope.label)) }) })))
|
|
27
21
|
.filter((chart) => chart.aggFilters);
|
|
28
|
-
return {
|
|
29
|
-
...chartSettings,
|
|
30
|
-
chart: charts.length ? charts : chartSettings.chart,
|
|
31
|
-
};
|
|
22
|
+
return Object.assign(Object.assign({}, chartSettings), { chart: charts.length ? charts : chartSettings.chart });
|
|
32
23
|
}
|
|
33
24
|
exports.applyHierarchyForAggFilters = applyHierarchyForAggFilters;
|
|
@@ -12,6 +12,7 @@ const getBackendValues_1 = require("./getBackendValues");
|
|
|
12
12
|
* @returns a filter expression
|
|
13
13
|
*/
|
|
14
14
|
function buildExpression(filter) {
|
|
15
|
+
var _a;
|
|
15
16
|
const expression = {
|
|
16
17
|
groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(filter),
|
|
17
18
|
questionid: filter.column.id,
|
|
@@ -21,7 +22,7 @@ function buildExpression(filter) {
|
|
|
21
22
|
value: (0, getBackendValues_1.getBackendValues)(filter),
|
|
22
23
|
};
|
|
23
24
|
expression["enabled"] =
|
|
24
|
-
filter.selectAll || expression.value
|
|
25
|
+
filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
|
|
25
26
|
return expression;
|
|
26
27
|
}
|
|
27
28
|
exports.buildExpression = buildExpression;
|
|
@@ -70,8 +70,9 @@ function logicToNumeric(operator, priority = false) {
|
|
|
70
70
|
function numericExpression(filters, groupColumns = false) {
|
|
71
71
|
let expression = "";
|
|
72
72
|
filters.forEach((item, index) => {
|
|
73
|
+
var _a;
|
|
73
74
|
const nextColumn = (filters[index + 1] || {}).column;
|
|
74
|
-
const operator = logicToNumeric(item.operator, groupColumns && item.column
|
|
75
|
+
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));
|
|
75
76
|
expression += `${item.filterid}${operator}`;
|
|
76
77
|
});
|
|
77
78
|
return expression.substr(0, expression.length - 1);
|
|
@@ -21,9 +21,6 @@ function getAggFiltersBySummaryIndex(aggFilters, summaryIndex) {
|
|
|
21
21
|
});
|
|
22
22
|
if (!expressions.length)
|
|
23
23
|
return undefined;
|
|
24
|
-
return {
|
|
25
|
-
...aggFilters,
|
|
26
|
-
expressions,
|
|
27
|
-
};
|
|
24
|
+
return Object.assign(Object.assign({}, aggFilters), { expressions });
|
|
28
25
|
}
|
|
29
26
|
exports.getAggFiltersBySummaryIndex = getAggFiltersBySummaryIndex;
|
|
@@ -17,22 +17,20 @@ function getLogicByDatasets(logic, datasets = [], settings) {
|
|
|
17
17
|
if ((0, isEmpty_1.isEmpty)(datasets))
|
|
18
18
|
return logic;
|
|
19
19
|
settings = getGetLogicByDatasetsSettings(settings);
|
|
20
|
-
return logic.map((_l) => ({
|
|
21
|
-
..._l,
|
|
22
|
-
filters: (0, general_1.filterNestedTree)(_l.filters, "expressions", (expression) => {
|
|
20
|
+
return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: (0, general_1.filterNestedTree)(_l.filters, "expressions", (expression) => {
|
|
23
21
|
const dataset = datasets.find((_data) => _data === expression.qrveyid);
|
|
24
22
|
return ((settings.letPassUndefinedProperties.qrveyid &&
|
|
25
23
|
!(0, general_1._hasProperty)(expression, "qrveyid")) ||
|
|
26
24
|
!(0, isEmpty_1.isEmpty)(dataset));
|
|
27
|
-
})
|
|
28
|
-
}));
|
|
25
|
+
}) })));
|
|
29
26
|
}
|
|
30
27
|
exports.getLogicByDatasets = getLogicByDatasets;
|
|
31
28
|
function getGetLogicByDatasetsSettings(settings) {
|
|
29
|
+
var _a, _b, _c;
|
|
32
30
|
return {
|
|
33
|
-
filterEmptyArrays: settings
|
|
31
|
+
filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
|
|
34
32
|
letPassUndefinedProperties: {
|
|
35
|
-
qrveyid: settings
|
|
33
|
+
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,
|
|
36
34
|
},
|
|
37
35
|
};
|
|
38
36
|
}
|
|
@@ -18,9 +18,7 @@ function getLogicByDatasetsColumns(logic, datasets = [], settings) {
|
|
|
18
18
|
if ((0, isEmpty_1.isEmpty)(datasets))
|
|
19
19
|
return logic;
|
|
20
20
|
settings = getGetLogicByDatasetsSettings(settings);
|
|
21
|
-
return logic.map((_l) => ({
|
|
22
|
-
..._l,
|
|
23
|
-
filters: (0, filterNestedTree_1.filterNestedTree)(_l.filters, "expressions", (expression) => {
|
|
21
|
+
return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: (0, filterNestedTree_1.filterNestedTree)(_l.filters, "expressions", (expression) => {
|
|
24
22
|
const letQrveyidPass = settings.letPassUndefinedProperties.qrveyid ||
|
|
25
23
|
(0, hasProperty_1._hasProperty)(expression, "qrveyid");
|
|
26
24
|
let letQuestionidPass = settings.letPassUndefinedProperties.questionid ||
|
|
@@ -35,8 +33,7 @@ function getLogicByDatasetsColumns(logic, datasets = [], settings) {
|
|
|
35
33
|
letQuestionidPass = letQuestionidPass || !(0, isEmpty_1.isEmpty)(column);
|
|
36
34
|
}
|
|
37
35
|
return letQrveyidPass && !(0, isEmpty_1.isEmpty)(dataset) && letQuestionidPass;
|
|
38
|
-
})
|
|
39
|
-
}));
|
|
36
|
+
}) })));
|
|
40
37
|
}
|
|
41
38
|
exports.getLogicByDatasetsColumns = getLogicByDatasetsColumns;
|
|
42
39
|
/**
|
|
@@ -45,11 +42,12 @@ exports.getLogicByDatasetsColumns = getLogicByDatasetsColumns;
|
|
|
45
42
|
* @returns an object with all properties set
|
|
46
43
|
*/
|
|
47
44
|
function getGetLogicByDatasetsSettings(settings) {
|
|
45
|
+
var _a, _b, _c, _d, _e;
|
|
48
46
|
return {
|
|
49
|
-
filterEmptyArrays: settings
|
|
47
|
+
filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
|
|
50
48
|
letPassUndefinedProperties: {
|
|
51
|
-
qrveyid: settings
|
|
52
|
-
questionid: settings
|
|
49
|
+
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,
|
|
50
|
+
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,
|
|
53
51
|
},
|
|
54
52
|
};
|
|
55
53
|
}
|
|
@@ -8,11 +8,12 @@ exports.areFiltersEquals = void 0;
|
|
|
8
8
|
* @returns true: the filters are equal; false: the filters are NOT equal
|
|
9
9
|
*/
|
|
10
10
|
function areFiltersEquals(filter1, filter2) {
|
|
11
|
+
var _a, _b, _c, _d;
|
|
11
12
|
return (filter1.extras.scopeid === filter2.extras.scopeid &&
|
|
12
13
|
filter1.column.qrveyid === filter2.column.qrveyid &&
|
|
13
14
|
filter1.extras.panelid === filter2.extras.panelid &&
|
|
14
15
|
filter1.column.id === filter2.column.id &&
|
|
15
|
-
filter1.column
|
|
16
|
-
filter1.column
|
|
16
|
+
((_a = filter1.column) === null || _a === void 0 ? void 0 : _a.aggregate) === ((_b = filter2.column) === null || _b === void 0 ? void 0 : _b.aggregate) &&
|
|
17
|
+
((_c = filter1.column) === null || _c === void 0 ? void 0 : _c.calculation) === ((_d = filter2.column) === null || _d === void 0 ? void 0 : _d.calculation));
|
|
17
18
|
}
|
|
18
19
|
exports.areFiltersEquals = areFiltersEquals;
|