@qrvey/utils 1.4.4 → 1.4.5

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 (54) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/columns/interfaces/IColumn.d.ts +0 -1
  3. package/dist/cjs/filters/adapters/FDToFlatUI.js +2 -7
  4. package/dist/cjs/filters/adapters/FDToUI.js +2 -5
  5. package/dist/cjs/filters/adapters/UIToFD.js +0 -1
  6. package/dist/cjs/filters/adapters/UIToFlatUI.js +2 -7
  7. package/dist/cjs/filters/adapters/UIToOldLogic.js +0 -3
  8. package/dist/cjs/filters/adapters/flatUIToFD.js +0 -1
  9. package/dist/cjs/filters/adapters/flatUIToOldLogic.js +0 -2
  10. package/dist/cjs/filters/adapters/flatUIToUI.js +0 -4
  11. package/dist/cjs/filters/adapters/logicToFlatUI.js +10 -14
  12. package/dist/cjs/filters/adapters/transformFilters.js +0 -4
  13. package/dist/cjs/filters/helpers/OLD_getAggFilters.js +0 -1
  14. package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js +3 -4
  15. package/dist/cjs/filters/helpers/common/mergeFilters.js +0 -1
  16. package/dist/cjs/filters/helpers/common/resolveDatasetConditions.js +0 -4
  17. package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +3 -5
  18. package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js +2 -3
  19. package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js +2 -3
  20. package/dist/cjs/filters/interfaces/OLD_IFilterExpression.d.ts +0 -1
  21. package/dist/cjs/filters/interfaces/common/IFSDataset.d.ts +0 -1
  22. package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts +0 -1
  23. package/dist/cjs/filters/services/UChartApi.js +1 -2
  24. package/dist/cjs/filters/services/UChartPaginationApi.js +1 -1
  25. package/dist/cjs/services/adapters/BColumnsToUIColumns.adapter.js +0 -2
  26. package/dist/cjs/services/adapters/BDatasetsToUIDatasets.adapter.js +0 -1
  27. package/dist/cjs/services/helpers/getDefaultQuestionListOptionsAttributes.js +0 -2
  28. package/dist/columns/interfaces/IColumn.d.ts +0 -1
  29. package/dist/filters/adapters/FDToFlatUI.js +2 -7
  30. package/dist/filters/adapters/FDToUI.js +2 -5
  31. package/dist/filters/adapters/UIToFD.js +0 -1
  32. package/dist/filters/adapters/UIToFlatUI.js +2 -7
  33. package/dist/filters/adapters/UIToOldLogic.js +0 -3
  34. package/dist/filters/adapters/flatUIToFD.js +0 -1
  35. package/dist/filters/adapters/flatUIToOldLogic.js +0 -2
  36. package/dist/filters/adapters/flatUIToUI.js +0 -4
  37. package/dist/filters/adapters/logicToFlatUI.js +10 -14
  38. package/dist/filters/adapters/transformFilters.js +0 -4
  39. package/dist/filters/helpers/OLD_getAggFilters.js +0 -1
  40. package/dist/filters/helpers/common/excludeFiltersByParams.js +3 -4
  41. package/dist/filters/helpers/common/mergeFilters.js +0 -1
  42. package/dist/filters/helpers/common/resolveDatasetConditions.js +0 -4
  43. package/dist/filters/helpers/common/resolveFilterConditions.js +3 -5
  44. package/dist/filters/helpers/ui/getUpdatedUIFilters.js +2 -3
  45. package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js +2 -3
  46. package/dist/filters/interfaces/OLD_IFilterExpression.d.ts +0 -1
  47. package/dist/filters/interfaces/common/IFSDataset.d.ts +0 -1
  48. package/dist/filters/interfaces/common/IFSParamsToGetFilter.d.ts +0 -1
  49. package/dist/filters/services/UChartApi.js +1 -2
  50. package/dist/filters/services/UChartPaginationApi.js +1 -1
  51. package/dist/services/adapters/BColumnsToUIColumns.adapter.js +0 -2
  52. package/dist/services/adapters/BDatasetsToUIDatasets.adapter.js +0 -1
  53. package/dist/services/helpers/getDefaultQuestionListOptionsAttributes.js +0 -2
  54. package/package.json +1 -1
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.4*
1
+ # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.5*
2
2
 
3
3
  > Helper, Utils for all Qrvey Projects
4
4
 
package/dist/cjs/columns/interfaces/IColumn.d.ts CHANGED
@@ -18,7 +18,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
18
18
  expressionWords?: IBColumnAnswerExpressionWord[];
19
19
  formulaid?: string;
20
20
  label?: string;
21
- linkid?: string;
22
21
  lookupValue?: IBColumnAnswerLookupValueValue;
23
22
  property?: IColumnPropertyType;
24
23
  slidebarValue?: number;
package/dist/cjs/filters/adapters/FDToFlatUI.js CHANGED
@@ -40,13 +40,11 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
40
40
  scope.datasets.forEach((dataset) => {
41
41
  if (dataset.filters.length > 0) {
42
42
  dataset.filters.forEach((filter) => {
43
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
44
- dInfo.linkid === dataset.linkid);
43
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
45
44
  let columnInfo;
46
45
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
47
46
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
48
- cInfo.qrveyid === filter.column.qrveyid &&
49
- cInfo.linkid === filter.column.linkid);
47
+ cInfo.qrveyid === filter.column.qrveyid);
50
48
  const info = !(0, isEmpty_1.isEmpty)(filter.extras.info)
51
49
  ? {
52
50
  icon: filter.extras.info.icon,
@@ -63,8 +61,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
63
61
  aggregate: filter.column.aggregate,
64
62
  calculation: filter.column.calculation,
65
63
  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
64
  outputFormat: (0, get_1._get)(datasetInfo, "outputFormat"),
69
65
  type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
70
66
  },
@@ -84,7 +80,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
84
80
  enabled: dataset.enabled,
85
81
  displayed: dataset.enabled,
86
82
  label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
87
- linkid: dataset.linkid,
88
83
  } }),
89
84
  filterid: filter.filterid,
90
85
  lookupDisplayIndex: filter.lookupDisplayIndex,
