@lightdash/common 2.64.2 → 2.65.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/utils/i18n/abstract.d.ts +4 -4
- package/dist/cjs/utils/i18n/abstract.d.ts.map +1 -1
- package/dist/cjs/utils/i18n/abstract.js.map +1 -1
- package/dist/cjs/utils/i18n/dashboardAsCode.d.ts +27 -2
- package/dist/cjs/utils/i18n/dashboardAsCode.d.ts.map +1 -1
- package/dist/cjs/utils/i18n/dashboardAsCode.js +46 -6
- package/dist/cjs/utils/i18n/dashboardAsCode.js.map +1 -1
- package/dist/cjs/utils/i18n/dashboardAsCode.test.d.ts +2 -0
- package/dist/cjs/utils/i18n/dashboardAsCode.test.d.ts.map +1 -0
- package/dist/cjs/utils/i18n/dashboardAsCode.test.js +131 -0
- package/dist/cjs/utils/i18n/dashboardAsCode.test.js.map +1 -0
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/utils/i18n/abstract.d.ts +4 -4
- package/dist/esm/utils/i18n/abstract.d.ts.map +1 -1
- package/dist/esm/utils/i18n/abstract.js.map +1 -1
- package/dist/esm/utils/i18n/dashboardAsCode.d.ts +27 -2
- package/dist/esm/utils/i18n/dashboardAsCode.d.ts.map +1 -1
- package/dist/esm/utils/i18n/dashboardAsCode.js +43 -5
- package/dist/esm/utils/i18n/dashboardAsCode.js.map +1 -1
- package/dist/esm/utils/i18n/dashboardAsCode.test.d.ts +2 -0
- package/dist/esm/utils/i18n/dashboardAsCode.test.d.ts.map +1 -0
- package/dist/esm/utils/i18n/dashboardAsCode.test.js +129 -0
- package/dist/esm/utils/i18n/dashboardAsCode.test.js.map +1 -0
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/utils/i18n/abstract.d.ts +4 -4
- package/dist/types/utils/i18n/abstract.d.ts.map +1 -1
- package/dist/types/utils/i18n/abstract.js.map +1 -1
- package/dist/types/utils/i18n/dashboardAsCode.d.ts +27 -2
- package/dist/types/utils/i18n/dashboardAsCode.d.ts.map +1 -1
- package/dist/types/utils/i18n/dashboardAsCode.js +43 -5
- package/dist/types/utils/i18n/dashboardAsCode.js.map +1 -1
- package/dist/types/utils/i18n/dashboardAsCode.test.d.ts +2 -0
- package/dist/types/utils/i18n/dashboardAsCode.test.d.ts.map +1 -0
- package/dist/types/utils/i18n/dashboardAsCode.test.js +129 -0
- package/dist/types/utils/i18n/dashboardAsCode.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -8,13 +8,13 @@ type AllowedAsCode = {
|
|
|
8
8
|
type: 'dashboard';
|
|
9
9
|
content: DashboardAsCode;
|
|
10
10
|
};
|
|
11
|
-
export declare abstract class AsCodeInternalization<T extends AllowedAsCode, Z extends z.AnyZodObject
|
|
11
|
+
export declare abstract class AsCodeInternalization<T extends AllowedAsCode, Z extends z.AnyZodObject, MapEntry = PartialDeep<T['content'], {
|
|
12
|
+
recurseIntoArrays: true;
|
|
13
|
+
}>> {
|
|
12
14
|
protected abstract schema: Z;
|
|
13
15
|
abstract getLanguageMap(asCode: T['content']): {
|
|
14
16
|
[typeKey in T['type']]: {
|
|
15
|
-
[slugKey in T['content']['slug']]:
|
|
16
|
-
recurseIntoArrays: true;
|
|
17
|
-
}>;
|
|
17
|
+
[slugKey in T['content']['slug']]: MapEntry;
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
20
|
abstract merge(internalizationMap: ReturnType<this['getLanguageMap']>[T['type']][string], content: T['content']): T['content'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/utils/i18n/abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE3E,KAAK,aAAa,GACZ;IACI,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;CACxB,GACD;IACI,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;CAC5B,CAAC;AAER,8BAAsB,qBAAqB,CACvC,CAAC,SAAS,aAAa,EACvB,CAAC,SAAS,CAAC,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/utils/i18n/abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE3E,KAAK,aAAa,GACZ;IACI,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;CACxB,GACD;IACI,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;CAC5B,CAAC;AAER,8BAAsB,qBAAqB,CACvC,CAAC,SAAS,aAAa,EACvB,CAAC,SAAS,CAAC,CAAC,YAAY,EAIxB,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE;IAAE,iBAAiB,EAAE,IAAI,CAAA;CAAE,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7B,SAAgB,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG;SACjD,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG;aACnB,OAAO,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ;SAC9C;KACJ,CAAC;IAEF,SAAgB,KAAK,CACjB,kBAAkB,EAAE,UAAU,CAC1B,IAAI,CAAC,gBAAgB,CAAC,CACzB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EACpB,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,GACtB,CAAC,CAAC,SAAS,CAAC,CAAC;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/utils/i18n/abstract.ts"],"names":[],"mappings":"AAcA,MAAM,OAAgB,qBAAqB;
|
|
1
|
+
{"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/utils/i18n/abstract.ts"],"names":[],"mappings":"AAcA,MAAM,OAAgB,qBAAqB;CAsB1C"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type PartialDeep } from 'type-fest';
|
|
1
2
|
import { z } from 'zod';
|
|
2
3
|
import { type DashboardAsCode } from '../../types/coder';
|
|
3
4
|
import { DashboardTileTypes } from '../../types/dashboard';
|
|
@@ -174,10 +175,31 @@ declare const dashboardAsCodeSchema: z.ZodObject<{
|
|
|
174
175
|
};
|
|
175
176
|
})[];
|
|
176
177
|
}>;
|
|
178
|
+
/**
|
|
179
|
+
* Source (untranslated) filter label -> translated label. Keyed by label
|
|
180
|
+
* rather than array position so translations survive filter reordering,
|
|
181
|
+
* insertion, and deletion; renaming a label invalidates its translation
|
|
182
|
+
* (the pill falls back to the source label). Deliberately an
|
|
183
|
+
* index-signature literal, not `Record` — see DashboardTileTargets.
|
|
184
|
+
*/
|
|
185
|
+
export type DashboardFilterLabelTranslations = {
|
|
186
|
+
[sourceLabel: string]: string;
|
|
187
|
+
};
|
|
188
|
+
export declare const getFilterLabelTranslation: (labels: DashboardFilterLabelTranslations, sourceLabel: string | undefined) => string | undefined;
|
|
189
|
+
export declare const translateFilterRuleLabels: <T extends {
|
|
190
|
+
label: string | undefined;
|
|
191
|
+
}>(rules: T[], labels: DashboardFilterLabelTranslations) => T[];
|
|
192
|
+
type DashboardLanguageMapEntry = PartialDeep<Omit<DashboardAsCode, 'filters'>, {
|
|
193
|
+
recurseIntoArrays: true;
|
|
194
|
+
}> & {
|
|
195
|
+
filters: {
|
|
196
|
+
labels: DashboardFilterLabelTranslations;
|
|
197
|
+
} | undefined;
|
|
198
|
+
};
|
|
177
199
|
export declare class DashboardAsCodeInternalization extends AsCodeInternalization<{
|
|
178
200
|
type: 'dashboard';
|
|
179
201
|
content: DashboardAsCode;
|
|
180
|
-
}, typeof dashboardAsCodeSchema> {
|
|
202
|
+
}, typeof dashboardAsCodeSchema, DashboardLanguageMapEntry> {
|
|
181
203
|
protected schema: z.ZodObject<{
|
|
182
204
|
name: z.ZodString;
|
|
183
205
|
description: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | undefined, string | null | undefined>;
|
|
@@ -555,10 +577,13 @@ export declare class DashboardAsCodeInternalization extends AsCodeInternalizatio
|
|
|
555
577
|
title: string;
|
|
556
578
|
};
|
|
557
579
|
})[] | undefined;
|
|
580
|
+
filters: {
|
|
581
|
+
labels: DashboardFilterLabelTranslations;
|
|
582
|
+
} | undefined;
|
|
558
583
|
};
|
|
559
584
|
};
|
|
560
585
|
};
|
|
561
|
-
merge(internalizationMap: ReturnType<this['getLanguageMap']>['dashboard'][string], content: DashboardAsCode):
|
|
586
|
+
merge(internalizationMap: ReturnType<this['getLanguageMap']>['dashboard'][string], content: DashboardAsCode): DashboardAsCode;
|
|
562
587
|
}
|
|
563
588
|
export type DashboardAsCodeLanguageMap = ReturnType<DashboardAsCodeInternalization['getLanguageMap']>;
|
|
564
589
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboardAsCode.d.ts","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CzB,CAAC;AAEH,qBAAa,8BAA+B,SAAQ,qBAAqB,CACrE;IACI,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;CAC5B,EACD,OAAO,qBAAqB,
|
|
1
|
+
{"version":3,"file":"dashboardAsCode.d.ts","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CzB,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,MAAM,gCAAgC,GAAG;IAC3C,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC1B,gCAAgC,eAC3B,MAAM,GAAG,SAAS,KAChC,MAAM,GAAG,SAMX,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAClC,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,SAEhC,CAAC,EAAE,UACF,gCAAgC,KACzC,CAAC,EAIE,CAAC;AAoBP,KAAK,yBAAyB,GAAG,WAAW,CACxC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EAChC;IAAE,iBAAiB,EAAE,IAAI,CAAA;CAAE,CAC9B,GAAG;IACA,OAAO,EAAE;QAAE,MAAM,EAAE,gCAAgC,CAAA;KAAE,GAAG,SAAS,CAAC;CACrE,CAAC;AAEF,qBAAa,8BAA+B,SAAQ,qBAAqB,CACrE;IACI,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;CAC5B,EACD,OAAO,qBAAqB,EAC5B,yBAAyB,CAC5B;IACe,SAAS,CAAC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA5B,YAAsB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAwB,EAEnD;IAEM,cAAc,CAAC,eAAe,EAAE,eAAe;;YAI1C,CAAC,eAAe,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAKrB;;MAGZ;IAGM,KAAK,CACR,kBAAkB,EAAE,UAAU,CAC1B,IAAI,CAAC,gBAAgB,CAAC,CACzB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACtB,OAAO,EAAE,eAAe,mBA2B3B;CACJ;AAED,MAAM,MAAM,0BAA0B,GAAG,UAAU,CAC/C,8BAA8B,CAAC,gBAAgB,CAAC,CACnD,CAAC"}
|
|
@@ -47,24 +47,62 @@ const dashboardAsCodeSchema = z.object({
|
|
|
47
47
|
}),
|
|
48
48
|
])),
|
|
49
49
|
});
|
|
50
|
+
export const getFilterLabelTranslation = (labels, sourceLabel) => {
|
|
51
|
+
if (!sourceLabel)
|
|
52
|
+
return undefined;
|
|
53
|
+
const translated = labels[sourceLabel];
|
|
54
|
+
return typeof translated === 'string' && translated.length > 0
|
|
55
|
+
? translated
|
|
56
|
+
: undefined;
|
|
57
|
+
};
|
|
58
|
+
export const translateFilterRuleLabels = (rules, labels) => rules.map((rule) => {
|
|
59
|
+
const translated = getFilterLabelTranslation(labels, rule.label);
|
|
60
|
+
return translated ? { ...rule, label: translated } : rule;
|
|
61
|
+
});
|
|
62
|
+
const getFilterLabels = (filters) => {
|
|
63
|
+
const labels = [
|
|
64
|
+
...(filters?.dimensions ?? []),
|
|
65
|
+
...(filters?.metrics ?? []),
|
|
66
|
+
...(filters?.tableCalculations ?? []),
|
|
67
|
+
]
|
|
68
|
+
.map((rule) => rule.label)
|
|
69
|
+
.filter((label) => typeof label === 'string' && label.length > 0);
|
|
70
|
+
return labels.length > 0
|
|
71
|
+
? Object.fromEntries(labels.map((label) => [label, label]))
|
|
72
|
+
: undefined;
|
|
73
|
+
};
|
|
50
74
|
export class DashboardAsCodeInternalization extends AsCodeInternalization {
|
|
51
75
|
constructor(schema = dashboardAsCodeSchema) {
|
|
52
76
|
super();
|
|
53
77
|
this.schema = schema;
|
|
54
78
|
}
|
|
55
79
|
getLanguageMap(dashboardAsCode) {
|
|
80
|
+
const filterLabels = getFilterLabels(dashboardAsCode.filters);
|
|
56
81
|
return {
|
|
57
82
|
dashboard: {
|
|
58
|
-
[dashboardAsCode.slug]:
|
|
59
|
-
.deepPartial()
|
|
60
|
-
|
|
61
|
-
|
|
83
|
+
[dashboardAsCode.slug]: {
|
|
84
|
+
...this.schema.deepPartial().strip().parse(dashboardAsCode),
|
|
85
|
+
filters: filterLabels
|
|
86
|
+
? { labels: filterLabels }
|
|
87
|
+
: undefined,
|
|
88
|
+
},
|
|
62
89
|
},
|
|
63
90
|
};
|
|
64
91
|
}
|
|
65
92
|
// eslint-disable-next-line class-methods-use-this
|
|
66
93
|
merge(internalizationMap, content) {
|
|
67
|
-
|
|
94
|
+
const { filters: filterOverrides, ...contentOverrides } = internalizationMap;
|
|
95
|
+
const merged = mergeExisting(content, contentOverrides);
|
|
96
|
+
const labels = filterOverrides?.labels;
|
|
97
|
+
if (labels && merged.filters) {
|
|
98
|
+
merged.filters = {
|
|
99
|
+
...merged.filters,
|
|
100
|
+
dimensions: translateFilterRuleLabels(merged.filters.dimensions ?? [], labels),
|
|
101
|
+
metrics: translateFilterRuleLabels(merged.filters.metrics ?? [], labels),
|
|
102
|
+
tableCalculations: translateFilterRuleLabels(merged.filters.tableCalculations ?? [], labels),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
return merged;
|
|
68
106
|
}
|
|
69
107
|
}
|
|
70
108
|
//# sourceMappingURL=dashboardAsCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboardAsCode.js","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dashboardAsCode.js","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dashboardAsCode.test.d.ts","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { DashboardTileTypes } from '../../types/dashboard';
|
|
2
|
+
import { FilterOperator } from '../../types/filter';
|
|
3
|
+
import { DashboardAsCodeInternalization } from './dashboardAsCode';
|
|
4
|
+
const dashboardAsCode = {
|
|
5
|
+
name: 'Sales overview',
|
|
6
|
+
description: undefined,
|
|
7
|
+
slug: 'sales-overview',
|
|
8
|
+
spaceSlug: 'shared',
|
|
9
|
+
version: 1,
|
|
10
|
+
tabs: [],
|
|
11
|
+
tiles: [
|
|
12
|
+
{
|
|
13
|
+
uuid: undefined,
|
|
14
|
+
tileSlug: undefined,
|
|
15
|
+
type: DashboardTileTypes.MARKDOWN,
|
|
16
|
+
x: 0,
|
|
17
|
+
y: 0,
|
|
18
|
+
h: 3,
|
|
19
|
+
w: 9,
|
|
20
|
+
properties: { title: 'Notes', content: 'Some content' },
|
|
21
|
+
},
|
|
22
|
+
],
|
|
23
|
+
filters: {
|
|
24
|
+
dimensions: [
|
|
25
|
+
{
|
|
26
|
+
label: 'Regio klant',
|
|
27
|
+
target: {
|
|
28
|
+
fieldId: 'customers_region',
|
|
29
|
+
tableName: 'customers',
|
|
30
|
+
},
|
|
31
|
+
operator: FilterOperator.EQUALS,
|
|
32
|
+
values: [],
|
|
33
|
+
tileTargets: {},
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
label: undefined,
|
|
37
|
+
target: { fieldId: 'orders_status', tableName: 'orders' },
|
|
38
|
+
operator: FilterOperator.EQUALS,
|
|
39
|
+
values: [],
|
|
40
|
+
tileTargets: {},
|
|
41
|
+
},
|
|
42
|
+
],
|
|
43
|
+
metrics: [
|
|
44
|
+
{
|
|
45
|
+
id: 'metric-filter-1',
|
|
46
|
+
label: 'Totale omzet',
|
|
47
|
+
target: { fieldId: 'orders_total', tableName: 'orders' },
|
|
48
|
+
operator: FilterOperator.GREATER_THAN,
|
|
49
|
+
values: [0],
|
|
50
|
+
tileTargets: {},
|
|
51
|
+
},
|
|
52
|
+
],
|
|
53
|
+
tableCalculations: [],
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
describe('DashboardAsCodeInternalization', () => {
|
|
57
|
+
describe('getLanguageMap', () => {
|
|
58
|
+
it('should emit user-defined filter labels keyed by source label', () => {
|
|
59
|
+
const languageMap = new DashboardAsCodeInternalization().getLanguageMap(dashboardAsCode).dashboard[dashboardAsCode.slug];
|
|
60
|
+
expect(languageMap.name).toBe('Sales overview');
|
|
61
|
+
expect(languageMap.filters).toEqual({
|
|
62
|
+
labels: {
|
|
63
|
+
'Regio klant': 'Regio klant',
|
|
64
|
+
'Totale omzet': 'Totale omzet',
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
it('should handle a dashboard without filters', () => {
|
|
69
|
+
const { filters, ...dashboardWithoutFilters } = dashboardAsCode;
|
|
70
|
+
const languageMap = new DashboardAsCodeInternalization().getLanguageMap(dashboardWithoutFilters).dashboard[dashboardAsCode.slug];
|
|
71
|
+
expect(languageMap.filters).toBeUndefined();
|
|
72
|
+
});
|
|
73
|
+
it('should omit filters when no rule has a user-defined label', () => {
|
|
74
|
+
const languageMap = new DashboardAsCodeInternalization().getLanguageMap({
|
|
75
|
+
...dashboardAsCode,
|
|
76
|
+
filters: {
|
|
77
|
+
dimensions: [
|
|
78
|
+
{
|
|
79
|
+
...dashboardAsCode.filters.dimensions[0],
|
|
80
|
+
label: undefined,
|
|
81
|
+
},
|
|
82
|
+
],
|
|
83
|
+
metrics: [],
|
|
84
|
+
tableCalculations: [],
|
|
85
|
+
},
|
|
86
|
+
}).dashboard[dashboardAsCode.slug];
|
|
87
|
+
expect(languageMap.filters).toBeUndefined();
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
describe('merge', () => {
|
|
91
|
+
it('should translate filter labels by source label without touching other rule fields', () => {
|
|
92
|
+
const merged = new DashboardAsCodeInternalization().merge({
|
|
93
|
+
filters: {
|
|
94
|
+
labels: {
|
|
95
|
+
'Regio klant': 'Région client',
|
|
96
|
+
'Totale omzet': "Chiffre d'affaires",
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
}, structuredClone(dashboardAsCode));
|
|
100
|
+
expect(merged.filters?.dimensions?.[0]).toMatchObject({
|
|
101
|
+
label: 'Région client',
|
|
102
|
+
operator: FilterOperator.EQUALS,
|
|
103
|
+
target: {
|
|
104
|
+
fieldId: 'customers_region',
|
|
105
|
+
tableName: 'customers',
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
expect(merged.filters?.dimensions?.[1]?.label).toBeUndefined();
|
|
109
|
+
expect(merged.filters?.metrics?.[0]).toMatchObject({
|
|
110
|
+
id: 'metric-filter-1',
|
|
111
|
+
label: "Chiffre d'affaires",
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
it('should leave labels without a translation entry untouched', () => {
|
|
115
|
+
const merged = new DashboardAsCodeInternalization().merge({ filters: { labels: { 'Some other label': 'Autre' } } }, structuredClone(dashboardAsCode));
|
|
116
|
+
expect(merged.filters?.dimensions?.[0]?.label).toBe('Regio klant');
|
|
117
|
+
expect(merged.filters?.metrics?.[0]?.label).toBe('Totale omzet');
|
|
118
|
+
});
|
|
119
|
+
it('should still merge non-filter content alongside filter labels', () => {
|
|
120
|
+
const merged = new DashboardAsCodeInternalization().merge({
|
|
121
|
+
name: 'Aperçu des ventes',
|
|
122
|
+
filters: { labels: { 'Regio klant': 'Région client' } },
|
|
123
|
+
}, structuredClone(dashboardAsCode));
|
|
124
|
+
expect(merged.name).toBe('Aperçu des ventes');
|
|
125
|
+
expect(merged.filters?.dimensions?.[0]?.label).toBe('Région client');
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
//# sourceMappingURL=dashboardAsCode.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dashboardAsCode.test.js","sourceRoot":"","sources":["../../../../src/utils/i18n/dashboardAsCode.test.ts"],"names":[],"mappings":"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"}
|