@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
|
@@ -10,19 +10,17 @@ import { columnTypeByChart } from "./columnTypeByChart";
|
|
|
10
10
|
* @param {IColumnFormatSettings} settings - IColumnFormatSettings
|
|
11
11
|
*/
|
|
12
12
|
export const defineTableChartFormat = (column, settings) => {
|
|
13
|
-
const { aggregate,
|
|
13
|
+
const { aggregate, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
|
|
14
14
|
const { tableType, shelfType } = settings;
|
|
15
15
|
//Defaults
|
|
16
16
|
const defaultText = "Default";
|
|
17
17
|
const defaultNumeric = { type: "NUMERIC", format: "Numeric" };
|
|
18
|
-
const defaultAbb = { type: "NUMERIC", format: "Abbreviated" };
|
|
19
18
|
const isGroupedTable = tableType === TABLE_TYPE.GROUPED;
|
|
20
19
|
const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.TABLES, isGroupedTable);
|
|
21
|
-
const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === dateGroup
|
|
20
|
+
const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
|
|
22
21
|
const hasDefaultFormat = isEmpty(selectedFormat) ||
|
|
23
|
-
outputFormat
|
|
24
|
-
selectedFormat
|
|
25
|
-
const isUsedAsNumericColumn = type !== columnType;
|
|
22
|
+
(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
|
|
23
|
+
(selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
|
|
26
24
|
switch (columnType) {
|
|
27
25
|
case COLUMN.YES_NO:
|
|
28
26
|
case COLUMN.PHONE:
|
|
@@ -41,11 +39,7 @@ export const defineTableChartFormat = (column, settings) => {
|
|
|
41
39
|
}
|
|
42
40
|
else if (hasDefaultFormat) {
|
|
43
41
|
const columnDefaultFormat = defaultFormat || outputFormat;
|
|
44
|
-
return {
|
|
45
|
-
...defaultFormat,
|
|
46
|
-
format: defaultText,
|
|
47
|
-
originalFormat: { ...columnDefaultFormat },
|
|
48
|
-
};
|
|
42
|
+
return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat) });
|
|
49
43
|
}
|
|
50
44
|
else {
|
|
51
45
|
return selectedFormat;
|
|
@@ -54,23 +48,13 @@ export const defineTableChartFormat = (column, settings) => {
|
|
|
54
48
|
case COLUMN.NUMERIC:
|
|
55
49
|
case COLUMN.RATING:
|
|
56
50
|
case COLUMN.SLIDEBAR: {
|
|
57
|
-
if (
|
|
58
|
-
if (aggregate
|
|
51
|
+
if (hasDefaultFormat) {
|
|
52
|
+
if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT ||
|
|
53
|
+
(aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.DISTINCTCOUNT)
|
|
59
54
|
return defaultNumeric;
|
|
60
|
-
|
|
61
|
-
return defaultAbb;
|
|
62
|
-
else
|
|
63
|
-
return outputFormat;
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
if (hasDefaultFormat) {
|
|
67
|
-
return {
|
|
68
|
-
...column.outputFormat,
|
|
69
|
-
};
|
|
70
|
-
}
|
|
71
|
-
else
|
|
72
|
-
return selectedFormat;
|
|
55
|
+
return defaultFormat;
|
|
73
56
|
}
|
|
57
|
+
return selectedFormat;
|
|
74
58
|
}
|
|
75
59
|
}
|
|
76
60
|
};
|
|
@@ -18,11 +18,11 @@ export const defineXYChartFormat = (column, settings) => {
|
|
|
18
18
|
const defaultText = "Default";
|
|
19
19
|
const defaultAbb = { type: "NUMERIC", format: "Abbreviated" };
|
|
20
20
|
const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.XY);
|
|
21
|
-
const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === dateGroup
|
|
21
|
+
const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
|
|
22
22
|
const isUsedAsNumericColumn = type !== columnType;
|
|
23
23
|
const hasDefaultFormat = isEmpty(selectedFormat) ||
|
|
24
|
-
outputFormat
|
|
25
|
-
selectedFormat
|
|
24
|
+
(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
|
|
25
|
+
(selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
|
|
26
26
|
switch (columnType) {
|
|
27
27
|
case COLUMN.YES_NO:
|
|
28
28
|
case COLUMN.PHONE:
|
|
@@ -40,11 +40,7 @@ export const defineXYChartFormat = (column, settings) => {
|
|
|
40
40
|
return STRING_FORMAT.NONE;
|
|
41
41
|
}
|
|
42
42
|
else if (hasDefaultFormat) {
|
|
43
|
-
return {
|
|
44
|
-
...columnDefaultFormat,
|
|
45
|
-
format: defaultText,
|
|
46
|
-
originalFormat: { ...outputFormat },
|
|
47
|
-
};
|
|
43
|
+
return Object.assign(Object.assign({}, columnDefaultFormat), { format: defaultText, originalFormat: Object.assign({}, outputFormat) });
|
|
48
44
|
}
|
|
49
45
|
else {
|
|
50
46
|
return selectedFormat;
|
|
@@ -54,8 +50,8 @@ export const defineXYChartFormat = (column, settings) => {
|
|
|
54
50
|
case COLUMN.RATING:
|
|
55
51
|
case COLUMN.SLIDEBAR: {
|
|
56
52
|
if (isUsedAsNumericColumn) {
|
|
57
|
-
if ((aggregate
|
|
58
|
-
(isUsedAsNumericColumn && outputFormat
|
|
53
|
+
if (((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT && hasDefaultFormat) ||
|
|
54
|
+
(isUsedAsNumericColumn && (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.type) !== COLUMN.NUMERIC) ||
|
|
59
55
|
withoutFormat)
|
|
60
56
|
return defaultAbb;
|
|
61
57
|
else
|
|
@@ -66,7 +62,7 @@ export const defineXYChartFormat = (column, settings) => {
|
|
|
66
62
|
return columnDefaultFormat;
|
|
67
63
|
}
|
|
68
64
|
else if (hasDefaultFormat) {
|
|
69
|
-
return {
|
|
65
|
+
return Object.assign({}, outputFormat);
|
|
70
66
|
}
|
|
71
67
|
else
|
|
72
68
|
return selectedFormat;
|
|
@@ -6,184 +6,158 @@ import { NUMERICAL_COLUMN_INFO } from "./NUMERICAL_COLUMN_INFO";
|
|
|
6
6
|
/**
|
|
7
7
|
* @description Key/array of column property info
|
|
8
8
|
*/
|
|
9
|
-
export const COLUMN_INFO = {
|
|
10
|
-
[COLUMN.SINGLE_CHOICE]: {
|
|
9
|
+
export const COLUMN_INFO = Object.assign(Object.assign(Object.assign({ [COLUMN.SINGLE_CHOICE]: {
|
|
11
10
|
label: COLUMN_LABEL.SINGLE_CHOICE,
|
|
12
11
|
shortLabel: "Single Choice",
|
|
13
12
|
abbrLabel: "SC",
|
|
14
13
|
value: COLUMN.SINGLE_CHOICE,
|
|
15
14
|
displayed: true,
|
|
16
15
|
i18nLabelPath: "common.column_types.single_choice_label",
|
|
17
|
-
},
|
|
18
|
-
[COLUMN.MULTIPLE_CHOICE]: {
|
|
16
|
+
}, [COLUMN.MULTIPLE_CHOICE]: {
|
|
19
17
|
label: COLUMN_LABEL.MULTIPLE_CHOICE,
|
|
20
18
|
shortLabel: "Multiple Choice",
|
|
21
19
|
abbrLabel: "MC",
|
|
22
20
|
value: COLUMN.MULTIPLE_CHOICE,
|
|
23
21
|
displayed: true,
|
|
24
22
|
i18nLabelPath: "common.column_types.multiple_choice_label",
|
|
25
|
-
},
|
|
26
|
-
[COLUMN.YES_NO]: {
|
|
23
|
+
}, [COLUMN.YES_NO]: {
|
|
27
24
|
label: COLUMN_LABEL.YES_NO,
|
|
28
25
|
shortLabel: "Yes No",
|
|
29
26
|
abbrLabel: "YS",
|
|
30
27
|
value: COLUMN.YES_NO,
|
|
31
28
|
displayed: true,
|
|
32
29
|
i18nLabelPath: "common.column_types.yes_no_label",
|
|
33
|
-
},
|
|
34
|
-
[COLUMN.RANKING]: {
|
|
30
|
+
}, [COLUMN.RANKING]: {
|
|
35
31
|
label: COLUMN_LABEL.RANKING,
|
|
36
32
|
shortLabel: "Ranking",
|
|
37
33
|
abbrLabel: "RAN",
|
|
38
34
|
value: COLUMN.RANKING,
|
|
39
35
|
displayed: true,
|
|
40
36
|
i18nLabelPath: "common.column_types.ranking_label",
|
|
41
|
-
},
|
|
42
|
-
[COLUMN.DATE]: {
|
|
37
|
+
}, [COLUMN.DATE]: {
|
|
43
38
|
label: COLUMN_LABEL.DATE,
|
|
44
39
|
shortLabel: "Date",
|
|
45
40
|
abbrLabel: "DA",
|
|
46
41
|
value: COLUMN.DATE,
|
|
47
42
|
displayed: true,
|
|
48
43
|
i18nLabelPath: "common.column_types.date_label",
|
|
49
|
-
},
|
|
50
|
-
[COLUMN.SIGNATURE]: {
|
|
44
|
+
}, [COLUMN.SIGNATURE]: {
|
|
51
45
|
label: COLUMN_LABEL.SIGNATURE,
|
|
52
46
|
shortLabel: "Signature",
|
|
53
47
|
abbrLabel: "SIGN",
|
|
54
48
|
value: COLUMN.SIGNATURE,
|
|
55
49
|
displayed: true,
|
|
56
50
|
i18nLabelPath: "common.column_types.signature_label",
|
|
57
|
-
},
|
|
58
|
-
[COLUMN.DROPDOWN]: {
|
|
51
|
+
}, [COLUMN.DROPDOWN]: {
|
|
59
52
|
label: COLUMN_LABEL.DROPDOWN,
|
|
60
53
|
shortLabel: "Dropdown",
|
|
61
54
|
abbrLabel: "DD",
|
|
62
55
|
value: COLUMN.DROPDOWN,
|
|
63
56
|
displayed: true,
|
|
64
57
|
i18nLabelPath: "common.column_types.dropdown_label",
|
|
65
|
-
},
|
|
66
|
-
[COLUMN.IMAGE]: {
|
|
58
|
+
}, [COLUMN.IMAGE]: {
|
|
67
59
|
label: COLUMN_LABEL.IMAGE,
|
|
68
60
|
shortLabel: "Image",
|
|
69
61
|
abbrLabel: "IMG",
|
|
70
62
|
value: COLUMN.IMAGE,
|
|
71
63
|
displayed: true,
|
|
72
64
|
i18nLabelPath: "common.column_types.image_label",
|
|
73
|
-
},
|
|
74
|
-
[COLUMN.EMAIL_FORM]: {
|
|
65
|
+
}, [COLUMN.EMAIL_FORM]: {
|
|
75
66
|
label: COLUMN_LABEL.EMAIL_FORM,
|
|
76
67
|
shortLabel: "Email",
|
|
77
68
|
abbrLabel: "EML",
|
|
78
69
|
value: COLUMN.EMAIL_FORM,
|
|
79
70
|
displayed: true,
|
|
80
71
|
i18nLabelPath: "common.column_types.email_form_label",
|
|
81
|
-
},
|
|
82
|
-
[COLUMN.PHONE]: {
|
|
72
|
+
}, [COLUMN.PHONE]: {
|
|
83
73
|
label: COLUMN_LABEL.PHONE,
|
|
84
74
|
shortLabel: "Phone",
|
|
85
75
|
abbrLabel: "PHN",
|
|
86
76
|
value: COLUMN.PHONE,
|
|
87
77
|
displayed: true,
|
|
88
78
|
i18nLabelPath: "common.column_types.phone_label",
|
|
89
|
-
},
|
|
90
|
-
[COLUMN.PASSWORD]: {
|
|
79
|
+
}, [COLUMN.PASSWORD]: {
|
|
91
80
|
label: COLUMN_LABEL.PASSWORD,
|
|
92
81
|
shortLabel: "Password",
|
|
93
82
|
abbrLabel: "PWD",
|
|
94
83
|
value: COLUMN.PASSWORD,
|
|
95
84
|
displayed: true,
|
|
96
85
|
i18nLabelPath: "common.column_types.password_label",
|
|
97
|
-
},
|
|
98
|
-
[COLUMN.CHECKLIST]: {
|
|
86
|
+
}, [COLUMN.CHECKLIST]: {
|
|
99
87
|
label: COLUMN_LABEL.CHECKLIST,
|
|
100
88
|
shortLabel: "Check List",
|
|
101
89
|
abbrLabel: "CL",
|
|
102
90
|
value: COLUMN.CHECKLIST,
|
|
103
91
|
displayed: false,
|
|
104
92
|
i18nLabelPath: "common.column_types.checklist_label",
|
|
105
|
-
},
|
|
106
|
-
[COLUMN.NPS_SCORE]: {
|
|
93
|
+
}, [COLUMN.NPS_SCORE]: {
|
|
107
94
|
label: COLUMN_LABEL.NPS_SCORE,
|
|
108
95
|
shortLabel: "NPS Score",
|
|
109
96
|
abbrLabel: "NPMS",
|
|
110
97
|
value: COLUMN.NPS_SCORE,
|
|
111
98
|
displayed: false,
|
|
112
99
|
i18nLabelPath: "common.column_types.nps_score_label",
|
|
113
|
-
},
|
|
114
|
-
[COLUMN.NPS_FEEDBACK]: {
|
|
100
|
+
}, [COLUMN.NPS_FEEDBACK]: {
|
|
115
101
|
label: COLUMN_LABEL.NPS_FEEDBACK,
|
|
116
102
|
shortLabel: "NPS Feedback",
|
|
117
103
|
abbrLabel: "NPSFB",
|
|
118
104
|
value: COLUMN.NPS_FEEDBACK,
|
|
119
105
|
displayed: false,
|
|
120
106
|
i18nLabelPath: "common.column_types.nps_feedback_label",
|
|
121
|
-
},
|
|
122
|
-
[COLUMN.TEXT_LABEL]: {
|
|
107
|
+
}, [COLUMN.TEXT_LABEL]: {
|
|
123
108
|
label: COLUMN_LABEL.TEXT_LABEL,
|
|
124
109
|
shortLabel: "Text Label",
|
|
125
110
|
abbrLabel: "TL",
|
|
126
111
|
value: COLUMN.TEXT_LABEL,
|
|
127
112
|
displayed: true,
|
|
128
113
|
i18nLabelPath: "common.column_types.text_label_label",
|
|
129
|
-
},
|
|
130
|
-
[COLUMN.TEXT_CATEGORY]: {
|
|
114
|
+
}, [COLUMN.TEXT_CATEGORY]: {
|
|
131
115
|
label: COLUMN_LABEL.TEXT_CATEGORY,
|
|
132
116
|
shortLabel: "Text Category",
|
|
133
117
|
abbrLabel: "TC",
|
|
134
118
|
value: COLUMN.TEXT_CATEGORY,
|
|
135
119
|
displayed: true,
|
|
136
120
|
i18nLabelPath: "common.column_types.text_category_label",
|
|
137
|
-
},
|
|
138
|
-
[COLUMN.LOOKUP]: {
|
|
121
|
+
}, [COLUMN.LOOKUP]: {
|
|
139
122
|
label: COLUMN_LABEL.LOOKUP,
|
|
140
123
|
shortLabel: "Lookup",
|
|
141
124
|
abbrLabel: "LUP",
|
|
142
125
|
value: COLUMN.LOOKUP,
|
|
143
126
|
displayed: true,
|
|
144
127
|
i18nLabelPath: "common.column_types.lookup_label",
|
|
145
|
-
},
|
|
146
|
-
[COLUMN.HEADLINE]: {
|
|
128
|
+
}, [COLUMN.HEADLINE]: {
|
|
147
129
|
label: COLUMN_LABEL.HEADLINE,
|
|
148
130
|
shortLabel: "Headline",
|
|
149
131
|
abbrLabel: "HL",
|
|
150
132
|
value: COLUMN.HEADLINE,
|
|
151
133
|
displayed: false,
|
|
152
134
|
i18nLabelPath: "common.column_types.headline_label",
|
|
153
|
-
},
|
|
154
|
-
[COLUMN.SECTION]: {
|
|
135
|
+
}, [COLUMN.SECTION]: {
|
|
155
136
|
label: COLUMN_LABEL.SECTION,
|
|
156
137
|
shortLabel: "Section",
|
|
157
138
|
abbrLabel: "SCN",
|
|
158
139
|
value: COLUMN.SECTION,
|
|
159
140
|
displayed: false,
|
|
160
141
|
i18nLabelPath: "common.column_types.section_label",
|
|
161
|
-
},
|
|
162
|
-
[COLUMN.FORMULA]: {
|
|
142
|
+
}, [COLUMN.FORMULA]: {
|
|
163
143
|
label: COLUMN_LABEL.FORMULA,
|
|
164
144
|
shortLabel: "Formula",
|
|
165
145
|
abbrLabel: "FML",
|
|
166
146
|
value: COLUMN.FORMULA,
|
|
167
147
|
displayed: true,
|
|
168
148
|
i18nLabelPath: "common.column_types.formula_label",
|
|
169
|
-
},
|
|
170
|
-
[COLUMN.AGGREGATED_FORMULA]: {
|
|
149
|
+
}, [COLUMN.AGGREGATED_FORMULA]: {
|
|
171
150
|
label: COLUMN_LABEL.AGGREGATED_FORMULA,
|
|
172
151
|
shortLabel: "Agg Formula",
|
|
173
152
|
abbrLabel: "AF",
|
|
174
153
|
value: COLUMN.AGGREGATED_FORMULA,
|
|
175
154
|
displayed: true,
|
|
176
155
|
i18nLabelPath: "common.column_types.aggregated_formula_label",
|
|
177
|
-
},
|
|
178
|
-
[COLUMN.BUCKET]: {
|
|
156
|
+
}, [COLUMN.BUCKET]: {
|
|
179
157
|
label: COLUMN_LABEL.BUCKET,
|
|
180
158
|
shortLabel: "Bucket",
|
|
181
159
|
abbrLabel: "BCT",
|
|
182
160
|
value: COLUMN.BUCKET,
|
|
183
161
|
displayed: true,
|
|
184
162
|
i18nLabelPath: "common.column_types.bucket_label",
|
|
185
|
-
},
|
|
186
|
-
...NUMERICAL_COLUMN_INFO,
|
|
187
|
-
...COMPOUND_COLUMN_INFO,
|
|
188
|
-
...COMPLEX_COLUMN_INFO,
|
|
189
|
-
};
|
|
163
|
+
} }, NUMERICAL_COLUMN_INFO), COMPOUND_COLUMN_INFO), COMPLEX_COLUMN_INFO);
|
|
@@ -1,32 +1,4 @@
|
|
|
1
1
|
import { COMPLEX_COLUMN_LABEL } from "./COMPLEX_COLUMN_LABEL";
|
|
2
2
|
import { COMPOUND_COLUMN_LABEL } from "./COMPOUND_COLUMN_LABEL";
|
|
3
3
|
import { NUMERICAL_COLUMN_LABEL } from "./NUMERICAL_COLUMN_LABEL";
|
|
4
|
-
export const COLUMN_LABEL = {
|
|
5
|
-
SINGLE_CHOICE: "Single Choice",
|
|
6
|
-
MULTIPLE_CHOICE: "Multiple Choice",
|
|
7
|
-
YES_NO: "Yes No",
|
|
8
|
-
RANKING: "Ranking",
|
|
9
|
-
DATE: "Date",
|
|
10
|
-
SIGNATURE: "Signature",
|
|
11
|
-
DROPDOWN: "Dropdown",
|
|
12
|
-
IMAGE: "Image",
|
|
13
|
-
EMAIL_FORM: "Email Form",
|
|
14
|
-
PHONE: "Phone",
|
|
15
|
-
PASSWORD: "Password",
|
|
16
|
-
CHECKLIST: "Check List",
|
|
17
|
-
NPS_SCORE: "NPS Score",
|
|
18
|
-
NPS_FEEDBACK: "NPS Feedback",
|
|
19
|
-
TEXT: "Text",
|
|
20
|
-
TEXT_LABEL: "Text Label",
|
|
21
|
-
TEXT_CATEGORY: "Text Category",
|
|
22
|
-
LOOKUP: "Lookup",
|
|
23
|
-
HEADLINE: "Headline",
|
|
24
|
-
SECTION: "Section",
|
|
25
|
-
FORMULA: "Formula",
|
|
26
|
-
AGGREGATED_FORMULA: "Aggregated Formula",
|
|
27
|
-
BUCKET: "Bucket",
|
|
28
|
-
STRING: "String",
|
|
29
|
-
...NUMERICAL_COLUMN_LABEL,
|
|
30
|
-
...COMPOUND_COLUMN_LABEL,
|
|
31
|
-
...COMPLEX_COLUMN_LABEL,
|
|
32
|
-
};
|
|
4
|
+
export const COLUMN_LABEL = Object.assign(Object.assign(Object.assign({ SINGLE_CHOICE: "Single Choice", MULTIPLE_CHOICE: "Multiple Choice", YES_NO: "Yes No", RANKING: "Ranking", DATE: "Date", SIGNATURE: "Signature", DROPDOWN: "Dropdown", IMAGE: "Image", EMAIL_FORM: "Email Form", PHONE: "Phone", PASSWORD: "Password", CHECKLIST: "Check List", NPS_SCORE: "NPS Score", NPS_FEEDBACK: "NPS Feedback", TEXT: "Text", TEXT_LABEL: "Text Label", TEXT_CATEGORY: "Text Category", LOOKUP: "Lookup", HEADLINE: "Headline", SECTION: "Section", FORMULA: "Formula", AGGREGATED_FORMULA: "Aggregated Formula", BUCKET: "Bucket", STRING: "String" }, NUMERICAL_COLUMN_LABEL), COMPOUND_COLUMN_LABEL), COMPLEX_COLUMN_LABEL);
|
|
@@ -6,8 +6,7 @@ import { COMPLEX_COLUMN_PROPERTY_INFO } from "./COMPLEX_COLUMN_PROPERTY_INFO";
|
|
|
6
6
|
import { DATE_GROUPING_PROPERTY_INFO_LIST } from "../../dates/constants/DATE_GROUPING_PROPERTY_INFO_LIST";
|
|
7
7
|
import { DATE_GROUPING_TIME_PROPERTY_INFO_LIST } from "../../dates/constants/DATE_GROUPING_TIME_PROPERTY_INFO_LIST";
|
|
8
8
|
import { DATE_DISTINCT_TIME_PROPERTY_INFO_LIST } from "../../dates/constants/DATE_DISTINCT_TIME_PROPERTY_INFO_LIST";
|
|
9
|
-
export const COLUMN_PROPERTY_INFO = {
|
|
10
|
-
[COLUMN.LOOKUP]: [
|
|
9
|
+
export const COLUMN_PROPERTY_INFO = Object.assign(Object.assign({ [COLUMN.LOOKUP]: [
|
|
11
10
|
{
|
|
12
11
|
value: COLUMN_PROPERTY.LOOKUP_DISPLAY,
|
|
13
12
|
label: "Display",
|
|
@@ -24,13 +23,9 @@ export const COLUMN_PROPERTY_INFO = {
|
|
|
24
23
|
displayed: true,
|
|
25
24
|
i18nLabelPath: "common.properties.lookup_value_label",
|
|
26
25
|
},
|
|
27
|
-
],
|
|
28
|
-
[COLUMN.DATE]: [
|
|
26
|
+
], [COLUMN.DATE]: [
|
|
29
27
|
...DATE_GROUPING_PROPERTY_INFO_LIST,
|
|
30
28
|
...DATE_GROUPING_TIME_PROPERTY_INFO_LIST,
|
|
31
29
|
...DATE_DISTINCT_PROPERTY_INFO_LIST,
|
|
32
30
|
...DATE_DISTINCT_TIME_PROPERTY_INFO_LIST,
|
|
33
|
-
],
|
|
34
|
-
...COMPOUND_COLUMN_PROPERTY_INFO,
|
|
35
|
-
...COMPLEX_COLUMN_PROPERTY_INFO,
|
|
36
|
-
};
|
|
31
|
+
] }, COMPOUND_COLUMN_PROPERTY_INFO), COMPLEX_COLUMN_PROPERTY_INFO);
|
|
@@ -4,14 +4,4 @@ import { DATE_DISTINCT_PROPERTY_LABEL } from "../../dates/constants/DATE_DISTINC
|
|
|
4
4
|
import { DATE_DISTINCT_TIME_PROPERTY_LABEL } from "../../dates/constants/DATE_DISTINCT_TIME_PROPERTY_LABEL";
|
|
5
5
|
import { COMPLEX_COLUMN_PROPERTY_LABEL } from "./COMPLEX_COLUMN_PROPERTY_LABEL";
|
|
6
6
|
import { COMPOUND_COLUMN_PROPERTY_LABEL } from "./COMPOUND_COLUMN_PROPERTY_LABEL";
|
|
7
|
-
export const COLUMN_PROPERTY_LABEL = {
|
|
8
|
-
IMAGE_ANSWER_ID: "answer_id",
|
|
9
|
-
LOOKUP_DISPLAY: "display",
|
|
10
|
-
LOOKUP_VALUE: "value",
|
|
11
|
-
...DATE_GROUPING_PROPERTY_LABEL,
|
|
12
|
-
...DATE_GROUPING_TIME_PROPERTY_LABEL,
|
|
13
|
-
...DATE_DISTINCT_PROPERTY_LABEL,
|
|
14
|
-
...DATE_DISTINCT_TIME_PROPERTY_LABEL,
|
|
15
|
-
...COMPLEX_COLUMN_PROPERTY_LABEL,
|
|
16
|
-
...COMPOUND_COLUMN_PROPERTY_LABEL,
|
|
17
|
-
};
|
|
7
|
+
export const COLUMN_PROPERTY_LABEL = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ IMAGE_ANSWER_ID: "answer_id", LOOKUP_DISPLAY: "display", LOOKUP_VALUE: "value" }, DATE_GROUPING_PROPERTY_LABEL), DATE_GROUPING_TIME_PROPERTY_LABEL), DATE_DISTINCT_PROPERTY_LABEL), DATE_DISTINCT_TIME_PROPERTY_LABEL), COMPLEX_COLUMN_PROPERTY_LABEL), COMPOUND_COLUMN_PROPERTY_LABEL);
|
|
@@ -8,5 +8,5 @@ export function getDatasetColumn(column, dataset) {
|
|
|
8
8
|
return columns.find((c) => c.id === column.id);
|
|
9
9
|
}
|
|
10
10
|
function getDatasetColumns(dataset) {
|
|
11
|
-
return dataset
|
|
11
|
+
return (dataset === null || dataset === void 0 ? void 0 : dataset.options) || [];
|
|
12
12
|
}
|
|
@@ -7,8 +7,6 @@ import { DATE_GROUPING_PROPERTY } from "../constants/DATE_GROUPING_PROPERTY";
|
|
|
7
7
|
import { parseDate } from "./helpers/parseDate";
|
|
8
8
|
import { DATETIME_FORMAT } from "./constants/DATE_FORMATS";
|
|
9
9
|
export default class RelativeStatementAdapter {
|
|
10
|
-
statement;
|
|
11
|
-
now;
|
|
12
10
|
constructor(statement, now = new Date()) {
|
|
13
11
|
this.statement =
|
|
14
12
|
typeof statement === "string" ? statement : formatStatement(statement);
|
|
@@ -108,20 +106,12 @@ export default class RelativeStatementAdapter {
|
|
|
108
106
|
unit: this.unit,
|
|
109
107
|
resolveAsCalendar: this.isCalendarDate,
|
|
110
108
|
};
|
|
111
|
-
const gte = RelativeStatementAdapter.convertRelativeToAbsolute({
|
|
112
|
-
...args,
|
|
113
|
-
setTo: COMMON_CONSTANTS.START,
|
|
114
|
-
steps: -this.number +
|
|
109
|
+
const gte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_CONSTANTS.START, steps: -this.number +
|
|
115
110
|
(statementCase === COMMON_CONSTANTS.INCLUSIVE_AND_CALENDAR ||
|
|
116
111
|
(this.includeCurrent && this.unit === DATE_GROUPING_PROPERTY.DAY)
|
|
117
112
|
? 1
|
|
118
|
-
: 0)
|
|
119
|
-
});
|
|
120
|
-
const lte = RelativeStatementAdapter.convertRelativeToAbsolute({
|
|
121
|
-
...args,
|
|
122
|
-
setTo: COMMON_CONSTANTS.END,
|
|
123
|
-
steps: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? -1 : 0,
|
|
124
|
-
});
|
|
113
|
+
: 0) }));
|
|
114
|
+
const lte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_CONSTANTS.END, steps: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? -1 : 0 }));
|
|
125
115
|
return {
|
|
126
116
|
gte,
|
|
127
117
|
lte: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_ROLLING
|
|
@@ -147,20 +137,12 @@ export default class RelativeStatementAdapter {
|
|
|
147
137
|
unit: this.unit,
|
|
148
138
|
resolveAsCalendar: this.isCalendarDate,
|
|
149
139
|
};
|
|
150
|
-
const gte = RelativeStatementAdapter.convertRelativeToAbsolute({
|
|
151
|
-
|
|
152
|
-
setTo: COMMON_CONSTANTS.START,
|
|
153
|
-
steps: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? 1 : 0,
|
|
154
|
-
});
|
|
155
|
-
const lte = RelativeStatementAdapter.convertRelativeToAbsolute({
|
|
156
|
-
...args,
|
|
157
|
-
setTo: COMMON_CONSTANTS.END,
|
|
158
|
-
steps: this.number +
|
|
140
|
+
const gte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_CONSTANTS.START, steps: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? 1 : 0 }));
|
|
141
|
+
const lte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_CONSTANTS.END, steps: this.number +
|
|
159
142
|
(statementCase === COMMON_CONSTANTS.INCLUSIVE_AND_CALENDAR ||
|
|
160
143
|
(this.includeCurrent && this.unit === DATE_GROUPING_PROPERTY.DAY)
|
|
161
144
|
? -1
|
|
162
|
-
: 0)
|
|
163
|
-
});
|
|
145
|
+
: 0) }));
|
|
164
146
|
return {
|
|
165
147
|
lte,
|
|
166
148
|
gte: statementCase === COMMON_CONSTANTS.EXCLUSIVE_AND_ROLLING
|
|
@@ -58,40 +58,30 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
|
|
|
58
58
|
qrveyid: filter.column.qrveyid,
|
|
59
59
|
aggregate: filter.column.aggregate,
|
|
60
60
|
calculation: filter.column.calculation,
|
|
61
|
-
label: columnInfo
|
|
62
|
-
linkid: datasetInfo
|
|
63
|
-
linked: columnInfo
|
|
61
|
+
label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
|
|
62
|
+
linkid: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid,
|
|
63
|
+
linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
|
|
64
64
|
outputFormat: _get(datasetInfo, "outputFormat"),
|
|
65
|
-
type: columnInfo
|
|
65
|
+
type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
|
|
66
66
|
},
|
|
67
67
|
dateSection: filter.dateSection,
|
|
68
68
|
displayed: filter.displayed,
|
|
69
69
|
enabled: filter.enabled,
|
|
70
|
-
extras: {
|
|
71
|
-
...filter.extras,
|
|
72
|
-
panelid: filter.extras.panelid,
|
|
73
|
-
filterLabel: filter.extras.filterLabel,
|
|
74
|
-
info,
|
|
75
|
-
scope: filter.extras.scope,
|
|
76
|
-
scopeid: filter.extras.scopeid,
|
|
77
|
-
section: filter.extras.section,
|
|
78
|
-
scopeInfo: {
|
|
70
|
+
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: {
|
|
79
71
|
collapsed: scope.collapsed,
|
|
80
72
|
enabled: scope.enabled,
|
|
81
73
|
displayed: scope.displayed,
|
|
82
74
|
label: scope.label,
|
|
83
75
|
scope: scope.scope,
|
|
84
76
|
scopeid: scope.scopeid,
|
|
85
|
-
},
|
|
86
|
-
dataset: {
|
|
77
|
+
}, dataset: {
|
|
87
78
|
qrveyid: dataset.qrveyid,
|
|
88
79
|
collapsed: dataset.collapsed,
|
|
89
80
|
enabled: dataset.enabled,
|
|
90
81
|
displayed: dataset.enabled,
|
|
91
|
-
label: datasetInfo
|
|
82
|
+
label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
|
|
92
83
|
linkid: dataset.linkid,
|
|
93
|
-
},
|
|
94
|
-
},
|
|
84
|
+
} }),
|
|
95
85
|
filterid: filter.filterid,
|
|
96
86
|
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
97
87
|
nullValues: filter.nullValues,
|
|
@@ -37,40 +37,28 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
|
|
|
37
37
|
version,
|
|
38
38
|
scopes: [],
|
|
39
39
|
};
|
|
40
|
-
ufData.scopes = scopes.map((scope) => ({
|
|
41
|
-
...scope,
|
|
42
|
-
datasets: scope.datasets.map((dataset) => {
|
|
40
|
+
ufData.scopes = scopes.map((scope) => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
|
|
43
41
|
const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
|
|
44
|
-
return {
|
|
45
|
-
...dataset,
|
|
46
|
-
label: datasetInfo?.label,
|
|
47
|
-
filters: dataset.filters.map((filter) => {
|
|
42
|
+
return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map((filter) => {
|
|
48
43
|
let columnInfo;
|
|
49
44
|
if (!isEmpty(datasetInfo))
|
|
50
45
|
columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
|
|
51
46
|
cInfo.qrveyid === filter.column.qrveyid &&
|
|
52
47
|
cInfo.linkid === filter.column.linkid);
|
|
53
48
|
const property = adaptDateGroupingProperty(filter.property);
|
|
54
|
-
return {
|
|
55
|
-
...filter,
|
|
56
|
-
column: {
|
|
49
|
+
return Object.assign(Object.assign({}, filter), { column: {
|
|
57
50
|
aggregate: filter.column.aggregate,
|
|
58
51
|
calculation: filter.column.calculation,
|
|
59
|
-
formulaType: columnInfo
|
|
52
|
+
formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
|
|
60
53
|
id: filter.column.id,
|
|
61
|
-
label: columnInfo
|
|
62
|
-
linked: columnInfo
|
|
63
|
-
linkid: columnInfo
|
|
64
|
-
outputFormat: columnInfo
|
|
54
|
+
label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
|
|
55
|
+
linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
|
|
56
|
+
linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
|
|
57
|
+
outputFormat: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.outputFormat,
|
|
65
58
|
qrveyid: filter.column.qrveyid,
|
|
66
|
-
type: columnInfo
|
|
67
|
-
},
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
};
|
|
71
|
-
}),
|
|
72
|
-
};
|
|
73
|
-
}),
|
|
74
|
-
}));
|
|
59
|
+
type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
|
|
60
|
+
}, property, values: adaptFilterValues(filter) });
|
|
61
|
+
}) });
|
|
62
|
+
}) })));
|
|
75
63
|
return ufData;
|
|
76
64
|
}
|
|
@@ -56,7 +56,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
|
|
|
56
56
|
qrveyid: filter.column.qrveyid,
|
|
57
57
|
aggregate: filter.column.aggregate,
|
|
58
58
|
calculation: filter.column.calculation,
|
|
59
|
-
label: columnInfo
|
|
59
|
+
label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
|
|
60
60
|
linkid: filter.column.linkid,
|
|
61
61
|
linked: filter.column.linked,
|
|
62
62
|
outputFormat: filter.column.outputFormat,
|
|
@@ -65,31 +65,21 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
|
|
|
65
65
|
dateSection: filter.dateSection,
|
|
66
66
|
displayed: filter.displayed,
|
|
67
67
|
enabled: filter.enabled,
|
|
68
|
-
extras: {
|
|
69
|
-
...filter.extras,
|
|
70
|
-
panelid: filter.extras.panelid,
|
|
71
|
-
filterLabel: filter.extras.filterLabel,
|
|
72
|
-
info,
|
|
73
|
-
scope: filter.extras.scope,
|
|
74
|
-
scopeid: filter.extras.scopeid,
|
|
75
|
-
section: filter.extras.section,
|
|
76
|
-
scopeInfo: {
|
|
68
|
+
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: {
|
|
77
69
|
collapsed: scope.collapsed,
|
|
78
70
|
enabled: scope.enabled,
|
|
79
71
|
displayed: scope.displayed,
|
|
80
72
|
label: scope.label,
|
|
81
73
|
scope: scope.scope,
|
|
82
74
|
scopeid: scope.scopeid,
|
|
83
|
-
},
|
|
84
|
-
dataset: {
|
|
75
|
+
}, dataset: {
|
|
85
76
|
qrveyid: dataset.qrveyid,
|
|
86
77
|
collapsed: dataset.collapsed,
|
|
87
78
|
enabled: dataset.enabled,
|
|
88
79
|
displayed: dataset.enabled,
|
|
89
80
|
label: dataset.label,
|
|
90
81
|
linkid: dataset.linkid,
|
|
91
|
-
},
|
|
92
|
-
},
|
|
82
|
+
} }),
|
|
93
83
|
filterid: filter.filterid,
|
|
94
84
|
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
95
85
|
nullValues: filter.nullValues,
|
|
@@ -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);
|