package/dist/cjs/filters/adapters/FDToUI.js CHANGED
@@ -42,13 +42,12 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
42
42
  scopes: [],
43
43
  };
44
44
  ufData.scopes = scopes.map((scope) => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
45
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
45
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
46
46
  return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map((filter) => {
47
47
  let columnInfo;
48
48
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
49
49
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
50
- cInfo.qrveyid === filter.column.qrveyid &&
51
- cInfo.linkid === filter.column.linkid);
50
+ cInfo.qrveyid === filter.column.qrveyid);
52
51
  const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
53
52
  return Object.assign(Object.assign({}, filter), { column: {
54
53
  aggregate: filter.column.aggregate,
@@ -56,8 +55,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
56
55
  formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
57
56
  id: filter.column.id,
58
57
  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
58
  outputFormat: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.outputFormat,
62
59
  qrveyid: filter.column.qrveyid,
63
60
  type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
package/dist/cjs/filters/adapters/UIToFD.js CHANGED
@@ -42,7 +42,6 @@ function UI21ToFD(uFilterData, version) {
42
42
  delete filter.column.outputFormat;
43
43
  delete filter.column.sorting;
44
44
  delete filter.column.uniqueid;
45
- delete filter.column.linked;
46
45
  });
47
46
  });
48
47
  scopes.push(scope);
package/dist/cjs/filters/adapters/UIToFlatUI.js CHANGED
@@ -38,13 +38,11 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
38
38
  scope.datasets.forEach((dataset) => {
39
39
  if (dataset.filters.length > 0) {
40
40
  dataset.filters.forEach((filter) => {
41
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
42
- dInfo.linkid === dataset.linkid);
41
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
43
42
  let columnInfo;
44
43
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
45
44
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
46
- cInfo.qrveyid === filter.column.qrveyid &&
47
- cInfo.linkid === filter.column.linkid);
45
+ cInfo.qrveyid === filter.column.qrveyid);
48
46
  const info = !(0, isEmpty_1.isEmpty)(filter.extras.info)
49
47
  ? {
50
48
  icon: filter.extras.info.icon,
@@ -61,8 +59,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
61
59
  aggregate: filter.column.aggregate,
62
60
  calculation: filter.column.calculation,
63
61
  label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
64
- linkid: filter.column.linkid,
65
- linked: filter.column.linked,
66
62
  outputFormat: filter.column.outputFormat,
67
63
  type: filter.column.type,
68
64
  },
@@ -82,7 +78,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
82
78
  enabled: dataset.enabled,
83
79
  displayed: dataset.enabled,
84
80
  label: dataset.label,
85
- linkid: dataset.linkid,
86
81
  } }),
87
82
  filterid: filter.filterid,
88
83
  lookupDisplayIndex: filter.lookupDisplayIndex,
