@qrvey/utils 1.2.10-6 → 1.2.10-7

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 (5) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/filters/helpers/common/mergeFilters.js +36 -6
  3. package/dist/filters/helpers/common/mergeFilters.js +36 -6
  4. package/package.json +1 -1
  5. package/src/filters/helpers/common/mergeFilters.ts +34 -8
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.10-5*
1
+ # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.10-6*
2
2
 
3
3
  > Helper, Utils for all Qrvey Projects
4
4
 
package/dist/cjs/filters/helpers/common/mergeFilters.js CHANGED
@@ -115,8 +115,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
115
115
  * @returns a new filter structure with overwritted props
116
116
  */
117
117
  function mergeFilterProps(filter1, filter2, settings) {
118
+ var _a, _b, _c;
118
119
  if (settings.overwriteFilterProps) {
119
- filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
120
+ filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
120
121
  }
121
122
  return filter1;
122
123
  }
@@ -133,31 +134,64 @@ function mergeValues(filter1, filter2, settings) {
133
134
  let newValues = [];
134
135
  let filter1Values = filter1.values || [];
135
136
  const filter2Values = filter2.values || [];
136
- if (!settings.overwriteValues) {
137
+ if (settings.overwriteValues) {
138
+ filter1Values = filter2Values;
139
+ newValues = filter1Values;
140
+ }
141
+ else {
137
142
  if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
138
143
  newValues = filter2Values.reduce((values, value2) => {
144
+ var _a;
139
145
  const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
140
146
  if (value1Index === -1) {
141
147
  values.push(value2);
142
148
  }
149
+ else {
150
+ values[value1Index] = {
151
+ anchor: value2.anchor,
152
+ cursor: value2.cursor,
153
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
154
+ includeCurrent: value2.includeCurrent,
155
+ isCalendarDate: value2.isCalendarDate,
156
+ number: value2.number,
157
+ unit: value2.unit,
158
+ };
159
+ }
143
160
  return values;
144
161
  }, filter1Values);
145
162
  }
146
163
  else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
147
164
  newValues = filter2Values.reduce((values, value2) => {
165
+ var _a;
148
166
  const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
149
167
  if (value1Index === -1) {
150
168
  values.push(value2);
151
169
  }
170
+ else {
171
+ values[value1Index] = {
172
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
173
+ max: value2.max,
174
+ min: value2.min,
175
+ };
176
+ }
152
177
  return values;
153
178
  }, filter1Values);
154
179
  }
155
180
  else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
156
181
  newValues = filter2Values.reduce((values, value2) => {
182
+ var _a;
157
183
  const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
158
184
  if (value1Index === -1) {
159
185
  values.push(value2);
160
186
  }
187
+ else {
188
+ values[value1Index] = {
189
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
190
+ imageUrl: value2.imageUrl,
191
+ value: value2.value,
192
+ valueid: value2.valueid,
193
+ };
194
+ }
161
195
  return values;
162
196
  }, filter1Values);
163
197
  }
@@ -166,9 +200,5 @@ function mergeValues(filter1, filter2, settings) {
166
200
  newValues = filter1Values;
167
201
  }
168
202
  }
169
- else {
170
- filter1Values = filter2Values;
171
- newValues = filter1Values;
172
- }
173
203
  return newValues;
174
204
  }
package/dist/filters/helpers/common/mergeFilters.js CHANGED
@@ -111,8 +111,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
111
111
  * @returns a new filter structure with overwritted props
112
112
  */
113
113
  function mergeFilterProps(filter1, filter2, settings) {
114
+ var _a, _b, _c;
114
115
  if (settings.overwriteFilterProps) {
115
- filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
116
+ filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
116
117
  }
117
118
  return filter1;
118
119
  }
