Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(viz): rename v1 and v2 charts #22369

Merged
merged 3 commits into from
Dec 9, 2022
Merged

chore(viz): rename v1 and v2 charts #22369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e572fd9
chore(viz): rename v1 and v2 charts
villebro Dec 8, 2022
ba72738
rename cypress test
villebro Dec 8, 2022
ad5016d
fix cypress tests
villebro Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('Charts filters', () => {
});

it('should filter by viz type correctly', () => {
setFilter('Chart type', 'Area Chart');
setFilter('Chart type', 'Area Chart (legacy)');
cy.getBySel('styled-card').should('have.length', 3);
setFilter('Chart type', 'Bubble Chart');
cy.getBySel('styled-card').should('have.length', 2);
Expand Down Expand Up @@ -91,7 +91,7 @@ describe('Charts filters', () => {
});

it('should filter by viz type correctly', () => {
setFilter('Chart type', 'Area Chart');
setFilter('Chart type', 'Area Chart (legacy)');
cy.getBySel('table-row').should('have.length', 3);
setFilter('Chart type', 'Bubble Chart');
cy.getBySel('table-row').should('have.length', 2);
Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/cypress-base/cypress/integration/dashboard/drilltodetail.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ describe('Drill to detail modal', () => {
});
});

describe('Time-series Bar Chart V2', () => {
describe('Time-series Bar Chart', () => {
it('opens the modal with the correct filters', () => {
interceptSamples();

Expand Down Expand Up @@ -591,7 +591,7 @@ describe('Drill to detail modal', () => {
});
});

describe('Treemap V2', () => {
describe('Treemap', () => {
it('opens the modal with the correct filters', () => {
interceptSamples();

Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/legacy-plugin-chart-pivot-table/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const metadata = new ChartMetadata({
t(`Used to summarize a set of data by grouping together multiple statistics along two axes. Examples: Sales numbers by region and month, tasks by status and assignee, active users by age and location.

This chart is being deprecated and we recommend checking out Pivot Table V2 instead!`),
name: t('Pivot Table'),
name: t('Pivot Table (legacy)'),
tags: [t('Legacy')],
thumbnail,
useLegacyApi: true,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/legacy-plugin-chart-treemap/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const metadata = new ChartMetadata({
{ url: example3 },
{ url: example4 },
],
name: t('Treemap'),
name: t('Treemap (legacy)'),
tags: [
t('Categorical'),
t('Legacy'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const metadata = new ChartMetadata({
{ url: example3, caption: t('Video game consoles') },
{ url: example4, caption: t('Vehicle Types') },
],
name: t('Area Chart'),
name: t('Area Chart (legacy)'),
supportedAnnotationTypes: [ANNOTATION_TYPES.INTERVAL, ANNOTATION_TYPES.EVENT],
tags: [
t('Aesthetic'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({
'Visualize how a metric changes over time using bars. Add a group by column to visualize group level metrics and how they change over time.',
),
exampleGallery: [{ url: example1 }, { url: example2 }, { url: example3 }],
name: t('Time-series Bar Chart'),
name: t('Time-series Bar Chart (legacy)'),
supportedAnnotationTypes: [ANNOTATION_TYPES.INTERVAL, ANNOTATION_TYPES.EVENT],
tags: [
t('Bar'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const metadata = new ChartMetadata({
{ url: example2 },
{ url: battery, caption: t('Battery level over time') },
],
name: t('Line Chart'),
name: t('Line Chart (legacy)'),
supportedAnnotationTypes: [
ANNOTATION_TYPES.TIME_SERIES,
ANNOTATION_TYPES.INTERVAL,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default class EchartsAreaChartPlugin extends ChartPlugin<
AnnotationType.Timeseries,
],
name: hasGenericChartAxes
? t('Area Chart v2')
? t('Area Chart')
: t('Time-series Area Chart'),
tags: [
t('ECharts'),
Expand Down
4 changes: 1 addition & 3 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ export default class EchartsTimeseriesBarChartPlugin extends ChartPlugin<
AnnotationType.Interval,
AnnotationType.Timeseries,
],
name: hasGenericChartAxes
? t('Bar Chart v2')
: t('Time-series Bar Chart v2'),
name: hasGenericChartAxes ? t('Bar Chart') : t('Time-series Bar Chart'),
tags: [
t('ECharts'),
t('Predictive'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default class EchartsTimeseriesLineChartPlugin extends ChartPlugin<
AnnotationType.Timeseries,
],
name: hasGenericChartAxes
? t('Line Chart v2')
? t('Line Chart')
: t('Time-series Line Chart'),
tags: [
t('ECharts'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class EchartsTreemapChartPlugin extends ChartPlugin<
'Show hierarchical relationships of data, with with the value represented by area, showing proportion and contribution to the whole.',
),
exampleGallery: [{ url: example1 }, { url: example2 }],
name: t('Treemap v2'),
name: t('Treemap'),
tags: [
t('Aesthetic'),
t('Categorical'),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class PivotTableChartPlugin extends ChartPlugin<
description: t(
'Used to summarize a set of data by grouping together multiple statistics along two axes. Examples: Sales numbers by region and month, tasks by status and assignee, active users by age and location. Not the most visually stunning visualization, but highly informative and versatile.',
),
name: t('Pivot Table v2'),
name: t('Pivot Table'),
tags: [t('Additive'), t('Report'), t('Tabular'), t('Popular')],
thumbnail,
});
Expand Down
8 changes: 3 additions & 5 deletions superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe('VizTypeControl', () => {
).toBeInTheDocument();
expect(
within(screen.getByTestId('fast-viz-switcher')).getByText(
'Time-series Bar Chart v2',
'Time-series Bar Chart',
),
).toBeInTheDocument();
expect(
Expand Down Expand Up @@ -251,7 +251,7 @@ describe('VizTypeControl', () => {
within(visualizations).getByText('Time-series Line Chart'),
).toBeVisible();
expect(
within(visualizations).getByText('Time-series Bar Chart v2'),
within(visualizations).getByText('Time-series Bar Chart'),
).toBeVisible();
expect(
within(visualizations).queryByText('Line Chart'),
Expand All @@ -269,9 +269,7 @@ describe('VizTypeControl', () => {
renderWrapper();
userEvent.click(screen.getByRole('button', { name: 'ballot All charts' }));
const visualizations = screen.getByTestId(getTestId('viz-row'));
userEvent.click(
within(visualizations).getByText('Time-series Bar Chart v2'),
);
userEvent.click(within(visualizations).getByText('Time-series Bar Chart'));

expect(defaultProps.onChange).not.toBeCalled();
userEvent.dblClick(
Expand Down