package/dist/cjs/filters/adapters/UIToOldLogic.js CHANGED
@@ -75,7 +75,6 @@ function buildExpressions(filterSection, scope, dataset) {
75
75
  enabled: filter.enabled,
76
76
  formulaType: filter.column.formulaType,
77
77
  groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(filter),
78
- linkid: filter.column.linkid,
79
78
  property: (0, getBackendProperty_1.getBackendProperty)(filter),
80
79
  qrveyid: filter.column.qrveyid,
81
80
  questionType: filter.column.type,
@@ -115,8 +114,6 @@ const getFilterDetail = (filter, scope, dataset) => {
115
114
  aggregate: filter.column.aggregate,
116
115
  calculation: filter.column.calculation,
117
116
  formulaType: filter.column.formulaType,
118
- linked: undefined,
119
- linkid: filter.column.linkid,
120
117
  outputFormat: filter.column.outputFormat,
121
118
  property: filter.column.property,
122
119
  sorting: filter.column.sorting,
package/dist/cjs/filters/adapters/flatUIToFD.js CHANGED
@@ -77,7 +77,6 @@ function buildDataset(uFilter) {
77
77
  enabled: uFilter.extras.dataset.enabled,
78
78
  displayed: uFilter.extras.dataset.displayed,
79
79
  filters: undefined,
80
- linkid: uFilter.extras.dataset.linkid,
81
80
  };
82
81
  }
83
82
  /**
package/dist/cjs/filters/adapters/flatUIToOldLogic.js CHANGED
@@ -53,7 +53,6 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
53
53
  calculation: filter.column.calculation,
54
54
  formulaType: filter.column.formulaType,
55
55
  linked: undefined,
56
- linkid: filter.column.linkid,
57
56
  outputFormat: filter.column.outputFormat,
58
57
  property: filter.column.property,
59
58
  sorting: filter.column.sorting,
@@ -147,7 +146,6 @@ function getRegularExpression(props) {
147
146
  const uiValue = getUIValuess(props);
148
147
  const expression = {
149
148
  groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(props),
150
- linkid: props.column.linkid,
151
149
  property: (0, getBackendProperty_1.getBackendProperty)(props),
152
150
  qrveyid: props.column.qrveyid,
153
151
  questionid: props.column.id,
package/dist/cjs/filters/adapters/flatUIToUI.js CHANGED
@@ -41,7 +41,6 @@ function buildScopes(uFilters) {
41
41
  : -1;
42
42
  const lastUiFilterIndex = datasetIndex > -1
43
43
  ? (0, getLastIndexFromArray_1.getLastIndexFromArray)(scopes[scopeIndex].datasets[datasetIndex].filters, (uf) => uf.column.id === uiFilter.column.id &&
44
- uf.column.linkid === uFilter.column.linkid &&
45
44
  uf.column.qrveyid === uFilter.column.qrveyid)
46
45
  : -1;
47
46
  if (scopeIndex === -1) {
@@ -88,7 +87,6 @@ function buildDataset(uFilter) {
88
87
  displayed: uFilter.extras.dataset.displayed,
89
88
  filters: undefined,
90
89
  label: uFilter.extras.dataset.label,
91
- linkid: uFilter.extras.dataset.linkid,
92
90
  };
93
91
  }
94
92
  /**
@@ -112,8 +110,6 @@ function buildFilter(uFilter) {
112
110
  formulaType: uFilter.column.formulaType,
113
111
  id: uFilter.column.id,
114
112
  label: uFilter.column.label,
115
- linked: uFilter.column.linked,
116
- linkid: uFilter.column.linkid,
117
113
  outputFormat: uFilter.column.outputFormat,
118
114
  property: uFilter.column.property,
119
115
  qrveyid: uFilter.column.qrveyid,
package/dist/cjs/filters/adapters/logicToFlatUI.js CHANGED
@@ -65,7 +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
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
69
69
  const uiExtras = expression.uiExtras;
70
70
  const scopeid = scopeItem.scope !== FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL
71
71
  ? (0, get_1._get)(scopeItem, "uiExtras.scopeid")
@@ -79,25 +79,23 @@ function getFilterByExpression(expression, scopeItem) {
79
79
  column: {
80
80
  id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
81
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),
82
+ qrveyid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.qrveyid,
83
+ aggregate: ((_e = (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.aggregate) === null || _e === void 0 ? void 0 : _e.label) ||
84
+ ((_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate),
85
+ calculation: ((_h = (_g = uiExtras.column) === null || _g === void 0 ? void 0 : _g.calculation) === null || _h === void 0 ? void 0 : _h.value) ||
86
+ ((_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation),
89
87
  label: (0, get_1._get)(uiExtras.column, "text") || (0, get_1._get)(uiExtras.column, "label"),
90
88
  property: uiExtras.column.property,
91
89
  sorting: uiExtras.column.sorting,
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,
90
+ outputFormat: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.outputFormat,
91
+ type: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.type,
94
92
  },
95
93
  dateSection: uiExtras.dateSection,
96
94
  displayed: true,
97
95
  enabled: uiExtras.enabled,
98
96
  extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
99
97
  scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
100
- collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
98
+ collapsed: (_m = scopeItem.uiExtras) === null || _m === void 0 ? void 0 : _m.collapsed,
101
99
  enabled: scopeItem.enabled,
102
100
  displayed: true,
103
101
  scope: scopeItem.scope,
@@ -106,10 +104,9 @@ function getFilterByExpression(expression, scopeItem) {
106
104
  collapsed: false,
107
105
  enabled: true,
108
106
  displayed: true,
109
- qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
107
+ qrveyid: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.qrveyid,
110
108
  label: (0, get_1._get)(uiExtras.column, "dataset.name") ||
111
109
  (0, get_1._get)(uiExtras.column, "label"),
112
- linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
113
110
  } }),
114
111
  filterid: undefined,
115
112
  lookupDisplayIndex: uiExtras.lookupDisplayIndex,
@@ -149,7 +146,6 @@ function getFilter(filters, filter, getIndex = false) {
149
146
  const validator = (f) => f.validator === filter.validator &&
150
147
  f.column.id === filter.column.id &&
151
148
  f.column.qrveyid === filter.column.qrveyid &&
152
- f.column.linkid === filter.column.linkid &&
153
149
  (0, get_1._get)(f.column, "aggregate.label") ===
154
150
  (0, get_1._get)(filter.column, "aggregate.label") &&
155
151
  f.extras.scope === filter.scope &&
package/dist/cjs/filters/adapters/transformFilters.js CHANGED
@@ -392,7 +392,6 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
392
392
  const expressionItem = {
393
393
  enabled: oldFiltersItem.enabled,
394
394
  property: property,
395
- linkid: oldFiltersItem.dataset.linkid,
396
395
  qrveyid: oldFiltersItem.dataset.qrveyid,
397
396
  questionid: oldFiltersItem.qid,
398
397
  formulaType: formulaType,
@@ -402,14 +401,11 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
402
401
  uiExtras: {
403
402
  column: {
404
403
  dataset: {
405
- linkid: oldFiltersItem.dataset.linkid,
406
404
  qrveyid: oldFiltersItem.dataset.qrveyid,
407
405
  name: oldFiltersItem.dataset.name,
408
406
  },
409
407
  formulaType: formulaType,
410
408
  id: oldFiltersItem.qid,
411
- linked: oldFiltersItem.linked,
412
- linkid: oldFiltersItem.dataset.linkid,
413
409
  qrveyid: oldFiltersItem.dataset.qrveyid,
414
410
  text: oldFiltersItem.text,
415
411
  type: questionType,
package/dist/cjs/filters/helpers/OLD_getAggFilters.js CHANGED
@@ -24,7 +24,6 @@ function getAggFilters(logics = [], summaries = []) {
24
24
  .map((expression) => {
25
25
  const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
26
26
  expression.qrveyid === summary.qrveyid &&
27
- expression.linkid === summary.linkid &&
28
27
  (0, get_1._get)(expression.uiExtras.column, "aggregate") ===
29
28
  summary.aggregate);
30
29
  if (summaryIndex > -1 ||
package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js CHANGED
@@ -79,7 +79,7 @@ function resolveDatasetConditions(dataset, params) {
79
79
  dataset.filters.length > 0);
80
80
  }
81
81
  function resolveFilterConditions(filter, params) {
82
- var _a, _b, _c, _d, _e;
82
+ var _a, _b, _c, _d;
83
83
  return ((params.enableds == null || params.enableds !== filter.enabled) &&
84
84
  ((0, isEmpty_1.isEmpty)(params.dateSection) ||
85
85
  params.dateSection !== filter.dateSection) &&
@@ -89,7 +89,6 @@ function resolveFilterConditions(filter, params) {
89
89
  ((0, isEmpty_1.isEmpty)(params.column) ||
90
90
  (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) !== filter.column.id &&
91
91
  ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) !== filter.column.qrveyid &&
92
- ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) !== filter.column.linkid &&
93
- ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) !== filter.column.aggregate)) &&
94
- ((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0);
92
+ ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate) !== filter.column.aggregate)) &&
93
+ ((_d = filter.values) === null || _d === void 0 ? void 0 : _d.length) > 0);
95
94
  }
package/dist/cjs/filters/helpers/common/mergeFilters.js CHANGED
@@ -71,7 +71,6 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
71
71
  let newDatasets = datasets1.reduce((datasets, dataset1) => {
72
72
  const dataset2Index = datasets2.findIndex((dataset2) => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, {
73
73
  qrveyid: dataset1.qrveyid,
74
- linkid: dataset1.linkid,
75
74
  }));
76
75
  if (dataset2Index > -1) {
77
76
  dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
package/dist/cjs/filters/helpers/common/resolveDatasetConditions.js CHANGED
@@ -21,10 +21,6 @@ function resolveDatasetConditions(dataset, params, letPassUndefinedProperties =
21
21
  (letPassUndefinedProperties && dataset.qrveyid == null) ||
22
22
  (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.qrveyid)) ||
23
23
  params.qrveyid === dataset.qrveyid) &&
24
- (!(0, hasProperty_1._hasProperty)(params, "linkid") ||
25
- (letPassUndefinedProperties && dataset.linkid == null) ||
26
- (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.linkid)) ||
27
- params.linkid === dataset.linkid) &&
28
24
  dataset.filters.length > 0);
29
25
  }
30
26
  exports.resolveDatasetConditions = resolveDatasetConditions;
package/dist/cjs/filters/helpers/common/resolveFilterConditions.js CHANGED
@@ -12,7 +12,7 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
12
12
  * @returns true: the condition is satisfied
13
13
  */
14
14
  function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
15
- var _a, _b, _c, _d, _e, _f, _g, _h;
15
+ var _a, _b, _c, _d, _e, _f;
16
16
  return ((!(0, hasProperty_1._hasProperty)(params, "enableds") ||
17
17
  !(0, hasProperty_1._hasProperty)(params.enableds, "filters") ||
18
18
  (letPassUndefinedProperties && filter.enabled == null) ||
@@ -41,9 +41,7 @@ function resolveFilterConditions(filter, params, letPassUndefinedProperties = fa
41
41
  ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
42
42
  ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid)) ||
43
43
  ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
44
- ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid)) ||
45
- ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
46
- ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate)) ||
47
- ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate))));
44
+ ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_e = params.column) === null || _e === void 0 ? void 0 : _e.aggregate)) ||
45
+ ((_f = params.column) === null || _f === void 0 ? void 0 : _f.aggregate) === filter.column.aggregate))));
48
46
  }
