@qrvey/utils 1.4.0-1 → 1.4.0-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (150) hide show
  1. package/README.md +1 -1
  2. package/dist/charts/helpers/isSimpleTableChart.js +2 -1
  3. package/dist/cjs/charts/helpers/isSimpleTableChart.js +2 -1
  4. package/dist/cjs/column_format/helpers/defineTableChartFormat.js +7 -13
  5. package/dist/cjs/column_format/helpers/defineXYChartFormat.js +7 -11
  6. package/dist/cjs/columns/constants/COLUMN_INFO.js +23 -49
  7. package/dist/cjs/columns/constants/COLUMN_LABEL.js +1 -29
  8. package/dist/cjs/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
  9. package/dist/cjs/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
  10. package/dist/cjs/columns/helpers/getDatasetColumn.js +1 -1
  11. package/dist/cjs/dates/relative/RelativeStatementAdapter.js +6 -24
  12. package/dist/cjs/filters/adapters/FDToFlatUI.js +8 -18
  13. package/dist/cjs/filters/adapters/FDToLogic.js +1 -1
  14. package/dist/cjs/filters/adapters/FDToUI.js +12 -24
  15. package/dist/cjs/filters/adapters/UIToFlatUI.js +4 -14
  16. package/dist/cjs/filters/adapters/UIToOldLogic.js +2 -1
  17. package/dist/cjs/filters/adapters/adaptFilterValues.js +1 -6
  18. package/dist/cjs/filters/adapters/flatUIToFD.js +3 -14
  19. package/dist/cjs/filters/adapters/flatUIToOldLogic.js +15 -49
  20. package/dist/cjs/filters/adapters/flatUIToUI.js +3 -14
  21. package/dist/cjs/filters/adapters/logicToFlatUI.js +20 -32
  22. package/dist/cjs/filters/adapters/transformFilters.js +4 -19
  23. package/dist/cjs/filters/classes/FilterInputErrorHandler.js +0 -8
  24. package/dist/cjs/filters/helpers/applyHierarchyForAggFilters.js +2 -11
  25. package/dist/cjs/filters/helpers/backend/buildExpression.js +2 -1
  26. package/dist/cjs/filters/helpers/backend/buildFilters.js +2 -1
  27. package/dist/cjs/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
  28. package/dist/cjs/filters/helpers/backend/getLogicByDatasets.js +5 -7
  29. package/dist/cjs/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
  30. package/dist/cjs/filters/helpers/common/areFiltersEquals.js +3 -2
  31. package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js +17 -22
  32. package/dist/cjs/filters/helpers/common/getFilterid.js +9 -8
  33. package/dist/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
  34. package/dist/cjs/filters/helpers/common/getFiltersByParams.js +12 -18
  35. package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js +4 -3
  36. package/dist/cjs/filters/helpers/common/getMergeValuesSettings.js +2 -1
  37. package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
  38. package/dist/cjs/filters/helpers/common/mergeFilters.js +7 -30
  39. package/dist/cjs/filters/helpers/common/mergeValues.js +9 -6
  40. package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +9 -8
  41. package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js +1 -1
  42. package/dist/cjs/filters/helpers/ui/getUIValues.js +14 -12
  43. package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
  44. package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
  45. package/dist/cjs/filters/helpers/ui/transformFilterValues.js +3 -14
  46. package/dist/cjs/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
  47. package/dist/cjs/filters/services/Filters.api.js +44 -45
  48. package/dist/cjs/filters/services/UChartApi.js +246 -257
  49. package/dist/cjs/filters/services/UChartPaginationApi.js +289 -301
  50. package/dist/cjs/format/duration/durationFormatter.js +7 -12
  51. package/dist/cjs/format/format.js +8 -7
  52. package/dist/cjs/format/localization.d.ts +2 -1
  53. package/dist/cjs/format/localization.js +8 -7
  54. package/dist/cjs/general/array/addPropertyToArrayOfObjects.js +1 -1
  55. package/dist/cjs/general/object/getAttribute.js +2 -6
  56. package/dist/cjs/general/object/mergeDeep.js +3 -2
  57. package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
  58. package/dist/cjs/globalization/service/i18nextBuilder.js +31 -19
  59. package/dist/cjs/globalization/service/initI18n.js +13 -2
  60. package/dist/cjs/qrvey/helpers/getCategorizableExpression.js +2 -1
  61. package/dist/cjs/qrvey/helpers/getDataAnswersByColumn.js +1 -4
  62. package/dist/cjs/qrvey/helpers/getDropdownAnswers.js +1 -1
  63. package/dist/cjs/qrvey/helpers/getImageAnswers.js +1 -1
  64. package/dist/cjs/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
  65. package/dist/cjs/qrvey/helpers/getLookupAnswers.js +4 -4
  66. package/dist/cjs/qrvey/helpers/getLookupDisplays.js +1 -1
  67. package/dist/cjs/qrvey/helpers/getSlidebarAnswers.js +2 -1
  68. package/dist/cjs/qrvey/helpers/getYesNoAnswers.js +1 -5
  69. package/dist/cjs/qrvey/helpers/transformValue.js +2 -1
  70. package/dist/cjs/services/api/Charts.api.js +3 -9
  71. package/dist/cjs/services/api/getAllDatasets.api.js +1 -1
  72. package/dist/cjs/services/api/getAllQrveys.api.js +1 -1
  73. package/dist/cjs/services/api/getDatasetColumns.api.js +1 -1
  74. package/dist/cjs/services/api/getDatasetsByIds.api.js +2 -2
  75. package/dist/cjs/services/api/getModel.api.js +1 -4
  76. package/dist/cjs/services/helpers/Request.js +16 -5
  77. package/dist/column_format/helpers/defineTableChartFormat.js +7 -13
  78. package/dist/column_format/helpers/defineXYChartFormat.js +7 -11
  79. package/dist/columns/constants/COLUMN_INFO.js +23 -49
  80. package/dist/columns/constants/COLUMN_LABEL.js +1 -29
  81. package/dist/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
  82. package/dist/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
  83. package/dist/columns/helpers/getDatasetColumn.js +1 -1
  84. package/dist/dates/relative/RelativeStatementAdapter.js +6 -24
  85. package/dist/filters/adapters/FDToFlatUI.js +8 -18
  86. package/dist/filters/adapters/FDToLogic.js +1 -1
  87. package/dist/filters/adapters/FDToUI.js +12 -24
  88. package/dist/filters/adapters/UIToFlatUI.js +4 -14
  89. package/dist/filters/adapters/UIToOldLogic.js +2 -1
  90. package/dist/filters/adapters/adaptFilterValues.js +1 -6
  91. package/dist/filters/adapters/flatUIToFD.js +3 -14
  92. package/dist/filters/adapters/flatUIToOldLogic.js +15 -49
  93. package/dist/filters/adapters/flatUIToUI.js +3 -14
  94. package/dist/filters/adapters/logicToFlatUI.js +20 -32
  95. package/dist/filters/adapters/transformFilters.js +4 -19
  96. package/dist/filters/classes/FilterInputErrorHandler.js +0 -8
  97. package/dist/filters/helpers/applyHierarchyForAggFilters.js +2 -11
  98. package/dist/filters/helpers/backend/buildExpression.js +2 -1
  99. package/dist/filters/helpers/backend/buildFilters.js +2 -1
  100. package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
  101. package/dist/filters/helpers/backend/getLogicByDatasets.js +5 -7
  102. package/dist/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
  103. package/dist/filters/helpers/common/areFiltersEquals.js +3 -2
  104. package/dist/filters/helpers/common/excludeFiltersByParams.js +17 -22
  105. package/dist/filters/helpers/common/getFilterid.js +9 -8
  106. package/dist/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
  107. package/dist/filters/helpers/common/getFiltersByParams.js +12 -18
  108. package/dist/filters/helpers/common/getMergeFiltersSettings.js +4 -3
  109. package/dist/filters/helpers/common/getMergeValuesSettings.js +2 -1
  110. package/dist/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
  111. package/dist/filters/helpers/common/mergeFilters.js +7 -30
  112. package/dist/filters/helpers/common/mergeValues.js +9 -6
  113. package/dist/filters/helpers/common/resolveFilterConditions.js +9 -8
  114. package/dist/filters/helpers/getAggFiltersFromFilterData.js +1 -1
  115. package/dist/filters/helpers/ui/getUIValues.js +14 -12
  116. package/dist/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
  117. package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
  118. package/dist/filters/helpers/ui/transformFilterValues.js +3 -14
  119. package/dist/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
  120. package/dist/filters/services/Filters.api.js +44 -45
  121. package/dist/filters/services/UChartApi.js +246 -257
  122. package/dist/filters/services/UChartPaginationApi.js +289 -301
  123. package/dist/format/duration/durationFormatter.js +7 -12
  124. package/dist/format/format.js +8 -7
  125. package/dist/format/localization.d.ts +2 -1
  126. package/dist/format/localization.js +7 -6
  127. package/dist/general/array/addPropertyToArrayOfObjects.js +1 -1
  128. package/dist/general/object/getAttribute.js +2 -6
  129. package/dist/general/object/mergeDeep.js +3 -2
  130. package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
  131. package/dist/globalization/service/i18nextBuilder.js +31 -19
  132. package/dist/globalization/service/initI18n.js +13 -2
  133. package/dist/qrvey/helpers/getCategorizableExpression.js +2 -1
  134. package/dist/qrvey/helpers/getDataAnswersByColumn.js +1 -4
  135. package/dist/qrvey/helpers/getDropdownAnswers.js +1 -1
  136. package/dist/qrvey/helpers/getImageAnswers.js +1 -1
  137. package/dist/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
  138. package/dist/qrvey/helpers/getLookupAnswers.js +4 -4
  139. package/dist/qrvey/helpers/getLookupDisplays.js +1 -1
  140. package/dist/qrvey/helpers/getSlidebarAnswers.js +2 -1
  141. package/dist/qrvey/helpers/getYesNoAnswers.js +1 -5
  142. package/dist/qrvey/helpers/transformValue.js +2 -1
  143. package/dist/services/api/Charts.api.js +3 -9
  144. package/dist/services/api/getAllDatasets.api.js +1 -1
  145. package/dist/services/api/getAllQrveys.api.js +1 -1
  146. package/dist/services/api/getDatasetColumns.api.js +1 -1
  147. package/dist/services/api/getDatasetsByIds.api.js +2 -2
  148. package/dist/services/api/getModel.api.js +1 -4
  149. package/dist/services/helpers/Request.js +16 -5
  150. package/package.json +3 -3
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.0-1*
1
+ # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.0-2*
2
2
 
