@gooddata/sdk-code-convertors 11.68.0-alpha.0 → 11.68.0-alpha.1
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/configs/barChart.d.ts +5 -46
- package/esm/configs/barChart.d.ts.map +1 -1
- package/esm/configs/barChart.js +9 -2
- package/esm/configs/columnChart.d.ts +5 -46
- package/esm/configs/columnChart.d.ts.map +1 -1
- package/esm/configs/columnChart.js +9 -2
- package/esm/configs/lineChart.d.ts +5 -46
- package/esm/configs/lineChart.d.ts.map +1 -1
- package/esm/configs/lineChart.js +9 -2
- package/esm/configs/secondaryAxis.d.ts +43 -0
- package/esm/configs/secondaryAxis.d.ts.map +1 -0
- package/esm/configs/secondaryAxis.js +62 -0
- package/esm/configs/utils.d.ts +2 -1
- package/esm/configs/utils.d.ts.map +1 -1
- package/esm/from/declarativeVisualisationToYaml.d.ts.map +1 -1
- package/esm/from/declarativeVisualisationToYaml.js +17 -3
- package/esm/index.d.ts +1 -0
- package/esm/index.d.ts.map +1 -1
- package/esm/sdk-code-convertors.d.ts +29 -135
- package/esm/to/yamlVisualisationToDeclarative.js +3 -3
- package/esm/validateDeclarativePublisherEntityV2.d.ts.map +1 -1
- package/esm/validateDeclarativePublisherEntityV2.js +35 -6
- package/package.json +6 -6
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
1
|
+
import type { Bucket, Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
2
|
+
import { type SecondaryAxisProperties } from "./secondaryAxis.js";
|
|
2
3
|
import { type ChartFillType, type ColorMapping, type ICustomTooltip, type PatternFillName } from "./types.js";
|
|
3
4
|
import { type ConfigDefaults, type VisualisationConfig } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
@@ -40,6 +41,7 @@ export type BarChartConfigProperties = {
|
|
|
40
41
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
41
42
|
visible: boolean;
|
|
42
43
|
};
|
|
44
|
+
secondary_xaxis: SecondaryAxisProperties;
|
|
43
45
|
grid: {
|
|
44
46
|
enabled: boolean;
|
|
45
47
|
};
|
|
@@ -55,7 +57,7 @@ export declare const BAR_CHART_DEFAULTS: ConfigDefaults<BarChartConfigProperties
|
|
|
55
57
|
/** @internal */
|
|
56
58
|
export declare function barChartLoad(props: VisualisationConfig<BarChartConfigProperties>): import("yaml").Pair<import("yaml").Scalar<string>, any> | null;
|
|
57
59
|
/** @internal */
|
|
58
|
-
export declare function barChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
60
|
+
export declare function barChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
59
61
|
colorMapping: ColorMapping[] | undefined;
|
|
60
62
|
dataLabels: {
|
|
61
63
|
totalsVisible: "auto" | boolean | undefined;
|
|
@@ -93,6 +95,7 @@ export declare function barChartSave(_fields: Visualisation["query"]["fields"] |
|
|
|
93
95
|
visible: boolean | undefined;
|
|
94
96
|
labelsEnabled: boolean | undefined;
|
|
95
97
|
} | undefined;
|
|
98
|
+
secondary_xaxis: SecondaryAxisProperties | undefined;
|
|
96
99
|
grid: {
|
|
97
100
|
enabled: boolean | undefined;
|
|
98
101
|
} | undefined;
|
|
@@ -102,50 +105,6 @@ export declare function barChartSave(_fields: Visualisation["query"]["fields"] |
|
|
|
102
105
|
disableScheduledExports: boolean | undefined;
|
|
103
106
|
disableKeyDriveAnalysisOn: {
|
|
104
107
|
[k: string]: boolean;
|
|
105
|
-
} | {
|
|
106
|
-
[k: string]: boolean;
|
|
107
|
-
} | {
|
|
108
|
-
[k: string]: boolean;
|
|
109
|
-
} | {
|
|
110
|
-
[k: string]: boolean;
|
|
111
|
-
} | {
|
|
112
|
-
[k: string]: boolean;
|
|
113
|
-
} | {
|
|
114
|
-
[k: string]: boolean;
|
|
115
|
-
} | {
|
|
116
|
-
[k: string]: boolean;
|
|
117
|
-
} | {
|
|
118
|
-
[k: string]: boolean;
|
|
119
|
-
} | {
|
|
120
|
-
[k: string]: boolean;
|
|
121
|
-
} | {
|
|
122
|
-
[k: string]: boolean;
|
|
123
|
-
} | {
|
|
124
|
-
[k: string]: boolean;
|
|
125
|
-
} | {
|
|
126
|
-
[k: string]: boolean;
|
|
127
|
-
} | {
|
|
128
|
-
[k: string]: boolean;
|
|
129
|
-
} | {
|
|
130
|
-
[k: string]: boolean;
|
|
131
|
-
} | {
|
|
132
|
-
[k: string]: boolean;
|
|
133
|
-
} | {
|
|
134
|
-
[k: string]: boolean;
|
|
135
|
-
} | {
|
|
136
|
-
[k: string]: boolean;
|
|
137
|
-
} | {
|
|
138
|
-
[k: string]: boolean;
|
|
139
|
-
} | {
|
|
140
|
-
[k: string]: boolean;
|
|
141
|
-
} | {
|
|
142
|
-
[k: string]: boolean;
|
|
143
|
-
} | {
|
|
144
|
-
[k: string]: boolean;
|
|
145
|
-
} | {
|
|
146
|
-
[k: string]: boolean;
|
|
147
|
-
} | {
|
|
148
|
-
[k: string]: boolean;
|
|
149
108
|
} | undefined;
|
|
150
109
|
customTooltip: ICustomTooltip | undefined;
|
|
151
110
|
} | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"barChart.d.ts","sourceRoot":"","sources":["../../src/configs/barChart.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"barChart.d.ts","sourceRoot":"","sources":["../../src/configs/barChart.ts"],"names":[],"mappings":"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"}
|
package/esm/configs/barChart.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// (C) 2023-2026 GoodData Corporation
|
|
2
2
|
import { DEFAULT_CUSTOM_TOOLTIP, loadChartFill, loadColorMapping, loadCustomTooltip, loadDisableKda, saveChartFill, saveColorMapping, saveCustomTooltip, } from "../utils/configUtils.js";
|
|
3
|
+
import { SECONDARY_AXIS_DEFAULTS, loadSecondaryAxis, saveSecondaryAxis, } from "./secondaryAxis.js";
|
|
3
4
|
import { getValueOrDefault, loadConfig, saveConfigObject, } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
5
6
|
const DEFAULTS = {
|
|
@@ -39,6 +40,7 @@ const DEFAULTS = {
|
|
|
39
40
|
rotation: "auto",
|
|
40
41
|
visible: true,
|
|
41
42
|
},
|
|
43
|
+
secondary_xaxis: SECONDARY_AXIS_DEFAULTS,
|
|
42
44
|
grid: {
|
|
43
45
|
enabled: true,
|
|
44
46
|
},
|
|
@@ -127,6 +129,8 @@ export function barChartLoad(props) {
|
|
|
127
129
|
],
|
|
128
130
|
];
|
|
129
131
|
}
|
|
132
|
+
case "secondary_xaxis":
|
|
133
|
+
return [...loadSecondaryAxis(value, "xaxis_secondary")];
|
|
130
134
|
case "grid": {
|
|
131
135
|
return [["grid_enabled", getValueOrDefault(value.enabled, DEFAULTS.grid.enabled, "bool")]];
|
|
132
136
|
}
|
|
@@ -155,8 +159,10 @@ export function barChartLoad(props) {
|
|
|
155
159
|
});
|
|
156
160
|
}
|
|
157
161
|
/** @internal */
|
|
158
|
-
export function barChartSave(_fields,
|
|
159
|
-
|
|
162
|
+
export function barChartSave(_fields, inputConfig, metrics = []) {
|
|
163
|
+
const config = inputConfig ?? {};
|
|
164
|
+
const secondaryXAxis = saveSecondaryAxis(config, "xaxis_secondary", metrics);
|
|
165
|
+
if (!inputConfig && !secondaryXAxis) {
|
|
160
166
|
return undefined;
|
|
161
167
|
}
|
|
162
168
|
return saveConfigObject({
|
|
@@ -194,6 +200,7 @@ export function barChartSave(_fields, config) {
|
|
|
194
200
|
visible: getValueOrDefault(config.yaxis_visible, DEFAULTS.yaxis.visible, "bool"),
|
|
195
201
|
labelsEnabled: getValueOrDefault(config.yaxis_labels, DEFAULTS.yaxis.labelsEnabled, "bool"),
|
|
196
202
|
}),
|
|
203
|
+
secondary_xaxis: secondaryXAxis,
|
|
197
204
|
grid: saveConfigObject({
|
|
198
205
|
enabled: getValueOrDefault(config.grid_enabled, DEFAULTS.grid.enabled, "bool"),
|
|
199
206
|
}),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
1
|
+
import type { Bucket, Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
2
|
+
import { type SecondaryAxisProperties } from "./secondaryAxis.js";
|
|
2
3
|
import { type ChartFillType, type ColorMapping, type ICustomTooltip, type PatternFillName } from "./types.js";
|
|
3
4
|
import { type ConfigDefaults, type VisualisationConfig } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
@@ -40,6 +41,7 @@ export type ColumnChartConfigProperties = {
|
|
|
40
41
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
41
42
|
visible: boolean;
|
|
42
43
|
};
|
|
44
|
+
secondary_yaxis: SecondaryAxisProperties;
|
|
43
45
|
grid: {
|
|
44
46
|
enabled: boolean;
|
|
45
47
|
};
|
|
@@ -55,7 +57,7 @@ export declare const COLUMN_CHART_DEFAULTS: ConfigDefaults<ColumnChartConfigProp
|
|
|
55
57
|
/** @internal */
|
|
56
58
|
export declare function columnChartLoad(props: VisualisationConfig<ColumnChartConfigProperties>): import("yaml").Pair<import("yaml").Scalar<string>, any> | null;
|
|
57
59
|
/** @internal */
|
|
58
|
-
export declare function columnChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
60
|
+
export declare function columnChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
59
61
|
colorMapping: ColorMapping[] | undefined;
|
|
60
62
|
dataLabels: {
|
|
61
63
|
totalsVisible: "auto" | boolean | undefined;
|
|
@@ -93,6 +95,7 @@ export declare function columnChartSave(_fields: Visualisation["query"]["fields"
|
|
|
93
95
|
visible: boolean | undefined;
|
|
94
96
|
labelsEnabled: boolean | undefined;
|
|
95
97
|
} | undefined;
|
|
98
|
+
secondary_yaxis: SecondaryAxisProperties | undefined;
|
|
96
99
|
grid: {
|
|
97
100
|
enabled: boolean | undefined;
|
|
98
101
|
} | undefined;
|
|
@@ -102,50 +105,6 @@ export declare function columnChartSave(_fields: Visualisation["query"]["fields"
|
|
|
102
105
|
disableScheduledExports: boolean | undefined;
|
|
103
106
|
disableKeyDriveAnalysisOn: {
|
|
104
107
|
[k: string]: boolean;
|
|
105
|
-
} | {
|
|
106
|
-
[k: string]: boolean;
|
|
107
|
-
} | {
|
|
108
|
-
[k: string]: boolean;
|
|
109
|
-
} | {
|
|
110
|
-
[k: string]: boolean;
|
|
111
|
-
} | {
|
|
112
|
-
[k: string]: boolean;
|
|
113
|
-
} | {
|
|
114
|
-
[k: string]: boolean;
|
|
115
|
-
} | {
|
|
116
|
-
[k: string]: boolean;
|
|
117
|
-
} | {
|
|
118
|
-
[k: string]: boolean;
|
|
119
|
-
} | {
|
|
120
|
-
[k: string]: boolean;
|
|
121
|
-
} | {
|
|
122
|
-
[k: string]: boolean;
|
|
123
|
-
} | {
|
|
124
|
-
[k: string]: boolean;
|
|
125
|
-
} | {
|
|
126
|
-
[k: string]: boolean;
|
|
127
|
-
} | {
|
|
128
|
-
[k: string]: boolean;
|
|
129
|
-
} | {
|
|
130
|
-
[k: string]: boolean;
|
|
131
|
-
} | {
|
|
132
|
-
[k: string]: boolean;
|
|
133
|
-
} | {
|
|
134
|
-
[k: string]: boolean;
|
|
135
|
-
} | {
|
|
136
|
-
[k: string]: boolean;
|
|
137
|
-
} | {
|
|
138
|
-
[k: string]: boolean;
|
|
139
|
-
} | {
|
|
140
|
-
[k: string]: boolean;
|
|
141
|
-
} | {
|
|
142
|
-
[k: string]: boolean;
|
|
143
|
-
} | {
|
|
144
|
-
[k: string]: boolean;
|
|
145
|
-
} | {
|
|
146
|
-
[k: string]: boolean;
|
|
147
|
-
} | {
|
|
148
|
-
[k: string]: boolean;
|
|
149
108
|
} | undefined;
|
|
150
109
|
customTooltip: ICustomTooltip | undefined;
|
|
151
110
|
} | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnChart.d.ts","sourceRoot":"","sources":["../../src/configs/columnChart.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"columnChart.d.ts","sourceRoot":"","sources":["../../src/configs/columnChart.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// (C) 2023-2026 GoodData Corporation
|
|
2
2
|
import { DEFAULT_CUSTOM_TOOLTIP, loadChartFill, loadColorMapping, loadCustomTooltip, loadDisableKda, saveChartFill, saveColorMapping, saveCustomTooltip, } from "../utils/configUtils.js";
|
|
3
|
+
import { SECONDARY_AXIS_DEFAULTS, loadSecondaryAxis, saveSecondaryAxis, } from "./secondaryAxis.js";
|
|
3
4
|
import { getValueOrDefault, loadConfig, saveConfigObject, } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
5
6
|
const DEFAULTS = {
|
|
@@ -39,6 +40,7 @@ const DEFAULTS = {
|
|
|
39
40
|
rotation: "auto",
|
|
40
41
|
visible: false,
|
|
41
42
|
},
|
|
43
|
+
secondary_yaxis: SECONDARY_AXIS_DEFAULTS,
|
|
42
44
|
grid: {
|
|
43
45
|
enabled: true,
|
|
44
46
|
},
|
|
@@ -127,6 +129,8 @@ export function columnChartLoad(props) {
|
|
|
127
129
|
["yaxis_visible", getValueOrDefault(value.visible, DEFAULTS.yaxis.visible, "bool")],
|
|
128
130
|
];
|
|
129
131
|
}
|
|
132
|
+
case "secondary_yaxis":
|
|
133
|
+
return [...loadSecondaryAxis(value, "yaxis_secondary")];
|
|
130
134
|
case "grid": {
|
|
131
135
|
return [["grid_enabled", getValueOrDefault(value.enabled, DEFAULTS.grid.enabled, "bool")]];
|
|
132
136
|
}
|
|
@@ -155,8 +159,10 @@ export function columnChartLoad(props) {
|
|
|
155
159
|
});
|
|
156
160
|
}
|
|
157
161
|
/** @internal */
|
|
158
|
-
export function columnChartSave(_fields,
|
|
159
|
-
|
|
162
|
+
export function columnChartSave(_fields, inputConfig, metrics = []) {
|
|
163
|
+
const config = inputConfig ?? {};
|
|
164
|
+
const secondaryYAxis = saveSecondaryAxis(config, "yaxis_secondary", metrics);
|
|
165
|
+
if (!inputConfig && !secondaryYAxis) {
|
|
160
166
|
return undefined;
|
|
161
167
|
}
|
|
162
168
|
return saveConfigObject({
|
|
@@ -194,6 +200,7 @@ export function columnChartSave(_fields, config) {
|
|
|
194
200
|
visible: getValueOrDefault(config.yaxis_visible, DEFAULTS.yaxis.visible, "bool"),
|
|
195
201
|
labelsEnabled: getValueOrDefault(config.yaxis_labels, DEFAULTS.yaxis.labelsEnabled, "bool"),
|
|
196
202
|
}),
|
|
203
|
+
secondary_yaxis: secondaryYAxis,
|
|
197
204
|
grid: saveConfigObject({
|
|
198
205
|
enabled: getValueOrDefault(config.grid_enabled, DEFAULTS.grid.enabled, "bool"),
|
|
199
206
|
}),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
1
|
+
import type { Bucket, Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
2
|
+
import { type SecondaryAxisProperties } from "./secondaryAxis.js";
|
|
2
3
|
import { type ColorMapping, type ICustomTooltip, type LineStyleMapping, type PointShapeSymbol } from "./types.js";
|
|
3
4
|
import { type ConfigDefaults, type VisualisationConfig } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
@@ -43,6 +44,7 @@ export type LineChartConfigProperties = {
|
|
|
43
44
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
44
45
|
visible: boolean;
|
|
45
46
|
};
|
|
47
|
+
secondary_yaxis: SecondaryAxisProperties;
|
|
46
48
|
grid: {
|
|
47
49
|
enabled: boolean;
|
|
48
50
|
};
|
|
@@ -74,7 +76,7 @@ export declare const LINE_CHART_DEFAULTS: ConfigDefaults<LineChartConfigProperti
|
|
|
74
76
|
/** @internal */
|
|
75
77
|
export declare function lineChartLoad(props: VisualisationConfig<LineChartConfigProperties>): import("yaml").Pair<import("yaml").Scalar<string>, any> | null;
|
|
76
78
|
/** @internal */
|
|
77
|
-
export declare function lineChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
79
|
+
export declare function lineChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
78
80
|
colorMapping: ColorMapping[] | undefined;
|
|
79
81
|
continuousLine: {
|
|
80
82
|
enabled: boolean | undefined;
|
|
@@ -115,6 +117,7 @@ export declare function lineChartSave(_fields: Visualisation["query"]["fields"]
|
|
|
115
117
|
visible: boolean | undefined;
|
|
116
118
|
labelsEnabled: boolean | undefined;
|
|
117
119
|
} | undefined;
|
|
120
|
+
secondary_yaxis: SecondaryAxisProperties | undefined;
|
|
118
121
|
grid: {
|
|
119
122
|
enabled: boolean | undefined;
|
|
120
123
|
} | undefined;
|
|
@@ -136,50 +139,6 @@ export declare function lineChartSave(_fields: Visualisation["query"]["fields"]
|
|
|
136
139
|
disableScheduledExports: boolean | undefined;
|
|
137
140
|
disableKeyDriveAnalysisOn: {
|
|
138
141
|
[k: string]: boolean;
|
|
139
|
-
} | {
|
|
140
|
-
[k: string]: boolean;
|
|
141
|
-
} | {
|
|
142
|
-
[k: string]: boolean;
|
|
143
|
-
} | {
|
|
144
|
-
[k: string]: boolean;
|
|
145
|
-
} | {
|
|
146
|
-
[k: string]: boolean;
|
|
147
|
-
} | {
|
|
148
|
-
[k: string]: boolean;
|
|
149
|
-
} | {
|
|
150
|
-
[k: string]: boolean;
|
|
151
|
-
} | {
|
|
152
|
-
[k: string]: boolean;
|
|
153
|
-
} | {
|
|
154
|
-
[k: string]: boolean;
|
|
155
|
-
} | {
|
|
156
|
-
[k: string]: boolean;
|
|
157
|
-
} | {
|
|
158
|
-
[k: string]: boolean;
|
|
159
|
-
} | {
|
|
160
|
-
[k: string]: boolean;
|
|
161
|
-
} | {
|
|
162
|
-
[k: string]: boolean;
|
|
163
|
-
} | {
|
|
164
|
-
[k: string]: boolean;
|
|
165
|
-
} | {
|
|
166
|
-
[k: string]: boolean;
|
|
167
|
-
} | {
|
|
168
|
-
[k: string]: boolean;
|
|
169
|
-
} | {
|
|
170
|
-
[k: string]: boolean;
|
|
171
|
-
} | {
|
|
172
|
-
[k: string]: boolean;
|
|
173
|
-
} | {
|
|
174
|
-
[k: string]: boolean;
|
|
175
|
-
} | {
|
|
176
|
-
[k: string]: boolean;
|
|
177
|
-
} | {
|
|
178
|
-
[k: string]: boolean;
|
|
179
|
-
} | {
|
|
180
|
-
[k: string]: boolean;
|
|
181
|
-
} | {
|
|
182
|
-
[k: string]: boolean;
|
|
183
142
|
} | undefined;
|
|
184
143
|
customTooltip: ICustomTooltip | undefined;
|
|
185
144
|
thresholdMeasures: string[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineChart.d.ts","sourceRoot":"","sources":["../../src/configs/lineChart.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"lineChart.d.ts","sourceRoot":"","sources":["../../src/configs/lineChart.ts"],"names":[],"mappings":"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"}
|
package/esm/configs/lineChart.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// (C) 2023-2026 GoodData Corporation
|
|
2
2
|
import { DEFAULT_CUSTOM_TOOLTIP, loadColorMapping, loadCustomTooltip, loadDisableKda, loadLineStyleMapping, saveColorMapping, saveCustomTooltip, saveLineStyleMapping, } from "../utils/configUtils.js";
|
|
3
|
+
import { SECONDARY_AXIS_DEFAULTS, loadSecondaryAxis, saveSecondaryAxis, } from "./secondaryAxis.js";
|
|
3
4
|
import { getValueOrDefault, loadConfig, saveConfigObject, } from "./utils.js";
|
|
4
5
|
/** @internal */
|
|
5
6
|
const DEFAULTS = {
|
|
@@ -42,6 +43,7 @@ const DEFAULTS = {
|
|
|
42
43
|
rotation: "auto",
|
|
43
44
|
visible: true,
|
|
44
45
|
},
|
|
46
|
+
secondary_yaxis: SECONDARY_AXIS_DEFAULTS,
|
|
45
47
|
grid: {
|
|
46
48
|
enabled: true,
|
|
47
49
|
},
|
|
@@ -153,6 +155,8 @@ export function lineChartLoad(props) {
|
|
|
153
155
|
],
|
|
154
156
|
];
|
|
155
157
|
}
|
|
158
|
+
case "secondary_yaxis":
|
|
159
|
+
return [...loadSecondaryAxis(value, "yaxis_secondary")];
|
|
156
160
|
case "grid": {
|
|
157
161
|
return [["grid_enabled", getValueOrDefault(value.enabled, DEFAULTS.grid.enabled, "bool")]];
|
|
158
162
|
}
|
|
@@ -229,8 +233,10 @@ export function lineChartLoad(props) {
|
|
|
229
233
|
});
|
|
230
234
|
}
|
|
231
235
|
/** @internal */
|
|
232
|
-
export function lineChartSave(_fields,
|
|
233
|
-
|
|
236
|
+
export function lineChartSave(_fields, inputConfig, metrics = []) {
|
|
237
|
+
const config = inputConfig ?? {};
|
|
238
|
+
const secondaryYAxis = saveSecondaryAxis(config, "yaxis_secondary", metrics);
|
|
239
|
+
if (!inputConfig && !secondaryYAxis) {
|
|
234
240
|
return undefined;
|
|
235
241
|
}
|
|
236
242
|
return saveConfigObject({
|
|
@@ -275,6 +281,7 @@ export function lineChartSave(_fields, config) {
|
|
|
275
281
|
visible: getValueOrDefault(config.yaxis_visible, DEFAULTS.yaxis.visible, "bool"),
|
|
276
282
|
labelsEnabled: getValueOrDefault(config.yaxis_labels, DEFAULTS.yaxis.labelsEnabled, "bool"),
|
|
277
283
|
}),
|
|
284
|
+
secondary_yaxis: secondaryYAxis,
|
|
278
285
|
grid: saveConfigObject({
|
|
279
286
|
enabled: getValueOrDefault(config.grid_enabled, DEFAULTS.grid.enabled, "bool"),
|
|
280
287
|
}),
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { Bucket, Visualisation } from "@gooddata/sdk-code-schemas/v1";
|
|
2
|
+
import { type ConfigDefaults, type ConfigEntry } from "./utils.js";
|
|
3
|
+
/**
|
|
4
|
+
* Secondary axis of a dual-axis line, column or bar chart. It is the right axis of line and column
|
|
5
|
+
* charts (`secondary_yaxis`) and the top axis of bar charts (`secondary_xaxis`).
|
|
6
|
+
*
|
|
7
|
+
* @internal
|
|
8
|
+
*/
|
|
9
|
+
export type SecondaryAxisProperties = {
|
|
10
|
+
measures: string[];
|
|
11
|
+
format: "inherit" | "auto";
|
|
12
|
+
max: number | string;
|
|
13
|
+
min: number | string;
|
|
14
|
+
name: {
|
|
15
|
+
visible: boolean;
|
|
16
|
+
position: "center" | "left" | "right" | "auto";
|
|
17
|
+
};
|
|
18
|
+
labelsEnabled: boolean;
|
|
19
|
+
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
20
|
+
visible: boolean;
|
|
21
|
+
};
|
|
22
|
+
/** @internal */
|
|
23
|
+
export declare const SECONDARY_AXIS_DEFAULTS: ConfigDefaults<SecondaryAxisProperties>;
|
|
24
|
+
/**
|
|
25
|
+
* Prefix of the AAC config keys that hold the secondary axis settings.
|
|
26
|
+
*/
|
|
27
|
+
type SecondaryAxisConfigPrefix = "yaxis_secondary" | "xaxis_secondary";
|
|
28
|
+
/**
|
|
29
|
+
* Converts the stored secondary axis settings to AAC config entries. The measures on the axis are not
|
|
30
|
+
* part of the config, they are expressed as `axis: secondary` on the metrics instead.
|
|
31
|
+
*
|
|
32
|
+
* @internal
|
|
33
|
+
*/
|
|
34
|
+
export declare function loadSecondaryAxis(value: Partial<SecondaryAxisProperties>, prefix: SecondaryAxisConfigPrefix): ConfigEntry[];
|
|
35
|
+
/**
|
|
36
|
+
* Builds the stored secondary axis settings from the AAC config and from the metrics marked with
|
|
37
|
+
* `axis: secondary`.
|
|
38
|
+
*
|
|
39
|
+
* @internal
|
|
40
|
+
*/
|
|
41
|
+
export declare function saveSecondaryAxis(config: NonNullable<Visualisation["config"]>, prefix: SecondaryAxisConfigPrefix, metrics?: Bucket[]): SecondaryAxisProperties | undefined;
|
|
42
|
+
export {};
|
|
43
|
+
//# sourceMappingURL=secondaryAxis.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secondaryAxis.d.ts","sourceRoot":"","sources":["../../src/configs/secondaryAxis.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI3E,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAuC,MAAM,YAAY,CAAC;AAExG;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,EAAE;QACF,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;KAClD,CAAC;IACF,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC;IAC5C,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,uBAAuB,EAAE,cAAc,CAAC,uBAAuB,CAY3E,CAAC;AAEF;;GAEG;AACH,KAAK,yBAAyB,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAEvE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,OAAO,CAAC,uBAAuB,CAAC,EACvC,MAAM,EAAE,yBAAyB,GAClC,WAAW,EAAE,CAYf;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAC5C,MAAM,EAAE,yBAAyB,EACjC,OAAO,GAAE,MAAM,EAAO,GACvB,uBAAuB,GAAG,SAAS,CAoBrC"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
// (C) 2026 GoodData Corporation
|
|
2
|
+
import { getFullBucket } from "../utils/sharedUtils.js";
|
|
3
|
+
import { getValueOrDefault, saveConfigObject } from "./utils.js";
|
|
4
|
+
/** @internal */
|
|
5
|
+
export const SECONDARY_AXIS_DEFAULTS = {
|
|
6
|
+
measures: [],
|
|
7
|
+
format: "auto",
|
|
8
|
+
max: "",
|
|
9
|
+
min: "",
|
|
10
|
+
name: {
|
|
11
|
+
visible: true,
|
|
12
|
+
position: "auto",
|
|
13
|
+
},
|
|
14
|
+
labelsEnabled: true,
|
|
15
|
+
rotation: "auto",
|
|
16
|
+
visible: true,
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Converts the stored secondary axis settings to AAC config entries. The measures on the axis are not
|
|
20
|
+
* part of the config, they are expressed as `axis: secondary` on the metrics instead.
|
|
21
|
+
*
|
|
22
|
+
* @internal
|
|
23
|
+
*/
|
|
24
|
+
export function loadSecondaryAxis(value, prefix) {
|
|
25
|
+
const defaults = SECONDARY_AXIS_DEFAULTS;
|
|
26
|
+
return [
|
|
27
|
+
[`${prefix}_format`, getValueOrDefault(value.format, defaults.format)],
|
|
28
|
+
[`${prefix}_max`, getValueOrDefault(value.max, defaults.max, "number")],
|
|
29
|
+
[`${prefix}_min`, getValueOrDefault(value.min, defaults.min, "number")],
|
|
30
|
+
[`${prefix}_name_position`, getValueOrDefault(value.name?.position, defaults.name.position)],
|
|
31
|
+
[`${prefix}_name_visible`, getValueOrDefault(value.name?.visible, defaults.name.visible, "bool")],
|
|
32
|
+
[`${prefix}_rotation`, getValueOrDefault(value.rotation, defaults.rotation)],
|
|
33
|
+
[`${prefix}_visible`, getValueOrDefault(value.visible, defaults.visible, "bool")],
|
|
34
|
+
[`${prefix}_labels`, getValueOrDefault(value.labelsEnabled, defaults.labelsEnabled, "bool")],
|
|
35
|
+
];
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Builds the stored secondary axis settings from the AAC config and from the metrics marked with
|
|
39
|
+
* `axis: secondary`.
|
|
40
|
+
*
|
|
41
|
+
* @internal
|
|
42
|
+
*/
|
|
43
|
+
export function saveSecondaryAxis(config, prefix, metrics = []) {
|
|
44
|
+
const defaults = SECONDARY_AXIS_DEFAULTS;
|
|
45
|
+
const measures = metrics
|
|
46
|
+
.map(getFullBucket)
|
|
47
|
+
.filter((bucket) => bucket.axis === "secondary" && bucket.field)
|
|
48
|
+
.map((bucket) => bucket.field);
|
|
49
|
+
return saveConfigObject({
|
|
50
|
+
measures: measures.length > 0 ? measures : undefined,
|
|
51
|
+
format: getValueOrDefault(config[`${prefix}_format`], defaults.format),
|
|
52
|
+
max: getValueOrDefault(config[`${prefix}_max`], defaults.max),
|
|
53
|
+
min: getValueOrDefault(config[`${prefix}_min`], defaults.min),
|
|
54
|
+
name: saveConfigObject({
|
|
55
|
+
position: getValueOrDefault(config[`${prefix}_name_position`], defaults.name.position),
|
|
56
|
+
visible: getValueOrDefault(config[`${prefix}_name_visible`], defaults.name.visible, "bool"),
|
|
57
|
+
}),
|
|
58
|
+
rotation: getValueOrDefault(config[`${prefix}_rotation`], defaults.rotation),
|
|
59
|
+
visible: getValueOrDefault(config[`${prefix}_visible`], defaults.visible, "bool"),
|
|
60
|
+
labelsEnabled: getValueOrDefault(config[`${prefix}_labels`], defaults.labelsEnabled, "bool"),
|
|
61
|
+
});
|
|
62
|
+
}
|
package/esm/configs/utils.d.ts
CHANGED
|
@@ -21,7 +21,8 @@ type KnownKeys<T> = {
|
|
|
21
21
|
[K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
|
|
22
22
|
};
|
|
23
23
|
type YamlConfig = KnownKeys<NonNullable<Visualisation["config"]>>;
|
|
24
|
-
|
|
24
|
+
/** @internal */
|
|
25
|
+
export type ConfigEntry = {
|
|
25
26
|
[K in keyof YamlConfig]-?: [key: K, value: unknown];
|
|
26
27
|
}[keyof YamlConfig];
|
|
27
28
|
type LoaderArgs<T> = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/configs/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAInE,cAAc;AACd,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACjC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAChB,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC3B,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,cAAc;AACd,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAE7E,cAAc;AACd,wBAAgB,iBAAiB,CAAC,CAAC,EAC/B,KAAK,EAAE,CAAC,EACR,YAAY,EAAE,CAAC,EACf,IAAI,GAAE,SAAoB,EAC1B,kBAAkB,GAAE,OAAe,GACpC,CAAC,GAAG,SAAS,CAuBf;AAED;;;;GAIG;AACH,KAAK,SAAS,CAAC,CAAC,IAAI;KACf,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClF,CAAC;AACF,KAAK,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAClE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/configs/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAInE,cAAc;AACd,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACjC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAChB,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC3B,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,cAAc;AACd,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAE7E,cAAc;AACd,wBAAgB,iBAAiB,CAAC,CAAC,EAC/B,KAAK,EAAE,CAAC,EACR,YAAY,EAAE,CAAC,EACf,IAAI,GAAE,SAAoB,EAC1B,kBAAkB,GAAE,OAAe,GACpC,CAAC,GAAG,SAAS,CAuBf;AAED;;;;GAIG;AACH,KAAK,SAAS,CAAC,CAAC,IAAI;KACf,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClF,CAAC;AACF,KAAK,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAClE,gBAAgB;AAChB,MAAM,MAAM,WAAW,GAAG;KAAG,CAAC,IAAI,MAAM,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC;CAAE,CAAC,MAAM,UAAU,CAAC,CAAC;AACpG,KAAK,UAAU,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AAExE,wBAAgB,UAAU,CAAC,CAAC,EACxB,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAC7B,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,mDAyBpD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,CAUpF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarativeVisualisationToYaml.d.ts","sourceRoot":"","sources":["../../src/from/declarativeVisualisationToYaml.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"declarativeVisualisationToYaml.d.ts","sourceRoot":"","sources":["../../src/from/declarativeVisualisationToYaml.ts"],"names":[],"mappings":"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"}
|
|
@@ -611,7 +611,7 @@ function declarativeVisTableToYaml(doc, def, report, _context) {
|
|
|
611
611
|
}
|
|
612
612
|
function declarativeVisBarToYaml(doc, def, report, _errorContext) {
|
|
613
613
|
//buckets
|
|
614
|
-
const metrics = report.buckets.consume(BucketsType.Measures);
|
|
614
|
+
const metrics = addSecondaryAxisToGroup(report.buckets.consume(BucketsType.Measures), def.properties, "secondary_xaxis");
|
|
615
615
|
if (metrics && metrics.items.length > 0) {
|
|
616
616
|
doc.add(entryWithSpace("metrics", groupToYaml(metrics)));
|
|
617
617
|
}
|
|
@@ -630,7 +630,7 @@ function declarativeVisBarToYaml(doc, def, report, _errorContext) {
|
|
|
630
630
|
}
|
|
631
631
|
function declarativeVisColumnToYaml(doc, def, report, _errorContext) {
|
|
632
632
|
//buckets
|
|
633
|
-
const metrics = report.buckets.consume(BucketsType.Measures);
|
|
633
|
+
const metrics = addSecondaryAxisToGroup(report.buckets.consume(BucketsType.Measures), def.properties, "secondary_yaxis");
|
|
634
634
|
if (metrics && metrics.items.length > 0) {
|
|
635
635
|
doc.add(entryWithSpace("metrics", groupToYaml(metrics)));
|
|
636
636
|
}
|
|
@@ -649,7 +649,7 @@ function declarativeVisColumnToYaml(doc, def, report, _errorContext) {
|
|
|
649
649
|
}
|
|
650
650
|
function declarativeVisLineToYaml(doc, def, report, _errorContext) {
|
|
651
651
|
//buckets
|
|
652
|
-
const metrics = report.buckets.consume(BucketsType.Measures);
|
|
652
|
+
const metrics = addSecondaryAxisToGroup(report.buckets.consume(BucketsType.Measures), def.properties, "secondary_yaxis");
|
|
653
653
|
if (metrics && metrics.items.length > 0) {
|
|
654
654
|
doc.add(entryWithSpace("metrics", groupToYaml(metrics)));
|
|
655
655
|
}
|
|
@@ -1105,6 +1105,20 @@ function groupToYaml(group) {
|
|
|
1105
1105
|
return map;
|
|
1106
1106
|
});
|
|
1107
1107
|
}
|
|
1108
|
+
/**
|
|
1109
|
+
* Marks the metrics that are listed in the stored secondary axis measures with `axis: secondary`.
|
|
1110
|
+
* Line and column charts keep these measures in `secondary_yaxis`, bar charts in `secondary_xaxis`.
|
|
1111
|
+
*/
|
|
1112
|
+
function addSecondaryAxisToGroup(group, properties, axisKey) {
|
|
1113
|
+
const measures = properties?.["controls"]?.[axisKey]?.measures;
|
|
1114
|
+
if (!group || !Array.isArray(measures) || measures.length === 0) {
|
|
1115
|
+
return group;
|
|
1116
|
+
}
|
|
1117
|
+
return {
|
|
1118
|
+
...group,
|
|
1119
|
+
items: group.items.map((item) => item && measures.includes(item.field) ? { ...item, axis: "secondary" } : item),
|
|
1120
|
+
};
|
|
1121
|
+
}
|
|
1108
1122
|
function addAxisTypeToGroup(group, axis) {
|
|
1109
1123
|
if (!group) {
|
|
1110
1124
|
return undefined;
|
package/esm/index.d.ts
CHANGED
|
@@ -55,6 +55,7 @@ export { geoChart, geoChartLoad, geoChartSave, GEO_CHART_DEFAULTS, type IGeoChar
|
|
|
55
55
|
export { geoAreaChart, geoAreaChartLoad, geoAreaChartSave, GEO_AREA_CHART_DEFAULTS, type IGeoAreaChartConfig, type GeoAreaChartConfigProperties, } from "./configs/geoAreaChart.js";
|
|
56
56
|
export { repeaterChart, repeaterChartLoad, repeaterChartSave, REPEATER_CHART_DEFAULTS, saveInlineVisualizations, type IRepeaterChartConfig, type RepeaterChartConfigProperties, type InlineVisualizations, } from "./configs/repeaterChart.js";
|
|
57
57
|
export type { IChartFill as ChartFill, ChartFillType, ColorMapping, LineStyleMapping, ColumnLocator, ColumnWidth, ColumnWidthItem, ICustomTooltip as CustomTooltip, CustomTooltipPlacement, IAbsoluteColumnWidth, IAllMeasureColumnWidthItem, IAllMeasureColumnWidthItemBody, IAttributeColumnLocator, IAttributeColumnLocatorBody, IAttributeColumnWidthItem, IAttributeColumnWidthItemBody, IAutoColumnWidth, IMeasureColumnLocator, IMeasureColumnLocatorBody, IMeasureColumnWidthItem, IMeasureColumnWidthItemBody, IMixedValuesColumnWidthItem, IMixedValuesColumnWidthItemBody, ISliceMeasureColumnWidthItem, ISliceMeasureColumnWidthItemBody, ITotalColumnLocator, ITotalColumnLocatorBody, IWeakMeasureColumnWidthItem, IWeakMeasureColumnWidthItemBody, PatternFillName, PointShapeSymbol, } from "./configs/types.js";
|
|
58
|
+
export type { SecondaryAxisProperties } from "./configs/secondaryAxis.js";
|
|
58
59
|
export { getValueOrDefault, type ConfigDefaults, type VisualisationConfig, type ValueType, } from "./configs/utils.js";
|
|
59
60
|
export { generateFileName, resolveIdFromFileName, type FileNamesUsed } from "./utils/nameUtils.js";
|
|
60
61
|
export { assertUnreachable, type FilePath, type FullFields } from "./utils/sharedUtils.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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"}
|
|
@@ -437,6 +437,7 @@ export declare type BarChartConfigProperties = {
|
|
|
437
437
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
438
438
|
visible: boolean;
|
|
439
439
|
};
|
|
440
|
+
secondary_xaxis: SecondaryAxisProperties;
|
|
440
441
|
grid: {
|
|
441
442
|
enabled: boolean;
|
|
442
443
|
};
|
|
@@ -452,7 +453,7 @@ export declare type BarChartConfigProperties = {
|
|
|
452
453
|
export declare function barChartLoad(props: VisualisationConfig<BarChartConfigProperties>): Pair<Scalar<string>, any> | null;
|
|
453
454
|
|
|
454
455
|
/** @internal */
|
|
455
|
-
export declare function barChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
456
|
+
export declare function barChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
456
457
|
colorMapping: ColorMapping[] | undefined;
|
|
457
458
|
dataLabels: {
|
|
458
459
|
totalsVisible: "auto" | boolean | undefined;
|
|
@@ -490,6 +491,7 @@ export declare function barChartSave(_fields: Visualisation["query"]["fields"] |
|
|
|
490
491
|
visible: boolean | undefined;
|
|
491
492
|
labelsEnabled: boolean | undefined;
|
|
492
493
|
} | undefined;
|
|
494
|
+
secondary_xaxis: SecondaryAxisProperties | undefined;
|
|
493
495
|
grid: {
|
|
494
496
|
enabled: boolean | undefined;
|
|
495
497
|
} | undefined;
|
|
@@ -499,50 +501,6 @@ export declare function barChartSave(_fields: Visualisation["query"]["fields"] |
|
|
|
499
501
|
disableScheduledExports: boolean | undefined;
|
|
500
502
|
disableKeyDriveAnalysisOn: {
|
|
501
503
|
[k: string]: boolean;
|
|
502
|
-
} | {
|
|
503
|
-
[k: string]: boolean;
|
|
504
|
-
} | {
|
|
505
|
-
[k: string]: boolean;
|
|
506
|
-
} | {
|
|
507
|
-
[k: string]: boolean;
|
|
508
|
-
} | {
|
|
509
|
-
[k: string]: boolean;
|
|
510
|
-
} | {
|
|
511
|
-
[k: string]: boolean;
|
|
512
|
-
} | {
|
|
513
|
-
[k: string]: boolean;
|
|
514
|
-
} | {
|
|
515
|
-
[k: string]: boolean;
|
|
516
|
-
} | {
|
|
517
|
-
[k: string]: boolean;
|
|
518
|
-
} | {
|
|
519
|
-
[k: string]: boolean;
|
|
520
|
-
} | {
|
|
521
|
-
[k: string]: boolean;
|
|
522
|
-
} | {
|
|
523
|
-
[k: string]: boolean;
|
|
524
|
-
} | {
|
|
525
|
-
[k: string]: boolean;
|
|
526
|
-
} | {
|
|
527
|
-
[k: string]: boolean;
|
|
528
|
-
} | {
|
|
529
|
-
[k: string]: boolean;
|
|
530
|
-
} | {
|
|
531
|
-
[k: string]: boolean;
|
|
532
|
-
} | {
|
|
533
|
-
[k: string]: boolean;
|
|
534
|
-
} | {
|
|
535
|
-
[k: string]: boolean;
|
|
536
|
-
} | {
|
|
537
|
-
[k: string]: boolean;
|
|
538
|
-
} | {
|
|
539
|
-
[k: string]: boolean;
|
|
540
|
-
} | {
|
|
541
|
-
[k: string]: boolean;
|
|
542
|
-
} | {
|
|
543
|
-
[k: string]: boolean;
|
|
544
|
-
} | {
|
|
545
|
-
[k: string]: boolean;
|
|
546
504
|
} | undefined;
|
|
547
505
|
customTooltip: CustomTooltip | undefined;
|
|
548
506
|
} | undefined;
|
|
@@ -964,6 +922,7 @@ export declare type ColumnChartConfigProperties = {
|
|
|
964
922
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
965
923
|
visible: boolean;
|
|
966
924
|
};
|
|
925
|
+
secondary_yaxis: SecondaryAxisProperties;
|
|
967
926
|
grid: {
|
|
968
927
|
enabled: boolean;
|
|
969
928
|
};
|
|
@@ -979,7 +938,7 @@ export declare type ColumnChartConfigProperties = {
|
|
|
979
938
|
export declare function columnChartLoad(props: VisualisationConfig<ColumnChartConfigProperties>): Pair<Scalar<string>, any> | null;
|
|
980
939
|
|
|
981
940
|
/** @internal */
|
|
982
|
-
export declare function columnChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
941
|
+
export declare function columnChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
983
942
|
colorMapping: ColorMapping[] | undefined;
|
|
984
943
|
dataLabels: {
|
|
985
944
|
totalsVisible: "auto" | boolean | undefined;
|
|
@@ -1017,6 +976,7 @@ export declare function columnChartSave(_fields: Visualisation["query"]["fields"
|
|
|
1017
976
|
visible: boolean | undefined;
|
|
1018
977
|
labelsEnabled: boolean | undefined;
|
|
1019
978
|
} | undefined;
|
|
979
|
+
secondary_yaxis: SecondaryAxisProperties | undefined;
|
|
1020
980
|
grid: {
|
|
1021
981
|
enabled: boolean | undefined;
|
|
1022
982
|
} | undefined;
|
|
@@ -1026,50 +986,6 @@ export declare function columnChartSave(_fields: Visualisation["query"]["fields"
|
|
|
1026
986
|
disableScheduledExports: boolean | undefined;
|
|
1027
987
|
disableKeyDriveAnalysisOn: {
|
|
1028
988
|
[k: string]: boolean;
|
|
1029
|
-
} | {
|
|
1030
|
-
[k: string]: boolean;
|
|
1031
|
-
} | {
|
|
1032
|
-
[k: string]: boolean;
|
|
1033
|
-
} | {
|
|
1034
|
-
[k: string]: boolean;
|
|
1035
|
-
} | {
|
|
1036
|
-
[k: string]: boolean;
|
|
1037
|
-
} | {
|
|
1038
|
-
[k: string]: boolean;
|
|
1039
|
-
} | {
|
|
1040
|
-
[k: string]: boolean;
|
|
1041
|
-
} | {
|
|
1042
|
-
[k: string]: boolean;
|
|
1043
|
-
} | {
|
|
1044
|
-
[k: string]: boolean;
|
|
1045
|
-
} | {
|
|
1046
|
-
[k: string]: boolean;
|
|
1047
|
-
} | {
|
|
1048
|
-
[k: string]: boolean;
|
|
1049
|
-
} | {
|
|
1050
|
-
[k: string]: boolean;
|
|
1051
|
-
} | {
|
|
1052
|
-
[k: string]: boolean;
|
|
1053
|
-
} | {
|
|
1054
|
-
[k: string]: boolean;
|
|
1055
|
-
} | {
|
|
1056
|
-
[k: string]: boolean;
|
|
1057
|
-
} | {
|
|
1058
|
-
[k: string]: boolean;
|
|
1059
|
-
} | {
|
|
1060
|
-
[k: string]: boolean;
|
|
1061
|
-
} | {
|
|
1062
|
-
[k: string]: boolean;
|
|
1063
|
-
} | {
|
|
1064
|
-
[k: string]: boolean;
|
|
1065
|
-
} | {
|
|
1066
|
-
[k: string]: boolean;
|
|
1067
|
-
} | {
|
|
1068
|
-
[k: string]: boolean;
|
|
1069
|
-
} | {
|
|
1070
|
-
[k: string]: boolean;
|
|
1071
|
-
} | {
|
|
1072
|
-
[k: string]: boolean;
|
|
1073
989
|
} | undefined;
|
|
1074
990
|
customTooltip: CustomTooltip | undefined;
|
|
1075
991
|
} | undefined;
|
|
@@ -2984,6 +2900,7 @@ export declare type LineChartConfigProperties = {
|
|
|
2984
2900
|
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
2985
2901
|
visible: boolean;
|
|
2986
2902
|
};
|
|
2903
|
+
secondary_yaxis: SecondaryAxisProperties;
|
|
2987
2904
|
grid: {
|
|
2988
2905
|
enabled: boolean;
|
|
2989
2906
|
};
|
|
@@ -3015,7 +2932,7 @@ export declare type LineChartConfigProperties = {
|
|
|
3015
2932
|
export declare function lineChartLoad(props: VisualisationConfig<LineChartConfigProperties>): Pair<Scalar<string>, any> | null;
|
|
3016
2933
|
|
|
3017
2934
|
/** @internal */
|
|
3018
|
-
export declare function lineChartSave(_fields: Visualisation["query"]["fields"] | undefined,
|
|
2935
|
+
export declare function lineChartSave(_fields: Visualisation["query"]["fields"] | undefined, inputConfig: Visualisation["config"] | undefined, metrics?: Bucket[]): {
|
|
3019
2936
|
colorMapping: ColorMapping[] | undefined;
|
|
3020
2937
|
continuousLine: {
|
|
3021
2938
|
enabled: boolean | undefined;
|
|
@@ -3056,6 +2973,7 @@ export declare function lineChartSave(_fields: Visualisation["query"]["fields"]
|
|
|
3056
2973
|
visible: boolean | undefined;
|
|
3057
2974
|
labelsEnabled: boolean | undefined;
|
|
3058
2975
|
} | undefined;
|
|
2976
|
+
secondary_yaxis: SecondaryAxisProperties | undefined;
|
|
3059
2977
|
grid: {
|
|
3060
2978
|
enabled: boolean | undefined;
|
|
3061
2979
|
} | undefined;
|
|
@@ -3077,50 +2995,6 @@ export declare function lineChartSave(_fields: Visualisation["query"]["fields"]
|
|
|
3077
2995
|
disableScheduledExports: boolean | undefined;
|
|
3078
2996
|
disableKeyDriveAnalysisOn: {
|
|
3079
2997
|
[k: string]: boolean;
|
|
3080
|
-
} | {
|
|
3081
|
-
[k: string]: boolean;
|
|
3082
|
-
} | {
|
|
3083
|
-
[k: string]: boolean;
|
|
3084
|
-
} | {
|
|
3085
|
-
[k: string]: boolean;
|
|
3086
|
-
} | {
|
|
3087
|
-
[k: string]: boolean;
|
|
3088
|
-
} | {
|
|
3089
|
-
[k: string]: boolean;
|
|
3090
|
-
} | {
|
|
3091
|
-
[k: string]: boolean;
|
|
3092
|
-
} | {
|
|
3093
|
-
[k: string]: boolean;
|
|
3094
|
-
} | {
|
|
3095
|
-
[k: string]: boolean;
|
|
3096
|
-
} | {
|
|
3097
|
-
[k: string]: boolean;
|
|
3098
|
-
} | {
|
|
3099
|
-
[k: string]: boolean;
|
|
3100
|
-
} | {
|
|
3101
|
-
[k: string]: boolean;
|
|
3102
|
-
} | {
|
|
3103
|
-
[k: string]: boolean;
|
|
3104
|
-
} | {
|
|
3105
|
-
[k: string]: boolean;
|
|
3106
|
-
} | {
|
|
3107
|
-
[k: string]: boolean;
|
|
3108
|
-
} | {
|
|
3109
|
-
[k: string]: boolean;
|
|
3110
|
-
} | {
|
|
3111
|
-
[k: string]: boolean;
|
|
3112
|
-
} | {
|
|
3113
|
-
[k: string]: boolean;
|
|
3114
|
-
} | {
|
|
3115
|
-
[k: string]: boolean;
|
|
3116
|
-
} | {
|
|
3117
|
-
[k: string]: boolean;
|
|
3118
|
-
} | {
|
|
3119
|
-
[k: string]: boolean;
|
|
3120
|
-
} | {
|
|
3121
|
-
[k: string]: boolean;
|
|
3122
|
-
} | {
|
|
3123
|
-
[k: string]: boolean;
|
|
3124
2998
|
} | undefined;
|
|
3125
2999
|
customTooltip: CustomTooltip | undefined;
|
|
3126
3000
|
thresholdMeasures: string[] | undefined;
|
|
@@ -4002,6 +3876,26 @@ export declare function scatterChartSave(_fields: Visualisation["query"]["fields
|
|
|
4002
3876
|
customTooltip: CustomTooltip | undefined;
|
|
4003
3877
|
} | undefined;
|
|
4004
3878
|
|
|
3879
|
+
/**
|
|
3880
|
+
* Secondary axis of a dual-axis line, column or bar chart. It is the right axis of line and column
|
|
3881
|
+
* charts (`secondary_yaxis`) and the top axis of bar charts (`secondary_xaxis`).
|
|
3882
|
+
*
|
|
3883
|
+
* @internal
|
|
3884
|
+
*/
|
|
3885
|
+
export declare type SecondaryAxisProperties = {
|
|
3886
|
+
measures: string[];
|
|
3887
|
+
format: "inherit" | "auto";
|
|
3888
|
+
max: number | string;
|
|
3889
|
+
min: number | string;
|
|
3890
|
+
name: {
|
|
3891
|
+
visible: boolean;
|
|
3892
|
+
position: "center" | "left" | "right" | "auto";
|
|
3893
|
+
};
|
|
3894
|
+
labelsEnabled: boolean;
|
|
3895
|
+
rotation: "0" | "30" | "60" | "90" | "auto";
|
|
3896
|
+
visible: boolean;
|
|
3897
|
+
};
|
|
3898
|
+
|
|
4005
3899
|
/**
|
|
4006
3900
|
* @internal
|
|
4007
3901
|
* @deprecated Use tableLoad and tableSave instead.
|
|
@@ -84,13 +84,13 @@ function yamlConfigToDeclarative(def, positions) {
|
|
|
84
84
|
controls = table.save(def.query?.fields, def.config);
|
|
85
85
|
break;
|
|
86
86
|
case "bar_chart":
|
|
87
|
-
controls = barChart.save(def.query?.fields, def.config);
|
|
87
|
+
controls = barChart.save(def.query?.fields, def.config, def.metrics);
|
|
88
88
|
break;
|
|
89
89
|
case "column_chart":
|
|
90
|
-
controls = columnChart.save(def.query?.fields, def.config);
|
|
90
|
+
controls = columnChart.save(def.query?.fields, def.config, def.metrics);
|
|
91
91
|
break;
|
|
92
92
|
case "line_chart":
|
|
93
|
-
controls = lineChart.save(def.query?.fields, def.config);
|
|
93
|
+
controls = lineChart.save(def.query?.fields, def.config, def.metrics);
|
|
94
94
|
break;
|
|
95
95
|
case "area_chart":
|
|
96
96
|
controls = areaChart.save(def.query?.fields, def.config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDeclarativePublisherEntityV2.d.ts","sourceRoot":"","sources":["../src/validateDeclarativePublisherEntityV2.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,2BAA2B,EAKnC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"validateDeclarativePublisherEntityV2.d.ts","sourceRoot":"","sources":["../src/validateDeclarativePublisherEntityV2.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,2BAA2B,EAKnC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AA4KzF;;;;GAIG;AACH,wBAAgB,oDAAoD,CAChE,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,GACd,2BAA2B,EAAE,CAoB/B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oCAAoC,CAChD,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,gCAAgC,GACvC,2BAA2B,EAAE,CAE/B"}
|
|
@@ -9,6 +9,10 @@ const declarativeKeys = {
|
|
|
9
9
|
version: true,
|
|
10
10
|
period: true,
|
|
11
11
|
content: true,
|
|
12
|
+
createdAt: true,
|
|
13
|
+
createdBy: true,
|
|
14
|
+
modifiedAt: true,
|
|
15
|
+
modifiedBy: true,
|
|
12
16
|
}),
|
|
13
17
|
documentTemplate: keySet({
|
|
14
18
|
id: true,
|
|
@@ -31,6 +35,15 @@ const declarativeKeys = {
|
|
|
31
35
|
isDefault: true,
|
|
32
36
|
}),
|
|
33
37
|
};
|
|
38
|
+
// The backend sets these audit keys on a stored document. The sdk-model definition has them under
|
|
39
|
+
// other names, so they are renamed for its validator, and its issues are renamed back.
|
|
40
|
+
const auditKeyToModelKey = {
|
|
41
|
+
createdAt: "created",
|
|
42
|
+
createdBy: "createdBy",
|
|
43
|
+
modifiedAt: "updated",
|
|
44
|
+
modifiedBy: "updatedBy",
|
|
45
|
+
};
|
|
46
|
+
const modelKeyToAuditKey = Object.fromEntries(Object.entries(auditKeyToModelKey).map(([auditKey, modelKey]) => [modelKey, auditKey]));
|
|
34
47
|
const kinds = Object.keys(declarativeKeys);
|
|
35
48
|
function isKind(value) {
|
|
36
49
|
return typeof value === "string" && Object.hasOwn(declarativeKeys, value);
|
|
@@ -51,10 +64,19 @@ function keySet(keys) {
|
|
|
51
64
|
function isRecord(value) {
|
|
52
65
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
53
66
|
}
|
|
54
|
-
function
|
|
55
|
-
return
|
|
56
|
-
|
|
57
|
-
|
|
67
|
+
function renamedPath(path, from, to) {
|
|
68
|
+
return path === from || path.startsWith(`${from}.`) ? `${to}${path.slice(from.length)}` : undefined;
|
|
69
|
+
}
|
|
70
|
+
// An issue on the reference is reported on the id, and an issue on an audit key on its stored name.
|
|
71
|
+
function onStoredKeys(issue) {
|
|
72
|
+
const renames = [["ref", "id"], ...Object.entries(modelKeyToAuditKey)];
|
|
73
|
+
for (const [from, to] of renames) {
|
|
74
|
+
const path = renamedPath(issue.path, from, to);
|
|
75
|
+
if (path !== undefined) {
|
|
76
|
+
return { ...issue, path };
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return issue;
|
|
58
80
|
}
|
|
59
81
|
function unknownKeyIssues(entity, knownKeys) {
|
|
60
82
|
return Object.keys(entity)
|
|
@@ -92,7 +114,14 @@ function isBackendDefaultPageTemplate(entity, kind) {
|
|
|
92
114
|
// so it is validated without its reference; idIssues still checks the id itself.
|
|
93
115
|
function asDefinition(entity, kind) {
|
|
94
116
|
const { id, ...rest } = entity;
|
|
95
|
-
const known = Object.fromEntries(Object.entries(rest)
|
|
117
|
+
const known = Object.fromEntries(Object.entries(rest)
|
|
118
|
+
.filter(([key]) => declarativeKeys[kind].has(key))
|
|
119
|
+
// The api client allows a null audit date; the model leaves the key out instead.
|
|
120
|
+
.filter(([key, value]) => !(Object.hasOwn(auditKeyToModelKey, key) && value === null))
|
|
121
|
+
.map(([key, value]) => [
|
|
122
|
+
Object.hasOwn(auditKeyToModelKey, key) ? auditKeyToModelKey[key] : key,
|
|
123
|
+
value,
|
|
124
|
+
]));
|
|
96
125
|
const typed = { ...known, type: kind };
|
|
97
126
|
return isPublisherEntityIdV2(id) && !isBackendDefaultPageTemplate(entity, kind)
|
|
98
127
|
? { ...typed, ref: idRef(id) }
|
|
@@ -102,7 +131,7 @@ function issuesOfKind(entity, kind, knownKeys) {
|
|
|
102
131
|
return [
|
|
103
132
|
...unknownKeyIssues(entity, knownKeys),
|
|
104
133
|
...idIssues(entity["id"]),
|
|
105
|
-
...validatePublisherEntityV2(asDefinition(entity, kind)).map(
|
|
134
|
+
...validatePublisherEntityV2(asDefinition(entity, kind)).map(onStoredKeys),
|
|
106
135
|
];
|
|
107
136
|
}
|
|
108
137
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-code-convertors",
|
|
3
|
-
"version": "11.68.0-alpha.
|
|
3
|
+
"version": "11.68.0-alpha.1",
|
|
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.9.1",
|
|
29
|
-
"@gooddata/api-client-tiger": "11.68.0-alpha.
|
|
30
|
-
"@gooddata/sdk-
|
|
31
|
-
"@gooddata/sdk-
|
|
29
|
+
"@gooddata/api-client-tiger": "11.68.0-alpha.1",
|
|
30
|
+
"@gooddata/sdk-model": "11.68.0-alpha.1",
|
|
31
|
+
"@gooddata/sdk-code-schemas": "11.68.0-alpha.1"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@microsoft/api-extractor": "7.59.2",
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
"oxlint-tsgolint": "7.0.2001",
|
|
50
50
|
"typescript": "7.0.2",
|
|
51
51
|
"vitest": "5.0.4",
|
|
52
|
-
"@gooddata/
|
|
53
|
-
"@gooddata/
|
|
52
|
+
"@gooddata/oxlint-config": "11.68.0-alpha.1",
|
|
53
|
+
"@gooddata/eslint-config": "11.68.0-alpha.1"
|
|
54
54
|
},
|
|
55
55
|
"scripts": {
|
|
56
56
|
"_phase:build": "npm run build",
|