49
47
  exports.resolveFilterConditions = resolveFilterConditions;
package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js CHANGED
@@ -14,15 +14,14 @@ function getUpdatedUIFilters(data, datasets = []) {
14
14
  return data;
15
15
  let updatedScopes = data.scopes.map((scopes) => {
16
16
  scopes.datasets = scopes.datasets.map((dataset) => {
17
- const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
17
+ const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
18
18
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
19
19
  dataset.label = datasetInfo.label;
20
20
  dataset.filters = dataset.filters.map((filter) => {
21
21
  let columnInfo;
22
22
  if (!(0, isEmpty_1.isEmpty)(datasetInfo))
23
23
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
24
- cInfo.qrveyid === filter.column.qrveyid &&
25
- cInfo.linkid === filter.column.linkid);
24
+ cInfo.qrveyid === filter.column.qrveyid);
26
25
  if (!(0, isEmpty_1.isEmpty)(columnInfo)) {
27
26
  filter.column.formulaType = columnInfo.formulaType;
28
27
  filter.column.geogroup = columnInfo.geogroup;
package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js CHANGED
@@ -9,12 +9,11 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
9
9
  * @returns true: the conditions are satisfied.
10
10
  */
11
11
  function resolveUIFlatFilterByParams(filter, params) {
12
- var _a, _b, _c, _d;
12
+ var _a, _b, _c;
13
13
  return (((0, isEmpty_1.isEmpty)(params.column) ||
14
14
  (filter.column.id === ((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) &&
15
15
  filter.column.qrveyid === ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) &&
16
- filter.column.linkid === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) &&
17
- filter.column.aggregate === ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate))) &&
16
+ filter.column.aggregate === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate))) &&
18
17
  ((0, isEmpty_1.isEmpty)(params.scope) || filter.extras.scope === params.scope) &&
19
18
  ((0, isEmpty_1.isEmpty)(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
20
19
  ((0, isEmpty_1.isEmpty)(params.panelid) || filter.extras.panelid === params.panelid) &&
package/dist/cjs/filters/interfaces/OLD_IFilterExpression.d.ts CHANGED
@@ -9,7 +9,6 @@ export interface OLD_IFilterExpression {
9
9
  expressions?: OLD_IFilterExpression[];
10
10
  formulaType?: string;
11
11
  groupValue?: IFProperty;
12
- linkid?: string;
13
12
  operator?: IFOperator;
14
13
  property?: IFProperty;
15
14
  qrveyid?: string;
package/dist/cjs/filters/interfaces/common/IFSDataset.d.ts CHANGED
@@ -8,5 +8,4 @@ export interface IFSDataset {
8
8
  displayed: boolean;
9
9
  filters: IFSFilter[];
10
10
  qrveyid: string;
11
- linkid?: string;
12
11
  }
package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts CHANGED
@@ -13,7 +13,6 @@ export interface IFSParamsToGetFilter {
13
13
  dateSection?: IFDateSection;
14
14
  enableds?: IFSParamsToGetFilterEnableds;
15
15
  chart?: IFUChartSettings;
16
- linkid?: string;
17
16
  panelid?: string;
18
17
  property?: IFProperty;
19
18
  qrveyid?: string;
package/dist/cjs/filters/services/UChartApi.js CHANGED
@@ -88,7 +88,6 @@ class UChartApi {
88
88
  {
89
89
  questionid: column.id,
90
90
  qrveyid: column.qrveyid,
91
- // linkid: column.linkid,
92
91
  maxDataPoints: this._getMaxDataPoints(column, chartSettings),
93
92
  type: column.type,
94
93
  formulaType: column.type === "FORMULA" ? column.formulaType : undefined,
@@ -266,7 +265,7 @@ class UChartApi {
266
265
  let searchLogic;
267
266
  if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
268
267
  searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
269
- Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
268
+ Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
270
269
  ]);
271
270
  }
272
271
  return searchLogic;
package/dist/cjs/filters/services/UChartPaginationApi.js CHANGED
@@ -306,7 +306,7 @@ class UChartPaginationApi {
306
306
  let searchLogic;
307
307
  if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
308
308
  searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
309
- Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
309
+ Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
310
310
  ]);
311
311
  }
312
312
  return searchLogic;
package/dist/cjs/services/adapters/BColumnsToUIColumns.adapter.js CHANGED
@@ -16,8 +16,6 @@ function BColumnsToUIColumns(columns = [], dataset) {
16
16
  id: column.id,
17
17
  imageUploadOption: column.imageUploadOption,
18
18
  label: column.text,
19
- linked: column.linked,
20
- linkid: (0, getAttribute_1.getAttribute)(dataset, "link_id") || (0, getAttribute_1.getAttribute)(column, "link_id"),
21
19
  outputFormat: column.outputFormat,
22
20
  property: column.property,
23
21
  qrveyid: (0, getAttribute_1.getAttribute)(dataset, "qrvey_id") || (0, getAttribute_1.getAttribute)(column, "qrvey_id"),
package/dist/cjs/services/adapters/BDatasetsToUIDatasets.adapter.js CHANGED
@@ -7,7 +7,6 @@ function BDatasetsToUIDatasets(datasets = []) {
7
7
  return datasets.map((dataset) => ({
8
8
  qrveyid: (0, getAttribute_1.getAttribute)(dataset, "qrvey_id"),
9
9
  label: dataset.name,
10
- linkid: (0, getAttribute_1.getAttribute)(dataset, "link_id"),
11
10
  options: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(dataset.options, dataset),
12
11
  }));
13
12
  }
package/dist/cjs/services/helpers/getDefaultQuestionListOptionsAttributes.js CHANGED
@@ -7,8 +7,6 @@ function getDefaultQuestionListOptionsAttributes() {
7
7
  "text",
8
8
  "type",
9
9
  "property",
10
- "linked",
11
- "linkid",
12
10
  "qrveyid",
13
11
  "bucketId",
14
12
  "formulaId",
package/dist/columns/interfaces/IColumn.d.ts CHANGED
@@ -18,7 +18,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
18
18
  expressionWords?: IBColumnAnswerExpressionWord[];
19
19
  formulaid?: string;
20
20
  label?: string;
21
- linkid?: string;
22
21
  lookupValue?: IBColumnAnswerLookupValueValue;
23
22
  property?: IColumnPropertyType;
24
23
  slidebarValue?: number;
package/dist/filters/adapters/FDToFlatUI.js CHANGED
@@ -36,13 +36,11 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
36
36
  scope.datasets.forEach((dataset) => {
37
37
  if (dataset.filters.length > 0) {
38
38
  dataset.filters.forEach((filter) => {
39
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
40
- dInfo.linkid === dataset.linkid);
39
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
41
40
  let columnInfo;
42
41
  if (!isEmpty(datasetInfo))
43
42
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
44
- cInfo.qrveyid === filter.column.qrveyid &&
45
- cInfo.linkid === filter.column.linkid);
43
+ cInfo.qrveyid === filter.column.qrveyid);
46
44
  const info = !isEmpty(filter.extras.info)
47
45
  ? {
48
46
  icon: filter.extras.info.icon,
@@ -59,8 +57,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
59
57
  aggregate: filter.column.aggregate,
60
58
  calculation: filter.column.calculation,
61
59
  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
60
  outputFormat: _get(datasetInfo, "outputFormat"),
65
61
  type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
66
62
  },
@@ -80,7 +76,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
80
76
  enabled: dataset.enabled,
81
77
  displayed: dataset.enabled,
82
78
  label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
83
- linkid: dataset.linkid,
84
79
  } }),
85
80
  filterid: filter.filterid,
86
81
  lookupDisplayIndex: filter.lookupDisplayIndex,
package/dist/filters/adapters/FDToUI.js CHANGED
@@ -38,13 +38,12 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
38
38
  scopes: [],
39
39
  };
40
40
  ufData.scopes = scopes.map((scope) => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
41
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
41
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
42
42
  return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map((filter) => {
43
43
  let columnInfo;
44
44
  if (!isEmpty(datasetInfo))
45
45
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
46
- cInfo.qrveyid === filter.column.qrveyid &&
47
- cInfo.linkid === filter.column.linkid);
46
+ cInfo.qrveyid === filter.column.qrveyid);
48
47
  const property = adaptDateGroupingProperty(filter.property);
49
48
  return Object.assign(Object.assign({}, filter), { column: {
50
49
  aggregate: filter.column.aggregate,
@@ -52,8 +51,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
52
51
  formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
53
52
  id: filter.column.id,
54
53
  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
54
  outputFormat: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.outputFormat,
58
55
  qrveyid: filter.column.qrveyid,
59
56
  type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
package/dist/filters/adapters/UIToFD.js CHANGED
@@ -38,7 +38,6 @@ function UI21ToFD(uFilterData, version) {
38
38
  delete filter.column.outputFormat;
39
39
  delete filter.column.sorting;
40
40
  delete filter.column.uniqueid;
41
- delete filter.column.linked;
42
41
  });
43
42
  });
44
43
  scopes.push(scope);
package/dist/filters/adapters/UIToFlatUI.js CHANGED
@@ -34,13 +34,11 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
34
34
  scope.datasets.forEach((dataset) => {
35
35
  if (dataset.filters.length > 0) {
36
36
  dataset.filters.forEach((filter) => {
37
- const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
38
- dInfo.linkid === dataset.linkid);
37
+ const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
39
38
  let columnInfo;
40
39
  if (!isEmpty(datasetInfo))
41
40
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
42
- cInfo.qrveyid === filter.column.qrveyid &&
43
- cInfo.linkid === filter.column.linkid);
41
+ cInfo.qrveyid === filter.column.qrveyid);
44
42
  const info = !isEmpty(filter.extras.info)
45
43
  ? {
46
44
  icon: filter.extras.info.icon,
@@ -57,8 +55,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
57
55
  aggregate: filter.column.aggregate,
58
56
  calculation: filter.column.calculation,
59
57
  label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
60
- linkid: filter.column.linkid,
61
- linked: filter.column.linked,
62
58
  outputFormat: filter.column.outputFormat,
63
59
  type: filter.column.type,
64
60
  },
@@ -78,7 +74,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
78
74
  enabled: dataset.enabled,
79
75
  displayed: dataset.enabled,
80
76
  label: dataset.label,
81
- linkid: dataset.linkid,
82
77
  } }),
83
78
  filterid: filter.filterid,
84
79
  lookupDisplayIndex: filter.lookupDisplayIndex,
package/dist/filters/adapters/UIToOldLogic.js CHANGED
@@ -71,7 +71,6 @@ function buildExpressions(filterSection, scope, dataset) {
71
71
  enabled: filter.enabled,
72
72
  formulaType: filter.column.formulaType,
73
73
  groupValue: getBackendGroupValue(filter),
74
- linkid: filter.column.linkid,
75
74
  property: getBackendProperty(filter),
76
75
  qrveyid: filter.column.qrveyid,
77
76
  questionType: filter.column.type,
@@ -111,8 +110,6 @@ const getFilterDetail = (filter, scope, dataset) => {
111
110
  aggregate: filter.column.aggregate,
112
111
  calculation: filter.column.calculation,
113
112
  formulaType: filter.column.formulaType,
114
- linked: undefined,
115
- linkid: filter.column.linkid,
116
113
  outputFormat: filter.column.outputFormat,
117
114
  property: filter.column.property,
118
115
  sorting: filter.column.sorting,
package/dist/filters/adapters/flatUIToFD.js CHANGED
@@ -73,7 +73,6 @@ function buildDataset(uFilter) {
73
73
  enabled: uFilter.extras.dataset.enabled,
74
74
  displayed: uFilter.extras.dataset.displayed,
75
75
  filters: undefined,
76
- linkid: uFilter.extras.dataset.linkid,
77
76
  };
78
77
  }
79
78
  /**
package/dist/filters/adapters/flatUIToOldLogic.js CHANGED
@@ -49,7 +49,6 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
49
49
  calculation: filter.column.calculation,
50
50
  formulaType: filter.column.formulaType,
51
51
  linked: undefined,
52
- linkid: filter.column.linkid,
53
52
  outputFormat: filter.column.outputFormat,
54
53
  property: filter.column.property,
55
54
  sorting: filter.column.sorting,
@@ -141,7 +140,6 @@ function getRegularExpression(props) {
141
140
  const uiValue = getUIValuess(props);
142
141
  const expression = {
143
142
  groupValue: getBackendGroupValue(props),
144
- linkid: props.column.linkid,
145
143
  property: getBackendProperty(props),
146
144
  qrveyid: props.column.qrveyid,
147
145
  questionid: props.column.id,
package/dist/filters/adapters/flatUIToUI.js CHANGED
@@ -37,7 +37,6 @@ function buildScopes(uFilters) {
37
37
  : -1;
38
38
  const lastUiFilterIndex = datasetIndex > -1
39
39
  ? getLastIndexFromArray(scopes[scopeIndex].datasets[datasetIndex].filters, (uf) => uf.column.id === uiFilter.column.id &&
40
- uf.column.linkid === uFilter.column.linkid &&
41
40
  uf.column.qrveyid === uFilter.column.qrveyid)
42
41
  : -1;
43
42
  if (scopeIndex === -1) {
@@ -84,7 +83,6 @@ function buildDataset(uFilter) {
84
83
  displayed: uFilter.extras.dataset.displayed,
85
84
  filters: undefined,
86
85
  label: uFilter.extras.dataset.label,
87
- linkid: uFilter.extras.dataset.linkid,
88
86
  };
89
87
  }
90
88
  /**
@@ -108,8 +106,6 @@ function buildFilter(uFilter) {
108
106
  formulaType: uFilter.column.formulaType,
109
107
  id: uFilter.column.id,
110
108
  label: uFilter.column.label,
111
- linked: uFilter.column.linked,
112
- linkid: uFilter.column.linkid,
113
109
  outputFormat: uFilter.column.outputFormat,
114
110
  property: uFilter.column.property,
115
111
  qrveyid: uFilter.column.qrveyid,
package/dist/filters/adapters/logicToFlatUI.js CHANGED
@@ -61,7 +61,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
61
61
  }
62
62
  }
63
63
  function getFilterByExpression(expression, scopeItem) {
64
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
64
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
65
65
  const uiExtras = expression.uiExtras;
66
66
  const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
67
67
  ? _get(scopeItem, "uiExtras.scopeid")
@@ -75,25 +75,23 @@ function getFilterByExpression(expression, scopeItem) {
75
75
  column: {
76
76
  id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
77
77
  formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
78
- linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
79
- linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
80
- qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
81
- aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) ||
82
- ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
83
- calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) ||
84
- ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
78
+ qrveyid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.qrveyid,
79
+ aggregate: ((_e = (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.aggregate) === null || _e === void 0 ? void 0 : _e.label) ||
80
+ ((_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate),
81
+ calculation: ((_h = (_g = uiExtras.column) === null || _g === void 0 ? void 0 : _g.calculation) === null || _h === void 0 ? void 0 : _h.value) ||
82
+ ((_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation),
85
83
  label: _get(uiExtras.column, "text") || _get(uiExtras.column, "label"),
86
84
  property: uiExtras.column.property,
87
85
  sorting: uiExtras.column.sorting,
88
- outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
89
- type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
86
+ outputFormat: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.outputFormat,
87
+ type: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.type,
90
88
  },
91
89
  dateSection: uiExtras.dateSection,
92
90
  displayed: true,
93
91
  enabled: uiExtras.enabled,
94
92
  extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
95
93
  scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
96
- collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
94
+ collapsed: (_m = scopeItem.uiExtras) === null || _m === void 0 ? void 0 : _m.collapsed,
97
95
  enabled: scopeItem.enabled,
98
96
  displayed: true,
99
97
  scope: scopeItem.scope,
@@ -102,10 +100,9 @@ function getFilterByExpression(expression, scopeItem) {
102
100
  collapsed: false,
103
101
  enabled: true,
104
102
  displayed: true,
105
- qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
103
+ qrveyid: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.qrveyid,
106
104
  label: _get(uiExtras.column, "dataset.name") ||
107
105
  _get(uiExtras.column, "label"),
108
- linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
109
106
  } }),
110
107
  filterid: undefined,
111
108
  lookupDisplayIndex: uiExtras.lookupDisplayIndex,
@@ -145,7 +142,6 @@ function getFilter(filters, filter, getIndex = false) {
145
142
  const validator = (f) => f.validator === filter.validator &&
146
143
  f.column.id === filter.column.id &&
147
144
  f.column.qrveyid === filter.column.qrveyid &&
148
- f.column.linkid === filter.column.linkid &&
149
145
  _get(f.column, "aggregate.label") ===
150
146
  _get(filter.column, "aggregate.label") &&
151
147
  f.extras.scope === filter.scope &&
package/dist/filters/adapters/transformFilters.js CHANGED
@@ -388,7 +388,6 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
388
388
  const expressionItem = {
389
389
  enabled: oldFiltersItem.enabled,
390
390
  property: property,
391
- linkid: oldFiltersItem.dataset.linkid,
392
391
  qrveyid: oldFiltersItem.dataset.qrveyid,
393
392
  questionid: oldFiltersItem.qid,
394
393
  formulaType: formulaType,
@@ -398,14 +397,11 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
398
397
  uiExtras: {
399
398
  column: {
400
399
  dataset: {
401
- linkid: oldFiltersItem.dataset.linkid,
402
400
  qrveyid: oldFiltersItem.dataset.qrveyid,
403
401
  name: oldFiltersItem.dataset.name,
404
402
  },
405
403
  formulaType: formulaType,
406
404
  id: oldFiltersItem.qid,
407
- linked: oldFiltersItem.linked,
408
- linkid: oldFiltersItem.dataset.linkid,
409
405
  qrveyid: oldFiltersItem.dataset.qrveyid,
410
406
  text: oldFiltersItem.text,
411
407
  type: questionType,
package/dist/filters/helpers/OLD_getAggFilters.js CHANGED
@@ -21,7 +21,6 @@ export function getAggFilters(logics = [], summaries = []) {
21
21
  .map((expression) => {
22
22
  const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
23
23
  expression.qrveyid === summary.qrveyid &&
24
- expression.linkid === summary.linkid &&
25
24
  _get(expression.uiExtras.column, "aggregate") ===
26
25
  summary.aggregate);
27
26
  if (summaryIndex > -1 ||
package/dist/filters/helpers/common/excludeFiltersByParams.js CHANGED
@@ -75,7 +75,7 @@ function resolveDatasetConditions(dataset, params) {
75
75
  dataset.filters.length > 0);
76
76
  }
77
77
  function resolveFilterConditions(filter, params) {
78
- var _a, _b, _c, _d, _e;
78
+ var _a, _b, _c, _d;
79
79
  return ((params.enableds == null || params.enableds !== filter.enabled) &&
80
80
  (isEmpty(params.dateSection) ||
81
81
  params.dateSection !== filter.dateSection) &&
@@ -85,7 +85,6 @@ function resolveFilterConditions(filter, params) {
85
85
  (isEmpty(params.column) ||
86
86
  (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) !== filter.column.id &&
87
87
  ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) !== filter.column.qrveyid &&
88
- ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) !== filter.column.linkid &&
89
- ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) !== filter.column.aggregate)) &&
90
- ((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0);
88
+ ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate) !== filter.column.aggregate)) &&
89
+ ((_d = filter.values) === null || _d === void 0 ? void 0 : _d.length) > 0);
91
90
  }
package/dist/filters/helpers/common/mergeFilters.js CHANGED
@@ -67,7 +67,6 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
67
67
  let newDatasets = datasets1.reduce((datasets, dataset1) => {
68
68
  const dataset2Index = datasets2.findIndex((dataset2) => resolveDatasetConditions(dataset2, {
69
69
  qrveyid: dataset1.qrveyid,
70
- linkid: dataset1.linkid,
71
70
  }));
72
71
  if (dataset2Index > -1) {
73
72
  dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
package/dist/filters/helpers/common/resolveDatasetConditions.js CHANGED
@@ -18,9 +18,5 @@ export function resolveDatasetConditions(dataset, params, letPassUndefinedProper
18
18
  (letPassUndefinedProperties && dataset.qrveyid == null) ||
19
19
  (letPassUndefinedParams && isEmpty(params.qrveyid)) ||
20
20
  params.qrveyid === dataset.qrveyid) &&
21
- (!_hasProperty(params, "linkid") ||
22
- (letPassUndefinedProperties && dataset.linkid == null) ||
23
- (letPassUndefinedParams && isEmpty(params.linkid)) ||
24
- params.linkid === dataset.linkid) &&
25
21
  dataset.filters.length > 0);
26
22
  }
package/dist/filters/helpers/common/resolveFilterConditions.js CHANGED
@@ -9,7 +9,7 @@ import { _hasProperty } from "../../../general/object/hasProperty";
9
9
  * @returns true: the condition is satisfied
10
10
  */
11
11
  export function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
12
- var _a, _b, _c, _d, _e, _f, _g, _h;
12
+ var _a, _b, _c, _d, _e, _f;
13
13
  return ((!_hasProperty(params, "enableds") ||
14
14
  !_hasProperty(params.enableds, "filters") ||
15
15
  (letPassUndefinedProperties && filter.enabled == null) ||
@@ -38,8 +38,6 @@ export function resolveFilterConditions(filter, params, letPassUndefinedProperti
38
38
  ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
39
39
  ((letPassUndefinedParams && isEmpty((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid)) ||
40
40
  ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
41
- ((letPassUndefinedParams && isEmpty((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid)) ||
42
- ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
43
- ((letPassUndefinedParams && isEmpty((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate)) ||
44
- ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate))));
41
+ ((letPassUndefinedParams && isEmpty((_e = params.column) === null || _e === void 0 ? void 0 : _e.aggregate)) ||
42
+ ((_f = params.column) === null || _f === void 0 ? void 0 : _f.aggregate) === filter.column.aggregate))));
45
43
  }
package/dist/filters/helpers/ui/getUpdatedUIFilters.js CHANGED
@@ -11,15 +11,14 @@ export function getUpdatedUIFilters(data, datasets = []) {
11
11
  return data;
12
12
  let updatedScopes = data.scopes.map((scopes) => {
13
13
  scopes.datasets = scopes.datasets.map((dataset) => {
14
- const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
14
+ const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
15
15
  if (!isEmpty(datasetInfo))
16
16
  dataset.label = datasetInfo.label;
17
17
  dataset.filters = dataset.filters.map((filter) => {
18
18
  let columnInfo;
19
19
  if (!isEmpty(datasetInfo))
20
20
  columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
21
- cInfo.qrveyid === filter.column.qrveyid &&
22
- cInfo.linkid === filter.column.linkid);
21
+ cInfo.qrveyid === filter.column.qrveyid);
23
22
  if (!isEmpty(columnInfo)) {
24
23
  filter.column.formulaType = columnInfo.formulaType;
25
24
  filter.column.geogroup = columnInfo.geogroup;
package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js CHANGED
@@ -6,12 +6,11 @@ import { isEmpty } from "../../../general/mix/isEmpty";
6
6
  * @returns true: the conditions are satisfied.
7
7
  */
8
8
  export function resolveUIFlatFilterByParams(filter, params) {
9
- var _a, _b, _c, _d;
9
+ var _a, _b, _c;
10
10
  return ((isEmpty(params.column) ||
11
11
  (filter.column.id === ((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) &&
12
12
  filter.column.qrveyid === ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) &&
13
- filter.column.linkid === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) &&
14
- filter.column.aggregate === ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate))) &&
13
+ filter.column.aggregate === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate))) &&
15
14
  (isEmpty(params.scope) || filter.extras.scope === params.scope) &&
16
15
  (isEmpty(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
17
16
  (isEmpty(params.panelid) || filter.extras.panelid === params.panelid) &&
package/dist/filters/interfaces/OLD_IFilterExpression.d.ts CHANGED
@@ -9,7 +9,6 @@ export interface OLD_IFilterExpression {
9
9
  expressions?: OLD_IFilterExpression[];
10
10
  formulaType?: string;
11
11
  groupValue?: IFProperty;
12
- linkid?: string;
13
12
  operator?: IFOperator;
14
13
  property?: IFProperty;
15
14
  qrveyid?: string;
package/dist/filters/interfaces/common/IFSDataset.d.ts CHANGED
@@ -8,5 +8,4 @@ export interface IFSDataset {
8
8
  displayed: boolean;
9
9
  filters: IFSFilter[];
10
10
  qrveyid: string;
11
- linkid?: string;
12
11
  }
package/dist/filters/interfaces/common/IFSParamsToGetFilter.d.ts CHANGED
@@ -13,7 +13,6 @@ export interface IFSParamsToGetFilter {
13
13
  dateSection?: IFDateSection;
14
14
  enableds?: IFSParamsToGetFilterEnableds;
15
15
  chart?: IFUChartSettings;
16
- linkid?: string;
17
16
  panelid?: string;
18
17
  property?: IFProperty;
19
18
  qrveyid?: string;
package/dist/filters/services/UChartApi.js CHANGED
@@ -83,7 +83,6 @@ export default class UChartApi {
83
83
  {
84
84
  questionid: column.id,
85
85
  qrveyid: column.qrveyid,
86
- // linkid: column.linkid,
87
86
  maxDataPoints: this._getMaxDataPoints(column, chartSettings),
88
87
  type: column.type,
89
88
  formulaType: column.type === "FORMULA" ? column.formulaType : undefined,
@@ -261,7 +260,7 @@ export default class UChartApi {
261
260
  let searchLogic;
262
261
  if (!isEmpty(uFilter.values)) {
263
262
  searchLogic = flatUIToOldLogic([
264
- Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
263
+ Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
265
264
  ]);
266
265
  }
267
266
  return searchLogic;
package/dist/filters/services/UChartPaginationApi.js CHANGED
@@ -301,7 +301,7 @@ export default class UChartPaginationApi {
301
301
  let searchLogic;
302
302
  if (!isEmpty(uFilter.values)) {
303
303
  searchLogic = flatUIToOldLogic([
304
- Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
304
+ Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
305
305
  ]);
306
306
  }
307
307
  return searchLogic;
package/dist/services/adapters/BColumnsToUIColumns.adapter.js CHANGED
@@ -13,8 +13,6 @@ export function BColumnsToUIColumns(columns = [], dataset) {
13
13
  id: column.id,
14
14
  imageUploadOption: column.imageUploadOption,
15
15
  label: column.text,
16
- linked: column.linked,
17
- linkid: getAttribute(dataset, "link_id") || getAttribute(column, "link_id"),
18
16
  outputFormat: column.outputFormat,
19
17
  property: column.property,
20
18
  qrveyid: getAttribute(dataset, "qrvey_id") || getAttribute(column, "qrvey_id"),
package/dist/services/adapters/BDatasetsToUIDatasets.adapter.js CHANGED
@@ -4,7 +4,6 @@ export function BDatasetsToUIDatasets(datasets = []) {
4
4
  return datasets.map((dataset) => ({
5
5
  qrveyid: getAttribute(dataset, "qrvey_id"),
6
6
  label: dataset.name,
7
- linkid: getAttribute(dataset, "link_id"),
8
7
  options: BColumnsToUIColumns(dataset.options, dataset),
9
8
  }));
10
9
  }
package/dist/services/helpers/getDefaultQuestionListOptionsAttributes.js CHANGED
@@ -4,8 +4,6 @@ export function getDefaultQuestionListOptionsAttributes() {
4
4
  "text",
5
5
  "type",
6
6
  "property",
7
- "linked",
8
- "linkid",
9
7
  "qrveyid",
10
8
  "bucketId",
11
9
  "formulaId",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.4.4",
3
+ "version": "1.4.5",
4
4
  "description": "Helper, Utils for all Qrvey Projects",
5
5
  "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
6
6
  "main": "dist/index.js",