@@ -129,31 +130,64 @@ function mergeValues(filter1, filter2, settings) {
129
130
  let newValues = [];
130
131
  let filter1Values = filter1.values || [];
131
132
  const filter2Values = filter2.values || [];
132
- if (!settings.overwriteValues) {
133
+ if (settings.overwriteValues) {
134
+ filter1Values = filter2Values;
135
+ newValues = filter1Values;
136
+ }
137
+ else {
133
138
  if (isInValidator(filter1.validator)) {
134
139
  newValues = filter2Values.reduce((values, value2) => {
140
+ var _a;
135
141
  const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
136
142
  if (value1Index === -1) {
137
143
  values.push(value2);
138
144
  }
145
+ else {
146
+ values[value1Index] = {
147
+ anchor: value2.anchor,
148
+ cursor: value2.cursor,
149
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
150
+ includeCurrent: value2.includeCurrent,
151
+ isCalendarDate: value2.isCalendarDate,
152
+ number: value2.number,
153
+ unit: value2.unit,
154
+ };
155
+ }
139
156
  return values;
140
157
  }, filter1Values);
141
158
  }
142
159
  else if (isRangeValidator(filter1.validator)) {
143
160
  newValues = filter2Values.reduce((values, value2) => {
161
+ var _a;
144
162
  const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
145
163
  if (value1Index === -1) {
146
164
  values.push(value2);
147
165
  }
166
+ else {
167
+ values[value1Index] = {
168
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
169
+ max: value2.max,
170
+ min: value2.min,
171
+ };
172
+ }
148
173
  return values;
149
174
  }, filter1Values);
150
175
  }
151
176
  else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
152
177
  newValues = filter2Values.reduce((values, value2) => {
178
+ var _a;
153
179
  const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
154
180
  if (value1Index === -1) {
155
181
  values.push(value2);
156
182
  }
183
+ else {
184
+ values[value1Index] = {
185
+ enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
186
+ imageUrl: value2.imageUrl,
187
+ value: value2.value,
188
+ valueid: value2.valueid,
189
+ };
190
+ }
157
191
  return values;
158
192
  }, filter1Values);
159
193
  }
@@ -162,9 +196,5 @@ function mergeValues(filter1, filter2, settings) {
162
196
  newValues = filter1Values;
163
197
  }
164
198
  }
165
- else {
166
- filter1Values = filter2Values;
167
- newValues = filter1Values;
168
- }
169
199
  return newValues;
170
200
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.2.10-6",
3
+ "version": "1.2.10-7",
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",
package/src/filters/helpers/common/mergeFilters.ts CHANGED
@@ -134,8 +134,11 @@ function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFF
134
134
  if (settings.overwriteFilterProps) {
135
135
  filter1 = {
136
136
  ...filter1,
137
+ collapsed: filter2.collapsed ?? filter1.collapsed,
138
+ displayed: filter2.displayed ?? filter1.displayed,
139
+ dateSection: filter2.dateSection,
137
140
  extras: filter2.extras,
138
- enabled: filter2.enabled || filter1.enabled,
141
+ enabled: filter2.enabled ?? filter1.enabled,
139
142
  filterid: filter2.filterid,
140
143
  lookupDisplayIndex: filter2.lookupDisplayIndex,
141
144
  nullValues: filter2.nullValues,
@@ -158,28 +161,54 @@ function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFilter
158
161
  let newValues = [];
159
162
  let filter1Values = filter1.values || [];
160
163
  const filter2Values = filter2.values || [];
161
- if (!settings.overwriteValues) {
164
+ if (settings.overwriteValues) {
165
+ filter1Values = filter2Values;
166
+ newValues = filter1Values;
167
+ } else {
162
168
  if (isInValidator(filter1.validator)) {
163
- newValues = filter2Values.reduce((values: IFValue[], value2: IFSValueRelativeDate) => {
169
+ newValues = filter2Values.reduce((values: IFSValueRelativeDate[], value2: IFSValueRelativeDate) => {
164
170
  const value1Index = (filter1Values as IFSValueRelativeDate[]).findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
165
171
  if (value1Index === -1) {
166
172
  values.push(value2);
173
+ } else {
174
+ values[value1Index] = {
175
+ anchor: value2.anchor,
176
+ cursor: value2.cursor,
177
+ enabled: value2.enabled ?? values[value1Index].enabled,
178
+ includeCurrent: value2.includeCurrent,
179
+ isCalendarDate: value2.isCalendarDate,
180
+ number: value2.number,
181
+ unit: value2.unit,
182
+ };
167
183
  }
168
184
  return values;
169
185
  }, filter1Values as IFValue[]);
170
186
  } else if (isRangeValidator(filter1.validator)) {
171
- newValues = filter2Values.reduce((values: IFValue[], value2: IFSValueRange) => {
187
+ newValues = filter2Values.reduce((values: IFSValueRange[], value2: IFSValueRange) => {
172
188
  const value1Index = (filter1Values as IFSValueRange[]).findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
173
189
  if (value1Index === -1) {
174
190
  values.push(value2);
191
+ } else {
192
+ values[value1Index] = {
193
+ enabled: value2.enabled ?? values[value1Index].enabled,
194
+ max: value2.max,
195
+ min: value2.min,
196
+ };
175
197
  }
176
198
  return values;
177
199
  }, filter1Values as IFValue[]);
178
200
  } else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
179
- newValues = filter2Values.reduce((values: IFValue[], value2: IFSValue) => {
201
+ newValues = filter2Values.reduce((values: IFSValue[], value2: IFSValue) => {
180
202
  const value1Index = (filter1Values as IFSValue[]).findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
181
203
  if (value1Index === -1) {
182
204
  values.push(value2);
205
+ } else {
206
+ values[value1Index] = {
207
+ enabled: value2.enabled ?? values[value1Index].enabled,
208
+ imageUrl: value2.imageUrl,
209
+ value: value2.value,
210
+ valueid: value2.valueid,
211
+ };
183
212
  }
184
213
  return values;
185
214
  }, filter1Values as IFValue[]);
@@ -187,9 +216,6 @@ function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFilter
187
216
  filter1Values = filter1Values.concat(filter2Values);
188
217
  newValues = filter1Values;
189
218
  }
190
- } else {
191
- filter1Values = filter2Values;
192
- newValues = filter1Values;
193
219
  }
194
220
 
195
221
  return newValues;