@lightdash/common 1.155.0 → 1.157.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/types/mergeQuery.d.ts +28 -22
- package/dist/cjs/types/mergeQuery.d.ts.map +1 -1
- package/dist/cjs/types/mergeQuery.js +68 -43
- package/dist/cjs/types/mergeQuery.js.map +1 -1
- package/dist/cjs/types/mergeQuery.test.js +58 -0
- package/dist/cjs/types/mergeQuery.test.js.map +1 -1
- package/dist/cjs/utils/filters.d.ts +3 -1
- package/dist/cjs/utils/filters.d.ts.map +1 -1
- package/dist/cjs/utils/filters.js +12 -2
- package/dist/cjs/utils/filters.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/types/mergeQuery.d.ts +28 -22
- package/dist/esm/types/mergeQuery.d.ts.map +1 -1
- package/dist/esm/types/mergeQuery.js +67 -42
- package/dist/esm/types/mergeQuery.js.map +1 -1
- package/dist/esm/types/mergeQuery.test.js +59 -1
- package/dist/esm/types/mergeQuery.test.js.map +1 -1
- package/dist/esm/utils/filters.d.ts +3 -1
- package/dist/esm/utils/filters.d.ts.map +1 -1
- package/dist/esm/utils/filters.js +12 -2
- package/dist/esm/utils/filters.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/types/mergeQuery.d.ts +28 -22
- package/dist/types/types/mergeQuery.d.ts.map +1 -1
- package/dist/types/types/mergeQuery.js +67 -42
- package/dist/types/types/mergeQuery.js.map +1 -1
- package/dist/types/types/mergeQuery.test.js +59 -1
- package/dist/types/types/mergeQuery.test.js.map +1 -1
- package/dist/types/utils/filters.d.ts +3 -1
- package/dist/types/utils/filters.d.ts.map +1 -1
- package/dist/types/utils/filters.js +12 -2
- package/dist/types/utils/filters.js.map +1 -1
- package/package.json +1 -1
|
@@ -190,6 +190,8 @@ fieldTypes?: MergeFieldTypes) => MergeQueryError[];
|
|
|
190
190
|
export type RunMergeQueryRequest = {
|
|
191
191
|
mergeQuery: MergeQuery;
|
|
192
192
|
pivotConfiguration?: PivotConfiguration;
|
|
193
|
+
/** Export row limit. Null means all rows within the organization's cell cap. */
|
|
194
|
+
csvLimit?: number | null;
|
|
193
195
|
/**
|
|
194
196
|
* Parameter values for every source query, one map for the whole merge —
|
|
195
197
|
* two sides of one question should never disagree on a parameter.
|
|
@@ -254,6 +256,8 @@ export type ApiCompiledMergeQueryResults = {
|
|
|
254
256
|
itemsMap: ItemsMap;
|
|
255
257
|
/** Provenance of each field in `itemsMap`. */
|
|
256
258
|
fieldOrigins: MergeFieldOrigins;
|
|
259
|
+
/** User parameters referenced by any source query. */
|
|
260
|
+
parameterReferences: string[];
|
|
257
261
|
/**
|
|
258
262
|
* Field id for each column the statement returns. Warehouse aliases are
|
|
259
263
|
* short and positional so they cannot breach an identifier length limit;
|
|
@@ -293,6 +297,7 @@ export type MergeFieldOrigin = {
|
|
|
293
297
|
/** Shared by every source, so it descends from no single one. */
|
|
294
298
|
| {
|
|
295
299
|
kind: 'joinKey';
|
|
300
|
+
fieldIdBySourceId: Record<string, FieldId>;
|
|
296
301
|
}
|
|
297
302
|
/** Computed over the merged result, so it descends from no source. */
|
|
298
303
|
| {
|
|
@@ -300,40 +305,41 @@ export type MergeFieldOrigin = {
|
|
|
300
305
|
};
|
|
301
306
|
/** Provenance of every merged field, by field id. */
|
|
302
307
|
export type MergeFieldOrigins = Record<FieldId, MergeFieldOrigin>;
|
|
308
|
+
/** Current JSON schema stored in `saved_queries_version_merges.merge`. */
|
|
309
|
+
export declare const SAVED_MERGE_QUERY_SCHEMA_VERSION = 2;
|
|
303
310
|
/**
|
|
304
|
-
*
|
|
311
|
+
* A persisted merge source.
|
|
305
312
|
*
|
|
306
|
-
*
|
|
307
|
-
*
|
|
308
|
-
*
|
|
309
|
-
*
|
|
310
|
-
* by a source id that means nothing outside a single request.
|
|
313
|
+
* The chart source is a reference: its metric query already lives on the chart
|
|
314
|
+
* version. Every additional source owns its query. This keeps one source of
|
|
315
|
+
* truth while allowing more sources without adding `thirdQuery`, `fourthQuery`,
|
|
316
|
+
* and so on.
|
|
311
317
|
*/
|
|
318
|
+
export type SavedMergeQuerySource = {
|
|
319
|
+
id: string;
|
|
320
|
+
kind: 'chart';
|
|
321
|
+
} | {
|
|
322
|
+
id: string;
|
|
323
|
+
kind: 'query';
|
|
324
|
+
metricQuery: MetricQuery;
|
|
325
|
+
};
|
|
326
|
+
/** Canonical, scalable representation of a merge stored on a chart version. */
|
|
312
327
|
export type SavedMergeQuery = {
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
joinKey:
|
|
317
|
-
name: string;
|
|
318
|
-
/** Field in the chart's own query. */
|
|
319
|
-
chartFieldId: FieldId;
|
|
320
|
-
/** Field in the second query. */
|
|
321
|
-
secondFieldId: FieldId;
|
|
322
|
-
}>;
|
|
328
|
+
/** Source whose rows a LEFT merge preserves. */
|
|
329
|
+
primarySourceId: string;
|
|
330
|
+
sources: SavedMergeQuerySource[];
|
|
331
|
+
joinKey: MergeJoinKeyPart[];
|
|
323
332
|
joinType: MergeJoinType;
|
|
324
333
|
tableCalculations: MergeTableCalculation[];
|
|
325
334
|
};
|
|
326
|
-
/** Source ids the stored shape maps onto when it becomes a runnable merge. */
|
|
327
|
-
export declare const MERGE_CHART_SOURCE_ID = "chart";
|
|
328
|
-
export declare const MERGE_SECOND_SOURCE_ID = "second";
|
|
329
335
|
/**
|
|
330
336
|
* Rebuilds a runnable merge from a chart's own query and its stored merge.
|
|
331
337
|
*/
|
|
332
338
|
export declare const buildMergeQueryFromSaved: (chartMetricQuery: MetricQuery, saved: SavedMergeQuery) => MergeQuery;
|
|
333
339
|
/**
|
|
334
340
|
* Reads a stored merge back, returning null for anything that does not hold
|
|
335
|
-
* together.
|
|
336
|
-
*
|
|
341
|
+
* together. An unknown future version leaves the chart working without its
|
|
342
|
+
* merge rather than breaking the chart entirely.
|
|
337
343
|
*/
|
|
338
|
-
export declare const parseSavedMergeQuery: (value: unknown) => SavedMergeQuery | null;
|
|
344
|
+
export declare const parseSavedMergeQuery: (schemaVersion: number, value: unknown) => SavedMergeQuery | null;
|
|
339
345
|
//# sourceMappingURL=mergeQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeQuery.d.ts","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mergeQuery.d.ts","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseSavedMergeQuery = exports.buildMergeQueryFromSaved = exports.
|
|
3
|
+
exports.parseSavedMergeQuery = exports.buildMergeQueryFromSaved = exports.SAVED_MERGE_QUERY_SCHEMA_VERSION = exports.getMergeSourceTableLabel = exports.MERGE_TABLE_NAME = exports.MERGE_ROW_PRESENT_COLUMN = exports.MERGE_TRUNCATED_COLUMN = exports.validateMergeQuery = exports.getUnaccountedDimensions = exports.MergeQueryErrorKind = exports.mergeCalculationReferencePattern = exports.MergeJoinType = void 0;
|
|
4
4
|
const field_1 = require("./field");
|
|
5
5
|
/**
|
|
6
6
|
* How unmatched keys survive the merge. Mirrors the SQL join it compiles to.
|
|
@@ -271,65 +271,90 @@ exports.MERGE_TABLE_NAME = 'merge';
|
|
|
271
271
|
/** Label for the pseudo-table a source's merged fields belong to. */
|
|
272
272
|
const getMergeSourceTableLabel = (sourceIndex) => `Query ${String.fromCharCode(65 + sourceIndex)}`;
|
|
273
273
|
exports.getMergeSourceTableLabel = getMergeSourceTableLabel;
|
|
274
|
-
/**
|
|
275
|
-
exports.
|
|
276
|
-
exports.MERGE_SECOND_SOURCE_ID = 'second';
|
|
274
|
+
/** Current JSON schema stored in `saved_queries_version_merges.merge`. */
|
|
275
|
+
exports.SAVED_MERGE_QUERY_SCHEMA_VERSION = 2;
|
|
277
276
|
/**
|
|
278
277
|
* Rebuilds a runnable merge from a chart's own query and its stored merge.
|
|
279
278
|
*/
|
|
280
|
-
const buildMergeQueryFromSaved = (chartMetricQuery, saved) =>
|
|
281
|
-
sources
|
|
282
|
-
{
|
|
283
|
-
id:
|
|
284
|
-
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
}
|
|
298
|
-
|
|
299
|
-
tableCalculations: saved.tableCalculations,
|
|
300
|
-
limit: chartMetricQuery.limit,
|
|
301
|
-
});
|
|
279
|
+
const buildMergeQueryFromSaved = (chartMetricQuery, saved) => {
|
|
280
|
+
const sources = saved.sources.map((source) => {
|
|
281
|
+
if (source.kind === 'chart') {
|
|
282
|
+
return { id: source.id, metricQuery: chartMetricQuery };
|
|
283
|
+
}
|
|
284
|
+
return { id: source.id, metricQuery: source.metricQuery };
|
|
285
|
+
});
|
|
286
|
+
const primaryIndex = sources.findIndex((source) => source.id === saved.primarySourceId);
|
|
287
|
+
if (primaryIndex > 0) {
|
|
288
|
+
sources.unshift(...sources.splice(primaryIndex, 1));
|
|
289
|
+
}
|
|
290
|
+
return {
|
|
291
|
+
sources,
|
|
292
|
+
joinKey: saved.joinKey,
|
|
293
|
+
joinType: saved.joinType,
|
|
294
|
+
tableCalculations: saved.tableCalculations,
|
|
295
|
+
limit: chartMetricQuery.limit,
|
|
296
|
+
};
|
|
297
|
+
};
|
|
302
298
|
exports.buildMergeQueryFromSaved = buildMergeQueryFromSaved;
|
|
299
|
+
const parseJoinType = (value) => Object.values(MergeJoinType).includes(value)
|
|
300
|
+
? value
|
|
301
|
+
: MergeJoinType.FULL;
|
|
303
302
|
/**
|
|
304
303
|
* Reads a stored merge back, returning null for anything that does not hold
|
|
305
|
-
* together.
|
|
306
|
-
*
|
|
304
|
+
* together. An unknown future version leaves the chart working without its
|
|
305
|
+
* merge rather than breaking the chart entirely.
|
|
307
306
|
*/
|
|
308
|
-
const parseSavedMergeQuery = (value) => {
|
|
307
|
+
const parseSavedMergeQuery = (schemaVersion, value) => {
|
|
308
|
+
if (schemaVersion !== exports.SAVED_MERGE_QUERY_SCHEMA_VERSION)
|
|
309
|
+
return null;
|
|
309
310
|
if (value === null || typeof value !== 'object')
|
|
310
311
|
return null;
|
|
311
312
|
const candidate = value;
|
|
312
|
-
|
|
313
|
-
|
|
313
|
+
if (!Array.isArray(candidate.sources) ||
|
|
314
|
+
candidate.sources.length < 2 ||
|
|
315
|
+
typeof candidate.primarySourceId !== 'string') {
|
|
316
|
+
return null;
|
|
317
|
+
}
|
|
318
|
+
const sourceIds = candidate.sources.map((source) => source?.id);
|
|
319
|
+
if (sourceIds.some((id) => typeof id !== 'string' || id.length === 0) ||
|
|
320
|
+
new Set(sourceIds).size !== sourceIds.length ||
|
|
321
|
+
!sourceIds.includes(candidate.primarySourceId)) {
|
|
322
|
+
return null;
|
|
323
|
+
}
|
|
324
|
+
const validSources = candidate.sources.every((source) => {
|
|
325
|
+
if (source?.kind === 'chart') {
|
|
326
|
+
return true;
|
|
327
|
+
}
|
|
328
|
+
return (source?.kind === 'query' &&
|
|
329
|
+
source.metricQuery !== null &&
|
|
330
|
+
typeof source.metricQuery === 'object' &&
|
|
331
|
+
typeof source.metricQuery.exploreName === 'string');
|
|
332
|
+
});
|
|
333
|
+
const chartSources = candidate.sources.filter((source) => source?.kind === 'chart');
|
|
334
|
+
if (!validSources || chartSources.length !== 1) {
|
|
314
335
|
return null;
|
|
315
336
|
}
|
|
316
337
|
if (!Array.isArray(candidate.joinKey) || candidate.joinKey.length === 0) {
|
|
317
338
|
return null;
|
|
318
339
|
}
|
|
319
|
-
const
|
|
320
|
-
typeof part?.
|
|
321
|
-
|
|
322
|
-
|
|
340
|
+
const hasCompleteJoinKeys = candidate.joinKey.every((part) => {
|
|
341
|
+
if (typeof part?.name !== 'string' ||
|
|
342
|
+
part.fieldIdBySourceId === null ||
|
|
343
|
+
typeof part.fieldIdBySourceId !== 'object') {
|
|
344
|
+
return false;
|
|
345
|
+
}
|
|
346
|
+
const fieldSourceIds = Object.keys(part.fieldIdBySourceId);
|
|
347
|
+
return (fieldSourceIds.length === sourceIds.length &&
|
|
348
|
+
sourceIds.every((sourceId) => typeof sourceId === 'string' &&
|
|
349
|
+
typeof part.fieldIdBySourceId[sourceId] === 'string'));
|
|
350
|
+
});
|
|
351
|
+
if (!hasCompleteJoinKeys)
|
|
323
352
|
return null;
|
|
324
|
-
const joinType = Object.values(MergeJoinType).includes(String(candidate.joinType))
|
|
325
|
-
? candidate.joinType
|
|
326
|
-
: MergeJoinType.FULL;
|
|
327
353
|
return {
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
joinType,
|
|
354
|
+
primarySourceId: candidate.primarySourceId,
|
|
355
|
+
sources: candidate.sources,
|
|
356
|
+
joinKey: candidate.joinKey,
|
|
357
|
+
joinType: parseJoinType(candidate.joinType),
|
|
333
358
|
tableCalculations: Array.isArray(candidate.tableCalculations)
|
|
334
359
|
? candidate.tableCalculations
|
|
335
360
|
: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeQuery.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mergeQuery.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -227,4 +227,62 @@ describe('getUnaccountedDimensions', () => {
|
|
|
227
227
|
expect((0, mergeQuery_1.getUnaccountedDimensions)(queryA(), dateJoinKey)).toEqual([]);
|
|
228
228
|
});
|
|
229
229
|
});
|
|
230
|
+
describe('saved merge query schemas', () => {
|
|
231
|
+
it('round-trips every source and key in a version 2 payload', () => {
|
|
232
|
+
const saved = {
|
|
233
|
+
primarySourceId: 'payments',
|
|
234
|
+
sources: [
|
|
235
|
+
{ id: 'orders', kind: 'chart' },
|
|
236
|
+
{
|
|
237
|
+
id: 'payments',
|
|
238
|
+
kind: 'query',
|
|
239
|
+
metricQuery: metricQuery('payments', ['payments_month'], ['payments_total']),
|
|
240
|
+
},
|
|
241
|
+
{
|
|
242
|
+
id: 'subscriptions',
|
|
243
|
+
kind: 'query',
|
|
244
|
+
metricQuery: metricQuery('subscriptions', ['subscriptions_month'], ['subscriptions_mrr']),
|
|
245
|
+
},
|
|
246
|
+
],
|
|
247
|
+
joinKey: [
|
|
248
|
+
{
|
|
249
|
+
name: 'month',
|
|
250
|
+
fieldIdBySourceId: {
|
|
251
|
+
orders: 'orders_month',
|
|
252
|
+
payments: 'payments_month',
|
|
253
|
+
subscriptions: 'subscriptions_month',
|
|
254
|
+
},
|
|
255
|
+
},
|
|
256
|
+
],
|
|
257
|
+
joinType: mergeQuery_1.MergeJoinType.LEFT,
|
|
258
|
+
tableCalculations: [],
|
|
259
|
+
};
|
|
260
|
+
const parsed = (0, mergeQuery_1.parseSavedMergeQuery)(mergeQuery_1.SAVED_MERGE_QUERY_SCHEMA_VERSION, saved);
|
|
261
|
+
expect(parsed).toEqual(saved);
|
|
262
|
+
expect((0, mergeQuery_1.buildMergeQueryFromSaved)(metricQuery('orders', ['orders_month'], ['orders_total']), parsed).sources.map(({ id }) => id)).toEqual(['payments', 'orders', 'subscriptions']);
|
|
263
|
+
});
|
|
264
|
+
it('rejects unknown schemas and incomplete source mappings', () => {
|
|
265
|
+
expect((0, mergeQuery_1.parseSavedMergeQuery)(1, {})).toBeNull();
|
|
266
|
+
expect((0, mergeQuery_1.parseSavedMergeQuery)(99, {})).toBeNull();
|
|
267
|
+
expect((0, mergeQuery_1.parseSavedMergeQuery)(mergeQuery_1.SAVED_MERGE_QUERY_SCHEMA_VERSION, {
|
|
268
|
+
primarySourceId: 'orders',
|
|
269
|
+
sources: [
|
|
270
|
+
{ id: 'orders', kind: 'chart' },
|
|
271
|
+
{
|
|
272
|
+
id: 'payments',
|
|
273
|
+
kind: 'query',
|
|
274
|
+
metricQuery: metricQuery('payments', [], []),
|
|
275
|
+
},
|
|
276
|
+
],
|
|
277
|
+
joinKey: [
|
|
278
|
+
{
|
|
279
|
+
name: 'month',
|
|
280
|
+
fieldIdBySourceId: { orders: 'orders_month' },
|
|
281
|
+
},
|
|
282
|
+
],
|
|
283
|
+
joinType: 'full',
|
|
284
|
+
tableCalculations: [],
|
|
285
|
+
})).toBeNull();
|
|
286
|
+
});
|
|
287
|
+
});
|
|
230
288
|
//# sourceMappingURL=mergeQuery.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeQuery.test.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":";;AAAA,mCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"mergeQuery.test.js","sourceRoot":"","sources":["../../../src/types/mergeQuery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,11 +57,13 @@ export declare const createDashboardFilterRuleFromSqlColumn: ({ column, availabl
|
|
|
57
57
|
type AddFilterRuleArgs = {
|
|
58
58
|
filters: Filters;
|
|
59
59
|
field: FilterableField;
|
|
60
|
+
/** Override the display field's id when it represents another source. */
|
|
61
|
+
targetFieldId?: string;
|
|
60
62
|
value?: AnyType;
|
|
61
63
|
timezone?: string;
|
|
62
64
|
operator?: QuickFilterOperator;
|
|
63
65
|
};
|
|
64
|
-
export declare const addFilterRule: ({ filters, field, value, timezone, operator, }: AddFilterRuleArgs) => Filters;
|
|
66
|
+
export declare const addFilterRule: ({ filters, field, targetFieldId, value, timezone, operator, }: AddFilterRuleArgs) => Filters;
|
|
65
67
|
/**
|
|
66
68
|
* Checks if a dimension value is an invalid date before it is added to the filter
|
|
67
69
|
* @param item - The field to compare against the value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"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"}
|
|
@@ -381,7 +381,7 @@ const createDashboardFilterRuleFromSqlColumn = ({ column, availableTileColumns,
|
|
|
381
381
|
label: undefined,
|
|
382
382
|
}, !(0, isNil_1.default)(value) ? [value] : null);
|
|
383
383
|
exports.createDashboardFilterRuleFromSqlColumn = createDashboardFilterRuleFromSqlColumn;
|
|
384
|
-
const addFilterRule = ({ filters, field, value, timezone, operator, }) => {
|
|
384
|
+
const addFilterRule = ({ filters, field, targetFieldId, value, timezone, operator, }) => {
|
|
385
385
|
const groupKey = ((f) => {
|
|
386
386
|
if ((0, field_1.isDimension)(f) || (0, field_1.isCustomSqlDimension)(f)) {
|
|
387
387
|
return 'dimensions';
|
|
@@ -392,6 +392,16 @@ const addFilterRule = ({ filters, field, value, timezone, operator, }) => {
|
|
|
392
392
|
return 'metrics';
|
|
393
393
|
})(field);
|
|
394
394
|
const group = filters[groupKey];
|
|
395
|
+
const createdRule = (0, exports.createFilterRuleFromField)(field, value, timezone, operator);
|
|
396
|
+
const rule = targetFieldId
|
|
397
|
+
? {
|
|
398
|
+
...createdRule,
|
|
399
|
+
target: {
|
|
400
|
+
...createdRule.target,
|
|
401
|
+
fieldId: targetFieldId,
|
|
402
|
+
},
|
|
403
|
+
}
|
|
404
|
+
: createdRule;
|
|
395
405
|
return {
|
|
396
406
|
...filters,
|
|
397
407
|
[groupKey]: {
|
|
@@ -399,7 +409,7 @@ const addFilterRule = ({ filters, field, value, timezone, operator, }) => {
|
|
|
399
409
|
...group,
|
|
400
410
|
[(0, exports.getFilterGroupItemsPropertyName)(group)]: [
|
|
401
411
|
...(0, exports.getItemsFromFilterGroup)(group),
|
|
402
|
-
|
|
412
|
+
rule,
|
|
403
413
|
],
|
|
404
414
|
},
|
|
405
415
|
};
|