3
3
  > Helper, Utils for all Qrvey Projects
4
4
 
@@ -1,4 +1,5 @@
1
1
  import { isTableChart } from "./isTableChart";
2
2
  export function isSimpleTableChart(model = {}) {
3
- return (isTableChart(model.type) && !(model.chart?.fields?.groupsList || []).length);
3
+ var _a, _b;
4
+ return (isTableChart(model.type) && !(((_b = (_a = model.chart) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.groupsList) || []).length);
4
5
  }
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.isSimpleTableChart = void 0;
4
4
  const isTableChart_1 = require("./isTableChart");
5
5
  function isSimpleTableChart(model = {}) {
6
- return ((0, isTableChart_1.isTableChart)(model.type) && !(model.chart?.fields?.groupsList || []).length);
6
+ var _a, _b;
7
+ return ((0, isTableChart_1.isTableChart)(model.type) && !(((_b = (_a = model.chart) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.groupsList) || []).length);
7
8
  }
8
9
  exports.isSimpleTableChart = isSimpleTableChart;
@@ -21,10 +21,10 @@ const defineTableChartFormat = (column, settings) => {
21
21
  const defaultAbb = { type: "NUMERIC", format: "Abbreviated" };
22
22
  const isGroupedTable = tableType === TABLE_TYPE_1.TABLE_TYPE.GROUPED;
23
23
  const columnType = (0, columnTypeByChart_1.columnTypeByChart)(column, shelfType, CHART_GROUP_1.CHART_GROUPS.TABLES, isGroupedTable);
24
- const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === dateGroup?.label);
24
+ const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
25
25
  const hasDefaultFormat = (0, __1.isEmpty)(selectedFormat) ||
26
- outputFormat?.format === defaultText ||
27
- selectedFormat?.format === defaultText;
26
+ (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
27
+ (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
28
28
  const isUsedAsNumericColumn = type !== columnType;
29
29
  switch (columnType) {
30
30
  case __1.COLUMN.YES_NO:
@@ -44,11 +44,7 @@ const defineTableChartFormat = (column, settings) => {
44
44
  }
45
45
  else if (hasDefaultFormat) {
46
46
  const columnDefaultFormat = defaultFormat || outputFormat;
47
- return {
48
- ...defaultFormat,
49
- format: defaultText,
50
- originalFormat: { ...columnDefaultFormat },
51
- };
47
+ return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat) });
52
48
  }
53
49
  else {
54
50
  return selectedFormat;
@@ -58,18 +54,16 @@ const defineTableChartFormat = (column, settings) => {
58
54
  case __1.COLUMN.RATING:
59
55
  case __1.COLUMN.SLIDEBAR: {
60
56
  if (isUsedAsNumericColumn) {
61
- if (aggregate?.label === __1.AGGREGATE.COUNT && hasDefaultFormat)
57
+ if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === __1.AGGREGATE.COUNT && hasDefaultFormat)
62
58
  return defaultNumeric;
63
59
  else if (hasDefaultFormat)
64
60
  return defaultAbb;
65
61
  else
66
- return outputFormat;
62
+ return selectedFormat || outputFormat;
67
63
  }
68
64
  else {
69
65
  if (hasDefaultFormat) {
70
- return {
71
- ...column.outputFormat,
72
- };
66
+ return Object.assign({}, column.outputFormat);
73
67
  }
74
68
  else
75
69
  return selectedFormat;
@@ -21,11 +21,11 @@ const defineXYChartFormat = (column, settings) => {
21
21
  const defaultText = "Default";
22
22
  const defaultAbb = { type: "NUMERIC", format: "Abbreviated" };
23
23
  const columnType = (0, columnTypeByChart_1.columnTypeByChart)(column, shelfType, CHART_GROUP_1.CHART_GROUPS.XY);
24
- const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === dateGroup?.label);
24
+ const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
25
25
  const isUsedAsNumericColumn = type !== columnType;
26
26
  const hasDefaultFormat = (0, __1.isEmpty)(selectedFormat) ||
27
- outputFormat?.format === defaultText ||
28
- selectedFormat?.format === defaultText;
27
+ (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
28
+ (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
29
29
  switch (columnType) {
30
30
  case __1.COLUMN.YES_NO:
31
31
  case __1.COLUMN.PHONE:
@@ -43,11 +43,7 @@ const defineXYChartFormat = (column, settings) => {
43
43
  return STRING_FORMAT_1.STRING_FORMAT.NONE;
44
44
  }
45
45
  else if (hasDefaultFormat) {
46
- return {
47
- ...columnDefaultFormat,
48
- format: defaultText,
49
- originalFormat: { ...outputFormat },
50
- };
46
+ return Object.assign(Object.assign({}, columnDefaultFormat), { format: defaultText, originalFormat: Object.assign({}, outputFormat) });
51
47
  }
52
48
  else {
53
49
  return selectedFormat;
@@ -57,8 +53,8 @@ const defineXYChartFormat = (column, settings) => {
57
53
  case __1.COLUMN.RATING:
58
54
  case __1.COLUMN.SLIDEBAR: {
59
55
  if (isUsedAsNumericColumn) {
60
- if ((aggregate?.label === __1.AGGREGATE.COUNT && hasDefaultFormat) ||
61
- (isUsedAsNumericColumn && outputFormat?.type !== __1.COLUMN.NUMERIC) ||
56
+ if (((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === __1.AGGREGATE.COUNT && hasDefaultFormat) ||
57
+ (isUsedAsNumericColumn && (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.type) !== __1.COLUMN.NUMERIC) ||
62
58
  withoutFormat)
63
59
  return defaultAbb;
64
60
  else
@@ -69,7 +65,7 @@ const defineXYChartFormat = (column, settings) => {
69
65
  return columnDefaultFormat;
70
66
  }
71
67
  else if (hasDefaultFormat) {
72
- return { ...outputFormat };
68
+ return Object.assign({}, outputFormat);
73
69
  }
74
70
  else
75
71
  return selectedFormat;
@@ -9,184 +9,158 @@ const NUMERICAL_COLUMN_INFO_1 = require("./NUMERICAL_COLUMN_INFO");
9
9
  /**
10
10
  * @description Key/array of column property info
11
11
  */
12
- exports.COLUMN_INFO = {
13
- [COLUMN_1.COLUMN.SINGLE_CHOICE]: {
12
+ exports.COLUMN_INFO = Object.assign(Object.assign(Object.assign({ [COLUMN_1.COLUMN.SINGLE_CHOICE]: {
14
13
  label: COLUMN_LABEL_1.COLUMN_LABEL.SINGLE_CHOICE,
15
14
  shortLabel: "Single Choice",
16
15
  abbrLabel: "SC",
17
16
  value: COLUMN_1.COLUMN.SINGLE_CHOICE,
18
17
  displayed: true,
19
18
  i18nLabelPath: "common.column_types.single_choice_label",
20
- },
21
- [COLUMN_1.COLUMN.MULTIPLE_CHOICE]: {
19
+ }, [COLUMN_1.COLUMN.MULTIPLE_CHOICE]: {
22
20
  label: COLUMN_LABEL_1.COLUMN_LABEL.MULTIPLE_CHOICE,
23
21
  shortLabel: "Multiple Choice",
24
22
  abbrLabel: "MC",
25
23
  value: COLUMN_1.COLUMN.MULTIPLE_CHOICE,
26
24
  displayed: true,
27
25
  i18nLabelPath: "common.column_types.multiple_choice_label",
28
- },
29
- [COLUMN_1.COLUMN.YES_NO]: {
26
+ }, [COLUMN_1.COLUMN.YES_NO]: {
30
27
  label: COLUMN_LABEL_1.COLUMN_LABEL.YES_NO,
31
28
  shortLabel: "Yes No",
32
29
  abbrLabel: "YS",
33
30
  value: COLUMN_1.COLUMN.YES_NO,
34
31
  displayed: true,
35
32
  i18nLabelPath: "common.column_types.yes_no_label",
36
- },
37
- [COLUMN_1.COLUMN.RANKING]: {
33
+ }, [COLUMN_1.COLUMN.RANKING]: {
38
34
  label: COLUMN_LABEL_1.COLUMN_LABEL.RANKING,
39
35
  shortLabel: "Ranking",
40
36
  abbrLabel: "RAN",
41
37
  value: COLUMN_1.COLUMN.RANKING,
42
38
  displayed: true,
43
39
  i18nLabelPath: "common.column_types.ranking_label",
44
- },
45
- [COLUMN_1.COLUMN.DATE]: {
40
+ }, [COLUMN_1.COLUMN.DATE]: {
46
41
  label: COLUMN_LABEL_1.COLUMN_LABEL.DATE,
47
42
  shortLabel: "Date",
48
43
  abbrLabel: "DA",
49
44
  value: COLUMN_1.COLUMN.DATE,
50
45
  displayed: true,
51
46
  i18nLabelPath: "common.column_types.date_label",
52
- },
53
- [COLUMN_1.COLUMN.SIGNATURE]: {
47
+ }, [COLUMN_1.COLUMN.SIGNATURE]: {
54
48
  label: COLUMN_LABEL_1.COLUMN_LABEL.SIGNATURE,
55
49
  shortLabel: "Signature",
56
50
  abbrLabel: "SIGN",
57
51
  value: COLUMN_1.COLUMN.SIGNATURE,
58
52
  displayed: true,
59
53
  i18nLabelPath: "common.column_types.signature_label",
60
- },
61
- [COLUMN_1.COLUMN.DROPDOWN]: {
54
+ }, [COLUMN_1.COLUMN.DROPDOWN]: {
62
55
  label: COLUMN_LABEL_1.COLUMN_LABEL.DROPDOWN,
63
56
  shortLabel: "Dropdown",
64
57
  abbrLabel: "DD",
65
58
  value: COLUMN_1.COLUMN.DROPDOWN,
66
59
  displayed: true,
67
60
  i18nLabelPath: "common.column_types.dropdown_label",
68
- },
69
- [COLUMN_1.COLUMN.IMAGE]: {
61
+ }, [COLUMN_1.COLUMN.IMAGE]: {
70
62
  label: COLUMN_LABEL_1.COLUMN_LABEL.IMAGE,
71
63
  shortLabel: "Image",
72
64
  abbrLabel: "IMG",
73
65
  value: COLUMN_1.COLUMN.IMAGE,
74
66
  displayed: true,
75
67
  i18nLabelPath: "common.column_types.image_label",
76
- },
77
- [COLUMN_1.COLUMN.EMAIL_FORM]: {
68
+ }, [COLUMN_1.COLUMN.EMAIL_FORM]: {
78
69
  label: COLUMN_LABEL_1.COLUMN_LABEL.EMAIL_FORM,
79
70
  shortLabel: "Email",
80
71
  abbrLabel: "EML",
81
72
  value: COLUMN_1.COLUMN.EMAIL_FORM,
82
73
  displayed: true,
83
74
  i18nLabelPath: "common.column_types.email_form_label",
84
- },
85
- [COLUMN_1.COLUMN.PHONE]: {
75
+ }, [COLUMN_1.COLUMN.PHONE]: {
86
76
  label: COLUMN_LABEL_1.COLUMN_LABEL.PHONE,
87
77
  shortLabel: "Phone",
88
78
  abbrLabel: "PHN",
89
79
  value: COLUMN_1.COLUMN.PHONE,
90
80
  displayed: true,
91
81
  i18nLabelPath: "common.column_types.phone_label",
92
- },
93
- [COLUMN_1.COLUMN.PASSWORD]: {
82
+ }, [COLUMN_1.COLUMN.PASSWORD]: {
94
83
  label: COLUMN_LABEL_1.COLUMN_LABEL.PASSWORD,
95
84
  shortLabel: "Password",
96
85
  abbrLabel: "PWD",
97
86
  value: COLUMN_1.COLUMN.PASSWORD,
98
87
  displayed: true,
99
88
  i18nLabelPath: "common.column_types.password_label",
100
- },
101
- [COLUMN_1.COLUMN.CHECKLIST]: {
89
+ }, [COLUMN_1.COLUMN.CHECKLIST]: {
102
90
  label: COLUMN_LABEL_1.COLUMN_LABEL.CHECKLIST,
103
91
  shortLabel: "Check List",
104
92
  abbrLabel: "CL",
105
93
  value: COLUMN_1.COLUMN.CHECKLIST,
106
94
  displayed: false,
107
95
  i18nLabelPath: "common.column_types.checklist_label",
108
- },
109
- [COLUMN_1.COLUMN.NPS_SCORE]: {
96
+ }, [COLUMN_1.COLUMN.NPS_SCORE]: {
110
97
  label: COLUMN_LABEL_1.COLUMN_LABEL.NPS_SCORE,
111
98
  shortLabel: "NPS Score",
112
99
  abbrLabel: "NPMS",
113
100
  value: COLUMN_1.COLUMN.NPS_SCORE,
114
101
  displayed: false,
115
102
  i18nLabelPath: "common.column_types.nps_score_label",
116
- },
117
- [COLUMN_1.COLUMN.NPS_FEEDBACK]: {
103
+ }, [COLUMN_1.COLUMN.NPS_FEEDBACK]: {
118
104
  label: COLUMN_LABEL_1.COLUMN_LABEL.NPS_FEEDBACK,
119
105
  shortLabel: "NPS Feedback",
120
106
  abbrLabel: "NPSFB",
121
107
  value: COLUMN_1.COLUMN.NPS_FEEDBACK,
122
108
  displayed: false,
123
109
  i18nLabelPath: "common.column_types.nps_feedback_label",
124
- },
125
- [COLUMN_1.COLUMN.TEXT_LABEL]: {
110
+ }, [COLUMN_1.COLUMN.TEXT_LABEL]: {
126
111
  label: COLUMN_LABEL_1.COLUMN_LABEL.TEXT_LABEL,
127
112
  shortLabel: "Text Label",
128
113
  abbrLabel: "TL",
129
114
  value: COLUMN_1.COLUMN.TEXT_LABEL,
130
115
  displayed: true,
131
116
  i18nLabelPath: "common.column_types.text_label_label",
132
- },
133
- [COLUMN_1.COLUMN.TEXT_CATEGORY]: {
117
+ }, [COLUMN_1.COLUMN.TEXT_CATEGORY]: {
134
118
  label: COLUMN_LABEL_1.COLUMN_LABEL.TEXT_CATEGORY,
135
119
  shortLabel: "Text Category",
136
120
  abbrLabel: "TC",
137
121
  value: COLUMN_1.COLUMN.TEXT_CATEGORY,
138
122
  displayed: true,
139
123
  i18nLabelPath: "common.column_types.text_category_label",
140
- },
141
- [COLUMN_1.COLUMN.LOOKUP]: {
124
+ }, [COLUMN_1.COLUMN.LOOKUP]: {
142
125
  label: COLUMN_LABEL_1.COLUMN_LABEL.LOOKUP,
143
126
  shortLabel: "Lookup",
144
127
  abbrLabel: "LUP",
145
128
  value: COLUMN_1.COLUMN.LOOKUP,
146
129
  displayed: true,
147
130
  i18nLabelPath: "common.column_types.lookup_label",
148
- },
149
- [COLUMN_1.COLUMN.HEADLINE]: {
131
+ }, [COLUMN_1.COLUMN.HEADLINE]: {
150
132
  label: COLUMN_LABEL_1.COLUMN_LABEL.HEADLINE,
151
133
  shortLabel: "Headline",
152
134
  abbrLabel: "HL",
153
135
  value: COLUMN_1.COLUMN.HEADLINE,
154
136
  displayed: false,
155
137
  i18nLabelPath: "common.column_types.headline_label",
156
- },
157
- [COLUMN_1.COLUMN.SECTION]: {
138
+ }, [COLUMN_1.COLUMN.SECTION]: {
158
139
  label: COLUMN_LABEL_1.COLUMN_LABEL.SECTION,
159
140
  shortLabel: "Section",
160
141
  abbrLabel: "SCN",
161
142
  value: COLUMN_1.COLUMN.SECTION,
162
143
  displayed: false,
163
144
  i18nLabelPath: "common.column_types.section_label",
164
- },
165
- [COLUMN_1.COLUMN.FORMULA]: {
145
+ }, [COLUMN_1.COLUMN.FORMULA]: {
166
146
  label: COLUMN_LABEL_1.COLUMN_LABEL.FORMULA,
167
147
  shortLabel: "Formula",
168
148
  abbrLabel: "FML",
169
149
  value: COLUMN_1.COLUMN.FORMULA,
170
150
  displayed: true,
171
151
  i18nLabelPath: "common.column_types.formula_label",
172
- },
173
- [COLUMN_1.COLUMN.AGGREGATED_FORMULA]: {
152
+ }, [COLUMN_1.COLUMN.AGGREGATED_FORMULA]: {
174
153
  label: COLUMN_LABEL_1.COLUMN_LABEL.AGGREGATED_FORMULA,
175
154
  shortLabel: "Agg Formula",
176
155
  abbrLabel: "AF",
177
156
  value: COLUMN_1.COLUMN.AGGREGATED_FORMULA,
178
157
  displayed: true,
179
158
  i18nLabelPath: "common.column_types.aggregated_formula_label",
180
- },
181
- [COLUMN_1.COLUMN.BUCKET]: {
159
+ }, [COLUMN_1.COLUMN.BUCKET]: {
182
160
  label: COLUMN_LABEL_1.COLUMN_LABEL.BUCKET,
183
161
  shortLabel: "Bucket",
184
162
  abbrLabel: "BCT",
185
163
  value: COLUMN_1.COLUMN.BUCKET,
186
164
  displayed: true,
187
165
  i18nLabelPath: "common.column_types.bucket_label",
188
- },
189
- ...NUMERICAL_COLUMN_INFO_1.NUMERICAL_COLUMN_INFO,
190
- ...COMPOUND_COLUMN_INFO_1.COMPOUND_COLUMN_INFO,
191
- ...COMPLEX_COLUMN_INFO_1.COMPLEX_COLUMN_INFO,
192
- };
166
+ } }, NUMERICAL_COLUMN_INFO_1.NUMERICAL_COLUMN_INFO), COMPOUND_COLUMN_INFO_1.COMPOUND_COLUMN_INFO), COMPLEX_COLUMN_INFO_1.COMPLEX_COLUMN_INFO);
@@ -4,32 +4,4 @@ exports.COLUMN_LABEL = void 0;
4
4
  const COMPLEX_COLUMN_LABEL_1 = require("./COMPLEX_COLUMN_LABEL");
5
5
  const COMPOUND_COLUMN_LABEL_1 = require("./COMPOUND_COLUMN_LABEL");
6
6
  const NUMERICAL_COLUMN_LABEL_1 = require("./NUMERICAL_COLUMN_LABEL");
7
- exports.COLUMN_LABEL = {
8
- SINGLE_CHOICE: "Single Choice",
9
- MULTIPLE_CHOICE: "Multiple Choice",
10
- YES_NO: "Yes No",
11
- RANKING: "Ranking",
12
- DATE: "Date",
13
- SIGNATURE: "Signature",
14
- DROPDOWN: "Dropdown",
15
- IMAGE: "Image",
16
- EMAIL_FORM: "Email Form",
17
- PHONE: "Phone",
18
- PASSWORD: "Password",
19
- CHECKLIST: "Check List",
20
- NPS_SCORE: "NPS Score",
21
- NPS_FEEDBACK: "NPS Feedback",
22
- TEXT: "Text",
23
- TEXT_LABEL: "Text Label",
24
- TEXT_CATEGORY: "Text Category",
25
- LOOKUP: "Lookup",
26
- HEADLINE: "Headline",
27
- SECTION: "Section",
28
- FORMULA: "Formula",
29
- AGGREGATED_FORMULA: "Aggregated Formula",
30
- BUCKET: "Bucket",
31
- STRING: "String",
32
- ...NUMERICAL_COLUMN_LABEL_1.NUMERICAL_COLUMN_LABEL,
33
- ...COMPOUND_COLUMN_LABEL_1.COMPOUND_COLUMN_LABEL,
34
- ...COMPLEX_COLUMN_LABEL_1.COMPLEX_COLUMN_LABEL,
35
- };
7
+ exports.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_1.NUMERICAL_COLUMN_LABEL), COMPOUND_COLUMN_LABEL_1.COMPOUND_COLUMN_LABEL), COMPLEX_COLUMN_LABEL_1.COMPLEX_COLUMN_LABEL);
@@ -9,8 +9,7 @@ const COMPLEX_COLUMN_PROPERTY_INFO_1 = require("./COMPLEX_COLUMN_PROPERTY_INFO")
9
9
  const DATE_GROUPING_PROPERTY_INFO_LIST_1 = require("../../dates/constants/DATE_GROUPING_PROPERTY_INFO_LIST");
10
10
  const DATE_GROUPING_TIME_PROPERTY_INFO_LIST_1 = require("../../dates/constants/DATE_GROUPING_TIME_PROPERTY_INFO_LIST");
11
11
  const DATE_DISTINCT_TIME_PROPERTY_INFO_LIST_1 = require("../../dates/constants/DATE_DISTINCT_TIME_PROPERTY_INFO_LIST");
12
- exports.COLUMN_PROPERTY_INFO = {
13
- [COLUMN_1.COLUMN.LOOKUP]: [
12
+ exports.COLUMN_PROPERTY_INFO = Object.assign(Object.assign({ [COLUMN_1.COLUMN.LOOKUP]: [
14
13
  {
15
14
  value: COLUMN_PROPERTY_1.COLUMN_PROPERTY.LOOKUP_DISPLAY,
16
15
  label: "Display",
@@ -27,13 +26,9 @@ exports.COLUMN_PROPERTY_INFO = {
27
26
  displayed: true,
28
27
  i18nLabelPath: "common.properties.lookup_value_label",
29
28
  },
30
- ],
31
- [COLUMN_1.COLUMN.DATE]: [
29
+ ], [COLUMN_1.COLUMN.DATE]: [
32
30
  ...DATE_GROUPING_PROPERTY_INFO_LIST_1.DATE_GROUPING_PROPERTY_INFO_LIST,
33
31
  ...DATE_GROUPING_TIME_PROPERTY_INFO_LIST_1.DATE_GROUPING_TIME_PROPERTY_INFO_LIST,
34
32
  ...DATE_DISTINCT_PROPERTY_INFO_LIST_1.DATE_DISTINCT_PROPERTY_INFO_LIST,
35
33
  ...DATE_DISTINCT_TIME_PROPERTY_INFO_LIST_1.DATE_DISTINCT_TIME_PROPERTY_INFO_LIST,
36
- ],
37
- ...COMPOUND_COLUMN_PROPERTY_INFO_1.COMPOUND_COLUMN_PROPERTY_INFO,
38
- ...COMPLEX_COLUMN_PROPERTY_INFO_1.COMPLEX_COLUMN_PROPERTY_INFO,
39
- };
34
+ ] }, COMPOUND_COLUMN_PROPERTY_INFO_1.COMPOUND_COLUMN_PROPERTY_INFO), COMPLEX_COLUMN_PROPERTY_INFO_1.COMPLEX_COLUMN_PROPERTY_INFO);
@@ -7,14 +7,4 @@ const DATE_DISTINCT_PROPERTY_LABEL_1 = require("../../dates/constants/DATE_DISTI
7
7
  const DATE_DISTINCT_TIME_PROPERTY_LABEL_1 = require("../../dates/constants/DATE_DISTINCT_TIME_PROPERTY_LABEL");
8
8
  const COMPLEX_COLUMN_PROPERTY_LABEL_1 = require("./COMPLEX_COLUMN_PROPERTY_LABEL");
9
9
  const COMPOUND_COLUMN_PROPERTY_LABEL_1 = require("./COMPOUND_COLUMN_PROPERTY_LABEL");
10
- exports.COLUMN_PROPERTY_LABEL = {
11
- IMAGE_ANSWER_ID: "answer_id",
12
- LOOKUP_DISPLAY: "display",
13
- LOOKUP_VALUE: "value",
14
- ...DATE_GROUPING_PROPERTY_LABEL_1.DATE_GROUPING_PROPERTY_LABEL,
15
- ...DATE_GROUPING_TIME_PROPERTY_LABEL_1.DATE_GROUPING_TIME_PROPERTY_LABEL,
16
- ...DATE_DISTINCT_PROPERTY_LABEL_1.DATE_DISTINCT_PROPERTY_LABEL,
17
- ...DATE_DISTINCT_TIME_PROPERTY_LABEL_1.DATE_DISTINCT_TIME_PROPERTY_LABEL,
18
- ...COMPLEX_COLUMN_PROPERTY_LABEL_1.COMPLEX_COLUMN_PROPERTY_LABEL,
19
- ...COMPOUND_COLUMN_PROPERTY_LABEL_1.COMPOUND_COLUMN_PROPERTY_LABEL,
20
- };
10
+ exports.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_1.DATE_GROUPING_PROPERTY_LABEL), DATE_GROUPING_TIME_PROPERTY_LABEL_1.DATE_GROUPING_TIME_PROPERTY_LABEL), DATE_DISTINCT_PROPERTY_LABEL_1.DATE_DISTINCT_PROPERTY_LABEL), DATE_DISTINCT_TIME_PROPERTY_LABEL_1.DATE_DISTINCT_TIME_PROPERTY_LABEL), COMPLEX_COLUMN_PROPERTY_LABEL_1.COMPLEX_COLUMN_PROPERTY_LABEL), COMPOUND_COLUMN_PROPERTY_LABEL_1.COMPOUND_COLUMN_PROPERTY_LABEL);
@@ -12,5 +12,5 @@ function getDatasetColumn(column, dataset) {
12
12
  }
13
13
  exports.getDatasetColumn = getDatasetColumn;
14
14
  function getDatasetColumns(dataset) {
15
- return dataset?.options || [];
15
+ return (dataset === null || dataset === void 0 ? void 0 : dataset.options) || [];
16
16
  }
@@ -9,8 +9,6 @@ const DATE_GROUPING_PROPERTY_1 = require("../constants/DATE_GROUPING_PROPERTY");
9
9
  const parseDate_1 = require("./helpers/parseDate");
10
10
  const DATE_FORMATS_1 = require("./constants/DATE_FORMATS");
11
11
  class RelativeStatementAdapter {
12
- statement;
13
- now;
14
12
  constructor(statement, now = new Date()) {
15
13
  this.statement =
16
14
  typeof statement === "string" ? statement : (0, formatStatement_1.formatStatement)(statement);
@@ -110,20 +108,12 @@ class RelativeStatementAdapter {
110
108
  unit: this.unit,
111
109
  resolveAsCalendar: this.isCalendarDate,
112
110
  };
113
- const gte = RelativeStatementAdapter.convertRelativeToAbsolute({
114
- ...args,
115
- setTo: COMMON_1.COMMON_CONSTANTS.START,
116
- steps: -this.number +
111
+ const gte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_1.COMMON_CONSTANTS.START, steps: -this.number +
117
112
  (statementCase === COMMON_1.COMMON_CONSTANTS.INCLUSIVE_AND_CALENDAR ||
118
113
  (this.includeCurrent && this.unit === DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY)
119
114
  ? 1
120
- : 0),
121
- });
122
- const lte = RelativeStatementAdapter.convertRelativeToAbsolute({
123
- ...args,
124
- setTo: COMMON_1.COMMON_CONSTANTS.END,
125
- steps: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? -1 : 0,
126
- });
115
+ : 0) }));
116
+ const lte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_1.COMMON_CONSTANTS.END, steps: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? -1 : 0 }));
127
117
  return {
128
118
  gte,
129
119
  lte: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_ROLLING
@@ -149,20 +139,12 @@ class RelativeStatementAdapter {
149
139
  unit: this.unit,
150
140
  resolveAsCalendar: this.isCalendarDate,
151
141
  };
152
- const gte = RelativeStatementAdapter.convertRelativeToAbsolute({
153
- ...args,
154
- setTo: COMMON_1.COMMON_CONSTANTS.START,
155
- steps: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? 1 : 0,
156
- });
157
- const lte = RelativeStatementAdapter.convertRelativeToAbsolute({
158
- ...args,
159
- setTo: COMMON_1.COMMON_CONSTANTS.END,
160
- steps: this.number +
142
+ const gte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_1.COMMON_CONSTANTS.START, steps: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR ? 1 : 0 }));
143
+ const lte = RelativeStatementAdapter.convertRelativeToAbsolute(Object.assign(Object.assign({}, args), { setTo: COMMON_1.COMMON_CONSTANTS.END, steps: this.number +
161
144
  (statementCase === COMMON_1.COMMON_CONSTANTS.INCLUSIVE_AND_CALENDAR ||
162
145
  (this.includeCurrent && this.unit === DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY)
163
146
  ? -1
164
- : 0),
165
- });
147
+ : 0) }));
166
148
  return {
167
149
  lte,
168
150
  gte: statementCase === COMMON_1.COMMON_CONSTANTS.EXCLUSIVE_AND_ROLLING
@@ -62,40 +62,30 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
62
62
  qrveyid: filter.column.qrveyid,
63
63
  aggregate: filter.column.aggregate,
64
64
  calculation: filter.column.calculation,
65
- label: columnInfo?.label,
66
- linkid: datasetInfo?.linkid,
67
- linked: columnInfo?.linked,
65
+ label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
66
+ linkid: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid,
67
+ linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
68
68
  outputFormat: (0, get_1._get)(datasetInfo, "outputFormat"),
69
- type: columnInfo?.type || filter.column.type,
69
+ type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
70
70
  },
