@gooddata/sdk-code-convertors 11.65.0-alpha.9 → 11.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/esm/from/declarativeVisualisationToYaml.d.ts.map +1 -1
- package/esm/from/declarativeVisualisationToYaml.js +3 -1
- package/esm/from/filtersToYaml.d.ts +17 -4
- package/esm/from/filtersToYaml.d.ts.map +1 -1
- package/esm/from/filtersToYaml.js +37 -16
- package/esm/index.d.ts +1 -1
- package/esm/index.d.ts.map +1 -1
- package/esm/sdk-code-convertors.d.ts +18 -3
- package/esm/to/yamlDashboardToDeclarative.js +2 -2
- package/esm/to/yamlVisualisationToDeclarative.d.ts.map +1 -1
- package/esm/to/yamlVisualisationToDeclarative.js +30 -40
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarativeVisualisationToYaml.d.ts","sourceRoot":"","sources":["../../src/from/declarativeVisualisationToYaml.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,OAAO,EAAkC,MAAM,MAAM,CAAC;AAE5F,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACH,KAAK,4BAA4B,EACjC,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAEvB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,gCAAgC,EACrC,KAAK,SAAS,EACd,KAAK,MAAM,EAkBd,MAAM,qBAAqB,CAAC;AAyB7B,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAiB,KAAK,aAAa,EAAgC,MAAM,oBAAoB,CAAC;AAMrG,OAAO,EAAE,KAAK,kBAAkB,EAA4B,MAAM,oBAAoB,CAAC;AAEvF,cAAc;AACd,wBAAgB,8BAA8B,CAC1C,QAAQ,EAAE,YAAY,EACtB,aAAa,EAAE,8BAA8B,EAC7C,OAAO,CAAC,EAAE,aAAa,GACxB;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,aAAa,CAAC;CACxB,CA0EA;
|
|
1
|
+
{"version":3,"file":"declarativeVisualisationToYaml.d.ts","sourceRoot":"","sources":["../../src/from/declarativeVisualisationToYaml.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,7 +120,9 @@ function declarativeReportToYaml(entities, def, errorContext) {
|
|
|
120
120
|
}
|
|
121
121
|
const { filtersArray, filtersMap } = declarativeFiltersToYaml(entities, def.filters ?? [], updateErrorContext(errorContext, {
|
|
122
122
|
path: ["filters"],
|
|
123
|
-
})
|
|
123
|
+
}),
|
|
124
|
+
// only the insight's own date filters may carry the mode as the legacy "" attribute filter
|
|
125
|
+
{ readLegacyEmptyValuesFilter: true });
|
|
124
126
|
declarativeFiltersConfigToYaml(def, filtersMap, updateErrorContext(errorContext, {
|
|
125
127
|
path: ["filters"],
|
|
126
128
|
}));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { YAMLMap } from "yaml";
|
|
2
|
-
import { type IAbsoluteDateFilter, type IFilter, type IMeasureValueFilterBody, type INegativeAttributeFilterBody, type IPositiveAttributeFilterBody, type IRankingFilterBody, type IRelativeDateFilter } from "@gooddata/sdk-model";
|
|
2
|
+
import { type EmptyValues, type IAbsoluteDateFilter, type IFilter, type IMeasureValueFilterBody, type INegativeAttributeFilterBody, type IPositiveAttributeFilterBody, type IRankingFilterBody, type IRelativeDateFilter } from "@gooddata/sdk-model";
|
|
3
3
|
import { type FromEntities } from "../types.js";
|
|
4
4
|
import { type IErrorContext } from "../utils/errors.js";
|
|
5
5
|
/** @internal */
|
|
@@ -21,21 +21,34 @@ export type WrittenFilter = {
|
|
|
21
21
|
filter: IFilter;
|
|
22
22
|
};
|
|
23
23
|
/** @internal */
|
|
24
|
-
|
|
24
|
+
/** @internal */
|
|
25
|
+
export type DeclarativeFiltersToYamlOptions = {
|
|
26
|
+
/**
|
|
27
|
+
* Whether a date filter's connected attribute filter on the single empty string value is read as the
|
|
28
|
+
* date filter's `empty_values`: the representation insights saved before `emptyValueHandling` carry on
|
|
29
|
+
* their own (insight-level) date filters. A metric's such filter is one of its additional filters.
|
|
30
|
+
*/
|
|
31
|
+
readLegacyEmptyValuesFilter?: boolean;
|
|
32
|
+
};
|
|
33
|
+
/** @internal */
|
|
34
|
+
export declare function declarativeFiltersToYaml(entities: FromEntities, filters: IFilter[], errorContext?: IErrorContext, { readLegacyEmptyValuesFilter }?: DeclarativeFiltersToYamlOptions): YamlFilters;
|
|
25
35
|
/** @internal */
|
|
26
36
|
export type DateFilterEmitOptions = {
|
|
27
37
|
entities: FromEntities;
|
|
28
38
|
claimKey: ClaimFilterKey;
|
|
29
39
|
connectedAttributeFilters?: IFilter[];
|
|
40
|
+
/** the date filter's own mode, written as `empty_values` */
|
|
41
|
+
emptyValueHandling?: EmptyValues;
|
|
42
|
+
readLegacyEmptyValuesFilter?: boolean;
|
|
30
43
|
errorContext?: IErrorContext;
|
|
31
44
|
};
|
|
32
45
|
/** @internal */
|
|
33
|
-
export declare function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter: IAbsoluteDateFilter["absoluteDateFilter"], {
|
|
46
|
+
export declare function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter: IAbsoluteDateFilter["absoluteDateFilter"], { connectedAttributeFilters, errorContext, ...options }: DateFilterEmitOptions): {
|
|
34
47
|
yaml: YAMLMap;
|
|
35
48
|
carried: WrittenFilter[];
|
|
36
49
|
};
|
|
37
50
|
/** @internal */
|
|
38
|
-
export declare function declarativeRelativeDateFilterToYaml(relativeDateFilter: IRelativeDateFilter["relativeDateFilter"], {
|
|
51
|
+
export declare function declarativeRelativeDateFilterToYaml(relativeDateFilter: IRelativeDateFilter["relativeDateFilter"], { connectedAttributeFilters, errorContext, ...options }: DateFilterEmitOptions): {
|
|
39
52
|
yaml: YAMLMap;
|
|
40
53
|
carried: WrittenFilter[];
|
|
41
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filtersToYaml.d.ts","sourceRoot":"","sources":["../../src/from/filtersToYaml.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,OAAO,EAAW,MAAM,MAAM,CAAC;AAG9C,OAAO,EACH,KAAK,mBAAmB,EAGxB,KAAK,OAAO,EAEZ,KAAK,uBAAuB,EAC5B,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAsB3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAiB,KAAK,aAAa,EAAgC,MAAM,oBAAoB,CAAC;AAKrG,gBAAgB;AAChB,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/C,YAAY,EAAE,OAAO,CAAC;CACzB,CAAC;AAmHF,0FAA0F;AAC1F,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;AAEzD,gBAAgB;AAChB,MAAM,MAAM,aAAa,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAK5E,gBAAgB;AAChB,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,OAAO,EAAE,EAClB,YAAY,CAAC,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"filtersToYaml.d.ts","sourceRoot":"","sources":["../../src/from/filtersToYaml.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ function groupFiltersByDateFilter(filters) {
|
|
|
96
96
|
return result;
|
|
97
97
|
}
|
|
98
98
|
/** @internal */
|
|
99
|
-
export function declarativeFiltersToYaml(entities, filters, errorContext) {
|
|
99
|
+
export function declarativeFiltersToYaml(entities, filters, errorContext, { readLegacyEmptyValuesFilter = false } = {}) {
|
|
100
100
|
const filtersArray = [];
|
|
101
101
|
const filtersMap = {};
|
|
102
102
|
const usedKeys = new Set();
|
|
@@ -121,7 +121,7 @@ export function declarativeFiltersToYaml(entities, filters, errorContext) {
|
|
|
121
121
|
filtersGroupedByDateFilter.rest.forEach(([filter, fi]) => {
|
|
122
122
|
const result = declarativeFilterToYaml(entities, filter, claimKey, undefined, updateErrorContext(errorContext, {
|
|
123
123
|
path: [fi.toString()],
|
|
124
|
-
}));
|
|
124
|
+
}), readLegacyEmptyValuesFilter);
|
|
125
125
|
if (!result) {
|
|
126
126
|
return;
|
|
127
127
|
}
|
|
@@ -130,7 +130,7 @@ export function declarativeFiltersToYaml(entities, filters, errorContext) {
|
|
|
130
130
|
Object.values(filtersGroupedByDateFilter.grouped).forEach(({ dateFilter, attributeFilters }) => {
|
|
131
131
|
const result = declarativeFilterToYaml(entities, dateFilter[0], claimKey, attributeFilters.map(([f]) => f), updateErrorContext(errorContext, {
|
|
132
132
|
path: [dateFilter[1].toString()],
|
|
133
|
-
}));
|
|
133
|
+
}), readLegacyEmptyValuesFilter);
|
|
134
134
|
if (!result) {
|
|
135
135
|
return;
|
|
136
136
|
}
|
|
@@ -144,7 +144,7 @@ export function declarativeFiltersToYaml(entities, filters, errorContext) {
|
|
|
144
144
|
}, new YAMLMap()),
|
|
145
145
|
};
|
|
146
146
|
}
|
|
147
|
-
function declarativeFilterToYaml(entities, filter, claimKey, connectedAttributeFilters, errorContext) {
|
|
147
|
+
function declarativeFilterToYaml(entities, filter, claimKey, connectedAttributeFilters, errorContext, readLegacyEmptyValuesFilter = false) {
|
|
148
148
|
if (!isFilter(filter)) {
|
|
149
149
|
return null;
|
|
150
150
|
}
|
|
@@ -156,6 +156,7 @@ function declarativeFilterToYaml(entities, filter, claimKey, connectedAttributeF
|
|
|
156
156
|
entities,
|
|
157
157
|
claimKey,
|
|
158
158
|
connectedAttributeFilters,
|
|
159
|
+
readLegacyEmptyValuesFilter,
|
|
159
160
|
errorContext: updateErrorContext(errorContext, { path: ["absoluteDateFilter"] }),
|
|
160
161
|
});
|
|
161
162
|
return { key, yaml, filter, carried };
|
|
@@ -165,6 +166,7 @@ function declarativeFilterToYaml(entities, filter, claimKey, connectedAttributeF
|
|
|
165
166
|
entities,
|
|
166
167
|
claimKey,
|
|
167
168
|
connectedAttributeFilters,
|
|
169
|
+
readLegacyEmptyValuesFilter,
|
|
168
170
|
errorContext: updateErrorContext(errorContext, { path: ["relativeDateFilter"] }),
|
|
169
171
|
});
|
|
170
172
|
return { key, yaml, filter, carried };
|
|
@@ -225,15 +227,26 @@ function declarativeFilterToYaml(entities, filter, claimKey, connectedAttributeF
|
|
|
225
227
|
}
|
|
226
228
|
throw newError(CoreErrorCode.FilterItemTypeNotSupported, [JSON.stringify(filter)], errorContext);
|
|
227
229
|
}
|
|
228
|
-
/**
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
230
|
+
/**
|
|
231
|
+
* Adds `empty_values` and `with` to `map`, returning the filters written under the latter.
|
|
232
|
+
*
|
|
233
|
+
* `empty_values` is the date filter's own `emptyValueHandling`. An insight-level date filter saved before
|
|
234
|
+
* the field carried the mode as a connected attribute filter on the single empty string value instead
|
|
235
|
+
* (`readLegacyEmptyValuesFilter`): that filter is read as the mode when the date filter has none and is
|
|
236
|
+
* dropped either way, so the YAML always says `empty_values`.
|
|
237
|
+
*/
|
|
238
|
+
function processConnectedAttributeFilters(map, connectedAttributeFilters, { entities, claimKey, emptyValueHandling, readLegacyEmptyValuesFilter, errorContext, }) {
|
|
239
|
+
// empty values
|
|
240
|
+
const legacyEmptyValuesFilter = readLegacyEmptyValuesFilter
|
|
241
|
+
? connectedAttributeFilters.find((filter) => detectEmptyValuesFilterType(filter))
|
|
242
|
+
: undefined;
|
|
243
|
+
const emptyValues = emptyValueHandling ??
|
|
244
|
+
(legacyEmptyValuesFilter ? detectEmptyValuesFilterType(legacyEmptyValuesFilter) : undefined);
|
|
245
|
+
if (emptyValues) {
|
|
246
|
+
map.add(new Pair("empty_values", emptyValues));
|
|
234
247
|
}
|
|
235
248
|
// additional attribute filters
|
|
236
|
-
const additionalAttributeFilters = connectedAttributeFilters.filter((filter) => filter !==
|
|
249
|
+
const additionalAttributeFilters = connectedAttributeFilters.filter((filter) => filter !== legacyEmptyValuesFilter);
|
|
237
250
|
if (additionalAttributeFilters.length === 0) {
|
|
238
251
|
return [];
|
|
239
252
|
}
|
|
@@ -249,7 +262,7 @@ function processConnectedAttributeFilters(map, connectedAttributeFilters, entiti
|
|
|
249
262
|
});
|
|
250
263
|
}
|
|
251
264
|
/** @internal */
|
|
252
|
-
export function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter, {
|
|
265
|
+
export function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter, { connectedAttributeFilters = [], errorContext, ...options }) {
|
|
253
266
|
const map = new YAMLMap();
|
|
254
267
|
// base date filter attributes
|
|
255
268
|
map.add(new Pair("type", "date_filter"));
|
|
@@ -259,8 +272,12 @@ export function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter, { entiti
|
|
|
259
272
|
path: ["dateSet"],
|
|
260
273
|
}));
|
|
261
274
|
map.add(new Pair("using", id));
|
|
262
|
-
// connected attribute filters
|
|
263
|
-
const carried = processConnectedAttributeFilters(map, connectedAttributeFilters,
|
|
275
|
+
// empty values and connected attribute filters
|
|
276
|
+
const carried = processConnectedAttributeFilters(map, connectedAttributeFilters, {
|
|
277
|
+
...options,
|
|
278
|
+
emptyValueHandling: absoluteDateFilter.emptyValueHandling,
|
|
279
|
+
errorContext,
|
|
280
|
+
});
|
|
264
281
|
return { yaml: map, carried };
|
|
265
282
|
}
|
|
266
283
|
function isRelativeDateFilterAllTime(relativeDateFilter) {
|
|
@@ -273,7 +290,7 @@ function isRelativeDateFilterAllTime(relativeDateFilter) {
|
|
|
273
290
|
return granularity === "GDC.time.year" && from === undefined && to === undefined;
|
|
274
291
|
}
|
|
275
292
|
/** @internal */
|
|
276
|
-
export function declarativeRelativeDateFilterToYaml(relativeDateFilter, {
|
|
293
|
+
export function declarativeRelativeDateFilterToYaml(relativeDateFilter, { connectedAttributeFilters = [], errorContext, ...options }) {
|
|
277
294
|
const map = new YAMLMap();
|
|
278
295
|
map.add(new Pair("type", "date_filter"));
|
|
279
296
|
if (isRelativeDateFilterAllTime(relativeDateFilter)) {
|
|
@@ -294,7 +311,11 @@ export function declarativeRelativeDateFilterToYaml(relativeDateFilter, { entiti
|
|
|
294
311
|
path: ["dataSet"],
|
|
295
312
|
}));
|
|
296
313
|
map.add(new Pair("using", id));
|
|
297
|
-
const carried = processConnectedAttributeFilters(map, connectedAttributeFilters,
|
|
314
|
+
const carried = processConnectedAttributeFilters(map, connectedAttributeFilters, {
|
|
315
|
+
...options,
|
|
316
|
+
emptyValueHandling: relativeDateFilter.emptyValueHandling,
|
|
317
|
+
errorContext,
|
|
318
|
+
});
|
|
298
319
|
return { yaml: map, carried };
|
|
299
320
|
}
|
|
300
321
|
/**
|
package/esm/index.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export { declarativeMetricToYaml } from "./from/declarativeMetricToYaml.js";
|
|
|
24
24
|
export { declarativeParameterToYaml } from "./from/declarativeParameterToYaml.js";
|
|
25
25
|
export { declarativeComputedAttributeToYaml } from "./from/declarativeComputedAttributeToYaml.js";
|
|
26
26
|
export { declarativeVisualisationToYaml, declarativeVisTypeToYaml, declarativeArithmeticMetricToYaml, declarativeAttributeSortToYaml, declarativeAttributeToYaml, declarativeBucketsToYaml, declarativeInlineMetricToYaml, declarativeMeasureSortToYaml, declarativeNormalMetricToYaml, declarativePoPMetricToYaml, declarativePreviousPeriodMetricToYaml, declarativeSortsToYaml, declarativeTotalToYaml, type YamlSorts, type YamlPostProcessors, type YamlBuckets, type YamlBucketGroup, type YamlBucketGroupItems, type YamlFieldData, } from "./from/declarativeVisualisationToYaml.js";
|
|
27
|
-
export { type ClaimFilterKey, type DateFilterEmitOptions, type WrittenFilter, declarativeAbsoluteDateFilterToYaml, declarativeFiltersToYaml, declarativeMeasureValueFilterToYaml, declarativeNegativeAttributeFilterToYaml, declarativePositiveAttributeFilterToYaml, declarativeRankingFilterToYaml, declarativeRelativeDateFilterToYaml, type YamlFilterMapEntry, type YamlFilters, } from "./from/filtersToYaml.js";
|
|
27
|
+
export { type ClaimFilterKey, type DateFilterEmitOptions, type DeclarativeFiltersToYamlOptions, type WrittenFilter, declarativeAbsoluteDateFilterToYaml, declarativeFiltersToYaml, declarativeMeasureValueFilterToYaml, declarativeNegativeAttributeFilterToYaml, declarativePositiveAttributeFilterToYaml, declarativeRankingFilterToYaml, declarativeRelativeDateFilterToYaml, type YamlFilterMapEntry, type YamlFilters, } from "./from/filtersToYaml.js";
|
|
28
28
|
export { declarativeDashboardToYaml, declarativeDrillToYaml, declarativeFilterContextToYaml, declarativeFiltersConfigToYaml, declarativePluginsToYaml, declarativeSectionsToYaml, declarativeTabsToYaml, declarativeWidgetToYaml, type FilterContextItem, type OverrideDashboardDefinition, } from "./from/declarativeDashboardToYaml.js";
|
|
29
29
|
export { declarativePluginToYaml } from "./from/declarativePluginToYaml.js";
|
|
30
30
|
export { declarativeAttributeHierarchyToYaml } from "./from/declarativeAttributeHierarchyToYaml.js";
|
package/esm/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ import { DeclarativeReport } from '@gooddata/api-client-tiger';
|
|
|
34
34
|
import { DeclarativeReportPageLayout } from '@gooddata/api-client-tiger';
|
|
35
35
|
import { DeclarativeTable } from '@gooddata/api-client-tiger';
|
|
36
36
|
import { DeclarativeVisualizationObject } from '@gooddata/api-client-tiger';
|
|
37
|
+
import { EmptyValues } from '@gooddata/sdk-model';
|
|
37
38
|
import type { Fields } from '@gooddata/sdk-code-schemas/v1';
|
|
38
39
|
import type { Filter } from '@gooddata/sdk-code-schemas/v1';
|
|
39
40
|
import { IAbsoluteDateFilter } from '@gooddata/sdk-model';
|
|
@@ -1402,11 +1403,14 @@ export declare type DateFilterEmitOptions = {
|
|
|
1402
1403
|
entities: FromEntities;
|
|
1403
1404
|
claimKey: ClaimFilterKey;
|
|
1404
1405
|
connectedAttributeFilters?: IFilter[];
|
|
1406
|
+
/** the date filter's own mode, written as `empty_values` */
|
|
1407
|
+
emptyValueHandling?: EmptyValues;
|
|
1408
|
+
readLegacyEmptyValuesFilter?: boolean;
|
|
1405
1409
|
errorContext?: IErrorContext;
|
|
1406
1410
|
};
|
|
1407
1411
|
|
|
1408
1412
|
/** @internal */
|
|
1409
|
-
export declare function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter: IAbsoluteDateFilter["absoluteDateFilter"], {
|
|
1413
|
+
export declare function declarativeAbsoluteDateFilterToYaml(absoluteDateFilter: IAbsoluteDateFilter["absoluteDateFilter"], { connectedAttributeFilters, errorContext, ...options }: DateFilterEmitOptions): {
|
|
1410
1414
|
yaml: YAMLMap;
|
|
1411
1415
|
carried: WrittenFilter[];
|
|
1412
1416
|
};
|
|
@@ -1483,7 +1487,18 @@ export declare function declarativeFilterContextToYaml(dateFilterConfig?: IDashb
|
|
|
1483
1487
|
export declare function declarativeFiltersConfigToYaml(filtersMap: Record<string, FilterContextItem>, dateFilterConfig?: IDashboardDateFilterConfig, dateFilterConfigs?: IDashboardDateFilterConfigItem[], attributeFilterConfigs?: IDashboardAttributeFilterConfig[], measureValueFilterConfigs?: IDashboardMeasureValueFilterConfig[], errorContext?: IErrorContext): void;
|
|
1484
1488
|
|
|
1485
1489
|
/** @internal */
|
|
1486
|
-
export declare function declarativeFiltersToYaml(entities: FromEntities, filters: IFilter[], errorContext?: IErrorContext): YamlFilters;
|
|
1490
|
+
export declare function declarativeFiltersToYaml(entities: FromEntities, filters: IFilter[], errorContext?: IErrorContext, { readLegacyEmptyValuesFilter }?: DeclarativeFiltersToYamlOptions): YamlFilters;
|
|
1491
|
+
|
|
1492
|
+
/** @internal */
|
|
1493
|
+
/** @internal */
|
|
1494
|
+
export declare type DeclarativeFiltersToYamlOptions = {
|
|
1495
|
+
/**
|
|
1496
|
+
* Whether a date filter's connected attribute filter on the single empty string value is read as the
|
|
1497
|
+
* date filter's `empty_values`: the representation insights saved before `emptyValueHandling` carry on
|
|
1498
|
+
* their own (insight-level) date filters. A metric's such filter is one of its additional filters.
|
|
1499
|
+
*/
|
|
1500
|
+
readLegacyEmptyValuesFilter?: boolean;
|
|
1501
|
+
};
|
|
1487
1502
|
|
|
1488
1503
|
/** @internal */
|
|
1489
1504
|
export declare function declarativeInlineMetricToYaml(def: IMeasureBody, inlineDef: IInlineMeasureDefinition): YAMLMap;
|
|
@@ -1623,7 +1638,7 @@ export declare type DeclarativePublisherPageTemplateV2 = Omit<DeclarativePublish
|
|
|
1623
1638
|
export declare function declarativeRankingFilterToYaml(rankingFilter: IRankingFilterBody, errorContext?: IErrorContext): YAMLMap;
|
|
1624
1639
|
|
|
1625
1640
|
/** @internal */
|
|
1626
|
-
export declare function declarativeRelativeDateFilterToYaml(relativeDateFilter: IRelativeDateFilter["relativeDateFilter"], {
|
|
1641
|
+
export declare function declarativeRelativeDateFilterToYaml(relativeDateFilter: IRelativeDateFilter["relativeDateFilter"], { connectedAttributeFilters, errorContext, ...options }: DateFilterEmitOptions): {
|
|
1627
1642
|
yaml: YAMLMap;
|
|
1628
1643
|
carried: WrittenFilter[];
|
|
1629
1644
|
};
|
|
@@ -738,7 +738,7 @@ export function yamlFilterContextToDeclarative(baseId, yamlFilters) {
|
|
|
738
738
|
: {}),
|
|
739
739
|
...(filter.metric_filters
|
|
740
740
|
? {
|
|
741
|
-
validateElementsBy: filter["metric_filters"].map((metricFilter) => createIdentifier(metricFilter)),
|
|
741
|
+
validateElementsBy: filter["metric_filters"].map((metricFilter) => createIdentifier(metricFilter, { forceMetric: true })),
|
|
742
742
|
}
|
|
743
743
|
: {}),
|
|
744
744
|
title: filter.title,
|
|
@@ -909,7 +909,7 @@ export function yamlFilterContextToDeclarative(baseId, yamlFilters) {
|
|
|
909
909
|
: {}),
|
|
910
910
|
...(filter.metric_filters
|
|
911
911
|
? {
|
|
912
|
-
validateElementsBy: filter.metric_filters.map((metricFilter) => createIdentifier(metricFilter)),
|
|
912
|
+
validateElementsBy: filter.metric_filters.map((metricFilter) => createIdentifier(metricFilter, { forceMetric: true })),
|
|
913
913
|
}
|
|
914
914
|
: {}),
|
|
915
915
|
title: filter.title,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlVisualisationToDeclarative.d.ts","sourceRoot":"","sources":["../../src/to/yamlVisualisationToDeclarative.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,8BAA8B,EACnC,KAAK,6BAA6B,EACrC,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"yamlVisualisationToDeclarative.d.ts","sourceRoot":"","sources":["../../src/to/yamlVisualisationToDeclarative.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,8BAA8B,EACnC,KAAK,6BAA6B,EACrC,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EASR,MAAM,EAMN,YAAY,EAIZ,KAAK,EAEL,KAAK,EACL,aAAa,EAEhB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGH,KAAK,uBAAuB,EAE5B,KAAK,OAAO,EACZ,KAAK,QAAQ,EAIb,KAAK,SAAS,EACd,KAAK,MAAM,EAKd,MAAM,qBAAqB,CAAC;AAyB7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAkC/D,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACtC,QAAQ,CAAC,SAAS,CAAC,EACnB,kBAAkB,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,wBAAwB,GAAG,QAAQ,CAC5G,GAAG;IACA,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,cAAc;AACd,wBAAgB,8BAA8B,CAC1C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,aAAa,GACrB,8BAA8B,CAoChC;AAED,cAAc;AACd,wBAAgB,iCAAiC,CAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,aAAa,GACrB,6BAA6B,CAQ/B;AAiGD,gBAAgB;AAChB,wBAAgB,uBAAuB,CACnC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,aAAa,GACrB;IACC,OAAO,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,SAAS,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1D,sBAAsB,CAAC,EAAE,uBAAuB,CAAC;CACpD,CAmBA;AAuQD,gBAAgB;AAChB,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,KAAK,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GACzC,SAAS,EAAE,CA4Bb;AAogBD,gBAAgB;AAChB,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,cAAc,EACxB,UAAU,EAAE,YAAY,GAAG,MAAM,EAAE,GAAG,SAAS,EAC/C,sBAAsB,GAAE,uBAA4B,EAGpD,mBAAmB,UAAQ,GAC5B;IACC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,sBAAsB,EAAE,uBAAuB,GAAG,SAAS,CAAC;CAC/D,CAsBA;AAID,gBAAgB;AAChB,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,YAAK,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM,EAAE,CASxG;AAID,gBAAgB;AAChB,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,aAAa,GACrB;IACC,OAAO,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,SAAS,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1D,gBAAgB,EAAE,uBAAuB,CAAC;CAC7C,CAuDA"}
|
|
@@ -28,7 +28,7 @@ import { convertBucketToTitle } from "../utils/convertBucketToTitle.js";
|
|
|
28
28
|
import { mapDateAttribute, mapDateDataset } from "../utils/dateUtils.js";
|
|
29
29
|
import { CoreErrorCode, newError } from "../utils/errors.js";
|
|
30
30
|
import { parseDateValues, yamlConditionToMatch } from "../utils/filterUtils.js";
|
|
31
|
-
import { convertGranularity
|
|
31
|
+
import { convertGranularity } from "../utils/granularityUtils.js";
|
|
32
32
|
import { mapLocationLabel } from "../utils/locationUtils.js";
|
|
33
33
|
import { assertUnreachable, convertIdToTitle, getFullBucket, getFullField } from "../utils/sharedUtils.js";
|
|
34
34
|
import { isAbsoluteDateFilter, isArbitraryTextFilter, isArithmeticMetricField, isAttributeField, isAttributeSort, isCalculatedMetricField, isInlineMetricField, isMatchTextFilter, isMetricAllValueFilter, isMetricComparisonValueFilter, isMetricField, isMetricRangeValueFilter, isMetricSort, isMetricValueFilterWithConditions, isNegativeAttributeFilter, isPoPMetricField, isPositiveAttributeFilter, isPreviousPeriodField, isRankingFilter, isRelativeDateFilter, parseReferenceObject, } from "../utils/typeGuards.js";
|
|
@@ -509,50 +509,24 @@ function yamlAbsoluteDateFilterToDeclarative(entities, filter, assignFilterLocal
|
|
|
509
509
|
dataSet: createIdentifier(filter.using, { forceType: "dataset" }),
|
|
510
510
|
from: filter.from,
|
|
511
511
|
to: filter.to,
|
|
512
|
+
...dateFilterEmptyValueHandling(filter),
|
|
512
513
|
},
|
|
513
514
|
},
|
|
514
515
|
],
|
|
515
516
|
};
|
|
516
|
-
result = mergeDeclarativeResults(result, dateFilterEmptyValuesToDeclarative(filter));
|
|
517
517
|
result = mergeDeclarativeResults(result, dateFilterWithFieldToDeclarative(entities, filter, assignFilterLocalId));
|
|
518
518
|
return result;
|
|
519
519
|
}
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
negativeAttributeFilter: {
|
|
531
|
-
displayForm: identifier,
|
|
532
|
-
notIn: {
|
|
533
|
-
values: [""],
|
|
534
|
-
},
|
|
535
|
-
},
|
|
536
|
-
},
|
|
537
|
-
],
|
|
538
|
-
};
|
|
539
|
-
}
|
|
540
|
-
case "only": {
|
|
541
|
-
return {
|
|
542
|
-
filters: [
|
|
543
|
-
{
|
|
544
|
-
positiveAttributeFilter: {
|
|
545
|
-
displayForm: identifier,
|
|
546
|
-
in: {
|
|
547
|
-
values: [""],
|
|
548
|
-
},
|
|
549
|
-
},
|
|
550
|
-
},
|
|
551
|
-
],
|
|
552
|
-
};
|
|
553
|
-
}
|
|
554
|
-
}
|
|
555
|
-
return { filters: [] };
|
|
520
|
+
/**
|
|
521
|
+
* `empty_values` is the date filter's own `emptyValueHandling`, as on dashboard filters. Insights saved
|
|
522
|
+
* before carried the mode as a separate attribute filter on the single empty string value instead; that
|
|
523
|
+
* representation is still read (see `processConnectedAttributeFilters`), never written.
|
|
524
|
+
*/
|
|
525
|
+
function dateFilterEmptyValueHandling(filter) {
|
|
526
|
+
const { empty_values } = filter;
|
|
527
|
+
return empty_values === "include" || empty_values === "exclude" || empty_values === "only"
|
|
528
|
+
? { emptyValueHandling: empty_values }
|
|
529
|
+
: {};
|
|
556
530
|
}
|
|
557
531
|
function dateFilterWithFieldToDeclarative(entities, filter, assignFilterLocalId) {
|
|
558
532
|
if (!filter.with) {
|
|
@@ -575,6 +549,24 @@ function yamlRelativeDateFilterToDeclarative(entities, filter, assignFilterLocal
|
|
|
575
549
|
granularity: convertGranularity(filter.granularity),
|
|
576
550
|
from: filter.from,
|
|
577
551
|
to: filter.to,
|
|
552
|
+
...dateFilterEmptyValueHandling(filter),
|
|
553
|
+
},
|
|
554
|
+
},
|
|
555
|
+
],
|
|
556
|
+
});
|
|
557
|
+
}
|
|
558
|
+
else if (filter.empty_values) {
|
|
559
|
+
// All time carrying an empty values mode is the real All time filter, the one the execution
|
|
560
|
+
// sends and AD stores for it
|
|
561
|
+
result = mergeDeclarativeResults(result, {
|
|
562
|
+
filters: [
|
|
563
|
+
{
|
|
564
|
+
relativeDateFilter: {
|
|
565
|
+
dataSet: identifier,
|
|
566
|
+
granularity: "ALL_TIME_GRANULARITY",
|
|
567
|
+
from: 0,
|
|
568
|
+
to: 0,
|
|
569
|
+
...dateFilterEmptyValueHandling(filter),
|
|
578
570
|
},
|
|
579
571
|
},
|
|
580
572
|
],
|
|
@@ -587,14 +579,12 @@ function yamlRelativeDateFilterToDeclarative(entities, filter, assignFilterLocal
|
|
|
587
579
|
relativeDateFilter: {
|
|
588
580
|
dataSet: identifier,
|
|
589
581
|
// This is not compliant with the types from gdc-model, but this is what AD emits for an all time filter.
|
|
590
|
-
// AD actually cannot understand an ALL_TIME_GRANULARITY granularity.
|
|
591
582
|
granularity: convertGranularity("YEAR"),
|
|
592
583
|
},
|
|
593
584
|
},
|
|
594
585
|
],
|
|
595
586
|
});
|
|
596
587
|
}
|
|
597
|
-
result = mergeDeclarativeResults(result, dateFilterEmptyValuesToDeclarative(filter));
|
|
598
588
|
result = mergeDeclarativeResults(result, dateFilterWithFieldToDeclarative(entities, filter, assignFilterLocalId));
|
|
599
589
|
return result;
|
|
600
590
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-code-convertors",
|
|
3
|
-
"version": "11.65.0
|
|
3
|
+
"version": "11.65.0",
|
|
4
4
|
"description": "GoodData AAC declarative converters",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "GoodData",
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"uuid": "11.1.1",
|
|
28
28
|
"yaml": "2.8.3",
|
|
29
|
-
"@gooddata/sdk-code-schemas": "11.65.0
|
|
30
|
-
"@gooddata/
|
|
31
|
-
"@gooddata/
|
|
29
|
+
"@gooddata/sdk-code-schemas": "11.65.0",
|
|
30
|
+
"@gooddata/api-client-tiger": "11.65.0",
|
|
31
|
+
"@gooddata/sdk-model": "11.65.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@microsoft/api-extractor": "7.59.2",
|
|
@@ -48,8 +48,8 @@
|
|
|
48
48
|
"oxlint-tsgolint": "7.0.2001",
|
|
49
49
|
"typescript": "7.0.2",
|
|
50
50
|
"vitest": "5.0.4",
|
|
51
|
-
"@gooddata/eslint-config": "11.65.0
|
|
52
|
-
"@gooddata/oxlint-config": "11.65.0
|
|
51
|
+
"@gooddata/eslint-config": "11.65.0",
|
|
52
|
+
"@gooddata/oxlint-config": "11.65.0"
|
|
53
53
|
},
|
|
54
54
|
"scripts": {
|
|
55
55
|
"_phase:build": "npm run build",
|