diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js deleted file mode 100644 index d31196b956..0000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -describe('Visualization > Dual Line', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const DUAL_LINE_FORM_DATA = { - datasource: '3__table', - viz_type: 'dual_line', - slice_id: 58, - granularity_sqla: 'ds', - time_grain_sqla: 'P1D', - time_range: '100 years ago : now', - color_scheme: 'bnbColors', - x_axis_format: 'smart_date', - metric: 'sum__num', - y_axis_format: '.3s', - metric_2: 'count', - y_axis_2_format: '.3s', - adhoc_filters: [], - annotation_layers: [], - }; - - function verify(formData) { - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - } - - it('should work', () => { - verify(DUAL_LINE_FORM_DATA); - cy.get('.chart-container svg path.nv-line').should('have.length', 2); - }); - - it('should work with filter', () => { - verify({ - ...DUAL_LINE_FORM_DATA, - adhoc_filters: [ - { - expressionType: 'SIMPLE', - subject: 'gender', - operator: '==', - comparator: 'girl', - clause: 'WHERE', - sqlExpression: null, - filterOptionName: 'filter_1ep6q50g8vk_48jj6qxdems', - }, - ], - }); - cy.get('.chart-container svg path.nv-line').should('have.length', 2); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - verify(DUAL_LINE_FORM_DATA); - - cy.get('#controlSections-tab-display').click(); - cy.get('.Control[data-test="color_scheme"]').scrollIntoView(); - cy.get('.Control[data-test="color_scheme"] input[type="search"]') - .focus() - .type('supersetColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="supersetColors"]', - ).should('exist'); - cy.get('.dual_line .nv-legend .nv-legend-symbol') - .first() - .should('have.css', 'fill', 'rgb(31, 168, 201)'); - }); -}); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx deleted file mode 100644 index 2320290297..0000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { DualLineChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new DualLineChartPlugin().configure({ key: 'dual-line' }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/DualLine', -}; - -export { basic } from './stories/basic'; -export { verifyConsistentColors } from './stories/verifyConsistentColors'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts deleted file mode 100644 index 6cc99c0fc9..0000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts +++ /dev/null @@ -1,390 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* eslint-disable sort-keys, no-magic-numbers */ -export default [ - { - key: 'avg__num', - classed: '', - values: [ - { - x: -157766400000.0, - y: 1435.6116838487972, - }, - { - x: -126230400000.0, - y: 1359.0295103957076, - }, - { - x: -94694400000.0, - y: 1291.0963777490297, - }, - { - x: -63158400000.0, - y: 1254.5405915670233, - }, - { - x: -31536000000.0, - y: 1244.9671332927571, - }, - { - x: 0.0, - y: 1248.7126843657818, - }, - { - x: 31536000000.0, - y: 1147.4195205479452, - }, - { - x: 63072000000.0, - y: 1036.6540632054175, - }, - { - x: 94694400000.0, - y: 980.8740906547285, - }, - { - x: 126230400000.0, - y: 971.1190345584201, - }, - { - x: 157766400000.0, - y: 947.5531453362256, - }, - { - x: 189302400000.0, - y: 962.4153005464481, - }, - { - x: 220924800000.0, - y: 1004.2832876712329, - }, - { - x: 252460800000.0, - y: 1000.6107784431138, - }, - { - x: 283996800000.0, - y: 1045.711965349215, - }, - { - x: 315532800000.0, - y: 1089.5097402597403, - }, - { - x: 347155200000.0, - y: 1094.7375201288244, - }, - { - x: 378691200000.0, - y: 1113.3569511540527, - }, - { - x: 410227200000.0, - y: 1117.585260892953, - }, - { - x: 441763200000.0, - y: 1117.1530230069557, - }, - { - x: 473385600000.0, - y: 1143.6297297297297, - }, - { - x: 504921600000.0, - y: 1131.3461538461538, - }, - { - x: 536457600000.0, - y: 1137.0865800865802, - }, - { - x: 567993600000.0, - y: 1144.3100483610963, - }, - { - x: 599616000000.0, - y: 1153.075821845175, - }, - { - x: 631152000000.0, - y: 1170.1328, - }, - { - x: 662688000000.0, - y: 1134.3757412398922, - }, - { - x: 694224000000.0, - y: 1102.478189749182, - }, - { - x: 725846400000.0, - y: 1065.1231527093596, - }, - { - x: 757382400000.0, - y: 1035.223574986165, - }, - { - x: 788918400000.0, - y: 997.9584026622297, - }, - { - x: 820454400000.0, - y: 976.4625698324022, - }, - { - x: 852076800000.0, - y: 953.0983698707139, - }, - { - x: 883612800000.0, - y: 961.3199079401611, - }, - { - x: 915148800000.0, - y: 962.3351032448378, - }, - { - x: 946684800000.0, - y: 967.1753012048192, - }, - { - x: 978307200000.0, - y: 955.8330218068536, - }, - { - x: 1009843200000.0, - y: 947.7684413085311, - }, - { - x: 1041379200000.0, - y: 951.2866622428667, - }, - { - x: 1072915200000.0, - y: 913.469184890656, - }, - { - x: 1104537600000.0, - y: 910.3797643797644, - }, - { - x: 1136073600000.0, - y: 910.0478229835832, - }, - { - x: 1167609600000.0, - y: 886.5323636363636, - }, - { - x: 1199145600000.0, - y: 854.5530769230769, - }, - ], - yAxis: 1, - type: 'line', - }, - { - key: 'sum__num', - classed: '', - values: [ - { - x: -157766400000.0, - y: 2088815, - }, - { - x: -126230400000.0, - y: 2026313, - }, - { - x: -94694400000.0, - y: 1996035, - }, - { - x: -63158400000.0, - y: 1993465, - }, - { - x: -31536000000.0, - y: 2045481, - }, - { - x: 0.0, - y: 2116568, - }, - { - x: 31536000000.0, - y: 2010279, - }, - { - x: 63072000000.0, - y: 1836951, - }, - { - x: 94694400000.0, - y: 1752822, - }, - { - x: 126230400000.0, - y: 1770350, - }, - { - x: 157766400000.0, - y: 1747288, - }, - { - x: 189302400000.0, - y: 1761220, - }, - { - x: 220924800000.0, - y: 1832817, - }, - { - x: 252460800000.0, - y: 1838122, - }, - { - x: 283996800000.0, - y: 1931430, - }, - { - x: 315532800000.0, - y: 2013414, - }, - { - x: 347155200000.0, - y: 2039496, - }, - { - x: 378691200000.0, - y: 2074184, - }, - { - x: 410227200000.0, - y: 2077591, - }, - { - x: 441763200000.0, - y: 2087959, - }, - { - x: 473385600000.0, - y: 2115715, - }, - { - x: 504921600000.0, - y: 2088465, - }, - { - x: 536457600000.0, - y: 2101336, - }, - { - x: 567993600000.0, - y: 2129561, - }, - { - x: 599616000000.0, - y: 2174701, - }, - { - x: 631152000000.0, - y: 2193999, - }, - { - x: 662688000000.0, - y: 2104267, - }, - { - x: 694224000000.0, - y: 2021945, - }, - { - x: 725846400000.0, - y: 1945980, - }, - { - x: 757382400000.0, - y: 1870649, - }, - { - x: 788918400000.0, - y: 1799319, - }, - { - x: 820454400000.0, - y: 1747868, - }, - { - x: 852076800000.0, - y: 1695562, - }, - { - x: 883612800000.0, - y: 1670774, - }, - { - x: 915148800000.0, - y: 1631158, - }, - { - x: 946684800000.0, - y: 1605511, - }, - { - x: 978307200000.0, - y: 1534112, - }, - { - x: 1009843200000.0, - y: 1477571, - }, - { - x: 1041379200000.0, - y: 1433589, - }, - { - x: 1072915200000.0, - y: 1378425, - }, - { - x: 1104537600000.0, - y: 1313678, - }, - { - x: 1136073600000.0, - y: 1274977, - }, - { - x: 1167609600000.0, - y: 1218982, - }, - { - x: 1199145600000.0, - y: 1110919, - }, - ], - yAxis: 2, - type: 'line', - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx deleted file mode 100644 index aa58980f54..0000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const basic = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx deleted file mode 100644 index 779332ba1c..0000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -const reverseData = data.map(series => ({ - ...series, - yAxis: series.yAxis === 1 ? 2 : 1, -})); - -export const verifyConsistentColors = () => ( -
- - -
-); - -verifyConsistentColors.story = { - name: 'Swap y-axis with consistent color', -}; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts deleted file mode 100644 index 94137d1aef..0000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { t } from '@superset-ui/core'; -import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; -import { - xAxisFormat, - yAxis2Format, - showLegend, - yAxisBounds, - yAxisShowMinmax, - yAxis2Bounds, - yAxis2ShowMinmax, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - sections.legacyTimeseriesTime, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [['color_scheme'], [showLegend], [xAxisFormat]], - }, - { - label: t('Y Axis 1'), - expanded: true, - controlSetRows: [ - ['metric'], - ['y_axis_format'], - [yAxisShowMinmax], - [yAxisBounds], - ], - }, - { - label: t('Y Axis 2'), - expanded: true, - controlSetRows: [ - ['metric_2'], - [yAxis2Format], - [yAxis2ShowMinmax], - [yAxis2Bounds], - ], - }, - { - label: t('Query'), - expanded: true, - controlSetRows: [['adhoc_filters']], - }, - sections.annotations, - ], - controlOverrides: { - metric: { - label: t('Left Axis Metric'), - description: t('Choose a metric for left axis'), - }, - y_axis_format: { - label: t('Left Axis Format'), - }, - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg deleted file mode 100644 index d8a13f67e8..0000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png deleted file mode 100644 index a62ecfbac4..0000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png deleted file mode 100644 index 3c11fe43a9..0000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js deleted file mode 100644 index 218e45f9cd..0000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import thumbnail from './images/thumbnail.png'; -import example from './images/example.jpg'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Evolution'), - credits: ['http://nvd3.org'], - description: t( - 'Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.', - ), - exampleGallery: [{ url: example }], - name: t('Dual Line Chart'), - tags: [t('Legacy'), t('nvd3')], - thumbnail, - useLegacyApi: true, -}); - -export default class DualLineChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js index 6e2725ad1c..f4051195c9 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js @@ -126,7 +126,6 @@ const BREAKPOINTS = { const TIMESERIES_VIZ_TYPES = [ 'line', - 'dual_line', 'line_multi', 'area', 'compare', @@ -201,7 +200,6 @@ const propTypes = { 'line_multi', 'time_pivot', 'pie', - 'dual_line', ]), xAxisFormat: PropTypes.string, numberFormat: PropTypes.string, @@ -401,7 +399,6 @@ function nvd3Vis(element, props) { chart.interpolate(lineInterpolation); break; - case 'dual_line': case 'line_multi': chart = nv.models.multiChart(); chart.interpolate(lineInterpolation); @@ -713,7 +710,7 @@ function nvd3Vis(element, props) { ); } - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const yAxisFormatter1 = getNumberFormatter(yAxisFormat); const yAxisFormatter2 = getNumberFormatter(yAxis2Format); chart.yAxis1.tickFormat(yAxisFormatter1); @@ -812,7 +809,7 @@ function nvd3Vis(element, props) { } // align yAxis1 and yAxis2 ticks - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const count = chart.yAxis1.ticks(); const ticks1 = chart.yAxis1 .scale() @@ -915,7 +912,7 @@ function nvd3Vis(element, props) { margins.bottom = 40; } - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const maxYAxis2LabelWidth = getMaxLabelSize(svg, 'nv-y2'); margins.right = maxYAxis2LabelWidth + marginPad; } diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js index 4156c5ca89..b8381294d7 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js @@ -25,7 +25,6 @@ export { default as BubbleChartPlugin } from './Bubble'; export { default as BulletChartPlugin } from './Bullet'; export { default as CompareChartPlugin } from './Compare'; export { default as DistBarChartPlugin } from './DistBar'; -export { default as DualLineChartPlugin } from './DualLine'; export { default as LineChartPlugin } from './Line'; export { default as LineMultiChartPlugin } from './LineMulti'; export { default as PieChartPlugin } from './Pie'; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js index cccb877ecd..f109a3af2d 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js @@ -24,7 +24,6 @@ import BubbleChartPlugin from './Bubble'; import BulletChartPlugin from './Bullet'; import CompareChartPlugin from './Compare'; import DistBarChartPlugin from './DistBar'; -import DualLineChartPlugin from './DualLine'; import LineChartPlugin from './Line'; import LineMultiChartPlugin from './LineMulti'; import PieChartPlugin from './Pie'; @@ -42,7 +41,6 @@ export default class NVD3ChartPreset extends Preset { new BulletChartPlugin().configure({ key: 'bullet' }), new CompareChartPlugin().configure({ key: 'compare' }), new DistBarChartPlugin().configure({ key: 'dist_bar' }), - new DualLineChartPlugin().configure({ key: 'dual_line' }), new LineChartPlugin().configure({ key: 'line' }), new LineMultiChartPlugin().configure({ key: 'line_multi' }), new PieChartPlugin().configure({ key: 'pie' }), diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js index 7fc8669e6d..cf54d4c9f7 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js @@ -65,7 +65,6 @@ export default function transformProps(chartProps) { lineInterpolation, maxBubbleSize, metric, - metric2, metrics = [], orderBars, pieLabelType, @@ -106,7 +105,6 @@ export default function transformProps(chartProps) { rangeLabels, ranges, yAxisFormat, - yAxis2Format, } = formData; const rawData = queriesData[0].data || []; @@ -119,9 +117,6 @@ export default function transformProps(chartProps) { if (vizType === 'pie') { numberFormat = numberFormat || grabD3Format(datasource, metric); - } else if (vizType === 'dual_line') { - yAxisFormat = yAxisFormat || grabD3Format(datasource, metric); - yAxis2Format = yAxis2Format || grabD3Format(datasource, metric2); } else if ( ['line', 'dist_bar', 'bar', 'area'].includes(chartProps.formData.vizType) ) { @@ -188,7 +183,6 @@ export default function transformProps(chartProps) { xIsLogScale: xLogScale, xTicksLayout, yAxisFormat, - yAxis2Format, yAxisBounds, yAxis2Bounds, yAxisLabel, diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx index 94eafbe261..db94d8da79 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx @@ -90,7 +90,6 @@ const DEFAULT_ORDER = [ 'deck_arc', 'heatmap', 'deck_grid', - 'dual_line', 'deck_screengrid', 'line_multi', 'treemap_v2', diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js index d62c12f82f..02c0e682ab 100644 --- a/superset-frontend/src/visualizations/presets/MainPreset.js +++ b/superset-frontend/src/visualizations/presets/MainPreset.js @@ -41,7 +41,6 @@ import { BulletChartPlugin, CompareChartPlugin, DistBarChartPlugin, - DualLineChartPlugin, LineChartPlugin, LineMultiChartPlugin, TimePivotChartPlugin, @@ -105,7 +104,6 @@ export default class MainPreset extends Preset { new CompareChartPlugin().configure({ key: 'compare' }), new CountryMapChartPlugin().configure({ key: 'country_map' }), new DistBarChartPlugin().configure({ key: 'dist_bar' }), - new DualLineChartPlugin().configure({ key: 'dual_line' }), new EventFlowChartPlugin().configure({ key: 'event_flow' }), new FilterBoxChartPlugin().configure({ key: 'filter_box' }), new EchartsFunnelChartPlugin().configure({ key: 'funnel' }), diff --git a/superset/examples/birth_names.py b/superset/examples/birth_names.py index 80324ce39c..8b09aa4bf2 100644 --- a/superset/examples/birth_names.py +++ b/superset/examples/birth_names.py @@ -388,20 +388,21 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Average and Sum Trends", - viz_type="dual_line", + viz_type="mixed_timeseries", params=get_slice_json( defaults, - viz_type="dual_line", - metric={ + viz_type="mixed_timeseries", + metrics={ "expressionType": "SIMPLE", "column": {"column_name": "num", "type": "BIGINT(20)"}, "aggregate": "AVG", "label": "AVG(num)", "optionName": "metric_vgops097wej_g8uff99zhk7", }, - metric_2="sum__num", + metrics_b="sum__num", granularity_sqla="ds", - metrics=metrics, + yAxisIndex=0, + yAxisIndexB=1, ), ), Slice( diff --git a/superset/migrations/shared/migrate_viz/processors.py b/superset/migrations/shared/migrate_viz/processors.py index 0766553785..1616154bf2 100644 --- a/superset/migrations/shared/migrate_viz/processors.py +++ b/superset/migrations/shared/migrate_viz/processors.py @@ -84,3 +84,22 @@ class MigratePivotTable(MigrateViz): if pandas_aggfunc := self.data.get("pandas_aggfunc"): self.data["pandas_aggfunc"] = self.aggregation_mapping[pandas_aggfunc] + + +class MigrateDualLine(MigrateViz): + source_viz_type = "dual_line" + target_viz_type = "mixed_timeseries" + rename_keys = { + "x_axis_format": "x_axis_time_format", + "y_axis_2_format": "y_axis_format_secondary", + "y_axis_2_bounds": "y_axis_bounds_secondary", + } + remove_keys = {"metric", "metric_2"} + + def _pre_action(self) -> None: + self.data["yAxisIndex"] = 0 + self.data["yAxisIndexB"] = 1 + self.data["adhoc_filters_b"] = self.data.get("adhoc_filters") + self.data["truncateYAxis"] = True + self.data["metrics"] = [self.data.get("metric")] + self.data["metrics_b"] = [self.data.get("metric_2")] diff --git a/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py b/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py new file mode 100644 index 0000000000..5d707dc601 --- /dev/null +++ b/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py @@ -0,0 +1,37 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""migrate_dual_line_to_mixed_chart + +Revision ID: ae58e1e58e5c +Revises: 4c5da39be729 +Create Date: 2023-06-08 11:34:36.241939 + +""" + +# revision identifiers, used by Alembic. +revision = "ae58e1e58e5c" +down_revision = "4c5da39be729" + +from superset.migrations.shared.migrate_viz.processors import MigrateDualLine + + +def upgrade(): + MigrateDualLine.upgrade() + + +def downgrade(): + MigrateDualLine.downgrade() diff --git a/superset/translations/de/LC_MESSAGES/messages.json b/superset/translations/de/LC_MESSAGES/messages.json index 1631ba0a88..459d26f98e 100644 --- a/superset/translations/de/LC_MESSAGES/messages.json +++ b/superset/translations/de/LC_MESSAGES/messages.json @@ -1175,9 +1175,6 @@ ], "Choose a database...": ["Wählen Sie eine Datenbank..."], "Choose a dataset": ["Datensatz auswählen"], - "Choose a metric for left axis": [ - "Wählen Sie eine Metrik für die linke Achse" - ], "Choose a metric for right axis": [ "Wählen Sie eine Metrik für die rechte Achse" ], @@ -2782,7 +2779,6 @@ "Least recently modified": ["Zuletzt geändert"], "Left": ["Links"], "Left Axis Format": ["Format der linken Achse"], - "Left Axis Metric": ["Metrik linke Achse"], "Left Axis chart(s)": ["Diagramm(e) der linken Achse"], "Left Margin": ["Linker Abstand"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3521,12 +3517,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Wählen Sie eine Granularität im Abschnitt Zeit aus oder deaktivieren Sie \"Zeit einschließen\"." ], - "Pick a metric for left axis!": [ - "Wählen Sie eine Metrik für die linke Achse!" - ], - "Pick a metric for right axis!": [ - "Wählen Sie eine Metrik für die rechte Achse!" - ], "Pick a metric for x, y and size": [ "Wählen Sie eine Metrik für x, y und Größe" ], @@ -5339,9 +5329,6 @@ "Time Ratio": ["Zeitverhältnis"], "Time Series": ["Zeitreihen"], "Time Series - Bar Chart": ["Zeitreihen - Balkendiagramm"], - "Time Series - Dual Axis Line Chart": [ - "Zeitreihen - Zweiachsen-Liniendiagramm" - ], "Time Series - Line Chart": ["Zeitreihen - Liniendiagramm"], "Time Series - Multiple Line Charts": [ "Zeitreihen - Diagramme mit mehreren Linien" @@ -5760,9 +5747,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Visualisieren Sie zwei verschiedene Zeitreihen mit derselben x-Achse. Beachten Sie, dass jede Zeitreihe unterschiedlich visualisiert werden kann (z. B. eine mit Balken und die andere mit einer Linie)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Visualisiert 2 Metriken als Liniendiagramme mit derselben x-Achse. Dieses Diagramm ist nützlich, um Metriken über den gleichen Zeitraum zu vergleichen." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Visualisiert eine Metrik über drei Datendimensionen in einem einzelnen Diagramm (X-Achse, Y-Achse und Blasengröße). Blasen aus derselben Gruppe können mit Blasenfarbe präsentiert werden." ], @@ -6078,8 +6062,6 @@ "Y AXIS TITLE MARGIN": ["Y-ACHSE TITEL RAND"], "Y AXIS TITLE POSITION": ["Y-ACHSE TITEL POSITION"], "Y Axis": ["Y-Achse"], - "Y Axis 1": ["Y-Achse 1"], - "Y Axis 2": ["Y-Achse 2"], "Y Axis 2 Bounds": ["Grenzen der Y-Achse 2"], "Y Axis Bounds": ["Grenzen der Y-Achse"], "Y Axis Format": ["Y-Achsenformat"], diff --git a/superset/translations/de/LC_MESSAGES/messages.po b/superset/translations/de/LC_MESSAGES/messages.po index add584cb2e..76a425a7a6 100644 --- a/superset/translations/de/LC_MESSAGES/messages.po +++ b/superset/translations/de/LC_MESSAGES/messages.po @@ -1422,7 +1422,7 @@ msgstr "Erweiterter Datentyp" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Erweiterte Analysen" @@ -1632,7 +1632,7 @@ msgstr "Gesamter Texte" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Alle Diagramme" @@ -3233,7 +3233,7 @@ msgid "Categories to group by on the x-axis." msgstr "Kategorien, nach denen auf der x-Achse gruppiert werden soll." #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Kategorie" @@ -3479,7 +3479,6 @@ msgstr "Diagramm-ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3759,10 +3758,6 @@ msgstr "Wählen Sie eine Datenbank..." msgid "Choose a dataset" msgstr "Datensatz auswählen" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Wählen Sie eine Metrik für die linke Achse" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6496,7 +6491,7 @@ msgstr "Alle Filterwerte dynamisch durchsuchen" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts" @@ -7081,7 +7076,6 @@ msgstr "Jeden" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7108,7 +7102,7 @@ msgstr "Genau" msgid "Example" msgstr "Beispiel" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Beispiele" @@ -9004,15 +8998,10 @@ msgstr "Zuletzt geändert" msgid "Left" msgstr "Links" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Format der linken Achse" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Metrik linke Achse" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "Diagramm(e) der linken Achse" @@ -9053,7 +9042,6 @@ msgstr "Linker Wert" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10356,7 +10344,7 @@ msgstr "Keine Datenbanktabellen gefunden" msgid "No databases match your search" msgstr "Keine Datenbanken stimmen mit Ihrer Suche überein" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Keine Beschreibung verfügbar." @@ -11762,7 +11750,7 @@ msgstr "Tab-Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Beliebt" @@ -12040,7 +12028,6 @@ msgstr "Abfragen" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12282,7 +12269,7 @@ msgstr "Kürzlich" msgid "Recipients are separated by \",\" or \";\"" msgstr "Empfänger werden durch \",\" oder \";\" getrennt." -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Empfohlene Tags" @@ -13486,7 +13473,7 @@ msgstr "Suchen / Filtern" msgid "Search Metrics & Columns" msgstr "Metriken & Spalten durchsuchen" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Alle Diagramm durchsuchen" @@ -15243,7 +15230,7 @@ msgstr "Getaggtes Object konnte nicht gelöscht werden." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -19135,14 +19122,6 @@ msgstr "Y-ACHSE TITEL POSITION" msgid "Y Axis" msgstr "Y-Achse" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y-Achse 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y-Achse 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Grenzen der Y-Achse 2" @@ -19364,7 +19343,7 @@ msgstr "" "Sie können den letzten Zeitfilter nicht löschen, da er für " "Zeitbereichsfilter in Dashboards verwendet wird." -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Sie können das 45°-Strich-Layout nicht zusammen mit dem " @@ -20418,7 +20397,6 @@ msgstr "Symbol für numerischen Typ" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/en/LC_MESSAGES/messages.json b/superset/translations/en/LC_MESSAGES/messages.json index 2c8a916d20..2bc6be87cf 100644 --- a/superset/translations/en/LC_MESSAGES/messages.json +++ b/superset/translations/en/LC_MESSAGES/messages.json @@ -808,7 +808,6 @@ "Choose a chart or dashboard not both": [""], "Choose a database...": [""], "Choose a dataset": [""], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose a source": [""], @@ -2007,7 +2006,6 @@ "Least recently modified": [""], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2528,8 +2526,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3833,7 +3829,6 @@ "Time Ratio": [""], "Time Series": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -4153,9 +4148,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4363,8 +4355,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/en/LC_MESSAGES/messages.po b/superset/translations/en/LC_MESSAGES/messages.po index 77f32f7638..2a47724366 100644 --- a/superset/translations/en/LC_MESSAGES/messages.po +++ b/superset/translations/en/LC_MESSAGES/messages.po @@ -1313,7 +1313,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1512,7 +1512,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -2986,7 +2986,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3226,7 +3226,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3490,10 +3489,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6035,7 +6030,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6606,7 +6601,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6633,7 +6627,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8414,15 +8408,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8463,7 +8452,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9715,7 +9703,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11021,7 +11009,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11294,7 +11282,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11528,7 +11515,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12675,7 +12662,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14347,7 +14334,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -16981,12 +16968,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17704,14 +17685,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17903,7 +17876,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18912,7 +18885,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/es/LC_MESSAGES/messages.json b/superset/translations/es/LC_MESSAGES/messages.json index e7d35fa75a..553b19b24b 100644 --- a/superset/translations/es/LC_MESSAGES/messages.json +++ b/superset/translations/es/LC_MESSAGES/messages.json @@ -2143,12 +2143,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Elige una granularidad en la sección de tiempo o desmarca 'Incluir tiempo'" ], - "Pick a metric for left axis!": [ - "Elige una métrica para el eje izquierdo!" - ], - "Pick a metric for right axis!": [ - "Elige una métrica para el eje derecho!" - ], "Pick a metric for x, y and size": [ "Elige una métrica para 'x', 'y' y 'tamaño'" ], @@ -3257,9 +3251,6 @@ "Thursday": ["Jueves"], "Time": ["Tiempo"], "Time Series - Bar Chart": ["Serie Temporal - Gráfico de Barras"], - "Time Series - Dual Axis Line Chart": [ - "Serie Temporal - Gráfico de líneas de doble eje" - ], "Time Series - Line Chart": ["Serie Temporal - Gráfico de Líneas"], "Time Series - Multiple Line Charts": [ "Serie temportal - Gráfico de múltiples líneas" @@ -3554,9 +3545,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3747,8 +3735,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Eje Y"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Formato Eje Y"], diff --git a/superset/translations/es/LC_MESSAGES/messages.po b/superset/translations/es/LC_MESSAGES/messages.po index 08f505b40d..487e1e3af0 100644 --- a/superset/translations/es/LC_MESSAGES/messages.po +++ b/superset/translations/es/LC_MESSAGES/messages.po @@ -1395,7 +1395,7 @@ msgstr "Datos cargados en caché" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Analíticos Avanzadas" @@ -1603,7 +1603,7 @@ msgstr "Todo el Texto" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Todos los gráficos" @@ -3183,7 +3183,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3437,7 +3437,6 @@ msgstr "ID de gráfico" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3719,11 +3718,6 @@ msgstr "Selecciona una base de datos" msgid "Choose a dataset" msgstr "Selecciona una base de datos" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Elige una métrica para el eje derecho" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6429,7 +6423,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "gráfico" @@ -7038,7 +7032,6 @@ msgstr "Cada" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7067,7 +7060,7 @@ msgstr "Siguiente" msgid "Example" msgstr "Ver ejemplos" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Ver ejemplos" @@ -8987,17 +8980,11 @@ msgstr "Última modificación" msgid "Left" msgstr "alerta" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Formato Eje Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Métrica Eje Derecho" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 #, fuzzy msgid "Left Axis chart(s)" @@ -9040,7 +9027,6 @@ msgstr "Valores Nulos" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10382,7 +10368,7 @@ msgstr "La base de datos no existe" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descripción" @@ -11780,7 +11766,7 @@ msgstr "Pop Tab Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -12071,7 +12057,6 @@ msgstr "Series" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12330,7 +12315,7 @@ msgstr "Recientes" msgid "Recipients are separated by \",\" or \";\"" msgstr "Los destinatarios están separados por \",\" o \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13563,7 +13548,7 @@ msgstr "Buscar / Filtrar" msgid "Search Metrics & Columns" msgstr "Buscar Métricas y Columnas" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Todos los gráficos" @@ -15384,7 +15369,7 @@ msgstr "El conjunto de datos no pudo ser eliminado." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18236,12 +18221,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18994,14 +18973,6 @@ msgstr "" msgid "Y Axis" msgstr "Eje Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -19205,7 +19176,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -20293,7 +20264,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/fr/LC_MESSAGES/messages.json b/superset/translations/fr/LC_MESSAGES/messages.json index d8b3b6eb1f..dee61f7ee3 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.json +++ b/superset/translations/fr/LC_MESSAGES/messages.json @@ -2444,12 +2444,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Choississez une granularité dans la section Temps ou décochez 'Inclure le temps'" ], - "Pick a metric for left axis!": [ - "Choisissez une métrique pour l'axe de gauche !" - ], - "Pick a metric for right axis!": [ - "Choisissez une métrique pour l'axe de droite !" - ], "Pick a metric for x, y and size": [ "Choisissez une métrique pour x, y, taille" ], @@ -3751,7 +3745,6 @@ "Thursday": ["Jeudi"], "Time": ["Temps"], "Time Series - Bar Chart": ["Séries temporelles - histogramme"], - "Time Series - Dual Axis Line Chart": ["Séries temporelles - double axe"], "Time Series - Line Chart": ["Séries temporelles - ligne"], "Time Series - Multiple Line Charts": [ "Séries temporelles - Lignes multiples" @@ -4073,9 +4066,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4279,8 +4269,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Axe Y"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Format de l'axe Y"], diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po index 2963244cc4..0784784a20 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.po +++ b/superset/translations/fr/LC_MESSAGES/messages.po @@ -1428,7 +1428,7 @@ msgstr "Données chargées mises en cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Analyses avancées" @@ -1635,7 +1635,7 @@ msgstr "Tout texte" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Tous les graphiques" @@ -3264,7 +3264,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Catégorie" @@ -3523,7 +3523,6 @@ msgstr "ID Graphique" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3814,11 +3813,6 @@ msgstr "Choisissez un jeu de donnée" msgid "Choose a dataset" msgstr "Choisissez un jeu de donnée" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Choisir une mesure pour l'axe de droite" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6556,7 +6550,7 @@ msgstr "Charge dynamiquement les valeurs du filtre" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "EGraphiques" @@ -7166,7 +7160,6 @@ msgstr "Chaque" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7194,7 +7187,7 @@ msgstr "Zone de texte" msgid "Example" msgstr "Exemple" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Exemples" @@ -9161,17 +9154,11 @@ msgstr "Dernière modification" msgid "Left" msgstr "alerte" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Format de l'axe Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Mesure de l'axe de droite" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -9212,7 +9199,6 @@ msgstr "Valeur gauche" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10569,7 +10555,7 @@ msgstr "Base de données non trouvée." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Pas de description disponible." @@ -12004,7 +11990,7 @@ msgstr "Retirer le lien de l'onglet" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Populaires" @@ -12292,7 +12278,6 @@ msgstr "requêtes" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12547,7 +12532,7 @@ msgstr "Récents" msgid "Recipients are separated by \",\" or \";\"" msgstr "Les destinataires sont séparés par \",\" ou \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Tags recommandés" @@ -13789,7 +13774,7 @@ msgstr "Rechercher / Filtrer" msgid "Search Metrics & Columns" msgstr "Chercher dans les métriques et les colonnes" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Chercher tous les graphiques" @@ -15593,7 +15578,7 @@ msgstr "Le jeu de données n'a pas pu être supprimé." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18565,12 +18550,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -19343,14 +19322,6 @@ msgstr "" msgid "Y Axis" msgstr "Axe Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -19568,7 +19539,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -20664,7 +20635,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/it/LC_MESSAGES/messages.json b/superset/translations/it/LC_MESSAGES/messages.json index 520b80f35c..f1c973db36 100644 --- a/superset/translations/it/LC_MESSAGES/messages.json +++ b/superset/translations/it/LC_MESSAGES/messages.json @@ -2105,12 +2105,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Seleziona una granularità nella sezione tempo e deseleziona 'Includi Tempo'" ], - "Pick a metric for left axis!": [ - "Seleziona una metrica per l'asse sinistro" - ], - "Pick a metric for right axis!": [ - "Seleziona una metrica per l'asse destro" - ], "Pick a metric for x, y and size": [ "Seleziona una metrica per x, y e grandezza" ], @@ -3230,9 +3224,6 @@ "Time Lag": [""], "Time Range": [""], "Time Series - Bar Chart": ["Serie Temporali - Grafico Barre"], - "Time Series - Dual Axis Line Chart": [ - "Serie Temporali - Grafico Lineare ad Assi Duali" - ], "Time Series - Line Chart": ["Serie Temporali - Grafico Lineare"], "Time Series - Multiple Line Charts": [ "Serie Temporali - Grafico Lineare" @@ -3509,9 +3500,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3713,8 +3701,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/it/LC_MESSAGES/messages.po b/superset/translations/it/LC_MESSAGES/messages.po index 3507d53826..a2886a8927 100644 --- a/superset/translations/it/LC_MESSAGES/messages.po +++ b/superset/translations/it/LC_MESSAGES/messages.po @@ -1362,7 +1362,7 @@ msgstr "Analytics avanzate" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Analytics avanzate" @@ -1568,7 +1568,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Grafico a Proiettile" @@ -3102,7 +3102,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3348,7 +3348,6 @@ msgstr "Grafici" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3627,11 +3626,6 @@ msgstr "Seleziona una destinazione" msgid "Choose a dataset" msgstr "Seleziona una destinazione" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Seleziona una metrica per l'asse destro" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6279,7 +6273,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Grafici" @@ -6872,7 +6866,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6899,7 +6892,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8756,16 +8749,10 @@ msgstr "Ultima Modifica" msgid "Left" msgstr "Cancella" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Metrica asse destro" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8807,7 +8794,6 @@ msgstr "Valore del filtro" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10124,7 +10110,7 @@ msgstr "Template CSS" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descrizione" @@ -11480,7 +11466,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11768,7 +11754,6 @@ msgstr "Query salvate" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12017,7 +12002,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13211,7 +13196,7 @@ msgstr "Cerca / Filtra" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Grafico a Proiettile" @@ -14978,7 +14963,7 @@ msgstr "La query non può essere caricata" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17711,12 +17696,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18447,14 +18426,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18649,7 +18620,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19713,7 +19684,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/ja/LC_MESSAGES/messages.json b/superset/translations/ja/LC_MESSAGES/messages.json index 502a4c9e73..944b84e701 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.json +++ b/superset/translations/ja/LC_MESSAGES/messages.json @@ -2156,8 +2156,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": ["表示する指標を選択"], "Pick a metric!": ["指標を選んでください!"], @@ -3296,7 +3294,6 @@ "Time Comparison": [""], "Time Granularity": [""], "Time Series - Bar Chart": ["時系列 - 棒グラフ"], - "Time Series - Dual Axis Line Chart": ["時系列 - 二重軸折れ線グラフ"], "Time Series - Line Chart": ["時系列 - 折れ線グラフ"], "Time Series - Multiple Line Charts": ["時系列 - 複数の折れ線グラフ"], "Time Series - Nightingale Rose Chart": [""], @@ -3561,9 +3558,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3762,8 +3756,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Y軸"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/ja/LC_MESSAGES/messages.po b/superset/translations/ja/LC_MESSAGES/messages.po index deae8766f8..eafe24e52a 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.po +++ b/superset/translations/ja/LC_MESSAGES/messages.po @@ -1361,7 +1361,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1566,7 +1566,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "すべてのチャート" @@ -3097,7 +3097,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3346,7 +3346,6 @@ msgstr "チャートID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3624,11 +3623,6 @@ msgstr "データセットを選択" msgid "Choose a dataset" msgstr "データセットを選択" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "右軸の指標を選択" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6280,7 +6274,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "チャート" @@ -6876,7 +6870,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6904,7 +6897,7 @@ msgstr "次" msgid "Example" msgstr "例" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "例" @@ -8758,16 +8751,10 @@ msgstr "最終更新" msgid "Left" msgstr "アラート" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "右軸の指標" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8809,7 +8796,6 @@ msgstr "デフォルト値" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10125,7 +10111,7 @@ msgstr "データベースが見つかりません。" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11486,7 +11472,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11769,7 +11755,6 @@ msgstr "クエリ" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12019,7 +12004,7 @@ msgstr "最近" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13216,7 +13201,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "すべてのチャート" @@ -14989,7 +14974,7 @@ msgstr "データベースを削除できませんでした。" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17740,12 +17725,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18471,14 +18450,6 @@ msgstr "" msgid "Y Axis" msgstr "Y軸" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18674,7 +18645,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19741,7 +19712,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/ko/LC_MESSAGES/messages.json b/superset/translations/ko/LC_MESSAGES/messages.json index 9f0b2e2f64..ea3511f28b 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.json +++ b/superset/translations/ko/LC_MESSAGES/messages.json @@ -700,7 +700,6 @@ "Choose File": ["CSV 파일"], "Choose a chart or dashboard not both": [""], "Choose a dataset": ["데이터소스 선택"], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose one of the available databases from the panel on the left.": [""], @@ -1728,7 +1727,6 @@ ], "Least recently modified": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2186,8 +2184,6 @@ "Physical dataset": ["데이터소스 선택"], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3300,7 +3296,6 @@ "Time Lag": [""], "Time Range": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -3571,9 +3566,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3778,8 +3770,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/ko/LC_MESSAGES/messages.po b/superset/translations/ko/LC_MESSAGES/messages.po index 8b72f257d4..1f0cad66fa 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.po +++ b/superset/translations/ko/LC_MESSAGES/messages.po @@ -1355,7 +1355,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1559,7 +1559,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "차트 추가" @@ -3080,7 +3080,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3328,7 +3328,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3605,10 +3604,6 @@ msgstr "데이터소스 선택" msgid "Choose a dataset" msgstr "데이터소스 선택" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6229,7 +6224,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "차트" @@ -6818,7 +6813,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6845,7 +6839,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8688,15 +8682,10 @@ msgstr "" msgid "Left" msgstr "삭제" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8738,7 +8727,6 @@ msgstr "테이블 명" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10036,7 +10024,7 @@ msgstr "데이터베이스를 찾을 수 없습니다." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11371,7 +11359,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11652,7 +11640,6 @@ msgstr "저장된 Query" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11899,7 +11886,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13088,7 +13075,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "차트 추가" @@ -14847,7 +14834,7 @@ msgstr "데이터베이스를 삭제할 수 없습니다." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17552,12 +17539,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18277,14 +18258,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18477,7 +18450,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19527,7 +19500,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/messages.pot b/superset/translations/messages.pot index a6b659826f..b7dbebc0ea 100644 --- a/superset/translations/messages.pot +++ b/superset/translations/messages.pot @@ -1318,7 +1318,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1517,7 +1517,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -2991,7 +2991,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3231,7 +3231,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3495,10 +3494,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6037,7 +6032,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6605,7 +6600,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6632,7 +6626,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8413,15 +8407,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8462,7 +8451,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9713,7 +9701,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11018,7 +11006,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11291,7 +11279,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11525,7 +11512,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12672,7 +12659,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14342,7 +14329,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -16975,12 +16962,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17698,14 +17679,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17897,7 +17870,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18906,7 +18879,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/nl/LC_MESSAGES/messages.json b/superset/translations/nl/LC_MESSAGES/messages.json index 6467849fb2..b2c0327f7e 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.json +++ b/superset/translations/nl/LC_MESSAGES/messages.json @@ -887,7 +887,6 @@ ], "Choose a database...": [""], "Choose a dataset": ["Kies een dataset"], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [ "Kies een meeteenheid voor de rechteras" ], @@ -2141,7 +2140,6 @@ "Least recently modified": ["Meest recente wijziging"], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2669,12 +2667,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Kies een granulariteit in de sectie Tijd of vink ‘Inclusief tijd’ uit" ], - "Pick a metric for left axis!": [ - "Kies een meeteenheid voor de linkeras!" - ], - "Pick a metric for right axis!": [ - "Kies een meeteenheid voor de rechteras!" - ], "Pick a metric for x, y and size": [ "Kies een meeteenheid voor x, y en grootte" ], @@ -4051,9 +4043,6 @@ "Time Range": [""], "Time Series": [""], "Time Series - Bar Chart": ["Tijdreeks - Staafdiagram"], - "Time Series - Dual Axis Line Chart": [ - "Tijdreeks - lijngrafiek met twee assen" - ], "Time Series - Line Chart": ["Tijdreeks - Lijngrafiek"], "Time Series - Multiple Line Charts": [ "Tijdreeksen - Meervoudige lijndiagrammen" @@ -4399,9 +4388,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4613,8 +4599,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Y As"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Y-as Formaat"], diff --git a/superset/translations/nl/LC_MESSAGES/messages.po b/superset/translations/nl/LC_MESSAGES/messages.po index eb49e6720a..b10775dd72 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.po +++ b/superset/translations/nl/LC_MESSAGES/messages.po @@ -1382,7 +1382,7 @@ msgstr "Geladen gegevens in de cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1584,7 +1584,7 @@ msgstr "Alle tekst" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Alle grafieken" @@ -3141,7 +3141,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3388,7 +3388,6 @@ msgstr "Grafiek ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3660,10 +3659,6 @@ msgstr "" msgid "Choose a dataset" msgstr "Kies een dataset" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6270,7 +6265,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6854,7 +6849,6 @@ msgstr "Elke" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6881,7 +6875,7 @@ msgstr "" msgid "Example" msgstr "Voorbeeld" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Voorbeelden" @@ -8714,15 +8708,10 @@ msgstr "Meest recente wijziging" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8763,7 +8752,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10055,7 +10043,7 @@ msgstr "Database niet gevonden." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11385,7 +11373,7 @@ msgstr "Pop Tab Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11663,7 +11651,6 @@ msgstr "queries" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11907,7 +11894,7 @@ msgstr "Recente" msgid "Recipients are separated by \",\" or \";\"" msgstr "Ontvangers worden gescheiden door “,” of “;”" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13096,7 +13083,7 @@ msgstr "Zoek / Filter" msgid "Search Metrics & Columns" msgstr "Zoek meeteenheden & kolommen" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14825,7 +14812,7 @@ msgstr "Dataset kon niet worden verwijderd." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17531,12 +17518,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18268,14 +18249,6 @@ msgstr "" msgid "Y Axis" msgstr "Y As" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18475,7 +18448,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19529,7 +19502,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/pt/LC_MESSAGES/messages.json b/superset/translations/pt/LC_MESSAGES/messages.json index 4c889efb59..55fa70d0b1 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.json +++ b/superset/translations/pt/LC_MESSAGES/messages.json @@ -2096,12 +2096,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Escolha uma granularidade na secção Tempo ou desmarque 'Incluir hora'" ], - "Pick a metric for left axis!": [ - "Selecione uma métrica para o eixo esquerdo!" - ], - "Pick a metric for right axis!": [ - "Selecione uma métrica para o eixo direito!" - ], "Pick a metric for x, y and size": [ "Selecione uma métrica para x, y e tamanho" ], @@ -3205,9 +3199,6 @@ "Time Comparison": ["Coluna de tempo"], "Time Range": ["Granularidade Temporal"], "Time Series - Bar Chart": ["Série Temporal - Gráfico de barras"], - "Time Series - Dual Axis Line Chart": [ - "Série Temporal - Gráfico de linha de dois eixos" - ], "Time Series - Line Chart": ["Série Temporal - Gráfico de linhas"], "Time Series - Multiple Line Charts": [ "Série Temporal - Gráfico de linhas" @@ -3480,9 +3471,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3679,8 +3667,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Eixo YY"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Formato do Eixo YY"], diff --git a/superset/translations/pt/LC_MESSAGES/messages.po b/superset/translations/pt/LC_MESSAGES/messages.po index 8c60c54be2..c756a020af 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.po +++ b/superset/translations/pt/LC_MESSAGES/messages.po @@ -1378,7 +1378,7 @@ msgstr "Dados carregados em cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Análise Avançada" @@ -1591,7 +1591,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Gráfico de bala" @@ -3134,7 +3134,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3383,7 +3383,6 @@ msgstr "Tipo de gráfico" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3665,11 +3664,6 @@ msgstr "Escolha uma origem de dados" msgid "Choose a dataset" msgstr "Escolha uma origem de dados" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Escolha uma métrica para o eixo direito" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6349,7 +6343,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Mover gráfico" @@ -6952,7 +6946,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6979,7 +6972,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8865,17 +8858,11 @@ msgstr "Última Alteração" msgid "Left" msgstr "Eliminar" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Formato do Eixo YY" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Metric do Eixo Direito" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 #, fuzzy msgid "Left Axis chart(s)" @@ -8918,7 +8905,6 @@ msgstr "Latitude padrão" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10236,7 +10222,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descrição" @@ -11596,7 +11582,7 @@ msgstr "Ligação Abrir Aba" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11881,7 +11867,6 @@ msgstr "Séries" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12135,7 +12120,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13352,7 +13337,7 @@ msgstr "Pesquisa / Filtro" msgid "Search Metrics & Columns" msgstr "Colunas das séries temporais" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Gráfico de bala" @@ -15129,7 +15114,7 @@ msgstr "Não foi possível carregar a query" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17913,12 +17898,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18658,14 +18637,6 @@ msgstr "" msgid "Y Axis" msgstr "Eixo YY" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18859,7 +18830,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19920,7 +19891,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.json b/superset/translations/pt_BR/LC_MESSAGES/messages.json index 09daf9901f..c02c98e988 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.json +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.json @@ -165,6 +165,9 @@ "A dictionary with column names and their data types if you need to change the defaults. Example: {\"user_id\":\"integer\"}": [ "" ], + "A dictionary with column names and their data types if you need to change the defaults. Example: {\"user_id\":\"integer\"}": [ + "" + ], "A full URL pointing to the location of the built plugin (could be hosted on a CDN for example)": [ "Um URL completo apontando para o localização do plug-in construído (poderia ser hospedado em um CDN, por exemplo)" ], @@ -1080,9 +1083,6 @@ ], "Choose a database...": ["Escolha um banco de dados..."], "Choose a dataset": ["Escolha um conjunto de dados"], - "Choose a metric for left axis": [ - "Escolha uma métrica para o eixo esquerdo" - ], "Choose a metric for right axis": [ "Escolha uma métrica para o eixo direito" ], @@ -2610,7 +2610,6 @@ "Least recently modified": ["Modificação mais recente"], "Left": ["Esquerda"], "Left Axis Format": ["Formato do eixo esquerdo"], - "Left Axis Metric": ["Eixo esquerdo métrico"], "Left Axis chart(s)": ["Gráfico(s) do eixo esquerdo"], "Left Margin": ["Margem Esquerda"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3324,12 +3323,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Escolha uma granularidade na seção Tempo ou desmarque a opção 'Incluir tempo'" ], - "Pick a metric for left axis!": [ - "Escolha uma métrica para o eixo esquerdo!" - ], - "Pick a metric for right axis!": [ - "Escolha uma métrica para o eixo direito!" - ], "Pick a metric for x, y and size": [ "Escolha uma métrica para x, y e tamanho" ], @@ -5076,9 +5069,6 @@ "Time Ratio": ["Relação de tempo"], "Time Series": ["Séries temporais"], "Time Series - Bar Chart": ["Série temporal - Gráfico de barras"], - "Time Series - Dual Axis Line Chart": [ - "Série Temporal - Gráfico de Linhas de Eixo Duplo" - ], "Time Series - Line Chart": ["Série temporal - Gráfico de linhas"], "Time Series - Multiple Line Charts": [ "Séries temporais - Gráficos de linhas múltiplas" @@ -5505,9 +5495,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Visualize duas séries temporais diferentes usando o mesmo eixo x. Observe que cada série temporal pode ser visualizada de forma diferente (por exemplo, uma usando barras e outra usando uma linha)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Visualiza 2 métricas como gráficos de linha usando o mesmo eixo x. Esse gráfico é útil para comparar métricas no mesmo intervalo de tempo." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Visualiza uma métrica em três dimensões de dados em um único gráfico (eixo X, eixo Y e tamanho da bolha). As bolhas do mesmo grupo podem ser exibidas usando a cor da bolha." ], @@ -5803,8 +5790,6 @@ "Y AXIS TITLE MARGIN": ["MARGEM DO TÍTULO DO EIXO Y"], "Y AXIS TITLE POSITION": ["POSIÇÃO DO TÍTULO DO EIXO Y"], "Y Axis": ["Eixo Y"], - "Y Axis 1": ["Eixo Y 1"], - "Y Axis 2": ["Eixo Y 2"], "Y Axis 2 Bounds": ["Eixo Y 2 Limites"], "Y Axis Bounds": ["Limites do Eixo Y"], "Y Axis Format": ["Formato do eixo Y"], diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.po b/superset/translations/pt_BR/LC_MESSAGES/messages.po index b2f6898762..c1c70e19ec 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.po +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.po @@ -18186,11 +18186,13 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." +"Visualize two different time series using the same x-axis time range. " +"This chart is being deprecated and we recommend using the Mixed " +"Timeseries Chart instead!" msgstr "" -"Visualiza 2 métricas como gráficos de linha usando o mesmo eixo x. Esse " -"gráfico é útil para comparar métricas no mesmo intervalo de tempo." +"Visualize duas séries temporais diferentes usando o mesmo intervalo de " +"tempo do eixo x. Esse gráfico está sendo descontinuado e, em vez disso, " +"recomendamos o uso do gráfico de série temporal mista!" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" diff --git a/superset/translations/ru/LC_MESSAGES/messages.json b/superset/translations/ru/LC_MESSAGES/messages.json index d3a5e78700..4ff7e64627 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.json +++ b/superset/translations/ru/LC_MESSAGES/messages.json @@ -1105,7 +1105,6 @@ ], "Choose a database...": ["Выберите базу данных..."], "Choose a dataset": ["Выберите датасет"], - "Choose a metric for left axis": ["Выберите меру для левой оси"], "Choose a metric for right axis": ["Выберите меру для правой оси"], "Choose a number format": ["Выберите числовой формат"], "Choose a source": ["Выберите источник"], @@ -2586,7 +2585,6 @@ "Least recently modified": ["Измененные давно"], "Left": ["Слева"], "Left Axis Format": ["Формат левой оси"], - "Left Axis Metric": ["Мера левой оси"], "Left Axis chart(s)": ["График(и) по левой оси"], "Left Margin": ["Левый отступ"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3234,8 +3232,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Выберите степень детализации в разделе Время или снимите флажок \"Включить время\"." ], - "Pick a metric for left axis!": ["Выберите меру для левой оси"], - "Pick a metric for right axis!": ["Выберите меру для правой оси"], "Pick a metric for x, y and size": ["Выберите меру для x, y и размера"], "Pick a metric to display": ["Выберите меру для отображения"], "Pick a metric!": ["Выберите меру!"], @@ -4852,9 +4848,6 @@ "Time Ratio": ["Соотношение времени"], "Time Series": ["Временной ряд"], "Time Series - Bar Chart": ["Столбчатая диаграмма (временные ряды)"], - "Time Series - Dual Axis Line Chart": [ - "Диаграмма с двумя осями (временные ряды)" - ], "Time Series - Line Chart": ["Линейная диаграмма (временные ряды)"], "Time Series - Nightingale Rose Chart": [ "Диаграмма Найтингейл (временные ряды)" @@ -5240,9 +5233,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -5528,8 +5518,6 @@ "Y AXIS TITLE MARGIN": ["Отступ названия оси Y"], "Y AXIS TITLE POSITION": ["Положение названия оси Y"], "Y Axis": ["Ось Y"], - "Y Axis 1": ["Ось Y 1"], - "Y Axis 2": ["Ось Y 2"], "Y Axis 2 Bounds": ["Границы оси Y 2"], "Y Axis Bounds": ["Границы оси Y"], "Y Axis Format": ["Формат Оси Y"], diff --git a/superset/translations/ru/LC_MESSAGES/messages.po b/superset/translations/ru/LC_MESSAGES/messages.po index e2efc535c4..2594fca499 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.po +++ b/superset/translations/ru/LC_MESSAGES/messages.po @@ -1385,7 +1385,7 @@ msgstr "Расширенный тип данных" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Продвинутая аналитика" @@ -1591,7 +1591,7 @@ msgstr "Весь текст" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Все графики" @@ -3164,7 +3164,7 @@ msgid "Categories to group by on the x-axis." msgstr "Категории для группировки по оси x" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Категория" @@ -3410,7 +3410,6 @@ msgstr "ID графика" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3683,10 +3682,6 @@ msgstr "Выберите базу данных..." msgid "Choose a dataset" msgstr "Выберите датасет" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Выберите меру для левой оси" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6370,7 +6365,7 @@ msgstr "Динамически искать все значения фильтр #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "Графики Apache" @@ -6955,7 +6950,6 @@ msgstr "Каждый(ая)" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6982,7 +6976,7 @@ msgstr "Точное" msgid "Example" msgstr "Пример" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Примеры" @@ -8856,15 +8850,10 @@ msgstr "Измененные давно" msgid "Left" msgstr "Слева" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Формат левой оси" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Мера левой оси" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "График(и) по левой оси" @@ -8905,7 +8894,6 @@ msgstr "Левое значение" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10213,7 +10201,7 @@ msgstr "Не найдено таблиц в базе данных" msgid "No databases match your search" msgstr "Нет баз данных, удовлетворяющих вашему поиску" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Описание отсутствует." @@ -11594,7 +11582,7 @@ msgstr "Скопировать ссылку" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Популярно" @@ -11871,7 +11859,6 @@ msgstr "запросы" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12109,7 +12096,7 @@ msgstr "Недавние" msgid "Recipients are separated by \",\" or \";\"" msgstr "Получатели, разделенные \",\" или \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Рекомендованные теги" @@ -13294,7 +13281,7 @@ msgstr "Поиск / Фильтр" msgid "Search Metrics & Columns" msgstr "Поиск по мерам и столбцам" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Поиск по всем графикам" @@ -15035,7 +15022,7 @@ msgstr "Не удалось удалить датасет" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17896,12 +17883,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18678,14 +18659,6 @@ msgstr "Положение названия оси Y" msgid "Y Axis" msgstr "Ось Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Ось Y 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Ось Y 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Границы оси Y 2" @@ -18899,7 +18872,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Вы не можете использовать расположение делений под углом 45° при " @@ -19947,7 +19920,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/sk/LC_MESSAGES/messages.json b/superset/translations/sk/LC_MESSAGES/messages.json index 54560d12ed..ea88d4a6a9 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.json +++ b/superset/translations/sk/LC_MESSAGES/messages.json @@ -788,7 +788,6 @@ "Choose a chart or dashboard not both": [""], "Choose a database...": [""], "Choose a dataset": [""], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose a source": [""], @@ -2003,7 +2002,6 @@ "Least recently modified": [""], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2518,8 +2516,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3811,7 +3807,6 @@ "Time Ratio": [""], "Time Series": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -4124,9 +4119,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4334,8 +4326,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/sk/LC_MESSAGES/messages.po b/superset/translations/sk/LC_MESSAGES/messages.po index 1e77a47226..7900ff22d0 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.po +++ b/superset/translations/sk/LC_MESSAGES/messages.po @@ -1318,7 +1318,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1517,7 +1517,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -3005,7 +3005,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3246,7 +3246,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3513,10 +3512,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6076,7 +6071,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Grafy" @@ -6649,7 +6644,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6676,7 +6670,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8458,15 +8452,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8507,7 +8496,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9763,7 +9751,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11072,7 +11060,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11346,7 +11334,6 @@ msgstr "Uložené dotazy" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11582,7 +11569,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12733,7 +12720,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14411,7 +14398,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17054,12 +17041,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17779,14 +17760,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17978,7 +17951,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18994,7 +18967,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/sl/LC_MESSAGES/messages.json b/superset/translations/sl/LC_MESSAGES/messages.json index bee805f09c..547bd4071e 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.json +++ b/superset/translations/sl/LC_MESSAGES/messages.json @@ -988,7 +988,6 @@ ], "Choose a database...": ["Izberite podatkovno bazo..."], "Choose a dataset": ["Izberite podatkovni set"], - "Choose a metric for left axis": ["Izberite mero za levo os"], "Choose a metric for right axis": ["Izberite mero za desno os"], "Choose a number format": ["Izberite obliko zapisa števila"], "Choose a source": ["Izberite izvor"], @@ -2396,7 +2395,6 @@ "Least recently modified": ["Zadnje spremenjeno"], "Left": ["Levo"], "Left Axis Format": ["Oblika leve osi"], - "Left Axis Metric": ["Mera za levo os"], "Left Axis chart(s)": ["Grafikoni leve osi"], "Left Margin": ["Levi rob"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -2984,8 +2982,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Izberite granulacijo v razdelku 'Čas' ali odstranite 'Vključi čas'" ], - "Pick a metric for left axis!": ["Izberite mero za levo os!"], - "Pick a metric for right axis!": ["Izberite mero za desno os!"], "Pick a metric for x, y and size": ["Izberite mere za x, y in velikost"], "Pick a metric to display": ["Izberite mero za prikaz"], "Pick a metric!": ["Izberite mero!"], @@ -4491,9 +4487,6 @@ "Time Range": ["Časovno obdobje"], "Time Series": ["Časovna vrsta"], "Time Series - Bar Chart": ["Časovna vrsta - Stolpčni grafikon"], - "Time Series - Dual Axis Line Chart": [ - "Časovna vrsta - Črtni grafikon z dvojno osjo" - ], "Time Series - Line Chart": ["Časovna vrsta - Črtni grafikon"], "Time Series - Multiple Line Charts": [ "Časovna vrsta - Veččrtni grafikon" @@ -4877,9 +4870,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Prikaže dve različni časovni vrsti na isti x-osi. Časovni vrsti sta lahko prikazani različno (npr. ena s stolpci in druga s črto)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Prikaže dve meri na črtnem grafu z isto x-osjo. Grafikon je uporaben za primerjavo mer v istem časovnem obdobju." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Prikaže mero v treh dimenzijah podatkov na istem grafikonu (x os, y os, velikost mehurčka). Mehurčki v isti skupini so predstavljeni z barvo." ], @@ -5144,8 +5134,6 @@ "Y AXIS TITLE MARGIN": ["OBROBA NASLOVA Y OSI"], "Y AXIS TITLE POSITION": ["POZICIJA NASLOVA Y OSI"], "Y Axis": ["Y os"], - "Y Axis 1": ["Y-os 1"], - "Y Axis 2": ["Y-os 2"], "Y Axis 2 Bounds": ["Meje Y 2-osi"], "Y Axis Bounds": ["Meje Y-osi"], "Y Axis Format": ["Oblika Y osi"], diff --git a/superset/translations/sl/LC_MESSAGES/messages.po b/superset/translations/sl/LC_MESSAGES/messages.po index dcfd79d6ba..b712dfa7d4 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.po +++ b/superset/translations/sl/LC_MESSAGES/messages.po @@ -1431,7 +1431,7 @@ msgstr "Napredni podatkovni tip" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Napredna analitika" @@ -1641,7 +1641,7 @@ msgstr "Celotno besedilo" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Vsi grafikoni" @@ -3227,7 +3227,7 @@ msgid "Categories to group by on the x-axis." msgstr "Kategorije za združevanje po x-osi." #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Kategorija" @@ -3478,7 +3478,6 @@ msgstr "ID grafikona" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3763,10 +3762,6 @@ msgstr "Izberite podatkovno bazo..." msgid "Choose a dataset" msgstr "Izberite podatkovni set" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Izberite mero za levo os" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6483,7 +6478,7 @@ msgstr "Dinamično poišče vse možnosti filtra" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts" @@ -7073,7 +7068,6 @@ msgstr "Vsak" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7100,7 +7094,7 @@ msgstr "Natančno" msgid "Example" msgstr "Primer" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Vzorci" @@ -9011,15 +9005,10 @@ msgstr "Zadnje spremenjeno" msgid "Left" msgstr "Levo" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Oblika leve osi" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Mera za levo os" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "Grafikoni leve osi" @@ -9060,7 +9049,6 @@ msgstr "Leva vrednost" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10383,7 +10371,7 @@ msgstr "Podatkovna baza ni bila najdena." msgid "No databases match your search" msgstr "Nobena podatkovna baza ne ustreza iskanju" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Opisa ni na razpolago." @@ -11778,7 +11766,7 @@ msgstr "Prikaži povezavo zavihka" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Priljubljeni" @@ -12061,7 +12049,6 @@ msgstr "poizvedbe" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12304,7 +12291,7 @@ msgstr "Nedavno" msgid "Recipients are separated by \",\" or \";\"" msgstr "Prejemniki so ločeni z \",\" ali \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Priporočene značke" @@ -13521,7 +13508,7 @@ msgstr "Iskanje / Filter" msgid "Search Metrics & Columns" msgstr "Iskanje mer in stolpcev" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Išči vse grafikone" @@ -15296,7 +15283,7 @@ msgstr "Podatkovnega niza ni mogoče izbrisati." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18228,14 +18215,6 @@ msgstr "" "Prikaže dve različni časovni vrsti na isti x-osi. Časovni vrsti sta lahko" " prikazani različno (npr. ena s stolpci in druga s črto)." -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" -"Prikaže dve meri na črtnem grafu z isto x-osjo. Grafikon je uporaben za " -"primerjavo mer v istem časovnem obdobju." - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -19037,14 +19016,6 @@ msgstr "POZICIJA NASLOVA Y OSI" msgid "Y Axis" msgstr "Y os" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y-os 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y-os 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Meje Y 2-osi" @@ -19253,7 +19224,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Skupaj s filtriranjem časovnega obdobja ne morete uporabiti oznak pod 45°" @@ -20325,7 +20296,6 @@ msgstr "ikona numeričnega tipa" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/zh/LC_MESSAGES/messages.json b/superset/translations/zh/LC_MESSAGES/messages.json index 21ede6f44b..e12e17e340 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.json +++ b/superset/translations/zh/LC_MESSAGES/messages.json @@ -787,7 +787,6 @@ ], "Choose a database...": ["选择数据库"], "Choose a dataset": ["选择数据源"], - "Choose a metric for left axis": ["选择左轴的计量指标"], "Choose a metric for right axis": ["为右轴选择一个指标"], "Choose a number format": ["选择一种数字格式"], "Choose a source": ["选择一个源"], @@ -1911,7 +1910,6 @@ "Least recently modified": ["最远修改"], "Left": ["左边"], "Left Axis Format": ["左轴格式化"], - "Left Axis Metric": ["左轴指标"], "Left Axis chart(s)": ["左轴图表"], "Left Margin": ["左边距"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -2405,8 +2403,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "在“时间”部分选择一个粒度，或取消选中“包含时间”" ], - "Pick a metric for left axis!": ["为左轴选择一个指标！"], - "Pick a metric for right axis!": ["为右轴选择一个指标！"], "Pick a metric for x, y and size": ["为 x 轴，y 轴和大小选择一个指标"], "Pick a metric to display": ["选择一个指标来显示"], "Pick a metric!": ["选择一个指标！"], @@ -3685,7 +3681,6 @@ "Time Range": ["时间范围"], "Time Series": ["时间序列"], "Time Series - Bar Chart": ["时间序列 - 柱状图"], - "Time Series - Dual Axis Line Chart": ["时间序列-双轴线图"], "Time Series - Line Chart": ["时间序列-折线图"], "Time Series - Multiple Line Charts": ["时间序列-多线图"], "Time Series - Nightingale Rose Chart": ["时间序列 - 南丁格尔玫瑰图"], @@ -4008,9 +4003,6 @@ "Visualize two different time series using the same x-axis time range. This chart is being deprecated and we recommend using the Mixed Timeseries Chart instead!": [ "使用相同的x轴时间范围可视化两个不同的时间序列。此图表已被弃用，我们建议使用混合改为时间序列图！" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "使用相同的x轴将2个指标可视化为折线图。此图表可用于比较相同时间范围内的指标。" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "在单个图表中跨三维数据（X轴、Y轴和气泡大小）可视化度量。同一组中的气泡可以“使用气泡颜色显示" ], @@ -4229,8 +4221,6 @@ "Y AXIS TITLE MARGIN": ["Y轴标题页边距"], "Y AXIS TITLE POSITION": ["Y轴标题位置"], "Y Axis": ["Y 轴"], - "Y Axis 1": ["Y 轴 1"], - "Y Axis 2": ["Y 轴 2"], "Y Axis 2 Bounds": ["Y 轴界限"], "Y Axis Bounds": ["Y 轴界限"], "Y Axis Format": ["Y 轴格式化"], diff --git a/superset/translations/zh/LC_MESSAGES/messages.po b/superset/translations/zh/LC_MESSAGES/messages.po index 2cb9d497a1..08fe9801cc 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.po +++ b/superset/translations/zh/LC_MESSAGES/messages.po @@ -1370,7 +1370,7 @@ msgstr "数据缓存已加载" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "高级分析" @@ -1572,7 +1572,7 @@ msgstr "所有文本" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "所有图表" @@ -3101,7 +3101,7 @@ msgid "Categories to group by on the x-axis." msgstr "要在x轴上分组的类别。" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "分类" @@ -3349,7 +3349,6 @@ msgstr "图表 ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3622,10 +3621,6 @@ msgstr "选择数据库" msgid "Choose a dataset" msgstr "选择数据源" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "选择左轴的计量指标" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6243,7 +6238,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts图表" @@ -6832,7 +6827,6 @@ msgstr "每个" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6859,7 +6853,7 @@ msgstr "精确" msgid "Example" msgstr "例子" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "示例" @@ -8734,15 +8728,10 @@ msgstr "最远修改" msgid "Left" msgstr "左边" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "左轴格式化" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "左轴指标" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "左轴图表" @@ -8783,7 +8772,6 @@ msgstr "左值" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10090,7 +10078,7 @@ msgstr "数据库没有找到" msgid "No databases match your search" msgstr "没有与您的搜索匹配的数据库" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "没有可用的描述" @@ -11446,7 +11434,7 @@ msgstr "流行标签链接" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "常用" @@ -11728,7 +11716,6 @@ msgstr "序列" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11967,7 +11954,7 @@ msgstr "最近" msgid "Recipients are separated by \",\" or \";\"" msgstr "收件人之间用 \",\" 或者 \";\" 隔开" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "推荐标签" @@ -13165,7 +13152,7 @@ msgstr "搜索 / 过滤" msgid "Search Metrics & Columns" msgstr "搜索指标和列" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "搜索所有图表" @@ -14912,7 +14899,7 @@ msgstr "无法删除数据集" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17628,12 +17615,6 @@ msgid "" " a line)." msgstr "使用相同的x轴时间范围可视化两个不同的时间序列。请注意，每个时间序列可以以不同的方式可视化（例如1个使用条形图，1个使用线条）。" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "使用相同的x轴将2个指标可视化为折线图。此图表可用于比较相同时间范围内的指标。" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18370,14 +18351,6 @@ msgstr "Y轴标题位置" msgid "Y Axis" msgstr "Y 轴" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y 轴 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y 轴 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Y 轴界限" @@ -18574,7 +18547,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "不能将45°刻度线布局与时间范围过滤器一起使用" @@ -19642,7 +19615,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/viz.py b/superset/viz.py index d3d46c5b79..29e15b58f7 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -1434,82 +1434,6 @@ class MultiLineViz(NVD3Viz): return data -class NVD3DualLineViz(NVD3Viz): - - """A rich line chart with dual axis""" - - viz_type = "dual_line" - verbose_name = _("Time Series - Dual Axis Line Chart") - sort_series = False - is_timeseries = True - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - query_obj = super().query_obj() - m1 = self.form_data.get("metric") - m2 = self.form_data.get("metric_2") - if not m1: - raise QueryObjectValidationError(_("Pick a metric for left axis!")) - if not m2: - raise QueryObjectValidationError(_("Pick a metric for right axis!")) - if m1 == m2: - raise QueryObjectValidationError( - _("Please choose different metrics" " on left and right axis") - ) - query_obj["metrics"] = [m1, m2] - return query_obj - - @deprecated(deprecated_in="3.0") - def to_series(self, df: pd.DataFrame, classed: str = "") -> list[dict[str, Any]]: - cols = [] - for col in df.columns: - if col == "": - cols.append("N/A") - elif col is None: - cols.append("NULL") - else: - cols.append(col) - df.columns = cols - series = df.to_dict("series") - chart_data = [] - metrics = [self.form_data["metric"], self.form_data["metric_2"]] - for i, metric in enumerate(metrics): - metric_name = utils.get_metric_name(metric) - ys = series[metric_name] - if df[metric_name].dtype.kind not in "biufc": - continue - series_title = metric_name - chart_data.append( - { - "key": series_title, - "classed": classed, - "values": [ - {"x": ds, "y": ys[ds] if ds in ys else None} for ds in df.index - ], - "yAxis": i + 1, - "type": "line", - } - ) - return chart_data - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: - if df.empty: - return None - - if self.form_data.get("granularity") == "all": - raise QueryObjectValidationError( - _("Pick a time granularity for your time series") - ) - - metric = utils.get_metric_name(self.form_data["metric"]) - metric_2 = utils.get_metric_name(self.form_data["metric_2"]) - df = df.pivot_table(index=DTTM_ALIAS, values=[metric, metric_2]) - - chart_data = self.to_series(df) - return chart_data - - class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz): """A bar chart where the x axis is time""" diff --git a/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py b/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py new file mode 100644 index 0000000000..76addd8009 --- /dev/null +++ b/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py @@ -0,0 +1,97 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +import json + +from superset.migrations.shared.migrate_viz import MigrateDualLine + +ADHOC_FILTERS = [ + { + "clause": "WHERE", + "comparator": ["CA", "FL"], + "expressionType": "SIMPLE", + "operator": "IN", + "subject": "state", + } +] + +SOURCE_FORM_DATA = { + "metric": "num_boys", + "y_axis_format": ",d", + "y_axis_bounds": [50, 100], + "metric_2": "num_girls", + "y_axis_2_format": ",d", + "y_axis_2_bounds": [75, 150], + "viz_type": "dual_line", + "adhoc_filters": ADHOC_FILTERS, + "x_axis_format": "smart_date", + "color_scheme": "bnbColors", + "yAxisIndex": 0, +} + +TARGET_FORM_DATA = { + "metrics": ["num_boys"], + "y_axis_format": ",d", + "y_axis_bounds": [50, 100], + "y_axis_bounds_secondary": [75, 150], + "metrics_b": ["num_girls"], + "y_axis_format_secondary": ",d", + "viz_type": "mixed_timeseries", + "adhoc_filters": ADHOC_FILTERS, + "adhoc_filters_b": ADHOC_FILTERS, + "x_axis_time_format": "smart_date", + "color_scheme": "bnbColors", + "form_data_bak": SOURCE_FORM_DATA, + "yAxisIndex": 0, + "yAxisIndexB": 1, + "truncateYAxis": True, +} + + +def test_migration() -> None: + source = SOURCE_FORM_DATA.copy() + target = TARGET_FORM_DATA.copy() + upgrade_downgrade(source, target) + + +def upgrade_downgrade(source, target) -> None: + from superset.models.slice import Slice + + dumped_form_data = json.dumps(source) + + slc = Slice( + viz_type=MigrateDualLine.source_viz_type, + datasource_type="table", + params=dumped_form_data, + query_context=f'{{"form_data": {dumped_form_data}}}', + ) + + # upgrade + slc = MigrateDualLine.upgrade_slice(slc) + + # verify form_data + new_form_data = json.loads(slc.params) + assert new_form_data == target + assert new_form_data["form_data_bak"] == source + + # verify query_context + new_query_context = json.loads(slc.query_context) + assert new_query_context["form_data"]["viz_type"] == "mixed_timeseries" + + # downgrade + slc = MigrateDualLine.downgrade_slice(slc) + assert slc.viz_type == MigrateDualLine.source_viz_type + assert json.loads(slc.params) == source