71
71
  dateSection: filter.dateSection,
72
72
  displayed: filter.displayed,
73
73
  enabled: filter.enabled,
74
- extras: {
75
- ...filter.extras,
76
- panelid: filter.extras.panelid,
77
- filterLabel: filter.extras.filterLabel,
78
- info,
79
- scope: filter.extras.scope,
80
- scopeid: filter.extras.scopeid,
81
- section: filter.extras.section,
82
- scopeInfo: {
74
+ 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: {
83
75
  collapsed: scope.collapsed,
84
76
  enabled: scope.enabled,
85
77
  displayed: scope.displayed,
86
78
  label: scope.label,
87
79
  scope: scope.scope,
88
80
  scopeid: scope.scopeid,
89
- },
90
- dataset: {
81
+ }, dataset: {
91
82
  qrveyid: dataset.qrveyid,
92
83
  collapsed: dataset.collapsed,
93
84
  enabled: dataset.enabled,
94
85
  displayed: dataset.enabled,
95
- label: datasetInfo?.label,
86
+ label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
96
87
  linkid: dataset.linkid,
97
- },
98
- },
88
+ } }),
99
89
  filterid: filter.filterid,
100
90
  lookupDisplayIndex: filter.lookupDisplayIndex,
101
91
  nullValues: filter.nullValues,
