@lightdash/common 0.1634.0 → 0.1636.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/compiler/translator.d.ts.map +1 -1
- package/dist/cjs/compiler/translator.js +1 -1
- package/dist/cjs/compiler/translator.js.map +1 -1
- package/dist/cjs/ee/Ai/schemas.d.ts +152 -152
- package/dist/cjs/types/api/paginatedQuery.d.ts +1 -0
- package/dist/cjs/types/api/paginatedQuery.d.ts.map +1 -1
- package/dist/cjs/types/api/paginatedQuery.js.map +1 -1
- package/dist/cjs/types/filter.d.ts +10 -6
- package/dist/cjs/types/filter.d.ts.map +1 -1
- package/dist/cjs/types/filter.js +7 -4
- package/dist/cjs/types/filter.js.map +1 -1
- package/dist/cjs/types/filterGrammar.d.ts +2 -1
- package/dist/cjs/types/filterGrammar.d.ts.map +1 -1
- package/dist/cjs/types/filterGrammar.js +67 -1
- package/dist/cjs/types/filterGrammar.js.map +1 -1
- package/dist/cjs/types/table.d.ts +2 -2
- package/dist/cjs/types/table.d.ts.map +1 -1
- package/dist/cjs/utils/filters.d.ts +6 -5
- package/dist/cjs/utils/filters.d.ts.map +1 -1
- package/dist/cjs/utils/filters.js +31 -12
- package/dist/cjs/utils/filters.js.map +1 -1
- package/dist/cjs/utils/filters.mock.d.ts +6 -3
- package/dist/cjs/utils/filters.mock.d.ts.map +1 -1
- package/dist/cjs/utils/filters.mock.js +154 -3
- package/dist/cjs/utils/filters.mock.js.map +1 -1
- package/dist/cjs/utils/filters.test.js +11 -93
- package/dist/cjs/utils/filters.test.js.map +1 -1
- package/dist/cjs/utils/item.d.ts +1 -1
- package/dist/esm/compiler/translator.d.ts.map +1 -1
- package/dist/esm/compiler/translator.js +2 -2
- package/dist/esm/compiler/translator.js.map +1 -1
- package/dist/esm/ee/Ai/schemas.d.ts +152 -152
- package/dist/esm/types/api/paginatedQuery.d.ts +1 -0
- package/dist/esm/types/api/paginatedQuery.d.ts.map +1 -1
- package/dist/esm/types/api/paginatedQuery.js.map +1 -1
- package/dist/esm/types/filter.d.ts +10 -6
- package/dist/esm/types/filter.d.ts.map +1 -1
- package/dist/esm/types/filter.js +5 -2
- package/dist/esm/types/filter.js.map +1 -1
- package/dist/esm/types/filterGrammar.d.ts +2 -1
- package/dist/esm/types/filterGrammar.d.ts.map +1 -1
- package/dist/esm/types/filterGrammar.js +66 -1
- package/dist/esm/types/filterGrammar.js.map +1 -1
- package/dist/esm/types/table.d.ts +2 -2
- package/dist/esm/types/table.d.ts.map +1 -1
- package/dist/esm/utils/filters.d.ts +6 -5
- package/dist/esm/utils/filters.d.ts.map +1 -1
- package/dist/esm/utils/filters.js +29 -11
- package/dist/esm/utils/filters.js.map +1 -1
- package/dist/esm/utils/filters.mock.d.ts +6 -3
- package/dist/esm/utils/filters.mock.d.ts.map +1 -1
- package/dist/esm/utils/filters.mock.js +151 -1
- package/dist/esm/utils/filters.mock.js.map +1 -1
- package/dist/esm/utils/filters.test.js +9 -91
- package/dist/esm/utils/filters.test.js.map +1 -1
- package/dist/esm/utils/item.d.ts +1 -1
- package/dist/tsconfig.types.tsbuildinfo +1 -1
- package/dist/types/compiler/translator.d.ts.map +1 -1
- package/dist/types/ee/Ai/schemas.d.ts +152 -152
- package/dist/types/types/api/paginatedQuery.d.ts +1 -0
- package/dist/types/types/api/paginatedQuery.d.ts.map +1 -1
- package/dist/types/types/filter.d.ts +10 -6
- package/dist/types/types/filter.d.ts.map +1 -1
- package/dist/types/types/filterGrammar.d.ts +2 -1
- package/dist/types/types/filterGrammar.d.ts.map +1 -1
- package/dist/types/types/table.d.ts +2 -2
- package/dist/types/types/table.d.ts.map +1 -1
- package/dist/types/utils/filters.d.ts +6 -5
- package/dist/types/utils/filters.d.ts.map +1 -1
- package/dist/types/utils/filters.mock.d.ts +6 -3
- package/dist/types/utils/filters.mock.d.ts.map +1 -1
- package/dist/types/utils/item.d.ts +1 -1
- package/package.json +1 -1
@@ -1,4 +1,5 @@
|
|
1
1
|
import { ConditionalOperator } from '../types/conditionalRule';
|
2
|
+
import { SupportedDbtAdapter } from '../types/dbt';
|
2
3
|
import { CustomDimensionType, DimensionType, FieldType, } from '../types/field';
|
3
4
|
import { FilterOperator, } from '../types/filter';
|
4
5
|
import { OrderFieldsByStrategy } from '../types/table';
|
@@ -242,7 +243,7 @@ export const filterRule = {
|
|
242
243
|
operator: FilterOperator.IN_THE_NEXT,
|
243
244
|
values: ['mockValue1', 'mockValue2'],
|
244
245
|
};
|
245
|
-
export const
|
246
|
+
export const modelRequiredFilterRule = (inputFieldRef) => ({
|
246
247
|
id: 'uuid',
|
247
248
|
operator: FilterOperator.IN_THE_NEXT,
|
248
249
|
settings: {
|
@@ -253,6 +254,16 @@ export const metricFilterRule = (inputFieldRef) => ({
|
|
253
254
|
},
|
254
255
|
values: [14],
|
255
256
|
});
|
257
|
+
export const joinedModelRequiredFilterRule = (inputFieldRef, tableName) => {
|
258
|
+
const requiredFilterRule = modelRequiredFilterRule(inputFieldRef);
|
259
|
+
return {
|
260
|
+
...requiredFilterRule,
|
261
|
+
target: {
|
262
|
+
...requiredFilterRule.target,
|
263
|
+
tableName,
|
264
|
+
},
|
265
|
+
};
|
266
|
+
};
|
256
267
|
export const baseTable = {
|
257
268
|
name: 'table',
|
258
269
|
label: 'My table',
|
@@ -298,4 +309,143 @@ export const expectedRequiredResetResult = {
|
|
298
309
|
},
|
299
310
|
],
|
300
311
|
};
|
312
|
+
export const mockExplore = {
|
313
|
+
name: 'test',
|
314
|
+
label: 'Test',
|
315
|
+
tags: [],
|
316
|
+
baseTable: 'orders',
|
317
|
+
targetDatabase: SupportedDbtAdapter.POSTGRES,
|
318
|
+
joinedTables: [],
|
319
|
+
tables: {
|
320
|
+
orders: {
|
321
|
+
name: 'orders',
|
322
|
+
label: 'Orders',
|
323
|
+
database: 'test',
|
324
|
+
schema: 'public',
|
325
|
+
sqlTable: 'orders',
|
326
|
+
metrics: {},
|
327
|
+
lineageGraph: {},
|
328
|
+
dimensions: {
|
329
|
+
order_date_year: {
|
330
|
+
name: 'order_date_year',
|
331
|
+
label: 'Order Date Year',
|
332
|
+
table: 'orders',
|
333
|
+
tableLabel: 'Orders',
|
334
|
+
compiledSql: 'order_date_year',
|
335
|
+
tablesReferences: [],
|
336
|
+
sql: 'order_date_year',
|
337
|
+
hidden: false,
|
338
|
+
fieldType: FieldType.DIMENSION,
|
339
|
+
type: DimensionType.DATE,
|
340
|
+
timeIntervalBaseDimensionName: 'order_date',
|
341
|
+
},
|
342
|
+
order_date_month: {
|
343
|
+
name: 'order_date_month',
|
344
|
+
label: 'Order Date Month',
|
345
|
+
table: 'orders',
|
346
|
+
tableLabel: 'Orders',
|
347
|
+
compiledSql: 'order_date_month',
|
348
|
+
tablesReferences: [],
|
349
|
+
sql: 'order_date_month',
|
350
|
+
hidden: false,
|
351
|
+
fieldType: FieldType.DIMENSION,
|
352
|
+
type: DimensionType.DATE,
|
353
|
+
timeIntervalBaseDimensionName: 'order_date',
|
354
|
+
},
|
355
|
+
order_date_week: {
|
356
|
+
name: 'order_date_week',
|
357
|
+
label: 'Order Date Week',
|
358
|
+
table: 'orders',
|
359
|
+
tableLabel: 'Orders',
|
360
|
+
compiledSql: 'order_date_week',
|
361
|
+
sql: 'order_date_week',
|
362
|
+
hidden: false,
|
363
|
+
tablesReferences: [],
|
364
|
+
fieldType: FieldType.DIMENSION,
|
365
|
+
type: DimensionType.DATE,
|
366
|
+
timeIntervalBaseDimensionName: 'order_date',
|
367
|
+
},
|
368
|
+
status: {
|
369
|
+
name: 'status',
|
370
|
+
label: 'Status',
|
371
|
+
table: 'orders',
|
372
|
+
tableLabel: 'Orders',
|
373
|
+
compiledSql: 'status',
|
374
|
+
sql: 'status',
|
375
|
+
hidden: false,
|
376
|
+
tablesReferences: [],
|
377
|
+
fieldType: FieldType.DIMENSION,
|
378
|
+
type: DimensionType.BOOLEAN,
|
379
|
+
},
|
380
|
+
},
|
381
|
+
},
|
382
|
+
},
|
383
|
+
};
|
384
|
+
export const mockExploreWithJoinedTable = {
|
385
|
+
...mockExplore,
|
386
|
+
tables: {
|
387
|
+
orders: {
|
388
|
+
...mockExplore.tables.orders,
|
389
|
+
dimensions: {
|
390
|
+
...mockExplore.tables.orders.dimensions,
|
391
|
+
customer_id: {
|
392
|
+
name: 'customer_id',
|
393
|
+
label: 'Customer ID',
|
394
|
+
table: 'orders',
|
395
|
+
tableLabel: 'Orders',
|
396
|
+
compiledSql: 'customer_id',
|
397
|
+
sql: 'customer_id',
|
398
|
+
hidden: false,
|
399
|
+
fieldType: FieldType.DIMENSION,
|
400
|
+
type: DimensionType.NUMBER,
|
401
|
+
tablesReferences: [],
|
402
|
+
},
|
403
|
+
},
|
404
|
+
},
|
405
|
+
customers: {
|
406
|
+
name: 'customers',
|
407
|
+
label: 'Customers',
|
408
|
+
database: 'test',
|
409
|
+
schema: 'public',
|
410
|
+
sqlTable: 'customers',
|
411
|
+
metrics: {},
|
412
|
+
lineageGraph: {},
|
413
|
+
dimensions: {
|
414
|
+
id: {
|
415
|
+
name: 'id',
|
416
|
+
label: 'ID',
|
417
|
+
table: 'customers',
|
418
|
+
tableLabel: 'Customers',
|
419
|
+
compiledSql: 'id',
|
420
|
+
tablesReferences: [],
|
421
|
+
fieldType: FieldType.DIMENSION,
|
422
|
+
type: DimensionType.STRING,
|
423
|
+
sql: 'id',
|
424
|
+
hidden: false,
|
425
|
+
},
|
426
|
+
created_at_week: {
|
427
|
+
name: 'created_at_week',
|
428
|
+
label: 'Created At Week',
|
429
|
+
table: 'customers',
|
430
|
+
tableLabel: 'Customers',
|
431
|
+
compiledSql: 'created_at_week',
|
432
|
+
sql: 'created_at_week',
|
433
|
+
hidden: false,
|
434
|
+
tablesReferences: [],
|
435
|
+
fieldType: FieldType.DIMENSION,
|
436
|
+
type: DimensionType.DATE,
|
437
|
+
timeIntervalBaseDimensionName: 'created_at',
|
438
|
+
},
|
439
|
+
},
|
440
|
+
},
|
441
|
+
},
|
442
|
+
joinedTables: [
|
443
|
+
{
|
444
|
+
table: 'customers',
|
445
|
+
sqlOn: '${orders.customer_id} = ${customers.id}',
|
446
|
+
compiledSqlOn: '(orders.customer_id) = (customers.id)',
|
447
|
+
type: undefined,
|
448
|
+
},
|
449
|
+
],
|
450
|
+
};
|
301
451
|
//# sourceMappingURL=filters.mock.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"filters.mock.js","sourceRoot":"","sources":["../../../src/utils/filters.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"filters.mock.js","sourceRoot":"","sources":["../../../src/utils/filters.mock.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,6 @@
|
|
1
1
|
import { ConditionalOperator } from '../types/conditionalRule';
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
import { addDashboardFiltersToMetricQuery, addFilterRule, createFilterRuleFromRequiredMetricRule, isFilterRuleInQuery, overrideChartFilter, reduceRequiredDimensionFiltersToFilterRules, resetRequiredFilterRules, trackWhichTimeBasedMetricFiltersToOverride, } from './filters';
|
5
|
-
import { baseTable, chartAndFilterGroup, chartOrFilterGroup, customSqlDimension, dashboardFilterWithSameTargetAndOperator, dashboardFilterWithSameTargetButDifferentOperator, dashboardFilters, dimension, expectedChartWithOverrideDashboardFilters, expectedChartWithOverrideDashboardORFilters, expectedFiltersWithCustomSqlDimension, expectedRequiredResetResult, expectedRequiredResult, filterRule, metricFilterRule, metricQueryWithAndFilters, metricQueryWithOrFilters, } from './filters.mock';
|
2
|
+
import { addDashboardFiltersToMetricQuery, addFilterRule, createFilterRuleFromModelRequiredFilterRule, isFilterRuleInQuery, overrideChartFilter, reduceRequiredDimensionFiltersToFilterRules, resetRequiredFilterRules, trackWhichTimeBasedMetricFiltersToOverride, } from './filters';
|
3
|
+
import { chartAndFilterGroup, chartOrFilterGroup, customSqlDimension, dashboardFilterWithSameTargetAndOperator, dashboardFilterWithSameTargetButDifferentOperator, dashboardFilters, dimension, expectedChartWithOverrideDashboardFilters, expectedChartWithOverrideDashboardORFilters, expectedFiltersWithCustomSqlDimension, expectedRequiredResetResult, expectedRequiredResult, filterRule, joinedModelRequiredFilterRule, metricQueryWithAndFilters, metricQueryWithOrFilters, mockExplore, mockExploreWithJoinedTable, modelRequiredFilterRule, } from './filters.mock';
|
6
4
|
jest.mock('uuid', () => ({
|
7
5
|
v4: jest.fn(() => 'uuid'),
|
8
6
|
}));
|
@@ -93,9 +91,9 @@ describe('addFilterRule', () => {
|
|
93
91
|
expect(result).toEqual(expectedFiltersWithCustomSqlDimension);
|
94
92
|
});
|
95
93
|
});
|
96
|
-
describe('
|
94
|
+
describe('createFilterRuleFromModelRequiredFilterRule', () => {
|
97
95
|
test('should create a correct FilterRule', () => {
|
98
|
-
const result =
|
96
|
+
const result = createFilterRuleFromModelRequiredFilterRule(modelRequiredFilterRule('dimension'), 'tableName');
|
99
97
|
expect(result).toEqual(expectedRequiredResult('dimension', 'tableName'));
|
100
98
|
});
|
101
99
|
});
|
@@ -117,27 +115,19 @@ describe('reduceRequiredDimensionFiltersToFilterRules', () => {
|
|
117
115
|
test('should correctly reduce required dimension filters to filter rules', () => {
|
118
116
|
// Define mock data
|
119
117
|
const mockRequiredFilters = [
|
120
|
-
|
121
|
-
|
118
|
+
modelRequiredFilterRule('order_date_week'),
|
119
|
+
joinedModelRequiredFilterRule('customers.created_at_week', 'customers'),
|
122
120
|
];
|
123
|
-
const table = {
|
124
|
-
...baseTable,
|
125
|
-
lineageGraph: {},
|
126
|
-
dimensions: {
|
127
|
-
mockFieldRef1: dimension('mockFieldRef1', 'table'),
|
128
|
-
mockFieldRef2: dimension('mockFieldRef2', 'table'),
|
129
|
-
},
|
130
|
-
};
|
131
121
|
const emptyFilters = {
|
132
122
|
dimensions: {
|
133
123
|
id: 'mockGroupId',
|
134
124
|
and: [],
|
135
125
|
},
|
136
126
|
};
|
137
|
-
const result = reduceRequiredDimensionFiltersToFilterRules(mockRequiredFilters,
|
127
|
+
const result = reduceRequiredDimensionFiltersToFilterRules(mockRequiredFilters, emptyFilters.dimensions, mockExploreWithJoinedTable);
|
138
128
|
const expectedFilterRuleResult = [
|
139
|
-
expectedRequiredResult('
|
140
|
-
expectedRequiredResult('
|
129
|
+
expectedRequiredResult('order_date_week', 'orders'),
|
130
|
+
expectedRequiredResult('created_at_week', 'customers'),
|
141
131
|
];
|
142
132
|
expect(result).toEqual(expectedFilterRuleResult);
|
143
133
|
});
|
@@ -159,78 +149,6 @@ describe('resetRequiredFilterRules', () => {
|
|
159
149
|
});
|
160
150
|
});
|
161
151
|
describe('trackWhichTimeBasedMetricFiltersToOverride', () => {
|
162
|
-
const mockExplore = {
|
163
|
-
name: 'test',
|
164
|
-
label: 'Test',
|
165
|
-
tags: [],
|
166
|
-
baseTable: 'orders',
|
167
|
-
targetDatabase: SupportedDbtAdapter.POSTGRES,
|
168
|
-
joinedTables: [],
|
169
|
-
tables: {
|
170
|
-
orders: {
|
171
|
-
name: 'orders',
|
172
|
-
label: 'Orders',
|
173
|
-
database: 'test',
|
174
|
-
schema: 'public',
|
175
|
-
sqlTable: 'orders',
|
176
|
-
metrics: {},
|
177
|
-
lineageGraph: {},
|
178
|
-
dimensions: {
|
179
|
-
order_date_year: {
|
180
|
-
name: 'order_date_year',
|
181
|
-
label: 'Order Date Year',
|
182
|
-
table: 'orders',
|
183
|
-
tableLabel: 'Orders',
|
184
|
-
compiledSql: 'order_date_year',
|
185
|
-
tablesReferences: [],
|
186
|
-
sql: 'order_date_year',
|
187
|
-
hidden: false,
|
188
|
-
fieldType: FieldType.DIMENSION,
|
189
|
-
type: DimensionType.DATE,
|
190
|
-
timeIntervalBaseDimensionName: 'order_date',
|
191
|
-
},
|
192
|
-
order_date_month: {
|
193
|
-
name: 'order_date_month',
|
194
|
-
label: 'Order Date Month',
|
195
|
-
table: 'orders',
|
196
|
-
tableLabel: 'Orders',
|
197
|
-
compiledSql: 'order_date_month',
|
198
|
-
tablesReferences: [],
|
199
|
-
sql: 'order_date_month',
|
200
|
-
hidden: false,
|
201
|
-
fieldType: FieldType.DIMENSION,
|
202
|
-
type: DimensionType.DATE,
|
203
|
-
timeIntervalBaseDimensionName: 'order_date',
|
204
|
-
},
|
205
|
-
order_date_week: {
|
206
|
-
name: 'order_date_week',
|
207
|
-
label: 'Order Date Week',
|
208
|
-
table: 'orders',
|
209
|
-
tableLabel: 'Orders',
|
210
|
-
compiledSql: 'order_date_week',
|
211
|
-
sql: 'order_date_week',
|
212
|
-
hidden: false,
|
213
|
-
tablesReferences: [],
|
214
|
-
fieldType: FieldType.DIMENSION,
|
215
|
-
type: DimensionType.DATE,
|
216
|
-
timeIntervalBaseDimensionName: 'order_date',
|
217
|
-
},
|
218
|
-
status: {
|
219
|
-
name: 'status',
|
220
|
-
label: 'Status',
|
221
|
-
table: 'orders',
|
222
|
-
tableLabel: 'Orders',
|
223
|
-
compiledSql: 'status',
|
224
|
-
sql: 'status',
|
225
|
-
hidden: false,
|
226
|
-
tablesReferences: [],
|
227
|
-
fieldType: FieldType.DIMENSION,
|
228
|
-
type: DimensionType.BOOLEAN,
|
229
|
-
},
|
230
|
-
},
|
231
|
-
},
|
232
|
-
},
|
233
|
-
};
|
234
152
|
test('should track fields to change when dashboard filter targets base time dimension', () => {
|
235
153
|
const metricQueryDimensionFilters = {
|
236
154
|
id: 'dim-filter-group',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"filters.test.js","sourceRoot":"","sources":["../../../src/utils/filters.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"filters.test.js","sourceRoot":"","sources":["../../../src/utils/filters.test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/utils/item.d.ts
CHANGED
@@ -27,7 +27,7 @@ export declare const replaceDimensionInExplore: (explore: Explore, dimension: Co
|
|
27
27
|
orderFieldsBy?: import("..").OrderFieldsByStrategy;
|
28
28
|
groupLabel?: string;
|
29
29
|
sqlWhere?: string;
|
30
|
-
requiredFilters?: import("..").
|
30
|
+
requiredFilters?: import("..").ModelRequiredFilterRule[];
|
31
31
|
hidden?: boolean;
|
32
32
|
requiredAttributes?: Record<string, string | string[]>;
|
33
33
|
groupDetails?: Record<string, import("..").GroupType>;
|