QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add currencies controls in control panels (#24718)

Browse Source
This commit is contained in:
Kamil Gabryjelski
2023-08-02 19:22:45 +02:00
committed by Michael S. Molina
parent dfd699f440
commit 10e781d0ff
63 changed files with 697 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
View File

@@ -142,6 +142,7 @@ export default function PivotTableChart(props: PivotTableProps) {
rowTotals,
rowSubTotals,
valueFormat,
currencyFormat,
emitCrossFilters,
setDataMask,
selectedFilters,
@@ -157,8 +158,14 @@ export default function PivotTableChart(props: PivotTableProps) {
const theme = useTheme();
const defaultFormatter = useMemo(
() => getNumberFormatter(valueFormat),
[valueFormat],
() =>
currencyFormat?.symbol
? new CurrencyFormatter({
currency: currencyFormat,
d3Format: valueFormat,
})
: getNumberFormatter(valueFormat),
[valueFormat, currencyFormat],
);
const customFormatsArray = useMemo(
() =>
@@ -170,9 +177,9 @@ export default function PivotTableChart(props: PivotTableProps) {
).map(metricName => [
metricName,
columnFormats[metricName] || valueFormat,
currencyFormats[metricName],
currencyFormats[metricName] || currencyFormat,
]),
[columnFormats, currencyFormats, valueFormat],
[columnFormats, currencyFormat, currencyFormats, valueFormat],
);
const hasCustomMetricFormatters = customFormatsArray.length > 0;
const metricFormatters = useMemo(

1
superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.tsx
View File

@@ -296,6 +296,7 @@ const config: ControlPanelConfig = {
},
},
],
['currency_format'],
[
{
name: 'date_format',

2
superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts
View File

@@ -104,6 +104,7 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
metricsLayout,
conditionalFormatting,
timeGrainSqla,
currencyFormat,
} = formData;
const { selectedFilters } = filterState;
const granularity = extractTimegrain(rawFormData);
@@ -161,6 +162,7 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
rowTotals,
rowSubTotals,
valueFormat,
currencyFormat,
emitCrossFilters,
setDataMask,
selectedFilters,

1
superset-frontend/plugins/plugin-chart-pivot-table/src/types.ts
View File

@@ -67,6 +67,7 @@ interface PivotTableCustomizeProps {
rowTotals: boolean;
rowSubTotals: boolean;
valueFormat: string;
currencyFormat: Currency;
setDataMask: SetDataMaskHook;
emitCrossFilters?: boolean;
selectedFilters?: SelectedFiltersType;

1
superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts
View File

@@ -54,6 +54,7 @@ const formData: PivotTableQueryFormData = {
margin: 0,
time_grain_sqla: TimeGranularity.MONTH,
temporal_columns_lookup: { col1: true },
currencyFormat: { symbol: 'USD', symbolPosition: 'prefix' },
};
test('should build groupby with series in form data', () => {

2
superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
View File

@@ -45,6 +45,7 @@ describe('PivotTableChart transformProps', () => {
dateFormat: '',
legacy_order_by: 'count',
order_desc: true,
currencyFormat: { symbol: 'USD', symbolPosition: 'prefix' },
};
const chartProps = new ChartProps<QueryFormData>({
formData,
@@ -91,6 +92,7 @@ describe('PivotTableChart transformProps', () => {
emitCrossFilters: false,
columnFormats: {},
currencyFormats: {},
currencyFormat: { symbol: 'USD', symbolPosition: 'prefix' },
});
});
});