@@ -38,7 +38,7 @@ function getLogicBodyFromFD21(filterData) {
38
38
  filters = filters.concat(expressions);
39
39
  });
40
40
  }
41
- logics.push({ ...logic, filters });
41
+ logics.push(Object.assign(Object.assign({}, logic), { filters }));
42
42
  return logics;
43
43
  }, []);
44
44
  }
@@ -41,40 +41,28 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
41
41
  version,
42
42
  scopes: [],
43
43
  };
44
- ufData.scopes = scopes.map((scope) => ({
45
- ...scope,
46
- datasets: scope.datasets.map((dataset) => {
44
+ ufData.scopes = scopes.map((scope) => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
47
45
  const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
48
- return {
49
- ...dataset,
50
- label: datasetInfo?.label,
51
- filters: dataset.filters.map((filter) => {
46
+ return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map((filter) => {
52
47
  let columnInfo;
53
48
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
54
49
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
55
50
  cInfo.qrveyid === filter.column.qrveyid &&
56
51
  cInfo.linkid === filter.column.linkid);
57
52
  const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
58
- return {
59
- ...filter,
60
- column: {
53
+ return Object.assign(Object.assign({}, filter), { column: {
61
54
  aggregate: filter.column.aggregate,
62
55
  calculation: filter.column.calculation,
63
- formulaType: columnInfo?.formulaType,
56
+ formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
64
57
  id: filter.column.id,
65
- label: columnInfo?.label,
66
- linked: columnInfo?.linked,
67
- linkid: columnInfo?.linkid || datasetInfo?.linkid,
68
- outputFormat: columnInfo?.outputFormat,
58
+ label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
59
+ linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
60
+ linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
61
+ outputFormat: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.outputFormat,
69
62
  qrveyid: filter.column.qrveyid,
70
- type: columnInfo?.type || filter.column.type,
71
- },
72
- property,
73
- values: (0, adaptFilterValues_1.adaptFilterValues)(filter),
74
- };
75
- }),
76
- };
77
- }),
78
- }));
63
+ type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
64
+ }, property, values: (0, adaptFilterValues_1.adaptFilterValues)(filter) });
65
+ }) });
66
+ }) })));
79
67
  return ufData;
80
68
  }
@@ -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?.label || filter.column.label,
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,