diff --git a/UPDATING.md b/UPDATING.md index 4267ae340..392e0cbb4 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -24,6 +24,7 @@ assists people when migrating to a new version. ## Next +- [31582](https://github.com/apache/superset/pull/31582) Removed the legacy Area, Bar, Event Flow, Heatmap, Histogram, Line, Sankey, and Sankey Loop charts. They were all automatically migrated to their ECharts counterparts with the exception of the Event Flow and Sankey Loop charts which were removed as they were not actively maintained and not widely used. If you were using the Event Flow or Sankey Loop charts, you will need to find an alternative solution. - [31198](https://github.com/apache/superset/pull/31198) Disallows by default the use of the following ClickHouse functions: "version", "currentDatabase", "hostName". - [29798](https://github.com/apache/superset/pull/29798) Since 3.1.0, the intial schedule for an alert or report was mistakenly offset by the specified timezone's relation to UTC. The initial schedule should now begin at the correct time. - [30021](https://github.com/apache/superset/pull/30021) The `dev` layer in our Dockerfile no long includes firefox binaries, only Chromium to reduce bloat/docker-build-time. diff --git a/superset-frontend/cypress-base/cypress/applitools/explore.test.ts b/superset-frontend/cypress-base/cypress/applitools/explore.test.ts index 142262262..233701cbf 100644 --- a/superset-frontend/cypress-base/cypress/applitools/explore.test.ts +++ b/superset-frontend/cypress-base/cypress/applitools/explore.test.ts @@ -31,7 +31,10 @@ describe('explore view', () => { }); it('should load Explore', () => { - const LINE_CHART_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'line' }; + const LINE_CHART_DEFAULTS = { + ...FORM_DATA_DEFAULTS, + viz_type: 'echarts_timeseries_line', + }; const formData = { ...LINE_CHART_DEFAULTS, metrics: [NUM_METRIC] }; cy.visitChartByParams(formData); cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts index 997372bae..619010eed 100644 --- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts @@ -524,8 +524,8 @@ describe('Drill by modal', () => { ]); }); - it('Bar Chart V2', () => { - testEchart('echarts_timeseries_bar', 'Bar Chart V2', [ + it('Bar Chart', () => { + testEchart('echarts_timeseries_bar', 'Bar Chart', [ [70, 94], [362, 68], ]); diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts index c876dbc24..81ba3a379 100644 --- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts @@ -431,19 +431,6 @@ describe('Drill to detail modal', () => { }); }); }); - - describe('Bar Chart', () => { - it('opens the modal for unsupported chart without filters', () => { - interceptSamples(); - - cy.get("[data-test-viz-type='dist_bar'] svg").then($canvas => { - cy.wrap($canvas).scrollIntoView(); - cy.wrap($canvas).rightclick(70, 150); - openModalFromChartContext('Drill to detail'); - cy.getBySel('filter-val').should('not.exist'); - }); - }); - }); }); describe('Tier 2 charts', () => { diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts index 0bc2ddc91..5059a7f7c 100644 --- a/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { - SAMPLE_DASHBOARD_1, - SUPPORTED_CHARTS_DASHBOARD, - TABBED_DASHBOARD, -} from 'cypress/utils/urls'; +import { SAMPLE_DASHBOARD_1, TABBED_DASHBOARD } from 'cypress/utils/urls'; import { drag, resize, waitForChartLoad } from 'cypress/utils'; import * as ace from 'brace'; import { @@ -30,7 +26,7 @@ import { openTab, } from './utils'; import { - interceptExploreJson, + interceptV1ChartData, interceptFiltering as interceptCharts, } from '../explore/utils'; @@ -55,14 +51,6 @@ function openProperties() { }); } -function openExploreProperties() { - cy.getBySel('actions-trigger').click({ force: true }); - cy.get('.ant-dropdown-menu') - .contains('Edit chart properties') - .click({ force: true }); - cy.get('.antd5-modal-body').should('be.visible'); -} - function assertMetadata(text: string) { const regex = new RegExp(text); cy.get('#json_metadata') @@ -225,7 +213,7 @@ function writeMetadata(metadata: string) { } function openExploreWithDashboardContext(chartName: string) { - interceptExploreJson(); + interceptV1ChartData(); interceptGet(); cy.get( @@ -237,7 +225,7 @@ function openExploreWithDashboardContext(chartName: string) { .eq(2) .should('contain', 'Edit chart') .click(); - cy.wait('@getJson'); + cy.wait('@v1Data'); cy.get('.chart-container').should('exist'); } @@ -255,13 +243,16 @@ function saveExploreColorScheme( cy.wait('@chartUpdate'); } +// FIXME: Skipping some tests as ECharts are rendered using Canvas and we cannot inspect the elements +// to verify the colors. We should revisit these tests once we have a solution to verify ECharts. + describe('Dashboard edit', () => { describe('Color consistency', () => { beforeEach(() => { resetDashboardColors(); }); - it('should not allow to change color scheme of a chart when dashboard has one', () => { + it.skip('should not allow to change color scheme of a chart when dashboard has one', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -272,11 +263,14 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); openExploreWithDashboardContext('Top 10 California Names Timeseries'); + // hover over canvas elements + cy.get('canvas').trigger('mouseover', { force: true }); + // label Anthony cy.get('[data-test="chart-container"] .line .nv-legend-symbol') .first() @@ -287,21 +281,21 @@ describe('Dashboard edit', () => { cy.get('[aria-label="Select color scheme"]').should('be.disabled'); }); - it('should not allow to change color scheme of a chart when dashboard has no scheme but chart has shared labels', () => { + it.skip('should not allow to change color scheme of a chart when dashboard has no scheme but chart has shared labels', () => { visit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // open second top tab to catch shared labels openTab(0, 1); waitForChartLoad({ name: 'Trends', - viz: 'line', + viz: 'echarts_timeseries_line', }); openTab(0, 0); @@ -317,7 +311,7 @@ describe('Dashboard edit', () => { cy.get('[aria-label="Select color scheme"]').should('be.disabled'); }); - it('should allow to change color scheme of a chart when dashboard has no scheme but only custom label colors', () => { + it.skip('should allow to change color scheme of a chart when dashboard has no scheme but only custom label colors', () => { visitEdit(TABBED_DASHBOARD); openProperties(); openAdvancedProperties(); @@ -330,7 +324,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -371,14 +365,14 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(0, 116, 241)'); }); - it('should allow to change color scheme of a chart when dashboard has no scheme and show the change', () => { + it.skip('should allow to change color scheme of a chart when dashboard has no scheme and show the change', () => { visit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -414,7 +408,7 @@ describe('Dashboard edit', () => { saveExploreColorScheme(); }); - it('should allow to change color scheme of a chart when dashboard has no scheme but custom label colors and show the change', () => { + it.skip('should allow to change color scheme of a chart when dashboard has no scheme but custom label colors and show the change', () => { visitEdit(TABBED_DASHBOARD); openProperties(); openAdvancedProperties(); @@ -427,7 +421,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -473,14 +467,14 @@ describe('Dashboard edit', () => { saveExploreColorScheme(); }); - it('should not change colors on refreshes with no color scheme set', () => { + it.skip('should not change colors on refreshes with no color scheme set', () => { visit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -492,7 +486,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Andrew cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -505,7 +499,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -517,7 +511,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Andrew cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -525,7 +519,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(69, 78, 124)'); }); - it('should not change colors on refreshes with color scheme set', () => { + it.skip('should not change colors on refreshes with color scheme set', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -536,7 +530,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -548,7 +542,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Andrew cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -561,7 +555,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -573,7 +567,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Andrew cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -581,14 +575,14 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(0, 76, 218)'); }); - it('should respect chart color scheme when none is set for the dashboard', () => { + it.skip('should respect chart color scheme when none is set for the dashboard', () => { visit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -599,7 +593,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(31, 168, 201)'); }); - it('should apply same color to same labels with color scheme set on refresh', () => { + it.skip('should apply same color to same labels with color scheme set on refresh', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -610,7 +604,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -622,7 +616,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -634,7 +628,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -646,7 +640,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -654,14 +648,14 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(50, 0, 167)'); }); - it('should apply same color to same labels with no color scheme set on refresh', () => { + it.skip('should apply same color to same labels with no color scheme set on refresh', () => { visit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -673,7 +667,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -686,7 +680,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -698,7 +692,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -706,7 +700,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(31, 168, 201)'); }); - it('custom label colors should take the precedence in nested tabs', () => { + it.skip('custom label colors should take the precedence in nested tabs', () => { visitEdit(TABBED_DASHBOARD); openProperties(); openAdvancedProperties(); @@ -721,7 +715,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); cy.get( '[data-test-chart-name="Top 10 California Names Timeseries"] .line .nv-legend-symbol', @@ -731,19 +725,19 @@ describe('Dashboard edit', () => { // open another nested tab openTab(2, 1); - waitForChartLoad({ name: 'Growth Rate', viz: 'line' }); + waitForChartLoad({ name: 'Growth Rate', viz: 'echarts_timeseries_line' }); cy.get('[data-test-chart-name="Growth Rate"] .line .nv-legend-symbol') .first() .should('have.css', 'fill', 'rgb(255, 0, 0)'); }); - it('label colors should take the precedence for rendered charts in nested tabs', () => { + it.skip('label colors should take the precedence for rendered charts in nested tabs', () => { visitEdit(TABBED_DASHBOARD); // open the tab first time and let chart load openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // go to previous tab @@ -766,7 +760,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(255, 0, 0)'); }); - it('should re-apply original color after removing custom label color with color scheme set', () => { + it.skip('should re-apply original color after removing custom label color with color scheme set', () => { visitEdit(TABBED_DASHBOARD); openProperties(); openAdvancedProperties(); @@ -809,13 +803,13 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(41, 171, 226)'); }); - it('should re-apply original color after removing custom label color with no color scheme set', () => { + it.skip('should re-apply original color after removing custom label color with no color scheme set', () => { visitEdit(TABBED_DASHBOARD); // open nested tab openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); cy.get( '[data-test-chart-name="Top 10 California Names Timeseries"] .line .nv-legend-symbol', @@ -873,7 +867,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(90, 193, 137)'); }); - it('should show the same colors in Explore', () => { + it.skip('should show the same colors in Explore', () => { visitEdit(TABBED_DASHBOARD); openProperties(); openAdvancedProperties(); @@ -888,7 +882,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -906,7 +900,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(255, 0, 0)'); }); - it('should change color scheme multiple times', () => { + it.skip('should change color scheme multiple times', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -917,7 +911,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // label Anthony @@ -929,7 +923,7 @@ describe('Dashboard edit', () => { // open 2nd main tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') @@ -959,7 +953,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(0, 128, 246)'); }); - it('should apply the color scheme across main tabs', () => { + it.skip('should apply the color scheme across main tabs', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -968,14 +962,14 @@ describe('Dashboard edit', () => { // go to second tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') .first() .should('have.css', 'fill', 'rgb(50, 0, 167)'); }); - it('should apply the color scheme across main tabs for rendered charts', () => { + it.skip('should apply the color scheme across main tabs for rendered charts', () => { visitEdit(TABBED_DASHBOARD); waitForChartLoad({ name: 'Treemap', viz: 'treemap_v2' }); openProperties(); @@ -985,7 +979,7 @@ describe('Dashboard edit', () => { // go to second tab openTab(0, 1); - waitForChartLoad({ name: 'Trends', viz: 'line' }); + waitForChartLoad({ name: 'Trends', viz: 'echarts_timeseries_line' }); cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') .first() @@ -1003,7 +997,7 @@ describe('Dashboard edit', () => { .should('have.css', 'fill', 'rgb(0, 128, 246)'); }); - it('should apply the color scheme in nested tabs', () => { + it.skip('should apply the color scheme in nested tabs', () => { visitEdit(TABBED_DASHBOARD); openProperties(); selectColorScheme('blueToGreen'); @@ -1014,7 +1008,7 @@ describe('Dashboard edit', () => { openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); cy.get( '[data-test-chart-name="Top 10 California Names Timeseries"] .line .nv-legend-symbol', @@ -1024,19 +1018,19 @@ describe('Dashboard edit', () => { // open another nested tab openTab(2, 1); - waitForChartLoad({ name: 'Growth Rate', viz: 'line' }); + waitForChartLoad({ name: 'Growth Rate', viz: 'echarts_timeseries_line' }); cy.get('[data-test-chart-name="Growth Rate"] .line .nv-legend-symbol') .first() .should('have.css', 'fill', 'rgb(50, 0, 167)'); }); - it('should apply a valid color scheme for rendered charts in nested tabs', () => { + it.skip('should apply a valid color scheme for rendered charts in nested tabs', () => { visitEdit(TABBED_DASHBOARD); // open the tab first time and let chart load openTab(1, 1); waitForChartLoad({ name: 'Top 10 California Names Timeseries', - viz: 'line', + viz: 'echarts_timeseries_line', }); // go to previous tab diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/tabs.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/tabs.test.ts index 39e937985..ef4ea6419 100644 --- a/superset-frontend/cypress-base/cypress/e2e/dashboard/tabs.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/tabs.test.ts @@ -25,7 +25,7 @@ import { TABBED_DASHBOARD } from 'cypress/utils/urls'; import { expandFilterOnLeftPanel } from './utils'; const TREEMAP = { name: 'Treemap', viz: 'treemap_v2' }; -const LINE_CHART = { name: 'Growth Rate', viz: 'line' }; +const LINE_CHART = { name: 'Growth Rate', viz: 'echarts_timeseries_line' }; const BOX_PLOT = { name: 'Box plot', viz: 'box_plot' }; const BIG_NUMBER = { name: 'Number of Girls', viz: 'big_number_total' }; const TABLE = { name: 'Names Sorted by Num in California', viz: 'table' }; @@ -64,9 +64,8 @@ describe('Dashboard tabs', () => { cy.get('@top-level-tabs') .last() .should('not.have.class', 'ant-tabs-tab-active'); - - cy.getBySel('grid-container').find('.box_plot').should('not.exist'); - cy.getBySel('grid-container').find('.line').should('not.exist'); + cy.get('[data-test-chart-name="Box plot"]').should('not.exist'); + cy.get('[data-test-chart-name="Trends"]').should('not.exist'); cy.get('@top-level-tabs').last().click(); cy.get('@top-level-tabs') @@ -76,7 +75,8 @@ describe('Dashboard tabs', () => { .first() .should('not.have.class', 'ant-tabs-tab-active'); waitForChartLoad(BOX_PLOT); - cy.getBySel('grid-container').find('.box_plot').should('be.visible'); + + cy.get('[data-test-chart-name="Box plot"]').should('exist'); resetTabs(); @@ -88,7 +88,7 @@ describe('Dashboard tabs', () => { cy.get('@row-level-tabs').last().click(); waitForChartLoad(LINE_CHART); - cy.getBySel('grid-container').find('.line').should('be.visible'); + cy.get('[data-test-chart-name="Trends"]').should('exist'); cy.get('@row-level-tabs').first().click(); }); diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts index 655eaecc8..fa85de54c 100644 --- a/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts +++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts @@ -24,9 +24,9 @@ export const WORLD_HEALTH_CHARTS = [ { name: '% Rural', viz: 'world_map' }, { name: 'Most Populated Countries', viz: 'table' }, { name: "World's Population", viz: 'big_number' }, - { name: 'Growth Rate', viz: 'line' }, + { name: 'Growth Rate', viz: 'echarts_timeseries_line' }, { name: 'Rural Breakdown', viz: 'sunburst_v2' }, - { name: "World's Pop Growth", viz: 'area' }, + { name: "World's Pop Growth", viz: 'echarts_area' }, { name: 'Life Expectancy VS Rural %', viz: 'bubble' }, { name: 'Treemap', viz: 'treemap_v2' }, { name: 'Box plot', viz: 'box_plot' }, @@ -41,7 +41,7 @@ export const SUPPORTED_TIER1_CHARTS = [ { name: 'Line Chart', viz: 'echarts_timeseries_line' }, { name: 'Area Chart', viz: 'echarts_area' }, { name: 'Scatter Chart', viz: 'echarts_timeseries_scatter' }, - { name: 'Bar Chart V2', viz: 'echarts_timeseries_bar' }, + { name: 'Bar Chart', viz: 'echarts_timeseries_bar' }, ] as ChartSpec[]; export const SUPPORTED_TIER2_CHARTS = [ diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts index f843f258f..fc1d7a00b 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ +import { interceptChart } from 'cypress/utils'; + describe('AdhocMetrics', () => { beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('postJson'); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); + interceptChart({ legacy: false }).as('chartData'); cy.visitChartByName('Num Births Trend'); - cy.verifySliceSuccess({ waitAlias: '@postJson' }); + cy.verifySliceSuccess({ waitAlias: '@chartData' }); }); it('Clear metric and set simple adhoc metric', () => { @@ -52,9 +53,8 @@ describe('AdhocMetrics', () => { cy.get('button[data-test="run-query-button"]').click(); cy.verifySliceSuccess({ - waitAlias: '@postJson', + waitAlias: '@chartData', querySubstring: `${metric} AS "${metricName}"`, // SQL statement - chartSelector: 'svg', }); }); @@ -88,9 +88,8 @@ describe('AdhocMetrics', () => { const metric = 'SUM(num)/COUNT(DISTINCT name)'; cy.verifySliceSuccess({ - waitAlias: '@postJson', + waitAlias: '@chartData', querySubstring: `${metric} AS "${metric}"`, - chartSelector: 'svg', }); }); @@ -117,9 +116,8 @@ describe('AdhocMetrics', () => { const metric = 'SUM(num)'; cy.verifySliceSuccess({ - waitAlias: '@postJson', + waitAlias: '@chartData', querySubstring: `${metric} AS "${metric}"`, - chartSelector: 'svg', }); }); }); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/advanced_analytics.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/advanced_analytics.test.ts index f07704c7b..2d50460fd 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/advanced_analytics.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/advanced_analytics.test.ts @@ -16,20 +16,21 @@ * specific language governing permissions and limitations * under the License. */ +import { interceptV1ChartData } from './utils'; + describe('Advanced analytics', () => { beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('postJson'); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); + interceptV1ChartData(); cy.intercept('PUT', '/api/v1/explore/**').as('putExplore'); cy.intercept('GET', '/explore/**').as('getExplore'); }); it('Create custom time compare', () => { cy.visitChartByName('Num Births Trend'); - cy.verifySliceSuccess({ waitAlias: '@postJson' }); + cy.verifySliceSuccess({ waitAlias: '@v1Data' }); cy.get('.ant-collapse-header') - .contains('Advanced Analytics') + .contains('Advanced analytics') .click({ force: true }); cy.get('[data-test=time_compare]').find('.ant-select').click(); @@ -43,17 +44,16 @@ describe('Advanced analytics', () => { .type('1 year{enter}'); cy.get('button[data-test="run-query-button"]').click(); - cy.wait('@postJson'); + cy.wait('@v1Data'); cy.wait('@putExplore'); cy.reload(); cy.verifySliceSuccess({ - waitAlias: '@postJson', - chartSelector: 'svg', + waitAlias: '@v1Data', }); cy.wait('@getExplore'); cy.get('.ant-collapse-header') - .contains('Advanced Analytics') + .contains('Advanced analytics') .click({ force: true }); cy.get('[data-test=time_compare]') .find('.ant-select-selector') diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/annotations.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/annotations.test.ts index a10295af9..ec1596e93 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/annotations.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/annotations.test.ts @@ -16,18 +16,22 @@ * specific language governing permissions and limitations * under the License. */ +import { interceptChart } from 'cypress/utils'; + describe('Annotations', () => { beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('postJson'); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); + interceptChart({ legacy: false }).as('chartData'); }); it('Create formula annotation y-axis goal line', () => { cy.visitChartByName('Num Births Trend'); - cy.verifySliceSuccess({ waitAlias: '@postJson' }); + cy.verifySliceSuccess({ waitAlias: '@chartData' }); const layerLabel = 'Goal line'; + // get by text Annotations and Layers + cy.get('span').contains('Annotations and Layers').click(); + cy.get('[data-test=annotation_layers]').click(); cy.get('[data-test="popover-content"]').within(() => { @@ -39,10 +43,6 @@ describe('Annotations', () => { cy.get('button[data-test="run-query-button"]').click(); cy.get('[data-test=annotation_layers]').contains(layerLabel); - cy.verifySliceSuccess({ - waitAlias: '@postJson', - chartSelector: 'svg', - }); - cy.get('.nv-legend-text').should('have.length', 2); + cy.verifySliceSuccess({ waitAlias: '@chartData' }); }); }); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js index 14c386e0e..c7b81a3e1 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js +++ b/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js @@ -21,6 +21,7 @@ import { interceptGet as interceptDashboardGet } from 'cypress/e2e/dashboard/uti import { FORM_DATA_DEFAULTS, NUM_METRIC } from './visualizations/shared.helper'; import { interceptFiltering, + interceptV1ChartData, saveChartToDashboard, visitSampleChartFromList, } from './utils'; @@ -124,14 +125,14 @@ describe('Cross-referenced dashboards', () => { describe('No Results', () => { beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); + interceptV1ChartData(); }); it('No results message shows up', () => { const formData = { ...FORM_DATA_DEFAULTS, metrics: [NUM_METRIC], - viz_type: 'line', + viz_type: 'echarts_timeseries_line', adhoc_filters: [ { expressionType: 'SIMPLE', @@ -145,7 +146,7 @@ describe('No Results', () => { }; cy.visitChartByParams(formData); - cy.wait('@getJson').its('response.statusCode').should('eq', 200); + cy.wait('@v1Data').its('response.statusCode').should('eq', 200); cy.get('div.chart-container').contains( 'No results were returned for this query', ); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts index e4e7a7dc7..b68d828ba 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts @@ -20,13 +20,12 @@ // Tests for setting controls in the UI // *********************************************** import { interceptChart } from 'cypress/utils'; -import { FORM_DATA_DEFAULTS, NUM_METRIC } from './visualizations/shared.helper'; describe('Datasource control', () => { const newMetricName = `abc${Date.now()}`; it('should allow edit dataset', () => { - interceptChart({ legacy: true }).as('chartData'); + interceptChart({ legacy: false }).as('chartData'); cy.visitChartByName('Num Births Trend'); cy.verifySliceSuccess({ waitAlias: '@chartData' }); @@ -85,7 +84,7 @@ describe('Datasource control', () => { describe('Color scheme control', () => { beforeEach(() => { - interceptChart({ legacy: true }).as('chartData'); + interceptChart({ legacy: false }).as('chartData'); cy.visitChartByName('Num Births Trend'); cy.verifySliceSuccess({ waitAlias: '@chartData' }); @@ -137,7 +136,7 @@ describe('VizType control', () => { describe('Test datatable', () => { beforeEach(() => { interceptChart({ legacy: false }).as('tableChartData'); - interceptChart({ legacy: true }).as('lineChartData'); + interceptChart({ legacy: false }).as('lineChartData'); cy.visitChartByName('Daily Totals'); }); it('Data Pane opens and loads results', () => { @@ -157,107 +156,9 @@ describe('Test datatable', () => { }); }); -describe('Time range filter', () => { - beforeEach(() => { - interceptChart({ legacy: true }).as('chartData'); - }); - - it('Advanced time_range params', () => { - const formData = { - ...FORM_DATA_DEFAULTS, - viz_type: 'line', - time_range: '100 years ago : now', - metrics: [NUM_METRIC], - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@chartData' }); - - cy.get('[data-test=time-range-trigger]').click(); - cy.get('.footer').find('button').its('length').should('eq', 2); - cy.get('.ant-popover-content').within(() => { - cy.get('input[value="100 years ago"]'); - cy.get('input[value="now"]'); - }); - cy.get('[data-test=cancel-button]').click(); - cy.wait(500); - cy.get('.ant-popover').should('not.exist'); - }); - - it('Common time_range params', () => { - const formData = { - ...FORM_DATA_DEFAULTS, - viz_type: 'line', - metrics: [NUM_METRIC], - time_range: 'Last year', - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@chartData' }); - - cy.get('[data-test=time-range-trigger]').click(); - cy.get('.ant-radio-group').children().its('length').should('eq', 5); - cy.get('.ant-radio-checked + span').contains('Last year'); - cy.get('[data-test=cancel-button]').click(); - }); - - it('Previous time_range params', () => { - const formData = { - ...FORM_DATA_DEFAULTS, - viz_type: 'line', - metrics: [NUM_METRIC], - time_range: 'previous calendar month', - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@chartData' }); - - cy.get('[data-test=time-range-trigger]').click(); - cy.get('.ant-radio-group').children().its('length').should('eq', 3); - cy.get('.ant-radio-checked + span').contains('previous calendar month'); - cy.get('[data-test=cancel-button]').click(); - }); - - it('Custom time_range params', () => { - const formData = { - ...FORM_DATA_DEFAULTS, - viz_type: 'line', - metrics: [NUM_METRIC], - time_range: 'DATEADD(DATETIME("today"), -7, day) : today', - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@chartData' }); - - cy.get('[data-test=time-range-trigger]').click(); - cy.get('[data-test=custom-frame]').then(() => { - cy.get('.antd5-input-number-input-wrap > input') - .invoke('attr', 'value') - .should('eq', '7'); - }); - cy.get('[data-test=cancel-button]').click(); - }); - - it('No filter time_range params', () => { - const formData = { - ...FORM_DATA_DEFAULTS, - viz_type: 'line', - metrics: [NUM_METRIC], - time_range: 'No filter', - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@chartData' }); - - cy.get('[data-test=time-range-trigger]').click(); - cy.get('[data-test=no-filter]').should('exist'); - cy.get('[data-test=cancel-button]').click(); - }); -}); - describe('Groupby control', () => { it('Set groupby', () => { - interceptChart({ legacy: true }).as('chartData'); + interceptChart({ legacy: false }).as('chartData'); cy.visitChartByName('Num Births Trend'); cy.verifySliceSuccess({ waitAlias: '@chartData' }); @@ -271,6 +172,6 @@ describe('Groupby control', () => { cy.get('[data-test="ColumnEdit#save"]').contains('Save').click(); cy.get('button[data-test="run-query-button"]').click(); - cy.verifySliceSuccess({ waitAlias: '@chartData', chartSelector: 'svg' }); + cy.verifySliceSuccess({ waitAlias: '@chartData' }); }); }); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts index 5c7be1c96..b6c6a020f 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts @@ -30,7 +30,7 @@ const apiURL = (endpoint: string, queryObject: Record) => describe('Test explore links', () => { beforeEach(() => { - interceptChart({ legacy: true }).as('chartData'); + interceptChart({ legacy: false }).as('chartData'); }); it('Open and close view query modal', () => { diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts index 95af89db5..95f6d34b6 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts +++ b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts @@ -77,7 +77,7 @@ export function saveChartToDashboard(dashboardName: string) { .click(); cy.get( '.ant-select-selection-search-input[aria-label="Select a dashboard"]', - ).type(dashboardName.slice(0, 3), { force: true }); + ).type(dashboardName, { force: true }); cy.get(`.ant-select-item-option[title="${dashboardName}"]`).click(); cy.getBySel('btn-modal-save').click(); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/area.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/area.test.js deleted file mode 100644 index 78981ed02..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/area.test.js +++ /dev/null @@ -1,120 +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 > Area', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const AREA_FORM_DATA = { - datasource: '2__table', - viz_type: 'area', - slice_id: 48, - granularity_sqla: 'year', - time_grain_sqla: 'P1D', - time_range: '1960-01-01 : now', - metrics: ['sum__SP_POP_TOTL'], - adhoc_filters: [], - groupby: [], - limit: '25', - order_desc: true, - contribution: false, - row_limit: 50000, - show_brush: 'auto', - show_legend: true, - line_interpolation: 'linear', - stacked_style: 'stack', - color_scheme: 'bnbColors', - rich_tooltip: true, - show_controls: false, - x_axis_label: '', - bottom_margin: 'auto', - x_ticks_layout: 'auto', - x_axis_format: 'smart_date', - x_axis_showminmax: false, - y_axis_format: '.3s', - y_log_scale: false, - rolling_type: 'None', - comparison_type: 'values', - annotation_layers: [], - }; - - function verify(formData) { - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - } - - it('should work without groupby', () => { - verify(AREA_FORM_DATA); - cy.get('.nv-area').should('have.length', 1); - }); - - it('should work with group by', () => { - verify({ - ...AREA_FORM_DATA, - groupby: ['region'], - }); - - cy.get('.nv-area').should('have.length', 7); - }); - - it('should work with groupby and filter', () => { - cy.visitChartByParams({ - ...AREA_FORM_DATA, - groupby: ['region'], - adhoc_filters: [ - { - expressionType: 'SIMPLE', - subject: 'region', - operator: 'IN', - comparator: ['South Asia', 'North America'], - clause: 'WHERE', - sqlExpression: null, - filterOptionName: 'filter_txje2ikiv6_wxmn0qwd1xo', - }, - ], - }); - - cy.wait('@getJson').then(async ({ response }) => { - const responseBody = response?.body; - // Make sure data is sorted correctly - const firstRow = responseBody.data[0].values; - const secondRow = responseBody.data[1].values; - expect(firstRow[firstRow.length - 1].y).to.be.greaterThan( - secondRow[secondRow.length - 1].y, - ); - cy.verifySliceContainer('svg'); - }); - cy.get('.nv-area').should('have.length', 2); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - verify(AREA_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(); - cy.focused().type('supersetColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="supersetColors"]', - ).should('exist'); - cy.get('.area .nv-legend .nv-legend-symbol') - .first() - .should('have.css', 'fill', 'rgb(31, 168, 201)'); - }); -}); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dist_bar.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dist_bar.test.js deleted file mode 100644 index e208b7892..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dist_bar.test.js +++ /dev/null @@ -1,90 +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 { FORM_DATA_DEFAULTS, NUM_METRIC } from './shared.helper'; - -describe('Visualization > Distribution bar chart', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const VIZ_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'dist_bar' }; - const DISTBAR_FORM_DATA = { - ...VIZ_DEFAULTS, - metrics: NUM_METRIC, - groupby: ['state'], - }; - - it('should work with adhoc metric', () => { - cy.visitChartByParams(DISTBAR_FORM_DATA); - cy.verifySliceSuccess({ - waitAlias: '@getJson', - querySubstring: NUM_METRIC.label, - chartSelector: 'svg', - }); - }); - - it('should work with series', () => { - const formData = { - ...VIZ_DEFAULTS, - metrics: NUM_METRIC, - groupby: ['state'], - columns: ['gender'], - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with row limit', () => { - const formData = { - ...VIZ_DEFAULTS, - metrics: NUM_METRIC, - groupby: ['state'], - row_limit: 10, - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with contribution', () => { - const formData = { - ...VIZ_DEFAULTS, - metrics: NUM_METRIC, - groupby: ['state'], - columns: ['gender'], - contribution: true, - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - cy.visitChartByParams(DISTBAR_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(); - cy.focused().type('bnbColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="bnbColors"]', - ).should('exist'); - }); -}); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js index 668e9c789..ce7e52277 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js +++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js @@ -18,8 +18,11 @@ */ import { FORM_DATA_DEFAULTS, NUM_METRIC } from './shared.helper'; -describe('Download Chart > Distribution bar chart', () => { - const VIZ_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'dist_bar' }; +describe('Download Chart > Bar chart', () => { + const VIZ_DEFAULTS = { + ...FORM_DATA_DEFAULTS, + viz_type: 'echarts_timeseries_bar', + }; beforeEach(() => { cy.intercept('POST', '/superset/explore_json/**').as('getJson'); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/histogram.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/histogram.test.ts deleted file mode 100644 index 7904bd970..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/histogram.test.ts +++ /dev/null @@ -1,102 +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 { QueryFormData } from '@superset-ui/core'; - -describe('Visualization > Histogram', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const HISTOGRAM_FORM_DATA: QueryFormData = { - datasource: '3__table', - viz_type: 'histogram', - slice_id: 60, - granularity_sqla: 'ds', - time_grain_sqla: 'P1D', - time_range: '100 years ago : now', - all_columns_x: ['num'], - adhoc_filters: [], - row_limit: 50000, - groupby: [], - color_scheme: 'bnbColors', - link_length: 5, // number of bins - x_axis_label: 'Frequency', - y_axis_label: 'Num', - global_opacity: 1, - normalized: false, - }; - - function verify(formData: QueryFormData) { - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - } - - it('should work without groupby', () => { - verify(HISTOGRAM_FORM_DATA); - cy.get('.chart-container svg .vx-bar').should( - 'have.length', - HISTOGRAM_FORM_DATA.link_length, - ); - }); - - it('should work with group by', () => { - verify({ - ...HISTOGRAM_FORM_DATA, - groupby: ['gender'], - }); - cy.get('.chart-container svg .vx-bar').should( - 'have.length', - HISTOGRAM_FORM_DATA.link_length * 2, - ); - }); - - it('should work with filter and update num bins', () => { - const numBins = 2; - verify({ - ...HISTOGRAM_FORM_DATA, - link_length: numBins, - adhoc_filters: [ - { - expressionType: 'SIMPLE', - clause: 'WHERE', - subject: 'state', - operator: '==', - comparator: 'CA', - }, - ], - }); - cy.get('.chart-container svg .vx-bar').should('have.length', numBins); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - verify(HISTOGRAM_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(); - cy.focused().type('supersetColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="supersetColors"]', - ).should('exist'); - cy.get('.histogram .vx-legend .vx-legend-shape div') - .first() - .should('have.css', 'background') - .and('contains', 'rgb(31, 168, 201)'); - }); -}); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/line.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/line.test.ts deleted file mode 100644 index ef7b9b53d..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/line.test.ts +++ /dev/null @@ -1,302 +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 { FORM_DATA_DEFAULTS, NUM_METRIC, SIMPLE_FILTER } from './shared.helper'; - -describe('Visualization > Line', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const LINE_CHART_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'line' }; - - it('should show validator error when no metric', () => { - const formData = { ...LINE_CHART_DEFAULTS, metrics: [] }; - cy.visitChartByParams(formData); - cy.get('.panel-body').contains( - `Add required control values to preview chart`, - ); - }); - - it('should not show validator error when metric added', () => { - const formData = { ...LINE_CHART_DEFAULTS, metrics: [] }; - cy.visitChartByParams(formData); - cy.get('.panel-body').contains( - `Add required control values to preview chart`, - ); - cy.get('[data-test="metrics-header"]').contains('Metrics'); - cy.get('[data-test="metrics-header"] [data-test="error-tooltip"]').should( - 'exist', - ); - - cy.get('[data-test=metrics]') - .contains('Drop columns/metrics here or click') - .click(); - - // Title edit for saved metrics is disabled - switch to Simple - cy.get('[id="adhoc-metric-edit-tabs-tab-SIMPLE"]').click(); - - cy.get('input[aria-label="Select column"]').click(); - cy.get('input[aria-label="Select column"]').type('num{enter}'); - cy.get('input[aria-label="Select aggregate options"]').click(); - cy.get('input[aria-label="Select aggregate options"]').type('sum{enter}'); - cy.get('[data-test="AdhocMetricEdit#save"]').contains('Save').click(); - - cy.get('[data-test="metrics-header"]').contains('Metrics'); - cy.get('[data-test="metrics-header"] [data-test="error-tooltip"]').should( - 'not.exist', - ); - - cy.get('.antd5-alert-warning').should('not.exist'); - }); - - it('should allow negative values in Y bounds', () => { - const formData = { ...LINE_CHART_DEFAULTS, metrics: [NUM_METRIC] }; - cy.visitChartByParams(formData); - cy.get('#controlSections-tab-display').click(); - cy.get('span').contains('Y Axis Bounds').scrollIntoView(); - cy.get('input[placeholder="Min"]').type('-0.1', { delay: 100 }); - cy.get('.antd5-alert-warning').should('not.exist'); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - 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(); - cy.focused().type('bnbColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="bnbColors"]', - ).should('exist'); - cy.get('.line .nv-legend .nv-legend-symbol') - .first() - .should('have.css', 'fill', 'rgb(41, 105, 107)'); - }); - - it('should work with adhoc metric', () => { - const formData = { ...LINE_CHART_DEFAULTS, metrics: [NUM_METRIC] }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with groupby', () => { - const metrics = ['count']; - const groupby = ['gender']; - const formData = { ...LINE_CHART_DEFAULTS, metrics, groupby }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with simple filter', () => { - const metrics = ['count']; - const filters = [SIMPLE_FILTER]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics, - adhoc_filters: filters, - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with series limit sort asc', () => { - const formData = { - ...LINE_CHART_DEFAULTS, - metrics: [NUM_METRIC], - limit: 10, - groupby: ['name'], - timeseries_limit_metric: NUM_METRIC, - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with series limit sort desc', () => { - const formData = { - ...LINE_CHART_DEFAULTS, - metrics: [NUM_METRIC], - limit: 10, - groupby: ['name'], - timeseries_limit_metric: NUM_METRIC, - order_desc: true, - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with rolling avg', () => { - const metrics = [NUM_METRIC]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics, - rolling_type: 'mean', - rolling_periods: 10, - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with time shift 1 year', () => { - const metrics = [NUM_METRIC]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics, - time_compare: ['1 year'], - comparison_type: 'values', - groupby: ['gender'], - }; - - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - - // Offset color should match original line color - cy.get('.nv-legend-text') - .contains('boy') - .siblings() - .first() - .should('have.attr', 'style') - .then(style => { - cy.get('.nv-legend-text') - .contains('boy, 1 year offset') - .siblings() - .first() - .should('have.attr', 'style') - .and('eq', style); - }); - - cy.get('.nv-legend-text') - .contains('girl') - .siblings() - .first() - .should('have.attr', 'style') - .then(style => { - cy.get('.nv-legend-text') - .contains('girl, 1 year offset') - .siblings() - .first() - .should('have.attr', 'style') - .and('eq', style); - }); - }); - - it('should work with time shift yoy', () => { - const metrics = [NUM_METRIC]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics, - time_compare: ['1 year'], - comparison_type: 'ratio', - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('should work with time shift percentage change', () => { - const metrics = [NUM_METRIC]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics, - time_compare: ['1 year'], - comparison_type: 'percentage', - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - }); - - it('Test verbose name shows up in legend', () => { - const formData = { - ...LINE_CHART_DEFAULTS, - metrics: ['count'], - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - cy.get('text.nv-legend-text').contains('COUNT(*)'); - }); - - it('Test hidden annotation', () => { - const formData = { - ...LINE_CHART_DEFAULTS, - metrics: ['count'], - annotation_layers: [ - { - name: 'Goal line', - annotationType: 'FORMULA', - sourceType: '', - value: 'y=140000', - overrides: { time_range: null }, - show: false, - showLabel: false, - titleColumn: '', - descriptionColumns: [], - timeColumn: '', - intervalEndColumn: '', - color: null, - opacity: '', - style: 'solid', - width: 1, - showMarkers: false, - hideLine: false, - }, - ], - }; - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - cy.get('.slice_container').within(() => { - // Goal line annotation doesn't show up in legend - cy.get('.nv-legend-text').should('have.length', 1); - }); - }); - - it('Test event annotation time override', () => { - cy.request('/chart/api/read?_flt_3_slice_name=Daily+Totals').then( - response => { - const value = response.body.pks[0]; - const formData = { - ...LINE_CHART_DEFAULTS, - metrics: ['count'], - annotation_layers: [ - { - name: 'Yearly date', - annotationType: 'EVENT', - sourceType: 'table', - value, - overrides: { time_range: null }, - show: true, - showLabel: false, - titleColumn: 'ds', - descriptionColumns: ['ds'], - timeColumn: 'ds', - color: null, - opacity: '', - style: 'solid', - width: 1, - showMarkers: false, - hideLine: false, - }, - ], - }; - cy.visitChartByParams(formData); - }, - ); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - cy.get('.slice_container').within(() => { - cy.get('.nv-event-annotation-layer-0') - .children() - .should('have.length', 44); - }); - }); -}); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sankey.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sankey.test.js deleted file mode 100644 index e5e6dc240..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sankey.test.js +++ /dev/null @@ -1,87 +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 > Sankey', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const SANKEY_FORM_DATA = { - datasource: '1__table', - viz_type: 'sankey', - slice_id: 1, - url_params: {}, - granularity_sqla: null, - time_grain_sqla: 'P1D', - time_range: 'Last week', - groupby: ['source', 'target'], - metric: 'sum__value', - adhoc_filters: [], - row_limit: '5000', - color_scheme: 'bnbColors', - }; - - function verify(formData) { - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - } - - it('should work', () => { - verify(SANKEY_FORM_DATA); - cy.get('.chart-container svg g.node rect').should('have.length', 41); - }); - - it('should work with filter', () => { - verify({ - ...SANKEY_FORM_DATA, - adhoc_filters: [ - { - expressionType: 'SQL', - sqlExpression: 'SUM(value) > 0', - clause: 'HAVING', - subject: null, - operator: null, - comparator: null, - filterOptionName: 'filter_jbdwe0hayaj_h9jfer8fy58', - }, - { - expressionType: 'SIMPLE', - subject: 'source', - operator: '==', - comparator: 'Energy', - clause: 'WHERE', - sqlExpression: null, - filterOptionName: 'filter_8e0otka9uif_vmqri4gmbqc', - }, - ], - }); - cy.get('.chart-container svg g.node rect').should('have.length', 6); - }); - - it('should allow type to search color schemes', () => { - verify(SANKEY_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(); - cy.focused().type('bnbColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="bnbColors"]', - ).should('exist'); - }); -}); diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/shared.helper.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/shared.helper.js index bfd50e66d..ca8ae94b7 100644 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/shared.helper.js +++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/shared.helper.js @@ -22,15 +22,22 @@ export const FORM_DATA_DEFAULTS = { datasource: '3__table', - granularity_sqla: 'ds', time_grain_sqla: null, - time_range: '100 years ago : now', - adhoc_filters: [], + x_axis: 'ds', + adhoc_filters: [ + { + clause: 'WHERE', + subject: 'ds', + operator: 'TEMPORAL_RANGE', + comparator: '100 years ago : now', + expressionType: 'SIMPLE', + }, + ], groupby: [], limit: null, timeseries_limit_metric: null, order_desc: false, - contribution: false, + contributionMode: null, }; export const HEALTH_POP_FORM_DATA_DEFAULTS = { diff --git a/superset-frontend/cypress-base/cypress/fixtures/charts.json b/superset-frontend/cypress-base/cypress/fixtures/charts.json index 5781fce81..879b16b02 100644 --- a/superset-frontend/cypress-base/cypress/fixtures/charts.json +++ b/superset-frontend/cypress-base/cypress/fixtures/charts.json @@ -3,40 +3,40 @@ "slice_name": "1 - Sample chart", "description": "chart description", "owners": [1], - "viz_type": "line", + "viz_type": "echarts_timeseries_line", "cache_timeout": 1000, "datasource_id": 2, "datasource_type": "table", - "params": "{\"viz_type\":\"line\",\"metrics\":[\"count\"]}" + "params": "{\"viz_type\":\"echarts_timeseries_line\",\"x_axis\":\"year\",\"metrics\":[\"count\"]}" }, { "slice_name": "2 - Sample chart", "description": "chart description", "owners": [1], - "viz_type": "line", + "viz_type": "echarts_timeseries_line", "cache_timeout": 1000, "datasource_id": 2, "datasource_type": "table", - "params": "{\"viz_type\":\"line\",\"metrics\":[\"count\"]}" + "params": "{\"viz_type\":\"echarts_timeseries_line\",\"x_axis\":\"year\",\"metrics\":[\"count\"]}" }, { "slice_name": "3 - Sample chart", "description": "chart description", "owners": [1], - "viz_type": "line", + "viz_type": "echarts_timeseries_line", "cache_timeout": 1000, "datasource_id": 2, "datasource_type": "table", - "params": "{\"viz_type\":\"line\",\"metrics\":[\"count\"]}" + "params": "{\"viz_type\":\"echarts_timeseries_line\",\"x_axis\":\"year\",\"metrics\":[\"count\"]}" }, { "slice_name": "4 - Sample chart", "description": "chart description", "owners": [1], - "viz_type": "line", + "viz_type": "echarts_timeseries_line", "cache_timeout": 1000, "datasource_id": 2, "datasource_type": "table", - "params": "{\"viz_type\":\"line\",\"metrics\":[\"count\"]}" + "params": "{\"viz_type\":\"echarts_timeseries_line\",\"x_axis\":\"year\",\"metrics\":[\"count\"]}" } ] diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 693c8ac64..f3607f0eb 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -30,17 +30,12 @@ "@superset-ui/legacy-plugin-chart-calendar": "file:./plugins/legacy-plugin-chart-calendar", "@superset-ui/legacy-plugin-chart-chord": "file:./plugins/legacy-plugin-chart-chord", "@superset-ui/legacy-plugin-chart-country-map": "file:./plugins/legacy-plugin-chart-country-map", - "@superset-ui/legacy-plugin-chart-event-flow": "file:./plugins/legacy-plugin-chart-event-flow", - "@superset-ui/legacy-plugin-chart-heatmap": "file:./plugins/legacy-plugin-chart-heatmap", - "@superset-ui/legacy-plugin-chart-histogram": "file:./plugins/legacy-plugin-chart-histogram", "@superset-ui/legacy-plugin-chart-horizon": "file:./plugins/legacy-plugin-chart-horizon", "@superset-ui/legacy-plugin-chart-map-box": "file:./plugins/legacy-plugin-chart-map-box", "@superset-ui/legacy-plugin-chart-paired-t-test": "file:./plugins/legacy-plugin-chart-paired-t-test", "@superset-ui/legacy-plugin-chart-parallel-coordinates": "file:./plugins/legacy-plugin-chart-parallel-coordinates", "@superset-ui/legacy-plugin-chart-partition": "file:./plugins/legacy-plugin-chart-partition", "@superset-ui/legacy-plugin-chart-rose": "file:./plugins/legacy-plugin-chart-rose", - "@superset-ui/legacy-plugin-chart-sankey": "file:./plugins/legacy-plugin-chart-sankey", - "@superset-ui/legacy-plugin-chart-sankey-loop": "file:./plugins/legacy-plugin-chart-sankey-loop", "@superset-ui/legacy-plugin-chart-world-map": "file:./plugins/legacy-plugin-chart-world-map", "@superset-ui/legacy-preset-chart-deckgl": "file:./plugins/legacy-preset-chart-deckgl", "@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3", @@ -3812,206 +3807,6 @@ "react-dom": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0" } }, - "node_modules/@data-ui/histogram": { - "version": "0.0.84", - "license": "MIT", - "dependencies": { - "@data-ui/shared": "^0.0.84", - "@data-ui/theme": "^0.0.84", - "@vx/axis": "^0.0.179", - "@vx/curve": "^0.0.165", - "@vx/event": "^0.0.179", - "@vx/glyph": "^0.0.179", - "@vx/gradient": "^0.0.165", - "@vx/group": "^0.0.170", - "@vx/pattern": "^0.0.179", - "@vx/responsive": "^0.0.192", - "@vx/scale": "^0.0.179", - "@vx/shape": "^0.0.179", - "@vx/tooltip": "0.0.179", - "d3-array": "^1.2.0", - "d3-scale": "^1.0.6", - "prop-types": "^15.5.10", - "react-move": "^2.1.0" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0", - "react-dom": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/axis": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "@vx/group": "0.0.170", - "@vx/point": "0.0.165", - "@vx/shape": "0.0.179", - "@vx/text": "0.0.179", - "classnames": "^2.2.5", - "prop-types": "^15.6.0" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/bounds": { - "version": "0.0.165", - "license": "MIT", - "dependencies": { - "prop-types": "^15.5.10" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0", - "react-dom": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/event": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "@vx/point": "0.0.165" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/glyph": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "@vx/group": "0.0.170", - "classnames": "^2.2.5", - "d3-shape": "^1.2.0", - "prop-types": "^15.6.2" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/gradient": { - "version": "0.0.165", - "license": "MIT", - "dependencies": { - "classnames": "^2.2.5", - "prop-types": "^15.5.7" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/group": { - "version": "0.0.170", - "license": "MIT", - "dependencies": { - "classnames": "^2.2.5" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/pattern": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/point": { - "version": "0.0.165", - "license": "MIT" - }, - "node_modules/@data-ui/histogram/node_modules/@vx/responsive": { - "version": "0.0.192", - "license": "MIT", - "dependencies": { - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.0" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/scale": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "d3-scale": "^2.0.0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/scale/node_modules/d3-scale": { - "version": "2.2.2", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/shape": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "@vx/curve": "0.0.165", - "@vx/group": "0.0.170", - "@vx/point": "0.0.165", - "classnames": "^2.2.5", - "d3-path": "^1.0.5", - "d3-shape": "^1.2.0", - "prop-types": "^15.5.10" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/@vx/tooltip": { - "version": "0.0.179", - "license": "MIT", - "dependencies": { - "@vx/bounds": "0.0.165", - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "node_modules/@data-ui/histogram/node_modules/d3-interpolate": { - "version": "1.4.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-color": "1" - } - }, - "node_modules/@data-ui/histogram/node_modules/d3-scale": { - "version": "1.0.7", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-color": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - }, - "node_modules/@data-ui/histogram/node_modules/d3-time-format": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", - "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", - "dependencies": { - "d3-time": "1" - } - }, - "node_modules/@data-ui/histogram/node_modules/resize-observer-polyfill": { - "version": "1.5.0", - "license": "MIT" - }, "node_modules/@data-ui/radial-chart": { "version": "0.0.84", "license": "MIT", @@ -12363,18 +12158,6 @@ "resolved": "plugins/legacy-plugin-chart-country-map", "link": true }, - "node_modules/@superset-ui/legacy-plugin-chart-event-flow": { - "resolved": "plugins/legacy-plugin-chart-event-flow", - "link": true - }, - "node_modules/@superset-ui/legacy-plugin-chart-heatmap": { - "resolved": "plugins/legacy-plugin-chart-heatmap", - "link": true - }, - "node_modules/@superset-ui/legacy-plugin-chart-histogram": { - "resolved": "plugins/legacy-plugin-chart-histogram", - "link": true - }, "node_modules/@superset-ui/legacy-plugin-chart-horizon": { "resolved": "plugins/legacy-plugin-chart-horizon", "link": true @@ -12399,14 +12182,6 @@ "resolved": "plugins/legacy-plugin-chart-rose", "link": true }, - "node_modules/@superset-ui/legacy-plugin-chart-sankey": { - "resolved": "plugins/legacy-plugin-chart-sankey", - "link": true - }, - "node_modules/@superset-ui/legacy-plugin-chart-sankey-loop": { - "resolved": "plugins/legacy-plugin-chart-sankey-loop", - "link": true - }, "node_modules/@superset-ui/legacy-plugin-chart-time-table": { "version": "0.18.25", "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-time-table/-/legacy-plugin-chart-time-table-0.18.25.tgz", @@ -15322,69 +15097,6 @@ "react": "^15.0.0-0 || ^16.0.0-0" } }, - "node_modules/@vx/scale": { - "version": "0.0.199", - "license": "MIT", - "dependencies": { - "@types/d3-interpolate": "^1.3.1", - "@types/d3-scale": "^2.1.1", - "@types/d3-time": "^1.0.10", - "d3-interpolate": "^1.4.0", - "d3-scale": "^3.0.1", - "d3-time": "^1.1.0" - } - }, - "node_modules/@vx/scale/node_modules/@types/d3-interpolate": { - "version": "1.4.5", - "license": "MIT", - "dependencies": { - "@types/d3-color": "^1" - } - }, - "node_modules/@vx/scale/node_modules/d3-array": { - "version": "2.12.1", - "license": "BSD-3-Clause", - "dependencies": { - "internmap": "^1.0.0" - } - }, - "node_modules/@vx/scale/node_modules/d3-interpolate": { - "version": "1.4.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-color": "1" - } - }, - "node_modules/@vx/scale/node_modules/d3-scale": { - "version": "3.3.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "^2.3.0", - "d3-format": "1 - 2", - "d3-interpolate": "1.2.0 - 2", - "d3-time": "^2.1.1", - "d3-time-format": "2 - 3" - } - }, - "node_modules/@vx/scale/node_modules/d3-scale/node_modules/d3-time": { - "version": "2.1.1", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "2" - } - }, - "node_modules/@vx/scale/node_modules/d3-time": { - "version": "1.1.0", - "license": "BSD-3-Clause" - }, - "node_modules/@vx/scale/node_modules/d3-time-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", - "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", - "dependencies": { - "d3-time": "1 - 2" - } - }, "node_modules/@vx/shape": { "version": "0.0.140", "license": "MIT", @@ -15440,6 +15152,7 @@ "node_modules/@vx/text": { "version": "0.0.179", "license": "MIT", + "peer": true, "dependencies": { "babel-plugin-lodash": "^3.3.2", "classnames": "^2.2.5", @@ -21491,47 +21204,6 @@ "version": "2.0.3", "license": "BSD-3-Clause" }, - "node_modules/d3-sankey": { - "version": "0.4.2", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "1", - "d3-collection": "1", - "d3-interpolate": "1" - } - }, - "node_modules/d3-sankey-diagram": { - "version": "0.7.3", - "license": "MIT", - "dependencies": { - "d3-array": "^1.0.2", - "d3-collection": "^1.0.2", - "d3-dispatch": "^1.0.3", - "d3-format": "^1.1.1", - "d3-interpolate": "^1.1.3", - "d3-selection": "^1.0.3", - "d3-transition": "^1.0.4", - "graphlib": "~2.1.0" - } - }, - "node_modules/d3-sankey-diagram/node_modules/d3-interpolate": { - "version": "1.4.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-color": "1" - } - }, - "node_modules/d3-sankey-diagram/node_modules/d3-selection": { - "version": "1.4.2", - "license": "BSD-3-Clause" - }, - "node_modules/d3-sankey/node_modules/d3-interpolate": { - "version": "1.4.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-color": "1" - } - }, "node_modules/d3-scale": { "version": "2.2.2", "license": "BSD-3-Clause", @@ -21588,13 +21260,6 @@ "d3-path": "1" } }, - "node_modules/d3-svg-legend": { - "version": "1.13.0", - "license": "ISC", - "peerDependencies": { - "d3": "^3.0.0" - } - }, "node_modules/d3-time": { "version": "1.0.10", "license": "BSD-3-Clause" @@ -28135,13 +27800,6 @@ "dev": true, "license": "MIT" }, - "node_modules/graphlib": { - "version": "2.1.8", - "license": "MIT", - "dependencies": { - "lodash": "^4.17.15" - } - }, "node_modules/grid-index": { "version": "1.1.0", "license": "ISC" @@ -46428,27 +46086,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/react-move": { - "version": "2.9.1", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.2.0", - "d3-interpolate": "^1.3.2", - "d3-timer": "^1.0.9", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" - }, - "peerDependencies": { - "react": "^15.4.0 || ^16.0.0" - } - }, - "node_modules/react-move/node_modules/d3-interpolate": { - "version": "1.4.0", - "license": "BSD-3-Clause", - "dependencies": { - "d3-color": "1" - } - }, "node_modules/react-redux": { "version": "7.2.9", "license": "MIT", @@ -57165,17 +56802,12 @@ "@superset-ui/legacy-plugin-chart-calendar": "*", "@superset-ui/legacy-plugin-chart-chord": "*", "@superset-ui/legacy-plugin-chart-country-map": "*", - "@superset-ui/legacy-plugin-chart-event-flow": "*", - "@superset-ui/legacy-plugin-chart-heatmap": "*", - "@superset-ui/legacy-plugin-chart-histogram": "*", "@superset-ui/legacy-plugin-chart-horizon": "*", "@superset-ui/legacy-plugin-chart-map-box": "*", "@superset-ui/legacy-plugin-chart-paired-t-test": "*", "@superset-ui/legacy-plugin-chart-parallel-coordinates": "*", "@superset-ui/legacy-plugin-chart-partition": "*", "@superset-ui/legacy-plugin-chart-rose": "*", - "@superset-ui/legacy-plugin-chart-sankey": "*", - "@superset-ui/legacy-plugin-chart-sankey-loop": "*", "@superset-ui/legacy-plugin-chart-time-table": "*", "@superset-ui/legacy-plugin-chart-world-map": "*", "@superset-ui/legacy-preset-chart-deckgl": "*", @@ -58688,6 +58320,7 @@ "plugins/legacy-plugin-chart-event-flow": { "name": "@superset-ui/legacy-plugin-chart-event-flow", "version": "0.20.3", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "@data-ui/event-flow": "^0.0.84", @@ -58702,6 +58335,7 @@ "plugins/legacy-plugin-chart-heatmap": { "name": "@superset-ui/legacy-plugin-chart-heatmap", "version": "0.20.3", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "d3": "^3.5.17", @@ -58719,6 +58353,7 @@ "plugins/legacy-plugin-chart-histogram": { "name": "@superset-ui/legacy-plugin-chart-histogram", "version": "0.20.3", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "@data-ui/histogram": "^0.0.84", @@ -58734,34 +58369,6 @@ "react": "^15 || ^16" } }, - "plugins/legacy-plugin-chart-histogram/node_modules/@vx/group": { - "version": "0.0.199", - "license": "MIT", - "dependencies": { - "@types/classnames": "^2.2.9", - "@types/react": "*", - "classnames": "^2.2.5", - "prop-types": "^15.6.2" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, - "plugins/legacy-plugin-chart-histogram/node_modules/@vx/legend": { - "version": "0.0.199", - "license": "MIT", - "dependencies": { - "@types/classnames": "^2.2.9", - "@types/react": "*", - "@vx/group": "0.0.199", - "@vx/scale": "0.0.199", - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - }, - "peerDependencies": { - "react": "^16.3.0-0" - } - }, "plugins/legacy-plugin-chart-horizon": { "name": "@superset-ui/legacy-plugin-chart-horizon", "version": "0.20.3", @@ -58926,6 +58533,7 @@ "plugins/legacy-plugin-chart-sankey": { "name": "@superset-ui/legacy-plugin-chart-sankey", "version": "0.20.3", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "d3": "^3.5.17", @@ -58941,6 +58549,7 @@ "plugins/legacy-plugin-chart-sankey-loop": { "name": "@superset-ui/legacy-plugin-chart-sankey-loop", "version": "0.20.3", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "d3-sankey-diagram": "^0.7.3", @@ -61783,161 +61392,6 @@ } } }, - "@data-ui/histogram": { - "version": "0.0.84", - "requires": { - "@data-ui/shared": "^0.0.84", - "@data-ui/theme": "^0.0.84", - "@vx/axis": "^0.0.179", - "@vx/curve": "^0.0.165", - "@vx/event": "^0.0.179", - "@vx/glyph": "^0.0.179", - "@vx/gradient": "^0.0.165", - "@vx/group": "^0.0.170", - "@vx/pattern": "^0.0.179", - "@vx/responsive": "^0.0.192", - "@vx/scale": "^0.0.179", - "@vx/shape": "^0.0.179", - "@vx/tooltip": "0.0.179", - "d3-array": "^1.2.0", - "d3-scale": "^1.0.6", - "prop-types": "^15.5.10", - "react-move": "^2.1.0" - }, - "dependencies": { - "@vx/axis": { - "version": "0.0.179", - "requires": { - "@vx/group": "0.0.170", - "@vx/point": "0.0.165", - "@vx/shape": "0.0.179", - "@vx/text": "0.0.179", - "classnames": "^2.2.5", - "prop-types": "^15.6.0" - } - }, - "@vx/bounds": { - "version": "0.0.165", - "requires": { - "prop-types": "^15.5.10" - } - }, - "@vx/event": { - "version": "0.0.179", - "requires": { - "@vx/point": "0.0.165" - } - }, - "@vx/glyph": { - "version": "0.0.179", - "requires": { - "@vx/group": "0.0.170", - "classnames": "^2.2.5", - "d3-shape": "^1.2.0", - "prop-types": "^15.6.2" - } - }, - "@vx/gradient": { - "version": "0.0.165", - "requires": { - "classnames": "^2.2.5", - "prop-types": "^15.5.7" - } - }, - "@vx/group": { - "version": "0.0.170", - "requires": { - "classnames": "^2.2.5" - } - }, - "@vx/pattern": { - "version": "0.0.179", - "requires": { - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - } - }, - "@vx/point": { - "version": "0.0.165" - }, - "@vx/responsive": { - "version": "0.0.192", - "requires": { - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.0" - } - }, - "@vx/scale": { - "version": "0.0.179", - "requires": { - "d3-scale": "^2.0.0" - }, - "dependencies": { - "d3-scale": { - "version": "2.2.2", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - } - } - }, - "@vx/shape": { - "version": "0.0.179", - "requires": { - "@vx/curve": "0.0.165", - "@vx/group": "0.0.170", - "@vx/point": "0.0.165", - "classnames": "^2.2.5", - "d3-path": "^1.0.5", - "d3-shape": "^1.2.0", - "prop-types": "^15.5.10" - } - }, - "@vx/tooltip": { - "version": "0.0.179", - "requires": { - "@vx/bounds": "0.0.165", - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - } - }, - "d3-interpolate": { - "version": "1.4.0", - "requires": { - "d3-color": "^3.1.0" - } - }, - "d3-scale": { - "version": "1.0.7", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-color": "^3.1.0", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - }, - "d3-time-format": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", - "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", - "requires": { - "d3-time": "1" - } - }, - "resize-observer-polyfill": { - "version": "1.5.0" - } - } - }, "@data-ui/radial-chart": { "version": "0.0.84", "requires": { @@ -69622,55 +69076,6 @@ } } }, - "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "file:plugins/legacy-plugin-chart-event-flow", - "requires": { - "@data-ui/event-flow": "^0.0.84", - "prop-types": "^15.8.1" - } - }, - "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "file:plugins/legacy-plugin-chart-heatmap", - "requires": { - "d3": "^3.5.17", - "d3-svg-legend": "^1.x", - "d3-tip": "^0.9.1", - "prop-types": "^15.8.1" - } - }, - "@superset-ui/legacy-plugin-chart-histogram": { - "version": "file:plugins/legacy-plugin-chart-histogram", - "requires": { - "@data-ui/histogram": "^0.0.84", - "@data-ui/theme": "^0.0.84", - "@vx/legend": "^0.0.199", - "@vx/responsive": "^0.0.199", - "@vx/scale": "^0.0.199", - "prop-types": "^15.8.1" - }, - "dependencies": { - "@vx/group": { - "version": "0.0.199", - "requires": { - "@types/classnames": "^2.2.9", - "@types/react": "*", - "classnames": "^2.2.5", - "prop-types": "^15.6.2" - } - }, - "@vx/legend": { - "version": "0.0.199", - "requires": { - "@types/classnames": "^2.2.9", - "@types/react": "*", - "@vx/group": "0.0.199", - "@vx/scale": "0.0.199", - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - } - } - } - }, "@superset-ui/legacy-plugin-chart-horizon": { "version": "file:plugins/legacy-plugin-chart-horizon", "requires": { @@ -69783,22 +69188,6 @@ "prop-types": "^15.8.1" } }, - "@superset-ui/legacy-plugin-chart-sankey": { - "version": "file:plugins/legacy-plugin-chart-sankey", - "requires": { - "d3": "^3.5.17", - "d3-sankey": "^0.4.2", - "prop-types": "^15.8.1" - } - }, - "@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "file:plugins/legacy-plugin-chart-sankey-loop", - "requires": { - "d3-sankey-diagram": "^0.7.3", - "d3-selection": "^3.0.0", - "prop-types": "^15.8.1" - } - }, "@superset-ui/legacy-plugin-chart-time-table": { "version": "0.18.25", "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-time-table/-/legacy-plugin-chart-time-table-0.18.25.tgz", @@ -72244,66 +71633,6 @@ "resize-observer-polyfill": "1.5.1" } }, - "@vx/scale": { - "version": "0.0.199", - "requires": { - "@types/d3-interpolate": "^1.3.1", - "@types/d3-scale": "^2.1.1", - "@types/d3-time": "^1.0.10", - "d3-interpolate": "^1.4.0", - "d3-scale": "^3.0.1", - "d3-time": "^1.1.0" - }, - "dependencies": { - "@types/d3-interpolate": { - "version": "1.4.5", - "requires": { - "@types/d3-color": "^1" - } - }, - "d3-array": { - "version": "2.12.1", - "requires": { - "internmap": "^1.0.0" - } - }, - "d3-interpolate": { - "version": "1.4.0", - "requires": { - "d3-color": "^3.1.0" - } - }, - "d3-scale": { - "version": "3.3.0", - "requires": { - "d3-array": "^2.3.0", - "d3-format": "1 - 2", - "d3-interpolate": "1.2.0 - 2", - "d3-time": "^2.1.1", - "d3-time-format": "2 - 3" - }, - "dependencies": { - "d3-time": { - "version": "2.1.1", - "requires": { - "d3-array": "2" - } - } - } - }, - "d3-time": { - "version": "1.1.0" - }, - "d3-time-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", - "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", - "requires": { - "d3-time": "1 - 2" - } - } - } - }, "@vx/shape": { "version": "0.0.140", "requires": { @@ -72348,6 +71677,7 @@ }, "@vx/text": { "version": "0.0.179", + "peer": true, "requires": { "babel-plugin-lodash": "^3.3.2", "classnames": "^2.2.5", @@ -76473,46 +75803,6 @@ "d3-queue": { "version": "2.0.3" }, - "d3-sankey": { - "version": "0.4.2", - "requires": { - "d3-array": "1", - "d3-collection": "1", - "d3-interpolate": "1" - }, - "dependencies": { - "d3-interpolate": { - "version": "1.4.0", - "requires": { - "d3-color": "^3.1.0" - } - } - } - }, - "d3-sankey-diagram": { - "version": "0.7.3", - "requires": { - "d3-array": "^1.0.2", - "d3-collection": "^1.0.2", - "d3-dispatch": "^1.0.3", - "d3-format": "^1.1.1", - "d3-interpolate": "^1.1.3", - "d3-selection": "^1.0.3", - "d3-transition": "^1.0.4", - "graphlib": "~2.1.0" - }, - "dependencies": { - "d3-interpolate": { - "version": "1.4.0", - "requires": { - "d3-color": "^3.1.0" - } - }, - "d3-selection": { - "version": "1.4.2" - } - } - }, "d3-scale": { "version": "2.2.2", "requires": { @@ -76564,10 +75854,6 @@ "d3-path": "1" } }, - "d3-svg-legend": { - "version": "1.13.0", - "requires": {} - }, "d3-time": { "version": "1.0.10" }, @@ -80889,12 +80175,6 @@ "version": "1.4.0", "dev": true }, - "graphlib": { - "version": "2.1.8", - "requires": { - "lodash": "^4.17.15" - } - }, "grid-index": { "version": "1.1.0" }, @@ -92102,24 +91382,6 @@ } } }, - "react-move": { - "version": "2.9.1", - "requires": { - "@babel/runtime": "^7.2.0", - "d3-interpolate": "^1.3.2", - "d3-timer": "^1.0.9", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" - }, - "dependencies": { - "d3-interpolate": { - "version": "1.4.0", - "requires": { - "d3-color": "^3.1.0" - } - } - } - }, "react-redux": { "version": "7.2.9", "requires": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index bc2d83346..2f82798d6 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -97,17 +97,12 @@ "@superset-ui/legacy-plugin-chart-calendar": "file:./plugins/legacy-plugin-chart-calendar", "@superset-ui/legacy-plugin-chart-chord": "file:./plugins/legacy-plugin-chart-chord", "@superset-ui/legacy-plugin-chart-country-map": "file:./plugins/legacy-plugin-chart-country-map", - "@superset-ui/legacy-plugin-chart-event-flow": "file:./plugins/legacy-plugin-chart-event-flow", - "@superset-ui/legacy-plugin-chart-heatmap": "file:./plugins/legacy-plugin-chart-heatmap", - "@superset-ui/legacy-plugin-chart-histogram": "file:./plugins/legacy-plugin-chart-histogram", "@superset-ui/legacy-plugin-chart-horizon": "file:./plugins/legacy-plugin-chart-horizon", "@superset-ui/legacy-plugin-chart-map-box": "file:./plugins/legacy-plugin-chart-map-box", "@superset-ui/legacy-plugin-chart-paired-t-test": "file:./plugins/legacy-plugin-chart-paired-t-test", "@superset-ui/legacy-plugin-chart-parallel-coordinates": "file:./plugins/legacy-plugin-chart-parallel-coordinates", "@superset-ui/legacy-plugin-chart-partition": "file:./plugins/legacy-plugin-chart-partition", "@superset-ui/legacy-plugin-chart-rose": "file:./plugins/legacy-plugin-chart-rose", - "@superset-ui/legacy-plugin-chart-sankey": "file:./plugins/legacy-plugin-chart-sankey", - "@superset-ui/legacy-plugin-chart-sankey-loop": "file:./plugins/legacy-plugin-chart-sankey-loop", "@superset-ui/legacy-plugin-chart-world-map": "file:./plugins/legacy-plugin-chart-world-map", "@superset-ui/legacy-preset-chart-deckgl": "file:./plugins/legacy-preset-chart-deckgl", "@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3", diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/operators/histogramOperator.test.ts b/superset-frontend/packages/superset-ui-chart-controls/test/operators/histogramOperator.test.ts index b4c6eacc9..b4f76f420 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/test/operators/histogramOperator.test.ts +++ b/superset-frontend/packages/superset-ui-chart-controls/test/operators/histogramOperator.test.ts @@ -26,7 +26,7 @@ const formData: SqlaFormData = { cumulative: true, normalize: true, groupby: ['country', 'region'], - viz_type: VizType.LegacyHistogram, + viz_type: VizType.Histogram, datasource: 'foo', }; diff --git a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts index ec01b0766..110d44f8f 100644 --- a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts +++ b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts @@ -30,8 +30,6 @@ export enum VizType { Chord = 'chord', Compare = 'compare', CountryMap = 'country_map', - DistBar = 'dist_bar', - EventFlow = 'event_flow', Funnel = 'funnel', Gauge = 'gauge_chart', Graph = 'graph_chart', @@ -39,13 +37,7 @@ export enum VizType { Heatmap = 'heatmap_v2', Histogram = 'histogram_v2', Horizon = 'horizon', - LegacyArea = 'area', - LegacyBar = 'bar', LegacyBubble = 'bubble', - LegacyHeatmap = 'heatmap', - LegacyHistogram = 'histogram', - LegacyLine = 'line', - LegacySankey = 'sankey', Line = 'echarts_timeseries_line', MapBox = 'mapbox', MixedTimeseries = 'mixed_timeseries', diff --git a/superset-frontend/packages/superset-ui-core/test/chart/clients/ChartClient.test.ts b/superset-frontend/packages/superset-ui-core/test/chart/clients/ChartClient.test.ts index 50238d3d7..f34c4b84e 100644 --- a/superset-frontend/packages/superset-ui-core/test/chart/clients/ChartClient.test.ts +++ b/superset-frontend/packages/superset-ui-core/test/chart/clients/ChartClient.test.ts @@ -87,13 +87,13 @@ describe('ChartClient', () => { sliceId, formData: { granularity: 'second', - viz_type: VizType.LegacyBar, + viz_type: VizType.Bar, }, }), ).resolves.toEqual({ ...sankeyFormData, granularity: 'second', - viz_type: VizType.LegacyBar, + viz_type: VizType.Bar, }); }); it('returns promise of formData if only formData was given', () => @@ -102,13 +102,13 @@ describe('ChartClient', () => { formData: { datasource: '1__table', granularity: 'minute', - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, }, }), ).resolves.toEqual({ datasource: '1__table', granularity: 'minute', - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, })); it('rejects if none of sliceId or formData is specified', () => expect( @@ -256,7 +256,7 @@ describe('ChartClient', () => { it('loadAllDataNecessaryForAChart', () => { fetchMock.get(`glob:*/api/v1/form_data/?slice_id=${sliceId}`, { granularity: 'minute', - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, datasource: '1__table', color: 'living-coral', }); @@ -276,12 +276,12 @@ describe('ChartClient', () => { }); getChartMetadataRegistry().registerValue( - VizType.LegacyLine, + VizType.Line, new ChartMetadata({ name: 'Line', thumbnail: '.gif' }), ); getChartBuildQueryRegistry().registerValue( - VizType.LegacyLine, + VizType.Line, (formData: QueryFormData) => buildQueryContext(formData), ); @@ -297,7 +297,7 @@ describe('ChartClient', () => { }, formData: { granularity: 'minute', - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, datasource: '1__table', color: 'living-coral', }, diff --git a/superset-frontend/packages/superset-ui-core/test/chart/fixtures/formData.ts b/superset-frontend/packages/superset-ui-core/test/chart/fixtures/formData.ts index 85bfd238e..ef8baab7f 100644 --- a/superset-frontend/packages/superset-ui-core/test/chart/fixtures/formData.ts +++ b/superset-frontend/packages/superset-ui-core/test/chart/fixtures/formData.ts @@ -71,7 +71,7 @@ export const sunburstFormData = { export const sankeyFormData = { datasource: '1__table', - viz_type: VizType.LegacySankey, + viz_type: VizType.Sankey, slice_id: 1, url_params: {}, granularity_sqla: null, diff --git a/superset-frontend/packages/superset-ui-core/test/query/api/legacy/getFormData.test.ts b/superset-frontend/packages/superset-ui-core/test/query/api/legacy/getFormData.test.ts index 5d46f1a35..4987d8b91 100644 --- a/superset-frontend/packages/superset-ui-core/test/query/api/legacy/getFormData.test.ts +++ b/superset-frontend/packages/superset-ui-core/test/query/api/legacy/getFormData.test.ts @@ -29,7 +29,7 @@ describe('getFormData()', () => { const mockData = { datasource: '1__table', - viz_type: VizType.LegacySankey, + viz_type: VizType.Sankey, slice_id: 1, url_params: {}, granularity_sqla: null, diff --git a/superset-frontend/packages/superset-ui-demo/package.json b/superset-frontend/packages/superset-ui-demo/package.json index 75125c194..4a6533e45 100644 --- a/superset-frontend/packages/superset-ui-demo/package.json +++ b/superset-frontend/packages/superset-ui-demo/package.json @@ -70,17 +70,12 @@ "@superset-ui/legacy-plugin-chart-calendar": "*", "@superset-ui/legacy-plugin-chart-chord": "*", "@superset-ui/legacy-plugin-chart-country-map": "*", - "@superset-ui/legacy-plugin-chart-event-flow": "*", - "@superset-ui/legacy-plugin-chart-heatmap": "*", - "@superset-ui/legacy-plugin-chart-histogram": "*", "@superset-ui/legacy-plugin-chart-horizon": "*", "@superset-ui/legacy-plugin-chart-map-box": "*", "@superset-ui/legacy-plugin-chart-paired-t-test": "*", "@superset-ui/legacy-plugin-chart-parallel-coordinates": "*", "@superset-ui/legacy-plugin-chart-partition": "*", "@superset-ui/legacy-plugin-chart-rose": "*", - "@superset-ui/legacy-plugin-chart-sankey": "*", - "@superset-ui/legacy-plugin-chart-sankey-loop": "*", "@superset-ui/legacy-plugin-chart-time-table": "*", "@superset-ui/legacy-plugin-chart-world-map": "*", "@superset-ui/legacy-preset-chart-deckgl": "*", diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-event-flow/EventFlow.stories.jsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-event-flow/EventFlow.stories.jsx deleted file mode 100644 index daac4ce8e..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-event-flow/EventFlow.stories.jsx +++ /dev/null @@ -1,50 +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 { SuperChart } from '@superset-ui/core'; -import sampleEvents from '@data-ui/event-flow/build/sampleEvents'; -import EventFlowChartPlugin from '@superset-ui/legacy-plugin-chart-event-flow'; - -new EventFlowChartPlugin().configure({ key: 'event-flow' }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-plugin-chart-event-flow', -}; - -const data = sampleEvents.twentyUsers.allEvents.map( - ({ ENTITY_ID, EVENT_NAME, TS }) => ({ - __timestamp: TS, - eventName: EVENT_NAME, - userId: ENTITY_ID, - }), -); - -export const basic = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/Heatmap.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/Heatmap.stories.tsx deleted file mode 100644 index c45ea21a5..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/Heatmap.stories.tsx +++ /dev/null @@ -1,147 +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 { SuperChart, VizType } from '@superset-ui/core'; -import HeatmapChartPlugin from '@superset-ui/legacy-plugin-chart-heatmap'; -import ResizableChartDemo from '../../../shared/components/ResizableChartDemo'; -import data from './data'; - -new HeatmapChartPlugin().configure({ key: VizType.LegacyHeatmap }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-plugin-chart-heatmap', -}; - -export const basic = () => ( - -); - -export const resizable = () => ( - - {({ width, height }) => ( - - )} - -); - -export const withNullData = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/data.ts deleted file mode 100644 index 4a1a6f6f3..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-heatmap/data.ts +++ /dev/null @@ -1,182 +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. - */ - -export default [ - { - x: 'Energy', - y: 'Electricity and heat', - v: 24.9, - perc: 1.0, - rank: 1.0, - }, - { - x: 'Energy', - y: 'Industry', - v: 14.7, - perc: 0.5887096774193549, - rank: 0.9882352941176471, - }, - { - x: 'Energy', - y: 'Transportation', - v: 14.3, - perc: 0.5725806451612905, - rank: 0.9764705882352941, - }, - { - x: 'Deforestation', - y: 'Carbon Dioxide', - v: 10.9, - perc: 0.435483870967742, - rank: 0.9588235294117647, - }, - { - x: 'Land Use Change', - y: 'Deforestation', - v: 10.9, - perc: 0.435483870967742, - rank: 0.9588235294117647, - }, - { - x: 'Road', - y: 'Carbon Dioxide', - v: 10.5, - perc: 0.4193548387096775, - rank: 0.9352941176470588, - }, - { - x: 'Transportation', - y: 'Road', - v: 10.5, - perc: 0.4193548387096775, - rank: 0.9352941176470588, - }, - { - x: 'Residential Buildings', - y: 'Carbon Dioxide', - v: 10.2, - perc: 0.40725806451612906, - rank: 0.9176470588235294, - }, - { - x: 'Energy', - y: 'Other Fuel Combustion', - v: 8.6, - perc: 0.342741935483871, - rank: 0.9058823529411765, - }, - { - x: 'Other Industry', - y: 'Carbon Dioxide', - v: 6.6, - perc: 0.26209677419354843, - rank: 0.8941176470588236, - }, - { - x: 'Commercial Buildings', - y: 'Carbon Dioxide', - v: 6.3, - perc: 0.25000000000000006, - rank: 0.8823529411764706, - }, - { - x: 'Agriculture', - y: 'Livestock and Manure', - v: 5.4, - perc: 0.2137096774193549, - rank: 0.8705882352941177, - }, - { - x: 'Agriculture', - y: 'Agriculture Soils', - v: 5.2, - perc: 0.20564516129032262, - rank: 0.8470588235294118, - }, - { - x: 'Agriculture Soils', - y: 'Nitrous Oxide', - v: 5.2, - perc: 0.20564516129032262, - rank: 0.8470588235294118, - }, - { - x: 'Oil and Gas Processing', - y: 'Methane', - v: 2.8, - perc: 0.10887096774193548, - rank: 0.6705882352941176, - }, - { - x: 'Electricity and heat', - y: 'Other Industry', - v: 2.7, - perc: 0.10483870967741937, - rank: 0.6470588235294118, - }, - { - x: 'Rail - Ship and Other Transport', - y: 'Carbon Dioxide', - v: 2.5, - perc: 0.09677419354838711, - rank: 0.6294117647058823, - }, - { - x: 'Transportation', - y: 'Rail - Ship and Other Transport', - v: 2.5, - perc: 0.09677419354838711, - rank: 0.6294117647058823, - }, - { - x: 'Electricity and heat', - y: 'T and D Losses', - v: 2.2, - perc: 0.08467741935483872, - rank: 0.6058823529411764, - }, - { - x: 'T and D Losses', - y: 'Carbon Dioxide', - v: 2.2, - perc: 0.08467741935483872, - rank: 0.6058823529411764, - }, - { - x: 'Electricity and heat', - y: 'Unallocated Fuel Combustion', - v: 2.0, - perc: 0.07661290322580645, - rank: 0.5882352941176471, - }, - { - x: 'Industry', - y: 'Cement', - v: 1.9, - perc: 0.07258064516129033, - rank: 0.5764705882352941, - }, - { - x: 'Other Fuel Combustion', - y: 'Unallocated Fuel Combustion', - v: 1.8, - perc: 0.0685483870967742, - rank: 0.5647058823529412, - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/Histogram.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/Histogram.stories.tsx deleted file mode 100644 index c6f3badcd..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/Histogram.stories.tsx +++ /dev/null @@ -1,48 +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 no-magic-numbers */ -import { SuperChart, VizType } from '@superset-ui/core'; -import HistogramChartPlugin from '@superset-ui/legacy-plugin-chart-histogram'; -import data from './data'; - -new HistogramChartPlugin() - .configure({ key: VizType.LegacyHistogram }) - .register(); - -export default { - title: 'Legacy Chart Plugins/legacy-plugin-chart-histogram', -}; - -export const basic = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/data.ts deleted file mode 100644 index 21ac39d50..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-histogram/data.ts +++ /dev/null @@ -1,32 +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: 'Entrance exam', - values: [ - 0.87, 0.944, 1.0, 0.879, 0.69, 0.667, 0.794, 0.838, 0.875, 0.385, 0.968, - 0.804, 1.0, 0.943, 0.96, 0.333, 0.5, 0.929, 0.863, 0.75, 0.957, 0.914, - 1.0, 0.909, 0.742, 0.964, 0.25, 0.75, 0.5, 0.867, 0.909, 0.333, 0.867, - 0.952, 0.857, 0.949, 0.857, 0.333, 0.8, 0.707, 0.833, 0.75, 0.88, 0.771, - 1.0, 1.0, 0.769, 1.0, 0.769, 0.622, 0.909, 0.725, 0.951, 1.0, - ], - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/SankeyLoop.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/SankeyLoop.stories.tsx deleted file mode 100644 index 97ec3f05e..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/SankeyLoop.stories.tsx +++ /dev/null @@ -1,41 +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 no-magic-numbers */ -import { SuperChart } from '@superset-ui/core'; -import SankeyLoopChartPlugin from '@superset-ui/legacy-plugin-chart-sankey-loop'; -import data from './data'; - -new SankeyLoopChartPlugin().configure({ key: 'sankey-loop' }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-plugin-chart-sankey-loop', -}; - -export const basic = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/data.ts deleted file mode 100644 index b310af21b..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey-loop/data.ts +++ /dev/null @@ -1,52 +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 [ - { - source: 'Lisdoonvarna', - target: 'Cliffs of Moher', - value: 50, - }, - { - source: 'Cliffs of Moher', - target: 'Lisdoonvarna', - value: 35, - }, - { - source: 'Cliffs of Moher', - target: 'Killarney', - value: 25, - }, - { - source: 'Lisdoonvarna', - target: 'Killarney', - value: 25, - }, - { - source: 'Lisdoonvarna', - target: 'Kinvarra', - value: 25, - }, - { - source: 'Kinvarra', - target: 'Lisdoonvarna', - value: 25, - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/Sankey.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/Sankey.stories.tsx deleted file mode 100644 index dcc9f5c44..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/Sankey.stories.tsx +++ /dev/null @@ -1,58 +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 no-magic-numbers */ -import { SuperChart, VizType } from '@superset-ui/core'; -import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey'; -import ResizableChartDemo from '../../../shared/components/ResizableChartDemo'; -import data from './data'; - -new SankeyChartPlugin().configure({ key: VizType.LegacySankey }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-plugin-chart-sankey', -}; - -export const basic = () => ( - -); - -export const resizable = () => ( - - {({ width, height }) => ( - - )} - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/data.ts deleted file mode 100644 index df04dff32..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-sankey/data.ts +++ /dev/null @@ -1,72 +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 [ - { - source: 'Energy', - target: 'Electricity and heat', - value: 24.9, - }, - { - source: 'Energy', - target: 'Industry', - value: 14.7, - }, - { - source: 'Energy', - target: 'Transportation', - value: 14.3, - }, - { - source: 'Deforestation', - target: 'Carbon Dioxide', - value: 10.9, - }, - { - source: 'Land Use Change', - target: 'Deforestation', - value: 10.9, - }, - { - source: 'Road', - target: 'Carbon Dioxide', - value: 10.5, - }, - { - source: 'Transportation', - target: 'Road', - value: 10.5, - }, - { - source: 'Residential Buildings', - target: 'Carbon Dioxide', - value: 10.2, - }, - { - source: 'Energy', - target: 'Other Fuel Combustion', - value: 8.6, - }, - { - source: 'Other Industry', - target: 'Carbon Dioxide', - value: 6.6, - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/NVD3Area.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/NVD3Area.stories.tsx deleted file mode 100644 index b1f4a9ebe..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/NVD3Area.stories.tsx +++ /dev/null @@ -1,35 +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 { VizType } from '@superset-ui/core'; -import { AreaChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new AreaChartPlugin().configure({ key: VizType.LegacyArea }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/Area', -}; - -export { stacked } from './stories/stacked'; -export { - stackedWithYAxisBounds, - stackedWithYAxisBoundsMinOnly, -} from './stories/stackedWithBounds'; -export { expanded } from './stories/expanded'; -export { controlsShown } from './stories/controlsShown'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/data.ts deleted file mode 100644 index 9372f798b..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/data.ts +++ /dev/null @@ -1,1147 +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 */ -export default [ - { - key: ['East Asia & Pacific'], - values: [ - { - x: -315619200000.0, - y: 1031863394.0, - }, - { - x: -283996800000.0, - y: 1034767718.0, - }, - { - x: -252460800000.0, - y: 1048537618.0, - }, - { - x: -220924800000.0, - y: 1073600747.0, - }, - { - x: -189388800000.0, - y: 1098305025.0, - }, - { - x: -157766400000.0, - y: 1124077872.0, - }, - { - x: -126230400000.0, - y: 1153296196.0, - }, - { - x: -94694400000.0, - y: 1181582226.0, - }, - { - x: -63158400000.0, - y: 1210302481.0, - }, - { - x: -31536000000.0, - y: 1242569208.0, - }, - { - x: 0.0, - y: 1274888198.0, - }, - { - x: 31536000000.0, - y: 1308215425.0, - }, - { - x: 63072000000.0, - y: 1339781984.0, - }, - { - x: 94694400000.0, - y: 1369814002.0, - }, - { - x: 126230400000.0, - y: 1399636343.0, - }, - { - x: 157766400000.0, - y: 1426562368.0, - }, - { - x: 189302400000.0, - y: 1450503110.0, - }, - { - x: 220924800000.0, - y: 1473091499.0, - }, - { - x: 252460800000.0, - y: 1495573053.0, - }, - { - x: 283996800000.0, - y: 1518439245.0, - }, - { - x: 315532800000.0, - y: 1540823440.0, - }, - { - x: 347155200000.0, - y: 1563926423.0, - }, - { - x: 378691200000.0, - y: 1589245249.0, - }, - { - x: 410227200000.0, - y: 1614538807.0, - }, - { - x: 441763200000.0, - y: 1638618355.0, - }, - { - x: 473385600000.0, - y: 1663385538.0, - }, - { - x: 504921600000.0, - y: 1689894237.0, - }, - { - x: 536457600000.0, - y: 1717904169.0, - }, - { - x: 567993600000.0, - y: 1746140324.0, - }, - { - x: 599616000000.0, - y: 1773743982.0, - }, - { - x: 631152000000.0, - y: 1800365903.0, - }, - { - x: 662688000000.0, - y: 1825955698.0, - }, - { - x: 694224000000.0, - y: 1849800435.0, - }, - { - x: 725846400000.0, - y: 1872809684.0, - }, - { - x: 757382400000.0, - y: 1895892806.0, - }, - { - x: 788918400000.0, - y: 1918680993.0, - }, - { - x: 820454400000.0, - y: 1941199188.0, - }, - { - x: 852076800000.0, - y: 1963227851.0, - }, - { - x: 883612800000.0, - y: 1984508261.0, - }, - { - x: 915148800000.0, - y: 2004495631.0, - }, - { - x: 946684800000.0, - y: 2023534787.0, - }, - { - x: 978307200000.0, - y: 2041915058.0, - }, - { - x: 1009843200000.0, - y: 2059375225.0, - }, - { - x: 1041379200000.0, - y: 2076029083.0, - }, - { - x: 1072915200000.0, - y: 2092086887.0, - }, - { - x: 1104537600000.0, - y: 2107802765.0, - }, - { - x: 1136073600000.0, - y: 2123180222.0, - }, - { - x: 1167609600000.0, - y: 2137834848.0, - }, - { - x: 1199145600000.0, - y: 2152663168.0, - }, - { - x: 1230768000000.0, - y: 2167098541.0, - }, - { - x: 1262304000000.0, - y: 2181465325.0, - }, - { - x: 1293840000000.0, - y: 2195899073.0, - }, - { - x: 1325376000000.0, - y: 2210627396.0, - }, - { - x: 1356998400000.0, - y: 2225523116.0, - }, - { - x: 1388534400000.0, - y: 2240687901.0, - }, - ], - }, - { - key: ['South Asia'], - values: [ - { - x: -315619200000.0, - y: 572036107.0, - }, - { - x: -283996800000.0, - y: 584143236.0, - }, - { - x: -252460800000.0, - y: 596701125.0, - }, - { - x: -220924800000.0, - y: 609571502.0, - }, - { - x: -189388800000.0, - y: 623073110.0, - }, - { - x: -157766400000.0, - y: 636963781.0, - }, - { - x: -126230400000.0, - y: 651325994.0, - }, - { - x: -94694400000.0, - y: 666134328.0, - }, - { - x: -63158400000.0, - y: 681405837.0, - }, - { - x: -31536000000.0, - y: 697060567.0, - }, - { - x: 0.0, - y: 713115397.0, - }, - { - x: 31536000000.0, - y: 729469562.0, - }, - { - x: 63072000000.0, - y: 746222138.0, - }, - { - x: 94694400000.0, - y: 763491289.0, - }, - { - x: 126230400000.0, - y: 781254784.0, - }, - { - x: 157766400000.0, - y: 799620311.0, - }, - { - x: 189302400000.0, - y: 818590962.0, - }, - { - x: 220924800000.0, - y: 838141522.0, - }, - { - x: 252460800000.0, - y: 858266916.0, - }, - { - x: 283996800000.0, - y: 878939779.0, - }, - { - x: 315532800000.0, - y: 900085240.0, - }, - { - x: 347155200000.0, - y: 921521635.0, - }, - { - x: 378691200000.0, - y: 943662470.0, - }, - { - x: 410227200000.0, - y: 966101576.0, - }, - { - x: 441763200000.0, - y: 988898603.0, - }, - { - x: 473385600000.0, - y: 1012110768.0, - }, - { - x: 504921600000.0, - y: 1035703508.0, - }, - { - x: 536457600000.0, - y: 1059570231.0, - }, - { - x: 567993600000.0, - y: 1083711645.0, - }, - { - x: 599616000000.0, - y: 1108132042.0, - }, - { - x: 631152000000.0, - y: 1132775493.0, - }, - { - x: 662688000000.0, - y: 1157716007.0, - }, - { - x: 694224000000.0, - y: 1182766320.0, - }, - { - x: 725846400000.0, - y: 1208041749.0, - }, - { - x: 757382400000.0, - y: 1233462879.0, - }, - { - x: 788918400000.0, - y: 1258964893.0, - }, - { - x: 820454400000.0, - y: 1284467586.0, - }, - { - x: 852076800000.0, - y: 1310020410.0, - }, - { - x: 883612800000.0, - y: 1335551944.0, - }, - { - x: 915148800000.0, - y: 1361114276.0, - }, - { - x: 946684800000.0, - y: 1386400954.0, - }, - { - x: 978307200000.0, - y: 1411281514.0, - }, - { - x: 1009843200000.0, - y: 1436503016.0, - }, - { - x: 1041379200000.0, - y: 1461682019.0, - }, - { - x: 1072915200000.0, - y: 1486598228.0, - }, - { - x: 1104537600000.0, - y: 1511119581.0, - }, - { - x: 1136073600000.0, - y: 1535264779.0, - }, - { - x: 1167609600000.0, - y: 1559023139.0, - }, - { - x: 1199145600000.0, - y: 1582535507.0, - }, - { - x: 1230768000000.0, - y: 1605893501.0, - }, - { - x: 1262304000000.0, - y: 1629189137.0, - }, - { - x: 1293840000000.0, - y: 1652449539.0, - }, - { - x: 1325376000000.0, - y: 1674883124.0, - }, - { - x: 1356998400000.0, - y: 1697955143.0, - }, - { - x: 1388534400000.0, - y: 1720976995.0, - }, - ], - }, - { - key: ['Europe & Central Asia'], - values: [ - { - x: -315619200000.0, - y: 660881033.0, - }, - { - x: -283996800000.0, - y: 668526708.0, - }, - { - x: -252460800000.0, - y: 676418331.0, - }, - { - x: -220924800000.0, - y: 684369825.0, - }, - { - x: -189388800000.0, - y: 692233988.0, - }, - { - x: -157766400000.0, - y: 699849949.0, - }, - { - x: -126230400000.0, - y: 706459925.0, - }, - { - x: -94694400000.0, - y: 712871897.0, - }, - { - x: -63158400000.0, - y: 719034272.0, - }, - { - x: -31536000000.0, - y: 725099571.0, - }, - { - x: 0.0, - y: 730528170.0, - }, - { - x: 31536000000.0, - y: 736135494.0, - }, - { - x: 63072000000.0, - y: 742450677.0, - }, - { - x: 94694400000.0, - y: 748475832.0, - }, - { - x: 126230400000.0, - y: 754297089.0, - }, - { - x: 157766400000.0, - y: 759928297.0, - }, - { - x: 189302400000.0, - y: 765417984.0, - }, - { - x: 220924800000.0, - y: 770663924.0, - }, - { - x: 252460800000.0, - y: 775939424.0, - }, - { - x: 283996800000.0, - y: 781099684.0, - }, - { - x: 315532800000.0, - y: 786407417.0, - }, - { - x: 347155200000.0, - y: 791686169.0, - }, - { - x: 378691200000.0, - y: 796410256.0, - }, - { - x: 410227200000.0, - y: 800966617.0, - }, - { - x: 441763200000.0, - y: 805742116.0, - }, - { - x: 473385600000.0, - y: 810633713.0, - }, - { - x: 504921600000.0, - y: 815649358.0, - }, - { - x: 536457600000.0, - y: 820716895.0, - }, - { - x: 567993600000.0, - y: 825834599.0, - }, - { - x: 599616000000.0, - y: 830998751.0, - }, - { - x: 631152000000.0, - y: 842907397.0, - }, - { - x: 662688000000.0, - y: 846199873.0, - }, - { - x: 694224000000.0, - y: 849633122.0, - }, - { - x: 725846400000.0, - y: 852664422.0, - }, - { - x: 757382400000.0, - y: 854549337.0, - }, - { - x: 788918400000.0, - y: 856102195.0, - }, - { - x: 820454400000.0, - y: 857333424.0, - }, - { - x: 852076800000.0, - y: 858726155.0, - }, - { - x: 883612800000.0, - y: 859806214.0, - }, - { - x: 915148800000.0, - y: 860985079.0, - }, - { - x: 946684800000.0, - y: 862073997.0, - }, - { - x: 978307200000.0, - y: 863554388.0, - }, - { - x: 1009843200000.0, - y: 865246750.0, - }, - { - x: 1041379200000.0, - y: 867562844.0, - }, - { - x: 1072915200000.0, - y: 870213016.0, - }, - { - x: 1104537600000.0, - y: 872968147.0, - }, - { - x: 1136073600000.0, - y: 875755753.0, - }, - { - x: 1167609600000.0, - y: 878819656.0, - }, - { - x: 1199145600000.0, - y: 882358214.0, - }, - { - x: 1230768000000.0, - y: 886063249.0, - }, - { - x: 1262304000000.0, - y: 889630390.0, - }, - { - x: 1293840000000.0, - y: 893094109.0, - }, - { - x: 1325376000000.0, - y: 894962840.0, - }, - { - x: 1356998400000.0, - y: 898837065.0, - }, - { - x: 1388534400000.0, - y: 903095786.0, - }, - ], - }, - { - key: ['Sub-Saharan Africa'], - values: [ - { - x: -315619200000.0, - y: 228268752.0, - }, - { - x: -283996800000.0, - y: 233759990.0, - }, - { - x: -252460800000.0, - y: 239403621.0, - }, - { - x: -220924800000.0, - y: 245217050.0, - }, - { - x: -189388800000.0, - y: 251215851.0, - }, - { - x: -157766400000.0, - y: 257414930.0, - }, - { - x: -126230400000.0, - y: 263830697.0, - }, - { - x: -94694400000.0, - y: 270477558.0, - }, - { - x: -63158400000.0, - y: 277365472.0, - }, - { - x: -31536000000.0, - y: 284502453.0, - }, - { - x: 0.0, - y: 291897883.0, - }, - { - x: 31536000000.0, - y: 299578724.0, - }, - { - x: 63072000000.0, - y: 307524082.0, - }, - { - x: 94694400000.0, - y: 315758889.0, - }, - { - x: 126230400000.0, - y: 324316627.0, - }, - { - x: 157766400000.0, - y: 333222446.0, - }, - { - x: 189302400000.0, - y: 342489556.0, - }, - { - x: 220924800000.0, - y: 352109622.0, - }, - { - x: 252460800000.0, - y: 362076216.0, - }, - { - x: 283996800000.0, - y: 372390972.0, - }, - { - x: 315532800000.0, - y: 383043891.0, - }, - { - x: 347155200000.0, - y: 394021126.0, - }, - { - x: 378691200000.0, - y: 405328909.0, - }, - { - x: 410227200000.0, - y: 416982682.0, - }, - { - x: 441763200000.0, - y: 429008541.0, - }, - { - x: 473385600000.0, - y: 441414277.0, - }, - { - x: 504921600000.0, - y: 454197298.0, - }, - { - x: 536457600000.0, - y: 467337821.0, - }, - { - x: 567993600000.0, - y: 480809661.0, - }, - { - x: 599616000000.0, - y: 494580339.0, - }, - { - x: 631152000000.0, - y: 508616039.0, - }, - { - x: 662688000000.0, - y: 523007873.0, - }, - { - x: 694224000000.0, - y: 537759561.0, - }, - { - x: 725846400000.0, - y: 552842678.0, - }, - { - x: 757382400000.0, - y: 568228356.0, - }, - { - x: 788918400000.0, - y: 583892679.0, - }, - { - x: 820454400000.0, - y: 599858645.0, - }, - { - x: 852076800000.0, - y: 616161312.0, - }, - { - x: 883612800000.0, - y: 632857149.0, - }, - { - x: 915148800000.0, - y: 650030484.0, - }, - { - x: 946684800000.0, - y: 667742098.0, - }, - { - x: 978307200000.0, - y: 685795280.0, - }, - { - x: 1009843200000.0, - y: 704102354.0, - }, - { - x: 1041379200000.0, - y: 722925207.0, - }, - { - x: 1072915200000.0, - y: 742396040.0, - }, - { - x: 1104537600000.0, - y: 762555740.0, - }, - { - x: 1136073600000.0, - y: 783427658.0, - }, - { - x: 1167609600000.0, - y: 805010175.0, - }, - { - x: 1199145600000.0, - y: 827287676.0, - }, - { - x: 1230768000000.0, - y: 850225069.0, - }, - { - x: 1262304000000.0, - y: 873800152.0, - }, - { - x: 1293840000000.0, - y: 898002051.0, - }, - { - x: 1325376000000.0, - y: 922840423.0, - }, - { - x: 1356998400000.0, - y: 948287652.0, - }, - { - x: 1388534400000.0, - y: 974315323.0, - }, - ], - }, - { - key: ['Latin America & Caribbean'], - values: [ - { - x: -315619200000.0, - y: 220564224.0, - }, - { - x: -283996800000.0, - y: 226764342.0, - }, - { - x: -252460800000.0, - y: 233183206.0, - }, - { - x: -220924800000.0, - y: 239771182.0, - }, - { - x: -189388800000.0, - y: 246458356.0, - }, - { - x: -157766400000.0, - y: 253195267.0, - }, - { - x: -126230400000.0, - y: 259965218.0, - }, - { - x: -94694400000.0, - y: 266776414.0, - }, - { - x: -63158400000.0, - y: 273654630.0, - }, - { - x: -31536000000.0, - y: 280641049.0, - }, - { - x: 0.0, - y: 287763515.0, - }, - { - x: 31536000000.0, - y: 295026304.0, - }, - { - x: 63072000000.0, - y: 302408883.0, - }, - { - x: 94694400000.0, - y: 309902169.0, - }, - { - x: 126230400000.0, - y: 317479496.0, - }, - { - x: 157766400000.0, - y: 325120067.0, - }, - { - x: 189302400000.0, - y: 332817916.0, - }, - { - x: 220924800000.0, - y: 340569396.0, - }, - { - x: 252460800000.0, - y: 348391181.0, - }, - { - x: 283996800000.0, - y: 356288443.0, - }, - { - x: 315532800000.0, - y: 364270961.0, - }, - { - x: 347155200000.0, - y: 372330102.0, - }, - { - x: 378691200000.0, - y: 380466998.0, - }, - { - x: 410227200000.0, - y: 388654061.0, - }, - { - x: 441763200000.0, - y: 396869481.0, - }, - { - x: 473385600000.0, - y: 405083115.0, - }, - { - x: 504921600000.0, - y: 413292690.0, - }, - { - x: 536457600000.0, - y: 421490233.0, - }, - { - x: 567993600000.0, - y: 429668211.0, - }, - { - x: 599616000000.0, - y: 437843614.0, - }, - { - x: 631152000000.0, - y: 445998222.0, - }, - { - x: 662688000000.0, - y: 454117634.0, - }, - { - x: 694224000000.0, - y: 462201058.0, - }, - { - x: 725846400000.0, - y: 470263697.0, - }, - { - x: 757382400000.0, - y: 478310786.0, - }, - { - x: 788918400000.0, - y: 486343677.0, - }, - { - x: 820454400000.0, - y: 494384205.0, - }, - { - x: 852076800000.0, - y: 502390020.0, - }, - { - x: 883612800000.0, - y: 510356845.0, - }, - { - x: 915148800000.0, - y: 518188225.0, - }, - { - x: 946684800000.0, - y: 525886558.0, - }, - { - x: 978307200000.0, - y: 533449671.0, - }, - { - x: 1009843200000.0, - y: 540884684.0, - }, - { - x: 1041379200000.0, - y: 548225528.0, - }, - { - x: 1072915200000.0, - y: 555515431.0, - }, - { - x: 1104537600000.0, - y: 562783235.0, - }, - { - x: 1136073600000.0, - y: 570029991.0, - }, - { - x: 1167609600000.0, - y: 577248307.0, - }, - { - x: 1199145600000.0, - y: 584435842.0, - }, - { - x: 1230768000000.0, - y: 591577623.0, - }, - { - x: 1262304000000.0, - y: 598662941.0, - }, - { - x: 1293840000000.0, - y: 605674766.0, - }, - { - x: 1325376000000.0, - y: 612617659.0, - }, - { - x: 1356998400000.0, - y: 619487273.0, - }, - { - x: 1388534400000.0, - y: 626270167.0, - }, - ], - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/controlsShown.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/controlsShown.tsx deleted file mode 100644 index 659b1636a..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/controlsShown.tsx +++ /dev/null @@ -1,53 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const controlsShown = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/expanded.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/expanded.tsx deleted file mode 100644 index 980d4360e..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/expanded.tsx +++ /dev/null @@ -1,53 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const expanded = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stacked.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stacked.tsx deleted file mode 100644 index a161ed68f..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stacked.tsx +++ /dev/null @@ -1,54 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const stacked = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stackedWithBounds.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stackedWithBounds.tsx deleted file mode 100644 index a7104b60a..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Area/stories/stackedWithBounds.tsx +++ /dev/null @@ -1,88 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const stackedWithYAxisBounds = () => ( - -); - -stackedWithYAxisBounds.storyName = 'Stacked with yAxisBounds'; - -export const stackedWithYAxisBoundsMinOnly = () => ( - -); - -stackedWithYAxisBoundsMinOnly.storyName = 'Stacked with yAxisBounds min only'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/NVD3Bar.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/NVD3Bar.stories.tsx deleted file mode 100644 index 5da1177c3..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/NVD3Bar.stories.tsx +++ /dev/null @@ -1,32 +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 { VizType } from '@superset-ui/core'; -import { BarChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new BarChartPlugin().configure({ key: VizType.LegacyBar }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/Bar', -}; - -export { basic } from './stories/basic'; -export { barWithValues } from './stories/barWithValues'; -export { barWithPositiveAndNegativeValues } from './stories/barWithPositiveAndNegativeValues'; -export { stackedBarWithValues } from './stories/stackedBarWithValues'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/data.ts deleted file mode 100644 index ef8338b65..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/data.ts +++ /dev/null @@ -1,247 +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 */ -export default [ - { - key: ['East Asia & Pacific'], - values: [ - { - x: -315619200000.0, - y: 1031863394.0, - }, - { - x: -283996800000.0, - y: 1034767718.0, - }, - { - x: -252460800000.0, - y: 1048537618.0, - }, - { - x: -220924800000.0, - y: 1073600747.0, - }, - { - x: -189388800000.0, - y: 1098305025.0, - }, - { - x: -157766400000.0, - y: 1124077872.0, - }, - { - x: -126230400000.0, - y: 1153296196.0, - }, - { - x: -94694400000.0, - y: 1181582226.0, - }, - { - x: -63158400000.0, - y: 1210302481.0, - }, - { - x: -31536000000.0, - y: 1242569208.0, - }, - ], - }, - { - key: ['South Asia'], - values: [ - { - x: -315619200000.0, - y: 572036107.0, - }, - { - x: -283996800000.0, - y: 584143236.0, - }, - { - x: -252460800000.0, - y: 596701125.0, - }, - { - x: -220924800000.0, - y: 609571502.0, - }, - { - x: -189388800000.0, - y: 623073110.0, - }, - { - x: -157766400000.0, - y: 636963781.0, - }, - { - x: -126230400000.0, - y: 651325994.0, - }, - { - x: -94694400000.0, - y: 666134328.0, - }, - { - x: -63158400000.0, - y: 681405837.0, - }, - { - x: -31536000000.0, - y: 697060567.0, - }, - ], - }, - { - key: ['Europe & Central Asia'], - values: [ - { - x: -315619200000.0, - y: 660881033.0, - }, - { - x: -283996800000.0, - y: 668526708.0, - }, - { - x: -252460800000.0, - y: 676418331.0, - }, - { - x: -220924800000.0, - y: 684369825.0, - }, - { - x: -189388800000.0, - y: 692233988.0, - }, - { - x: -157766400000.0, - y: 699849949.0, - }, - { - x: -126230400000.0, - y: 706459925.0, - }, - { - x: -94694400000.0, - y: 712871897.0, - }, - { - x: -63158400000.0, - y: 719034272.0, - }, - { - x: -31536000000.0, - y: 725099571.0, - }, - ], - }, - { - key: ['Sub-Saharan Africa'], - values: [ - { - x: -315619200000.0, - y: 228268752.0, - }, - { - x: -283996800000.0, - y: 233759990.0, - }, - { - x: -252460800000.0, - y: 239403621.0, - }, - { - x: -220924800000.0, - y: 245217050.0, - }, - { - x: -189388800000.0, - y: 251215851.0, - }, - { - x: -157766400000.0, - y: 257414930.0, - }, - { - x: -126230400000.0, - y: 263830697.0, - }, - { - x: -94694400000.0, - y: 270477558.0, - }, - { - x: -63158400000.0, - y: 277365472.0, - }, - { - x: -31536000000.0, - y: 284502453.0, - }, - ], - }, - { - key: ['Latin America & Caribbean'], - values: [ - { - x: -315619200000.0, - y: 220564224.0, - }, - { - x: -283996800000.0, - y: 226764342.0, - }, - { - x: -252460800000.0, - y: 233183206.0, - }, - { - x: -220924800000.0, - y: 239771182.0, - }, - { - x: -189388800000.0, - y: 246458356.0, - }, - { - x: -157766400000.0, - y: 253195267.0, - }, - { - x: -126230400000.0, - y: 259965218.0, - }, - { - x: -94694400000.0, - y: 266776414.0, - }, - { - x: -63158400000.0, - y: 273654630.0, - }, - { - x: -31536000000.0, - y: 280641049.0, - }, - ], - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithPositiveAndNegativeValues.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithPositiveAndNegativeValues.tsx deleted file mode 100644 index 449a54f6c..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithPositiveAndNegativeValues.tsx +++ /dev/null @@ -1,64 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const barWithPositiveAndNegativeValues = () => ( - ({ - ...group, - values: group.values.map(pair => ({ - ...pair, - y: (i % 2 === 0 ? 1 : -1) * pair.y, - })), - })), - }, - ]} - formData={{ - bottomMargin: 'auto', - colorScheme: 'd3Category10', - contribution: false, - groupby: ['region'], - lineInterpolation: 'linear', - metrics: ['sum__SP_POP_TOTL'], - richTooltip: true, - showBarValue: true, - showBrush: 'auto', - showControls: false, - showLegend: true, - stackedStyle: 'stack', - vizType: VizType.LegacyBar, - xAxisFormat: '%Y', - xAxisLabel: '', - xAxisShowminmax: false, - xTicksLayout: 'auto', - yAxisBounds: [null, null], - yAxisFormat: '.3s', - yLogScale: false, - }} - /> -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithValues.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithValues.tsx deleted file mode 100644 index 5679050f6..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/barWithValues.tsx +++ /dev/null @@ -1,54 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const barWithValues = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/basic.tsx deleted file mode 100644 index 00ad09b51..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/basic.tsx +++ /dev/null @@ -1,54 +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 { SuperChart, VizType } 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/Bar/stories/stackedBarWithValues.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/stackedBarWithValues.tsx deleted file mode 100644 index fb931e396..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Bar/stories/stackedBarWithValues.tsx +++ /dev/null @@ -1,55 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const stackedBarWithValues = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/NVD3DistBar.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/NVD3DistBar.stories.tsx deleted file mode 100644 index 5b9ef5012..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/NVD3DistBar.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 { DistBarChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new DistBarChartPlugin().configure({ key: 'dist-bar' }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/DistBar', -}; - -export { basic } from './stories/basic'; -export { manyBars } from './stories/manyBars'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/data.ts deleted file mode 100644 index a5cc5b534..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/data.ts +++ /dev/null @@ -1,112 +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: 'sum__sum_boys', - values: [ - { - x: 'CA', - y: 5430796, - }, - { - x: 'TX', - y: 3311985, - }, - { - x: 'NY', - y: 3543961, - }, - { - x: 'OH', - y: 2376385, - }, - { - x: 'PA', - y: 2390275, - }, - { - x: 'IL', - y: 2357411, - }, - { - x: 'MI', - y: 1938321, - }, - { - x: 'FL', - y: 1968060, - }, - { - x: 'NJ', - y: 1486126, - }, - { - x: 'MA', - y: 1285126, - }, - ], - }, - { - key: 'sum__sum_girls', - values: [ - { - x: 'CA', - y: 3567754, - }, - { - x: 'TX', - y: 2313186, - }, - { - x: 'NY', - y: 2280733, - }, - { - x: 'OH', - y: 1622814, - }, - { - x: 'PA', - y: 1615383, - }, - { - x: 'IL', - y: 1614427, - }, - { - x: 'MI', - y: 1326229, - }, - { - x: 'FL', - y: 1312593, - }, - { - x: 'NJ', - y: 992702, - }, - { - x: 'MA', - y: 842146, - }, - ], - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/stories/basic.tsx deleted file mode 100644 index c262c2cc2..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/stories/basic.tsx +++ /dev/null @@ -1,48 +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 { SuperChart, VizType } 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/DistBar/stories/manyBars.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/stories/manyBars.tsx deleted file mode 100644 index 246b590c0..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DistBar/stories/manyBars.tsx +++ /dev/null @@ -1,58 +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 { SuperChart, VizType, seedRandom } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; - -const data: { - key: string; - values: { - x: string; - y: number; - }[]; -}[] = [{ key: 'sth', values: [] }]; -const LONG_LABEL = - 'some extremely ridiculously extremely extremely extremely ridiculously extremely extremely ridiculously extremely extremely ridiculously extremely long category'; - -for (let i = 0; i < 50; i += 1) { - data[0].values.push({ - x: `${LONG_LABEL.substring( - 0, - Math.round(seedRandom() * LONG_LABEL.length), - )} ${i + 1}`, - y: Math.round(seedRandom() * 10000), - }); -} - -export const manyBars = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/NVD3Line.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/NVD3Line.stories.tsx deleted file mode 100644 index 0ba739c1f..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/NVD3Line.stories.tsx +++ /dev/null @@ -1,32 +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 { VizType } from '@superset-ui/core'; -import { LineChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new LineChartPlugin().configure({ key: VizType.LegacyLine }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/Line', -}; - -export { basic } from './stories/basic'; -export { markers } from './stories/markers'; -export { logScale } from './stories/logScale'; -export { yAxisBounds } from './stories/yAxisBounds'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/data.ts deleted file mode 100644 index 5d43d8e4b..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/data.ts +++ /dev/null @@ -1,927 +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: ['Christopher'], - values: [ - { - x: -157766400000.0, - y: 24703, - }, - { - x: -126230400000.0, - y: 27861, - }, - { - x: -94694400000.0, - y: 29436, - }, - { - x: -63158400000.0, - y: 31463, - }, - { - x: -31536000000.0, - y: 35718, - }, - { - x: 0.0, - y: 41758, - }, - { - x: 31536000000.0, - y: 48172, - }, - { - x: 63072000000.0, - y: 52092, - }, - { - x: 94694400000.0, - y: 48217, - }, - { - x: 126230400000.0, - y: 48476, - }, - { - x: 157766400000.0, - y: 46438, - }, - { - x: 189302400000.0, - y: 45086, - }, - { - x: 220924800000.0, - y: 46610, - }, - { - x: 252460800000.0, - y: 47107, - }, - { - x: 283996800000.0, - y: 50514, - }, - { - x: 315532800000.0, - y: 48969, - }, - { - x: 347155200000.0, - y: 50108, - }, - { - x: 378691200000.0, - y: 59055, - }, - { - x: 410227200000.0, - y: 59188, - }, - { - x: 441763200000.0, - y: 59859, - }, - { - x: 473385600000.0, - y: 59516, - }, - { - x: 504921600000.0, - y: 56633, - }, - { - x: 536457600000.0, - y: 54466, - }, - { - x: 567993600000.0, - y: 52996, - }, - { - x: 599616000000.0, - y: 53205, - }, - { - x: 631152000000.0, - y: 52322, - }, - { - x: 662688000000.0, - y: 47109, - }, - { - x: 694224000000.0, - y: 42470, - }, - { - x: 725846400000.0, - y: 38257, - }, - { - x: 757382400000.0, - y: 34823, - }, - { - x: 788918400000.0, - y: 32728, - }, - { - x: 820454400000.0, - y: 30988, - }, - { - x: 852076800000.0, - y: 29179, - }, - { - x: 883612800000.0, - y: 27083, - }, - { - x: 915148800000.0, - y: 25700, - }, - { - x: 946684800000.0, - y: 24959, - }, - { - x: 978307200000.0, - y: 23180, - }, - { - x: 1009843200000.0, - y: 21731, - }, - { - x: 1041379200000.0, - y: 20793, - }, - { - x: 1072915200000.0, - y: 19739, - }, - { - x: 1104537600000.0, - y: 19190, - }, - { - x: 1136073600000.0, - y: 19674, - }, - { - x: 1167609600000.0, - y: 19986, - }, - { - x: 1199145600000.0, - y: 17771, - }, - ], - }, - { - key: ['David'], - values: [ - { - x: -157766400000.0, - y: 67646, - }, - { - x: -126230400000.0, - y: 66207, - }, - { - x: -94694400000.0, - y: 66581, - }, - { - x: -63158400000.0, - y: 63531, - }, - { - x: -31536000000.0, - y: 63502, - }, - { - x: 0.0, - y: 61570, - }, - { - x: 31536000000.0, - y: 52948, - }, - { - x: 63072000000.0, - y: 46218, - }, - { - x: 94694400000.0, - y: 40968, - }, - { - x: 126230400000.0, - y: 41654, - }, - { - x: 157766400000.0, - y: 39019, - }, - { - x: 189302400000.0, - y: 39165, - }, - { - x: 220924800000.0, - y: 40407, - }, - { - x: 252460800000.0, - y: 40533, - }, - { - x: 283996800000.0, - y: 41898, - }, - { - x: 315532800000.0, - y: 41743, - }, - { - x: 347155200000.0, - y: 40486, - }, - { - x: 378691200000.0, - y: 40283, - }, - { - x: 410227200000.0, - y: 39048, - }, - { - x: 441763200000.0, - y: 38346, - }, - { - x: 473385600000.0, - y: 38395, - }, - { - x: 504921600000.0, - y: 37021, - }, - { - x: 536457600000.0, - y: 36672, - }, - { - x: 567993600000.0, - y: 35214, - }, - { - x: 599616000000.0, - y: 35139, - }, - { - x: 631152000000.0, - y: 33661, - }, - { - x: 662688000000.0, - y: 30347, - }, - { - x: 694224000000.0, - y: 28344, - }, - { - x: 725846400000.0, - y: 26947, - }, - { - x: 757382400000.0, - y: 24784, - }, - { - x: 788918400000.0, - y: 22967, - }, - { - x: 820454400000.0, - y: 22941, - }, - { - x: 852076800000.0, - y: 21824, - }, - { - x: 883612800000.0, - y: 20816, - }, - { - x: 915148800000.0, - y: 20267, - }, - { - x: 946684800000.0, - y: 19695, - }, - { - x: 978307200000.0, - y: 19281, - }, - { - x: 1009843200000.0, - y: 18600, - }, - { - x: 1041379200000.0, - y: 18557, - }, - { - x: 1072915200000.0, - y: 18315, - }, - { - x: 1104537600000.0, - y: 18017, - }, - { - x: 1136073600000.0, - y: 17510, - }, - { - x: 1167609600000.0, - y: 17400, - }, - { - x: 1199145600000.0, - y: 16049, - }, - ], - }, - { - key: ['James'], - values: [ - { - x: -157766400000.0, - y: 67506, - }, - { - x: -126230400000.0, - y: 65036, - }, - { - x: -94694400000.0, - y: 61554, - }, - { - x: -63158400000.0, - y: 60584, - }, - { - x: -31536000000.0, - y: 59824, - }, - { - x: 0.0, - y: 61597, - }, - { - x: 31536000000.0, - y: 54463, - }, - { - x: 63072000000.0, - y: 46960, - }, - { - x: 94694400000.0, - y: 42782, - }, - { - x: 126230400000.0, - y: 41258, - }, - { - x: 157766400000.0, - y: 39471, - }, - { - x: 189302400000.0, - y: 38203, - }, - { - x: 220924800000.0, - y: 39916, - }, - { - x: 252460800000.0, - y: 39783, - }, - { - x: 283996800000.0, - y: 39237, - }, - { - x: 315532800000.0, - y: 39185, - }, - { - x: 347155200000.0, - y: 38176, - }, - { - x: 378691200000.0, - y: 38750, - }, - { - x: 410227200000.0, - y: 36228, - }, - { - x: 441763200000.0, - y: 35728, - }, - { - x: 473385600000.0, - y: 35750, - }, - { - x: 504921600000.0, - y: 33955, - }, - { - x: 536457600000.0, - y: 32552, - }, - { - x: 567993600000.0, - y: 32418, - }, - { - x: 599616000000.0, - y: 32658, - }, - { - x: 631152000000.0, - y: 32288, - }, - { - x: 662688000000.0, - y: 30460, - }, - { - x: 694224000000.0, - y: 28450, - }, - { - x: 725846400000.0, - y: 26193, - }, - { - x: 757382400000.0, - y: 24706, - }, - { - x: 788918400000.0, - y: 22691, - }, - { - x: 820454400000.0, - y: 21122, - }, - { - x: 852076800000.0, - y: 20368, - }, - { - x: 883612800000.0, - y: 19651, - }, - { - x: 915148800000.0, - y: 18508, - }, - { - x: 946684800000.0, - y: 17939, - }, - { - x: 978307200000.0, - y: 17023, - }, - { - x: 1009843200000.0, - y: 16905, - }, - { - x: 1041379200000.0, - y: 16832, - }, - { - x: 1072915200000.0, - y: 16459, - }, - { - x: 1104537600000.0, - y: 16046, - }, - { - x: 1136073600000.0, - y: 16139, - }, - { - x: 1167609600000.0, - y: 15821, - }, - { - x: 1199145600000.0, - y: 14920, - }, - ], - }, - { - key: ['John'], - values: [ - { - x: -157766400000.0, - y: 71390, - }, - { - x: -126230400000.0, - y: 64858, - }, - { - x: -94694400000.0, - y: 61480, - }, - { - x: -63158400000.0, - y: 60754, - }, - { - x: -31536000000.0, - y: 58644, - }, - { - x: 0.0, - y: 58348, - }, - { - x: 31536000000.0, - y: 51382, - }, - { - x: 63072000000.0, - y: 43028, - }, - { - x: 94694400000.0, - y: 39061, - }, - { - x: 126230400000.0, - y: 37553, - }, - { - x: 157766400000.0, - y: 34970, - }, - { - x: 189302400000.0, - y: 33876, - }, - { - x: 220924800000.0, - y: 34103, - }, - { - x: 252460800000.0, - y: 33895, - }, - { - x: 283996800000.0, - y: 35305, - }, - { - x: 315532800000.0, - y: 35131, - }, - { - x: 347155200000.0, - y: 34761, - }, - { - x: 378691200000.0, - y: 34560, - }, - { - x: 410227200000.0, - y: 33047, - }, - { - x: 441763200000.0, - y: 32484, - }, - { - x: 473385600000.0, - y: 31397, - }, - { - x: 504921600000.0, - y: 30103, - }, - { - x: 536457600000.0, - y: 29462, - }, - { - x: 567993600000.0, - y: 29301, - }, - { - x: 599616000000.0, - y: 29751, - }, - { - x: 631152000000.0, - y: 29011, - }, - { - x: 662688000000.0, - y: 27727, - }, - { - x: 694224000000.0, - y: 26156, - }, - { - x: 725846400000.0, - y: 24918, - }, - { - x: 757382400000.0, - y: 24119, - }, - { - x: 788918400000.0, - y: 23174, - }, - { - x: 820454400000.0, - y: 22104, - }, - { - x: 852076800000.0, - y: 21330, - }, - { - x: 883612800000.0, - y: 20556, - }, - { - x: 915148800000.0, - y: 20280, - }, - { - x: 946684800000.0, - y: 20032, - }, - { - x: 978307200000.0, - y: 18839, - }, - { - x: 1009843200000.0, - y: 17400, - }, - { - x: 1041379200000.0, - y: 17170, - }, - { - x: 1072915200000.0, - y: 16381, - }, - { - x: 1104537600000.0, - y: 15692, - }, - { - x: 1136073600000.0, - y: 15083, - }, - { - x: 1167609600000.0, - y: 14348, - }, - { - x: 1199145600000.0, - y: 13110, - }, - ], - }, - { - key: ['Michael'], - values: [ - { - x: -157766400000.0, - y: 80812, - }, - { - x: -126230400000.0, - y: 79709, - }, - { - x: -94694400000.0, - y: 82204, - }, - { - x: -63158400000.0, - y: 81785, - }, - { - x: -31536000000.0, - y: 84893, - }, - { - x: 0.0, - y: 85015, - }, - { - x: 31536000000.0, - y: 77321, - }, - { - x: 63072000000.0, - y: 71197, - }, - { - x: 94694400000.0, - y: 67598, - }, - { - x: 126230400000.0, - y: 67304, - }, - { - x: 157766400000.0, - y: 68149, - }, - { - x: 189302400000.0, - y: 66686, - }, - { - x: 220924800000.0, - y: 67344, - }, - { - x: 252460800000.0, - y: 66875, - }, - { - x: 283996800000.0, - y: 67473, - }, - { - x: 315532800000.0, - y: 68375, - }, - { - x: 347155200000.0, - y: 68467, - }, - { - x: 378691200000.0, - y: 67904, - }, - { - x: 410227200000.0, - y: 67708, - }, - { - x: 441763200000.0, - y: 67457, - }, - { - x: 473385600000.0, - y: 64667, - }, - { - x: 504921600000.0, - y: 63959, - }, - { - x: 536457600000.0, - y: 63442, - }, - { - x: 567993600000.0, - y: 63924, - }, - { - x: 599616000000.0, - y: 65233, - }, - { - x: 631152000000.0, - y: 65138, - }, - { - x: 662688000000.0, - y: 60646, - }, - { - x: 694224000000.0, - y: 54216, - }, - { - x: 725846400000.0, - y: 49443, - }, - { - x: 757382400000.0, - y: 44361, - }, - { - x: 788918400000.0, - y: 41311, - }, - { - x: 820454400000.0, - y: 38284, - }, - { - x: 852076800000.0, - y: 37459, - }, - { - x: 883612800000.0, - y: 36525, - }, - { - x: 915148800000.0, - y: 33820, - }, - { - x: 946684800000.0, - y: 31956, - }, - { - x: 978307200000.0, - y: 29612, - }, - { - x: 1009843200000.0, - y: 28156, - }, - { - x: 1041379200000.0, - y: 27031, - }, - { - x: 1072915200000.0, - y: 25418, - }, - { - x: 1104537600000.0, - y: 23678, - }, - { - x: 1136073600000.0, - y: 22498, - }, - { - x: 1167609600000.0, - y: 21805, - }, - { - x: 1199145600000.0, - y: 20271, - }, - ], - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/basic.tsx deleted file mode 100644 index 3aea91e7f..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/basic.tsx +++ /dev/null @@ -1,52 +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 { SuperChart, VizType } 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/Line/stories/logScale.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/logScale.tsx deleted file mode 100644 index f93109f73..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/logScale.tsx +++ /dev/null @@ -1,39 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const logScale = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/markers.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/markers.tsx deleted file mode 100644 index c2a83b8eb..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/markers.tsx +++ /dev/null @@ -1,52 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const markers = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/yAxisBounds.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/yAxisBounds.tsx deleted file mode 100644 index c705c0b2b..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Line/stories/yAxisBounds.tsx +++ /dev/null @@ -1,97 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const yAxisBounds = () => ( -
-

yAxisBounds

- 
yAxisBounds=undefined
- - 
yAxisBounds=[0, 60000]
- - 
yAxisBounds=[null, 60000]
- - 
yAxisBounds=[40000, null]
- - 
yAxisBounds=[40000, null] with Legend
- -
-); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/NVD3Pie.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/NVD3Pie.stories.tsx deleted file mode 100644 index 5fcfa8702..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/NVD3Pie.stories.tsx +++ /dev/null @@ -1,30 +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 { VizType } from '@superset-ui/core'; -import { PieChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new PieChartPlugin().configure({ key: VizType.Pie }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/Pie', -}; - -export { basic } from './stories/basic'; -export { noData } from './stories/noData'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/data.ts deleted file mode 100644 index 6db3c5f69..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/data.ts +++ /dev/null @@ -1,30 +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 [ - { - x: 'boy', - y: 48133355, - }, - { - x: 'girl', - y: 32546308, - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/stories/basic.tsx deleted file mode 100644 index 0fd34b6ec..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/stories/basic.tsx +++ /dev/null @@ -1,42 +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 { SuperChart, VizType } 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/Pie/stories/noData.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/stories/noData.tsx deleted file mode 100644 index 028305901..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/Pie/stories/noData.tsx +++ /dev/null @@ -1,41 +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 { SuperChart, VizType } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; - -export const noData = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-chart/ChartDataProvider.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-chart/ChartDataProvider.stories.tsx index f05381963..ca3ef6187 100644 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-chart/ChartDataProvider.stories.tsx +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-chart/ChartDataProvider.stories.tsx @@ -23,7 +23,6 @@ import { SupersetClient, } from '@superset-ui/core'; import { BigNumberChartPlugin } from '@superset-ui/plugin-chart-echarts'; -import LegacySankeyPlugin from '@superset-ui/legacy-plugin-chart-sankey'; import { WordCloudChartPlugin } from '@superset-ui/plugin-chart-word-cloud'; import { @@ -44,8 +43,6 @@ const WORD_CLOUD = 'new_word_cloud'; new BigNumberChartPlugin().configure({ key: BIG_NUMBER }).register(); // eslint-disable-next-line -new LegacySankeyPlugin().configure({ key: SANKEY }).register(); -// eslint-disable-next-line new WordCloudChartPlugin().configure({ key: WORD_CLOUD }).register(); const VIS_TYPES = [BIG_NUMBER, SANKEY, SUNBURST, WORD_CLOUD, WORD_CLOUD_LEGACY]; diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-event-flow/CHANGELOG.md deleted file mode 100644 index c2cec75e6..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/CHANGELOG.md +++ /dev/null @@ -1,51 +0,0 @@ - - -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09) - -### Bug Fixes - -- **generic-chart-axes:** set x-axis if unset and ff is enabled ([#20107](https://github.com/apache/superset/issues/20107)) ([0b3d3dd](https://github.com/apache/superset/commit/0b3d3dd4caa7f4c31c1ba7229966a40ba0469e85)) - -### Features - -- **explore:** Frontend implementation of dataset creation from infobox ([#19855](https://github.com/apache/superset/issues/19855)) ([ba0c37d](https://github.com/apache/superset/commit/ba0c37d3df85b1af39404af1d578daeb0ff2d278)) - -# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07) - -### Bug Fixes - -- **generic-chart-axes:** set x-axis if unset and ff is enabled ([#20107](https://github.com/apache/superset/issues/20107)) ([0b3d3dd](https://github.com/apache/superset/commit/0b3d3dd4caa7f4c31c1ba7229966a40ba0469e85)) - -### Features - -- **explore:** Frontend implementation of dataset creation from infobox ([#19855](https://github.com/apache/superset/issues/19855)) ([ba0c37d](https://github.com/apache/superset/commit/ba0c37d3df85b1af39404af1d578daeb0ff2d278)) - -# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-event-flow - -## [0.17.61](https://github.com/apache-superset/superset-ui/compare/v0.17.60...v0.17.61) (2021-07-02) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-event-flow diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/README.md b/superset-frontend/plugins/legacy-plugin-chart-event-flow/README.md deleted file mode 100644 index 4d6ab3356..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/README.md +++ /dev/null @@ -1,52 +0,0 @@ - - -## @superset-ui/legacy-plugin-chart-event-flow - -[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-event-flow.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-event-flow) -[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-event-flow?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-event-flow) - -This plugin provides Event Flow for Superset. - -### Usage - -Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to -lookup this chart throughout the app. - -```js -import EventFlowChartPlugin from '@superset-ui/legacy-plugin-chart-event-flow'; - -new EventFlowChartPlugin().configure({ key: 'event-flow' }).register(); -``` - -Then use it via `SuperChart`. See -[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-event-flow) -for more details. - -```js - -``` diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json b/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json deleted file mode 100644 index ead0d994f..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@superset-ui/legacy-plugin-chart-event-flow", - "version": "0.20.3", - "description": "Superset Legacy Chart - Event Flow", - "sideEffects": [ - "*.css" - ], - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "repository": { - "type": "git", - "url": "https://github.com/apache/superset.git", - "directory": "superset-frontend/plugins/legacy-plugin-chart-event-flow" - }, - "keywords": [ - "superset" - ], - "author": "Superset", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/apache/superset/issues" - }, - "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-event-flow#readme", - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@data-ui/event-flow": "^0.0.84", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*", - "react": "^15 || ^16" - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx deleted file mode 100644 index 7b3cdd6a8..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx +++ /dev/null @@ -1,52 +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 { App as EventFlowApp } from '@data-ui/event-flow'; -import { t, TimeseriesDataRecord } from '@superset-ui/core'; - -export interface EventFlowProps { - data: TimeseriesDataRecord[]; - height: number; - width: number; - initialMinEventCount: number; -} - -export default function EventFlow({ - data, - initialMinEventCount, - height = 400, - width = 400, -}: EventFlowProps) { - if (data) { - return ( - - ); - } - - return ( -
-
{t('Sorry, there appears to be no data')}
-
- ); -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx deleted file mode 100644 index 32ed9969b..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx +++ /dev/null @@ -1,133 +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, validateNonEmpty } from '@superset-ui/core'; -import { - columnChoices, - ColumnOption, - ColumnMeta, - ControlPanelConfig, - ControlState, - formatSelectOptionsForRange, - SelectControlConfig, -} from '@superset-ui/chart-controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Event definition'), - controlSetRows: [ - ['entity'], - [ - { - name: 'all_columns_x', - config: { - type: 'SelectControl', - label: t('Event Names'), - description: t('Columns to display'), - mapStateToProps: state => ({ - choices: columnChoices(state?.datasource), - }), - // choices is from `mapStateToProps` - default: (control: ControlState) => - control.choices?.[0]?.[0] || null, - validators: [validateNonEmpty], - }, - }, - ], - ['row_limit'], - [ - { - name: 'order_by_entity', - config: { - type: 'CheckboxControl', - label: t('Order by entity id'), - description: t( - 'Important! Select this if the table is not already sorted by entity id, ' + - 'else there is no guarantee that all events for each entity are returned.', - ), - default: true, - }, - }, - ], - [ - { - name: 'min_leaf_node_event_count', - config: { - type: 'SelectControl', - freeForm: false, - label: t('Minimum leaf node event count'), - default: 1, - choices: formatSelectOptionsForRange(1, 10), - description: t( - 'Leaf nodes that represent fewer than this number of events will be initially ' + - 'hidden in the visualization', - ), - }, - }, - ], - ], - }, - { - label: t('Query'), - expanded: true, - controlSetRows: [['adhoc_filters']], - }, - { - label: t('Additional metadata'), - controlSetRows: [ - [ - { - name: 'all_columns', - // eslint-disable-next-line @typescript-eslint/consistent-type-assertions - config: { - type: 'SelectControl', - multi: true, - label: t('Metadata'), - default: [], - description: t('Select any columns for metadata inspection'), - optionRenderer: c => , - valueRenderer: c => , - valueKey: 'column_name', - allowAll: true, - mapStateToProps: state => ({ - options: state.datasource?.columns || [], - }), - commaChoosesOption: false, - freeForm: true, - } as SelectControlConfig, - }, - ], - ], - }, - ], - controlOverrides: { - entity: { - label: t('Entity ID'), - description: t('e.g., a "user id" column'), - }, - row_limit: { - label: t('Max Events'), - description: t( - 'The maximum number of events to return, equivalent to the number of rows', - ), - }, - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/example.jpg b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/example.jpg deleted file mode 100644 index e2cfb0222..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/example.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png deleted file mode 100644 index de10a4d19..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png deleted file mode 100644 index 0edb53563..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/index.ts b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/index.ts deleted file mode 100644 index 824f8f3db..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/index.ts +++ /dev/null @@ -1,46 +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 thumbnail from './images/thumbnail.png'; -import example from './images/example.jpg'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Flow'), - credits: ['https://github.com/williaster/data-ui'], - description: t( - 'Compares the lengths of time different activities take in a shared timeline view.', - ), - exampleGallery: [{ url: example }], - name: t('Event Flow'), - tags: [t('Legacy'), t('Progressive')], - thumbnail, - useLegacyApi: true, -}); - -export default class EventFlowChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('./EventFlow'), - loadTransformProps: () => import('./transformProps'), - metadata, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/transformProps.ts b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/transformProps.ts deleted file mode 100644 index c738ca6eb..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/transformProps.ts +++ /dev/null @@ -1,70 +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 { ChartProps, TimeseriesDataRecord } from '@superset-ui/core'; -import { cleanEvents, TS, EVENT_NAME, ENTITY_ID } from '@data-ui/event-flow'; - -export interface EventFlowFormData { - allColumnsX: string; - entity: string; - minLeafNodeEventCount: number; -} - -export interface EventFlowChartProps extends ChartProps { - formData: EventFlowFormData; - queriesData: { - data: TimeseriesDataRecord[]; - }[]; -} - -export default function transformProps(chartProps: ChartProps) { - const { formData, queriesData, width, height } = - chartProps as EventFlowChartProps; - const { allColumnsX, entity, minLeafNodeEventCount } = formData; - const { data } = queriesData[0]; - - const hasData = data && data.length > 0; - if (hasData) { - const userKey = entity; - const eventNameKey = allColumnsX; - - // map from the Superset form fields to 's expected data keys - const accessorFunctions = { - [ENTITY_ID]: (datum: TimeseriesDataRecord) => String(datum[userKey]), - [EVENT_NAME]: (datum: TimeseriesDataRecord) => - datum[eventNameKey] as string, - [TS]: (datum: TimeseriesDataRecord): Date | null => - // eslint-disable-next-line no-underscore-dangle - datum.__timestamp || datum.__timestamp === 0 - ? // eslint-disable-next-line no-underscore-dangle - new Date(datum.__timestamp) - : null, - }; - - const cleanData = cleanEvents(data, accessorFunctions); - - return { - data: cleanData, - height, - initialMinEventCount: minLeafNodeEventCount, - width, - }; - } - - return { data: null, height, width }; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts b/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts deleted file mode 100644 index a9b451b31..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts +++ /dev/null @@ -1,22 +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. - */ - -declare module '*.png'; -declare module '*.jpg'; -declare module '@data-ui/event-flow'; diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-event-flow/tsconfig.json deleted file mode 100644 index b6bfaa2d9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "declarationDir": "lib", - "outDir": "lib", - "rootDir": "src" - }, - "exclude": [ - "lib", - "test" - ], - "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "types/**/*", - "../../types/**/*" - ], - "references": [ - { - "path": "../../packages/superset-ui-chart-controls" - }, - { - "path": "../../packages/superset-ui-core" - } - ] -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-heatmap/CHANGELOG.md deleted file mode 100644 index 1cedf14e9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/CHANGELOG.md +++ /dev/null @@ -1,83 +0,0 @@ - - -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09) - -### Bug Fixes - -- **chart & heatmap:** make to fix that y label is rendering out of bounds ([#20011](https://github.com/apache/superset/issues/20011)) ([56e9695](https://github.com/apache/superset/commit/56e96950c17ec65ef18cedfb2ed6591796a96cfc)) -- Date column in Heatmap is displayed as unix timestamp ([#25009](https://github.com/apache/superset/issues/25009)) ([35eb66a](https://github.com/apache/superset/commit/35eb66a322f7938f840778633a4aea11c7f24dce)) -- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b)) -- Heatmap numeric sorting ([#27360](https://github.com/apache/superset/issues/27360)) ([fe2f5a7](https://github.com/apache/superset/commit/fe2f5a7be9fb6218aa72ab9173481fd21fa40b20)) -- **heatmap:** add detail descriptions for heatmap 'normalize across' ([#20566](https://github.com/apache/superset/issues/20566)) ([d925b0c](https://github.com/apache/superset/commit/d925b0c8835fb1773b80298a3de1bdc368c88850)) -- **legacy-plugin-chart-heatmap:** fix adhoc column tooltip ([#23507](https://github.com/apache/superset/issues/23507)) ([0cebe8b](https://github.com/apache/superset/commit/0cebe8bf18204d17f311345744e67c4bf5961083)) -- **select:** select component sort functionality on certain options ([#17638](https://github.com/apache/superset/issues/17638)) ([f476ba2](https://github.com/apache/superset/commit/f476ba23a279cb87a94ad3075e035cad0ae264b6)) -- Timeseries Y-axis format with contribution mode ([#27106](https://github.com/apache/superset/issues/27106)) ([af577d6](https://github.com/apache/superset/commit/af577d64b17a9730e28e9021376318326fe31437)) -- Tooltips don't disappear on the Heatmap chart ([#24959](https://github.com/apache/superset/issues/24959)) ([9703490](https://github.com/apache/superset/commit/97034901291420af844257fc76ac107d4a891f18)) - -### Features - -- Add currencies controls in control panels ([#24718](https://github.com/apache/superset/issues/24718)) ([f7e76d0](https://github.com/apache/superset/commit/f7e76d02b7cbe4940946673590bb979984ace9f5)) -- Adds the ECharts Heatmap chart ([#25353](https://github.com/apache/superset/issues/25353)) ([546d48a](https://github.com/apache/superset/commit/546d48adbb84b1354d6a3d4ae88dbeba0ad14d44)) -- **chart & legend:** make to enable show legend by default ([#19927](https://github.com/apache/superset/issues/19927)) ([7b3d0f0](https://github.com/apache/superset/commit/7b3d0f040b050905f7d0901d0227f1cd6b761b56)) -- **explore:** Apply denormalization to tier 2 charts form data ([#20524](https://github.com/apache/superset/issues/20524)) ([e12ee59](https://github.com/apache/superset/commit/e12ee59b13822241dca8d8015f1222c477edd4f3)) -- Implement support for currencies in more charts ([#24594](https://github.com/apache/superset/issues/24594)) ([d74d7ec](https://github.com/apache/superset/commit/d74d7eca23a3c94bc48af082c115d34c103e815d)) - -### Reverts - -- Revert "chore(deps): bump d3-svg-legend in /superset-frontend (#19846)" (#19972) ([f144de4](https://github.com/apache/superset/commit/f144de4ee2bf213bb7e17f903bd3975d504c4136)), closes [#19846](https://github.com/apache/superset/issues/19846) [#19972](https://github.com/apache/superset/issues/19972) - -# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07) - -### Bug Fixes - -- **chart & heatmap:** make to fix that y label is rendering out of bounds ([#20011](https://github.com/apache/superset/issues/20011)) ([56e9695](https://github.com/apache/superset/commit/56e96950c17ec65ef18cedfb2ed6591796a96cfc)) -- Date column in Heatmap is displayed as unix timestamp ([#25009](https://github.com/apache/superset/issues/25009)) ([35eb66a](https://github.com/apache/superset/commit/35eb66a322f7938f840778633a4aea11c7f24dce)) -- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b)) -- Heatmap numeric sorting ([#27360](https://github.com/apache/superset/issues/27360)) ([fe2f5a7](https://github.com/apache/superset/commit/fe2f5a7be9fb6218aa72ab9173481fd21fa40b20)) -- **heatmap:** add detail descriptions for heatmap 'normalize across' ([#20566](https://github.com/apache/superset/issues/20566)) ([d925b0c](https://github.com/apache/superset/commit/d925b0c8835fb1773b80298a3de1bdc368c88850)) -- **legacy-plugin-chart-heatmap:** fix adhoc column tooltip ([#23507](https://github.com/apache/superset/issues/23507)) ([0cebe8b](https://github.com/apache/superset/commit/0cebe8bf18204d17f311345744e67c4bf5961083)) -- **select:** select component sort functionality on certain options ([#17638](https://github.com/apache/superset/issues/17638)) ([f476ba2](https://github.com/apache/superset/commit/f476ba23a279cb87a94ad3075e035cad0ae264b6)) -- Timeseries Y-axis format with contribution mode ([#27106](https://github.com/apache/superset/issues/27106)) ([af577d6](https://github.com/apache/superset/commit/af577d64b17a9730e28e9021376318326fe31437)) -- Tooltips don't disappear on the Heatmap chart ([#24959](https://github.com/apache/superset/issues/24959)) ([9703490](https://github.com/apache/superset/commit/97034901291420af844257fc76ac107d4a891f18)) - -### Features - -- Add currencies controls in control panels ([#24718](https://github.com/apache/superset/issues/24718)) ([f7e76d0](https://github.com/apache/superset/commit/f7e76d02b7cbe4940946673590bb979984ace9f5)) -- Adds the ECharts Heatmap chart ([#25353](https://github.com/apache/superset/issues/25353)) ([546d48a](https://github.com/apache/superset/commit/546d48adbb84b1354d6a3d4ae88dbeba0ad14d44)) -- **chart & legend:** make to enable show legend by default ([#19927](https://github.com/apache/superset/issues/19927)) ([7b3d0f0](https://github.com/apache/superset/commit/7b3d0f040b050905f7d0901d0227f1cd6b761b56)) -- **explore:** Apply denormalization to tier 2 charts form data ([#20524](https://github.com/apache/superset/issues/20524)) ([e12ee59](https://github.com/apache/superset/commit/e12ee59b13822241dca8d8015f1222c477edd4f3)) -- Implement support for currencies in more charts ([#24594](https://github.com/apache/superset/issues/24594)) ([d74d7ec](https://github.com/apache/superset/commit/d74d7eca23a3c94bc48af082c115d34c103e815d)) - -### Reverts - -- Revert "chore(deps): bump d3-svg-legend in /superset-frontend (#19846)" (#19972) ([f144de4](https://github.com/apache/superset/commit/f144de4ee2bf213bb7e17f903bd3975d504c4136)), closes [#19846](https://github.com/apache/superset/issues/19846) [#19972](https://github.com/apache/superset/issues/19972) - -# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-heatmap - -## [0.17.61](https://github.com/apache-superset/superset-ui/compare/v0.17.60...v0.17.61) (2021-07-02) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-heatmap diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/README.md b/superset-frontend/plugins/legacy-plugin-chart-heatmap/README.md deleted file mode 100644 index 2843c8f2a..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/README.md +++ /dev/null @@ -1,52 +0,0 @@ - - -## @superset-ui/legacy-plugin-chart-heatmap - -[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-heatmap.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-heatmap) -[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-heatmap?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-heatmap) - -This plugin provides Heatmap for Superset. - -### Usage - -Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to -lookup this chart throughout the app. - -```js -import HeatmapChartPlugin from '@superset-ui/legacy-plugin-chart-heatmap'; - -new HeatmapChartPlugin().configure({ key: 'heatmap' }).register(); -``` - -Then use it via `SuperChart`. See -[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-heatmap) -for more details. - -```js - -``` diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json b/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json deleted file mode 100644 index e6cc1a824..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@superset-ui/legacy-plugin-chart-heatmap", - "version": "0.20.3", - "description": "Superset Legacy Chart - Heatmap", - "keywords": [ - "superset" - ], - "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-heatmap#readme", - "bugs": { - "url": "https://github.com/apache/superset/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/apache/superset.git", - "directory": "superset-frontend/plugins/legacy-plugin-chart-heatmap" - }, - "license": "Apache-2.0", - "author": "Superset", - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "dependencies": { - "d3": "^3.5.17", - "d3-svg-legend": "^1.x", - "d3-tip": "^0.9.1", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@emotion/react": "^11.4.1", - "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*", - "react": "^16.13.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js deleted file mode 100644 index ef2c76ad6..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js +++ /dev/null @@ -1,458 +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 func-names, react/sort-prop-types */ -import d3 from 'd3'; -import PropTypes from 'prop-types'; -import 'd3-svg-legend'; -import d3tip from 'd3-tip'; -import { - getColumnLabel, - getMetricLabel, - getNumberFormatter, - NumberFormats, - getSequentialSchemeRegistry, -} from '@superset-ui/core'; - -const propTypes = { - data: PropTypes.shape({ - records: PropTypes.arrayOf( - PropTypes.shape({ - x: PropTypes.string, - y: PropTypes.string, - v: PropTypes.number, - perc: PropTypes.number, - rank: PropTypes.number, - }), - ), - extents: PropTypes.arrayOf(PropTypes.number), - }), - width: PropTypes.number, - height: PropTypes.number, - bottomMargin: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - colorScheme: PropTypes.string, - columnX: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), - columnY: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), - leftMargin: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - metric: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), - normalized: PropTypes.bool, - valueFormatter: PropTypes.object, - showLegend: PropTypes.bool, - showPercentage: PropTypes.bool, - showValues: PropTypes.bool, - sortXAxis: PropTypes.string, - sortYAxis: PropTypes.string, - xScaleInterval: PropTypes.number, - yScaleInterval: PropTypes.number, - yAxisBounds: PropTypes.arrayOf(PropTypes.number), -}; - -function cmp(a, b) { - return a > b ? 1 : -1; -} - -const DEFAULT_PROPERTIES = { - minChartWidth: 150, - minChartHeight: 150, - marginLeft: 35, - marginBottom: 35, - marginTop: 10, - marginRight: 10, -}; - -// Inspired from http://bl.ocks.org/mbostock/3074470 -// https://jsfiddle.net/cyril123/h0reyumq/ -function Heatmap(element, props) { - const { - data, - width, - height, - bottomMargin, - canvasImageRendering, - colorScheme, - columnX, - columnY, - leftMargin, - metric, - normalized, - valueFormatter, - showLegend, - showPercentage, - showValues, - sortXAxis, - sortYAxis, - xScaleInterval, - yScaleInterval, - yAxisBounds, - xAxisFormatter, - yAxisFormatter, - } = props; - - const { extents } = data; - const records = data.records.map(record => ({ - ...record, - x: xAxisFormatter(record.x), - y: yAxisFormatter(record.y), - })); - - const margin = { - top: 10, - right: 10, - bottom: 35, - left: 35, - }; - - let showY = true; - let showX = true; - const pixelsPerCharX = 4.5; // approx, depends on font size - let pixelsPerCharY = 6; // approx, depends on font size - - // Dynamically adjusts based on max x / y category lengths - function adjustMargins() { - let longestX = 1; - let longestY = 1; - - records.forEach(datum => { - if (typeof datum.y === 'number') pixelsPerCharY = 7; - longestX = Math.max( - longestX, - (datum.x && datum.x.toString().length) || 1, - ); - longestY = Math.max( - longestY, - (datum.y && datum.y.toString().length) || 1, - ); - }); - - if (leftMargin === 'auto') { - margin.left = Math.ceil(Math.max(margin.left, pixelsPerCharY * longestY)); - } else { - margin.left = leftMargin; - } - - if (showLegend) { - margin.right += 40; - } - - margin.bottom = - bottomMargin === 'auto' - ? Math.ceil(Math.max(margin.bottom, pixelsPerCharX * longestX)) - : bottomMargin; - } - - // Check if x axis "x" position is outside of the container and rotate labels 90deg - function checkLabelPosition(container) { - const xAxisNode = container.select('.x.axis').node(); - - if (!xAxisNode) { - return; - } - - if ( - xAxisNode.getBoundingClientRect().x + 4 < - container.node().getBoundingClientRect().x - ) { - container - .selectAll('.x.axis') - .selectAll('text') - .attr('transform', 'rotate(-90)') - .attr('x', -6) - .attr('y', 0) - .attr('dy', '0.3em'); - } - } - - function ordScale(k, rangeBands, sortMethod, formatter) { - let domain = {}; - records.forEach(d => { - domain[d[k]] = (domain[d[k]] || 0) + d.v; - }); - const keys = Object.keys(domain).map(k => formatter(k)); - if (sortMethod === 'alpha_asc') { - domain = keys.sort(cmp); - } else if (sortMethod === 'alpha_desc') { - domain = keys.sort(cmp).reverse(); - } else if (sortMethod === 'value_desc') { - domain = Object.keys(domain).sort((a, b) => - domain[a] > domain[b] ? -1 : 1, - ); - } else if (sortMethod === 'value_asc') { - domain = Object.keys(domain).sort((a, b) => - domain[b] > domain[a] ? -1 : 1, - ); - } - - if (k === 'y' && rangeBands) { - domain.reverse(); - } - - if (rangeBands) { - return d3.scale.ordinal().domain(domain).rangeBands(rangeBands); - } - - return d3.scale.ordinal().domain(domain).range(d3.range(domain.length)); - } - - // eslint-disable-next-line no-param-reassign - element.innerHTML = ''; - const matrix = {}; - - adjustMargins(); - - let hmWidth = width - (margin.left + margin.right); - let hmHeight = height - (margin.bottom + margin.top); - const hideYLabel = () => { - margin.left = - leftMargin === 'auto' ? DEFAULT_PROPERTIES.marginLeft : leftMargin; - hmWidth = width - (margin.left + margin.right); - showY = false; - }; - - const hideXLabel = () => { - margin.bottom = - bottomMargin === 'auto' ? DEFAULT_PROPERTIES.marginBottom : bottomMargin; - hmHeight = height - (margin.bottom + margin.top); - showX = false; - }; - - // Hide Y Labels - if (hmWidth < DEFAULT_PROPERTIES.minChartWidth) { - hideYLabel(); - } - - // Hide X Labels - if ( - hmHeight < DEFAULT_PROPERTIES.minChartHeight || - hmWidth < DEFAULT_PROPERTIES.minChartWidth - ) { - hideXLabel(); - } - - if (showY && hmHeight < DEFAULT_PROPERTIES.minChartHeight) { - hideYLabel(); - } - - const fp = getNumberFormatter(NumberFormats.PERCENT_2_POINT); - - const xScale = ordScale('x', null, sortXAxis, xAxisFormatter); - const yScale = ordScale('y', null, sortYAxis, yAxisFormatter); - const xRbScale = ordScale('x', [0, hmWidth], sortXAxis, xAxisFormatter); - const yRbScale = ordScale('y', [hmHeight, 0], sortYAxis, yAxisFormatter); - const X = 0; - const Y = 1; - const heatmapDim = [xRbScale.domain().length, yRbScale.domain().length]; - - const minBound = yAxisBounds[0] || 0; - const maxBound = yAxisBounds[1] || 1; - const colorScale = getSequentialSchemeRegistry() - .get(colorScheme) - .createLinearScale([minBound, maxBound]); - - const scale = [ - d3.scale.linear().domain([0, heatmapDim[X]]).range([0, hmWidth]), - d3.scale.linear().domain([0, heatmapDim[Y]]).range([0, hmHeight]), - ]; - - const container = d3.select(element); - container.classed('superset-legacy-chart-heatmap', true); - - const canvas = container - .append('canvas') - .attr('width', heatmapDim[X]) - .attr('height', heatmapDim[Y]) - .style('width', `${hmWidth}px`) - .style('height', `${hmHeight}px`) - .style('image-rendering', canvasImageRendering) - .style('left', `${margin.left}px`) - .style('top', `${margin.top}px`) - .style('position', 'absolute'); - - const svg = container - .append('svg') - .attr('width', width) - .attr('height', height) - .attr('class', 'heatmap-container') - .style('position', 'relative'); - - if (showValues) { - const cells = svg - .selectAll('rect') - .data(records) - .enter() - .append('g') - .attr('transform', `translate(${margin.left}, ${margin.top})`); - - cells - .append('text') - .attr('transform', d => `translate(${xRbScale(d.x)}, ${yRbScale(d.y)})`) - .attr('y', yRbScale.rangeBand() / 2) - .attr('x', xRbScale.rangeBand() / 2) - .attr('text-anchor', 'middle') - .attr('dy', '.35em') - .text(d => valueFormatter(d.v)) - .attr( - 'font-size', - `${Math.min(yRbScale.rangeBand(), xRbScale.rangeBand()) / 3}px`, - ) - .attr('fill', d => (d.v >= extents[1] / 2 ? 'white' : 'black')); - } - - if (showLegend) { - const colorLegend = d3.legend - .color() - .labelFormat(valueFormatter) - .scale(colorScale) - .shapePadding(0) - .cells(10) - .shapeWidth(10) - .shapeHeight(10) - .labelOffset(3); - - svg - .append('g') - .attr('transform', `translate(${width - 40}, ${margin.top})`) - .call(colorLegend); - } - - const tip = d3tip() - .attr('class', 'd3-tip') - .offset(function () { - const k = d3.mouse(this); - const x = k[0] - hmWidth / 2; - - return [k[1] - 20, x]; - }) - .html(function () { - let s = ''; - const k = d3.mouse(this); - const m = Math.floor(scale[0].invert(k[0])); - const n = Math.floor(scale[1].invert(k[1])); - if (m in matrix && n in matrix[m]) { - const obj = matrix[m][n]; - s += `
${getColumnLabel(columnX)}: ${obj.x}
`; - s += `
${getColumnLabel(columnY)}: ${obj.y}
`; - s += `
${getMetricLabel(metric)}: ${valueFormatter( - obj.v, - )}
`; - if (showPercentage) { - s += `
%: ${fp(normalized ? obj.rank : obj.perc)}
`; - } - tip.style('display', null); - } else { - // this is a hack to hide the tooltip because we have map it to a single - // d3-tip toggles opacity and calling hide here is undone by the lib after this call - tip.style('display', 'none'); - } - - return s; - }); - - const rect = svg - .append('g') - .attr('transform', `translate(${margin.left}, ${margin.top})`) - .append('rect') - .classed('background-rect', true) - .on('mousemove', tip.show) - .on('mouseout', tip.hide) - .attr('width', hmWidth) - .attr('height', hmHeight); - - rect.call(tip); - - if (showX) { - const xAxis = d3.svg - .axis() - .scale(xRbScale) - .outerTickSize(0) - .tickValues(xRbScale.domain().filter((d, i) => !(i % xScaleInterval))) - .orient('bottom'); - - svg - .append('g') - .attr('class', 'x axis') - .attr('transform', `translate(${margin.left},${margin.top + hmHeight})`) - .call(xAxis) - .selectAll('text') - .attr('x', -4) - .attr('y', 10) - .attr('dy', '0.3em') - .style('text-anchor', 'end') - .attr('transform', 'rotate(-45)'); - } - - if (showY) { - const yAxis = d3.svg - .axis() - .scale(yRbScale) - .outerTickSize(0) - .tickValues(yRbScale.domain().filter((d, i) => !(i % yScaleInterval))) - .orient('left'); - - svg - .append('g') - .attr('class', 'y axis') - .attr('transform', `translate(${margin.left},${margin.top})`) - .call(yAxis); - } - - checkLabelPosition(container); - const context = canvas.node().getContext('2d'); - context.imageSmoothingEnabled = false; - - // Compute the pixel colors; scaled by CSS. - function createImageObj() { - const imageObj = new Image(); - const image = context.createImageData(heatmapDim[0], heatmapDim[1]); - const pixs = {}; - records.forEach(d => { - const c = d3.rgb(colorScale(normalized ? d.rank : d.perc)); - const x = xScale(d.x); - const y = yScale(d.y); - pixs[x + y * xScale.domain().length] = c; - if (matrix[x] === undefined) { - matrix[x] = {}; - } - if (matrix[x][y] === undefined) { - matrix[x][y] = d; - } - }); - - let p = 0; - for (let i = 0; i < heatmapDim[0] * heatmapDim[1]; i += 1) { - let c = pixs[i]; - let alpha = 255; - if (c === undefined) { - c = d3.rgb('#F00'); - alpha = 0; - } - image.data[p + 0] = c.r; - image.data[p + 1] = c.g; - image.data[p + 2] = c.b; - image.data[p + 3] = alpha; - p += 4; - } - context.putImageData(image, 0, 0); - imageObj.src = canvas.node().toDataURL(); - } - createImageObj(); -} - -Heatmap.displayName = 'Heatmap'; -Heatmap.propTypes = propTypes; - -export default Heatmap; diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/ReactHeatmap.jsx b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/ReactHeatmap.jsx deleted file mode 100644 index 9dad51e52..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/ReactHeatmap.jsx +++ /dev/null @@ -1,152 +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 { reactify, css, styled } from '@superset-ui/core'; -import { Global } from '@emotion/react'; -import Component from './Heatmap'; - -function componentWillUnmount() { - // Removes tooltips from the DOM - document.querySelectorAll('.d3-tip').forEach(t => t.remove()); -} - -const ReactComponent = reactify(Component, { componentWillUnmount }); - -const Heatmap = ({ className, ...otherProps }) => ( -
- css` - .d3-tip { - line-height: 1; - padding: ${theme.gridUnit * 3}px; - background: ${theme.colors.grayscale.dark2}; - color: ${theme.colors.grayscale.light5}; - border-radius: 4px; - pointer-events: none; - z-index: 1000; - font-size: ${theme.typography.sizes.s}px; - } - - /* Creates a small triangle extender for the tooltip */ - .d3-tip:after { - box-sizing: border-box; - display: inline; - font-size: ${theme.typography.sizes.xs}; - width: 100%; - line-height: 1; - color: ${theme.colors.grayscale.dark2}; - position: absolute; - pointer-events: none; - } - - /* Northward tooltips */ - .d3-tip.n:after { - content: '\\25BC'; - margin: -${theme.gridUnit}px 0 0 0; - top: 100%; - left: 0; - text-align: center; - } - - /* Eastward tooltips */ - .d3-tip.e:after { - content: '\\25C0'; - margin: -${theme.gridUnit}px 0 0 0; - top: 50%; - left: -${theme.gridUnit * 2}px; - } - - /* Southward tooltips */ - .d3-tip.s:after { - content: '\\25B2'; - margin: 0; - top: -${theme.gridUnit * 2}px; - left: 0; - text-align: center; - } - - /* Westward tooltips */ - .d3-tip.w:after { - content: '\\25B6'; - margin: -${theme.gridUnit}px 0 0 0px; - top: 50%; - left: 100%; - } - `} - /> - -
-); - -export default styled(Heatmap)` - ${({ theme }) => ` - .superset-legacy-chart-heatmap { - position: relative; - top: 0; - left: 0; - height: 100%; - } - - .superset-legacy-chart-heatmap .axis text { - font-size: ${theme.typography.sizes.xs}px; - text-rendering: optimizeLegibility; - } - - .superset-legacy-chart-heatmap .background-rect { - stroke: ${theme.colors.grayscale.light2}; - fill-opacity: 0; - pointer-events: all; - } - - .superset-legacy-chart-heatmap .axis path, - .superset-legacy-chart-heatmap .axis line { - fill: none; - stroke: ${theme.colors.grayscale.light2}; - shape-rendering: crispEdges; - } - - .superset-legacy-chart-heatmap canvas, - .superset-legacy-chart-heatmap img { - image-rendering: optimizeSpeed; /* Older versions of FF */ - image-rendering: -moz-crisp-edges; /* FF 6.0+ */ - image-rendering: -webkit-optimize-contrast; /* Safari */ - image-rendering: -o-crisp-edges; /* OS X & Windows Opera (12.02+) */ - image-rendering: pixelated; /* Awesome future-browsers */ - -ms-interpolation-mode: nearest-neighbor; /* IE */ - } - - .superset-legacy-chart-heatmap .legendCells text { - font-size: ${theme.typography.sizes.xs}px; - font-weight: ${theme.typography.weights.normal}; - opacity: 0; - } - - .superset-legacy-chart-heatmap .legendCells .cell:first-child text { - opacity: 1; - } - - .superset-legacy-chart-heatmap .legendCells .cell:last-child text { - opacity: 1; - } - - .dashboard .superset-legacy-chart-heatmap .axis text { - font-size: ${theme.typography.sizes.xs}px; - opacity: ${theme.opacity.heavy}; - } - `} -`; diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/controlPanel.tsx b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/controlPanel.tsx deleted file mode 100644 index d22428e1e..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/controlPanel.tsx +++ /dev/null @@ -1,329 +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, - formatSelectOptionsForRange, - sharedControls, - getStandardizedControls, - D3_TIME_FORMAT_DOCS, -} from '@superset-ui/chart-controls'; - -const sortAxisChoices = [ - ['alpha_asc', t('Axis ascending')], - ['alpha_desc', t('Axis descending')], - ['value_asc', t('Metric ascending')], - ['value_desc', t('Metric descending')], -]; - -const dndAllColumns = { - ...sharedControls.entity, - description: t('Columns to display'), -}; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - [ - { - name: 'all_columns_x', - config: { - ...dndAllColumns, - label: t('X Axis'), - }, - }, - ], - [ - { - name: 'all_columns_y', - config: { - ...dndAllColumns, - label: t('Y Axis'), - }, - }, - ], - ['metric'], - ['adhoc_filters'], - ['row_limit'], - ['sort_by_metric'], - ], - }, - { - label: t('Heatmap Options'), - expanded: true, - tabOverride: 'customize', - controlSetRows: [ - ['linear_color_scheme'], - [ - { - name: 'xscale_interval', - config: { - type: 'SelectControl', - label: t('XScale Interval'), - renderTrigger: true, - choices: formatSelectOptionsForRange(1, 50), - default: 1, - clearable: false, - description: t( - 'Number of steps to take between ticks when displaying the X scale', - ), - }, - }, - ], - [ - { - name: 'yscale_interval', - config: { - type: 'SelectControl', - label: t('YScale Interval'), - choices: formatSelectOptionsForRange(1, 50), - default: 1, - clearable: false, - renderTrigger: true, - description: t( - 'Number of steps to take between ticks when displaying the Y scale', - ), - }, - }, - ], - [ - { - name: 'canvas_image_rendering', - config: { - type: 'SelectControl', - label: t('Rendering'), - renderTrigger: true, - choices: [ - ['pixelated', t('pixelated (Sharp)')], - ['auto', t('auto (Smooth)')], - ], - default: 'pixelated', - description: t( - 'image-rendering CSS attribute of the canvas object that ' + - 'defines how the browser scales up the image', - ), - }, - }, - ], - [ - { - name: 'normalize_across', - config: { - type: 'SelectControl', - label: t('Normalize Across'), - choices: [ - ['heatmap', t('heatmap')], - ['x', t('x')], - ['y', t('y')], - ], - default: 'heatmap', - description: ( - <> -
- {t( - 'Color will be shaded based the normalized (0% to 100%) value of a given cell against the other cells in the selected range: ', - )} -
-
    -
  • {t('x: values are normalized within each column')}
    • -
  • {t('y: values are normalized within each row')}
    • -
  • - {t( - 'heatmap: values are normalized across the entire heatmap', - )} -
    • -
- - ), - }, - }, - ], - [ - { - name: 'left_margin', - config: { - type: 'SelectControl', - freeForm: true, - clearable: false, - label: t('Left Margin'), - choices: [ - ['auto', t('auto')], - [50, '50'], - [75, '75'], - [100, '100'], - [125, '125'], - [150, '150'], - [200, '200'], - ], - default: 'auto', - renderTrigger: true, - description: t( - 'Left margin, in pixels, allowing for more room for axis labels', - ), - }, - }, - ], - [ - { - name: 'bottom_margin', - config: { - type: 'SelectControl', - clearable: false, - freeForm: true, - label: t('Bottom Margin'), - choices: [ - ['auto', t('auto')], - [50, '50'], - [75, '75'], - [100, '100'], - [125, '125'], - [150, '150'], - [200, '200'], - ], - default: 'auto', - renderTrigger: true, - description: t( - 'Bottom margin, in pixels, allowing for more room for axis labels', - ), - }, - }, - ], - [ - { - name: 'y_axis_bounds', - config: { - type: 'BoundsControl', - label: t('Value bounds'), - renderTrigger: true, - default: [null, null], - description: t( - 'Hard value bounds applied for color coding. Is only relevant ' + - 'and applied when the normalization is applied against the whole heatmap.', - ), - }, - }, - ], - ['y_axis_format'], - [ - { - name: 'time_format', - config: { - ...sharedControls.x_axis_time_format, - default: '%d/%m/%Y', - description: `${D3_TIME_FORMAT_DOCS}.`, - }, - }, - ], - ['currency_format'], - [ - { - name: 'sort_x_axis', - config: { - type: 'SelectControl', - label: t('Sort X Axis'), - choices: sortAxisChoices, - clearable: false, - default: 'alpha_asc', - }, - }, - ], - [ - { - name: 'sort_y_axis', - config: { - type: 'SelectControl', - label: t('Sort Y Axis'), - choices: sortAxisChoices, - clearable: false, - default: 'alpha_asc', - }, - }, - ], - [ - { - name: 'show_legend', - config: { - type: 'CheckboxControl', - label: t('Legend'), - renderTrigger: true, - default: true, - description: t('Whether to display the legend (toggles)'), - }, - }, - ], - [ - { - name: 'show_perc', - config: { - type: 'CheckboxControl', - label: t('Show percentage'), - renderTrigger: true, - description: t( - 'Whether to include the percentage in the tooltip', - ), - default: true, - }, - }, - ], - [ - { - name: 'show_values', - config: { - type: 'CheckboxControl', - label: t('Show Values'), - renderTrigger: true, - default: false, - description: t( - 'Whether to display the numerical values within the cells', - ), - }, - }, - ], - [ - { - name: 'normalized', - config: { - type: 'CheckboxControl', - label: t('Normalized'), - renderTrigger: true, - description: t( - 'Whether to apply a normal distribution based on rank on the color scale', - ), - default: false, - }, - }, - ], - ], - }, - ], - controlOverrides: { - y_axis_format: { - label: t('Value Format'), - }, - }, - formDataOverrides: formData => ({ - ...formData, - metric: getStandardizedControls().shiftMetric(), - }), -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/channels.jpg b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/channels.jpg deleted file mode 100644 index 8f6c1b3e9..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/channels.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/employment.jpg b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/employment.jpg deleted file mode 100644 index 1a55ef839..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/employment.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png deleted file mode 100644 index f1703fc9d..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png deleted file mode 100644 index 1dfeabbdb..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/transportation.jpg b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/transportation.jpg deleted file mode 100644 index 1cf7a89cb..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/images/transportation.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/index.js deleted file mode 100644 index 3779c0d03..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/index.js +++ /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 { t, ChartMetadata, ChartPlugin, ChartLabel } from '@superset-ui/core'; -import transformProps from './transformProps'; -import transportation from './images/transportation.jpg'; -import channels from './images/channels.jpg'; -import employment from './images/employment.jpg'; -import thumbnail from './images/thumbnail.png'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Correlation'), - credits: ['http://bl.ocks.org/mbostock/3074470'], - description: t( - 'Visualize a related metric across pairs of groups. Heatmaps excel at showcasing the correlation or strength between two groups. Color is used to emphasize the strength of the link between each pair of groups.', - ), - exampleGallery: [ - { url: transportation, caption: t('Sizes of vehicles') }, - { url: channels, caption: t('Relationships between community channels') }, - { url: employment, caption: t('Employment and education') }, - ], - label: ChartLabel.DEPRECATED, - name: t('Heatmap (legacy)'), - tags: [ - t('Business'), - t('Intensity'), - t('Legacy'), - t('Density'), - t('Predictive'), - t('Single Metric'), - t('Deprecated'), - ], - thumbnail, - useLegacyApi: true, -}); - -/** - * @deprecated in version 4.0. - */ -export default class HeatmapChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('./ReactHeatmap'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js deleted file mode 100644 index 8b925f297..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js +++ /dev/null @@ -1,93 +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 { - GenericDataType, - getTimeFormatter, - getValueFormatter, -} from '@superset-ui/core'; - -export default function transformProps(chartProps) { - const { width, height, formData, queriesData, datasource } = chartProps; - const { - bottomMargin, - canvasImageRendering, - allColumnsX, - allColumnsY, - linearColorScheme, - leftMargin, - metric, - normalized, - showLegend, - showPerc, - showValues, - sortXAxis, - sortYAxis, - xscaleInterval, - yscaleInterval, - yAxisBounds, - yAxisFormat, - timeFormat, - currencyFormat, - } = formData; - const { data = [], coltypes = [] } = queriesData[0]; - const { columnFormats = {}, currencyFormats = {} } = datasource; - const valueFormatter = getValueFormatter( - metric, - currencyFormats, - columnFormats, - yAxisFormat, - currencyFormat, - ); - const xAxisFormatter = - coltypes[0] === GenericDataType.Temporal - ? getTimeFormatter(timeFormat) - : coltypes[0] === GenericDataType.Numeric - ? Number - : String; - const yAxisFormatter = - coltypes[1] === GenericDataType.Temporal - ? getTimeFormatter(timeFormat) - : coltypes[1] === GenericDataType.Numeric - ? Number - : String; - return { - width, - height, - data, - bottomMargin, - canvasImageRendering, - colorScheme: linearColorScheme, - columnX: allColumnsX, - columnY: allColumnsY, - leftMargin, - metric, - normalized, - showLegend, - showPercentage: showPerc, - showValues, - sortXAxis, - sortYAxis, - xScaleInterval: parseInt(xscaleInterval, 10), - yScaleInterval: parseInt(yscaleInterval, 10), - yAxisBounds, - valueFormatter, - xAxisFormatter, - yAxisFormatter, - }; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-heatmap/tsconfig.json deleted file mode 100644 index b6bfaa2d9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "declarationDir": "lib", - "outDir": "lib", - "rootDir": "src" - }, - "exclude": [ - "lib", - "test" - ], - "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "types/**/*", - "../../types/**/*" - ], - "references": [ - { - "path": "../../packages/superset-ui-chart-controls" - }, - { - "path": "../../packages/superset-ui-core" - } - ] -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-histogram/CHANGELOG.md deleted file mode 100644 index 93130f5dc..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/CHANGELOG.md +++ /dev/null @@ -1,63 +0,0 @@ - - -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09) - -### Bug Fixes - -- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964)) -- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b)) -- **histogram:** display correct percentile value instead of formula ([#18084](https://github.com/apache/superset/issues/18084)) ([28e729b](https://github.com/apache/superset/commit/28e729b835d8195f3610f7131504441803e43406)) -- Revert shared controls typing change. ([#22014](https://github.com/apache/superset/issues/22014)) ([4cbd70d](https://github.com/apache/superset/commit/4cbd70db34b140a026ef1a86a8ef0ba3355a350e)) - -### Features - -- Adds the ECharts Histogram chart ([#28652](https://github.com/apache/superset/issues/28652)) ([896fe85](https://github.com/apache/superset/commit/896fe854dc3865214325cfceea94824ff41a1b6c)) -- **chart & legend:** make to enable show legend by default ([#19927](https://github.com/apache/superset/issues/19927)) ([7b3d0f0](https://github.com/apache/superset/commit/7b3d0f040b050905f7d0901d0227f1cd6b761b56)) -- **explore:** Apply denormalization to tier 2 charts form data ([#20524](https://github.com/apache/superset/issues/20524)) ([e12ee59](https://github.com/apache/superset/commit/e12ee59b13822241dca8d8015f1222c477edd4f3)) -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07) - -### Bug Fixes - -- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964)) -- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b)) -- **histogram:** display correct percentile value instead of formula ([#18084](https://github.com/apache/superset/issues/18084)) ([28e729b](https://github.com/apache/superset/commit/28e729b835d8195f3610f7131504441803e43406)) -- Revert shared controls typing change. ([#22014](https://github.com/apache/superset/issues/22014)) ([4cbd70d](https://github.com/apache/superset/commit/4cbd70db34b140a026ef1a86a8ef0ba3355a350e)) - -### Features - -- Adds the ECharts Histogram chart ([#28652](https://github.com/apache/superset/issues/28652)) ([896fe85](https://github.com/apache/superset/commit/896fe854dc3865214325cfceea94824ff41a1b6c)) -- **chart & legend:** make to enable show legend by default ([#19927](https://github.com/apache/superset/issues/19927)) ([7b3d0f0](https://github.com/apache/superset/commit/7b3d0f040b050905f7d0901d0227f1cd6b761b56)) -- **explore:** Apply denormalization to tier 2 charts form data ([#20524](https://github.com/apache/superset/issues/20524)) ([e12ee59](https://github.com/apache/superset/commit/e12ee59b13822241dca8d8015f1222c477edd4f3)) -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-histogram - -## [0.17.61](https://github.com/apache-superset/superset-ui/compare/v0.17.60...v0.17.61) (2021-07-02) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-histogram diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/README.md b/superset-frontend/plugins/legacy-plugin-chart-histogram/README.md deleted file mode 100644 index 7d02227b6..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/README.md +++ /dev/null @@ -1,52 +0,0 @@ - - -## @superset-ui/legacy-plugin-chart-histogram - -[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-histogram.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-histogram) -[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-histogram?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-histogram) - -This plugin provides Histogram for Superset. - -### Usage - -Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to -lookup this chart throughout the app. - -```js -import HistogramChartPlugin from '@superset-ui/legacy-plugin-chart-histogram'; - -new HistogramChartPlugin().configure({ key: 'histogram' }).register(); -``` - -Then use it via `SuperChart`. See -[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-histogram) -for more details. - -```js - -``` diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json b/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json deleted file mode 100644 index 0b225a786..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "@superset-ui/legacy-plugin-chart-histogram", - "version": "0.20.3", - "description": "Superset Legacy Chart - Histogram", - "sideEffects": [ - "*.css" - ], - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "repository": { - "type": "git", - "url": "https://github.com/apache/superset.git", - "directory": "superset-frontend/packages/legacy-plugin-chart-histogram" - }, - "keywords": [ - "superset" - ], - "author": "Superset", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/apache/superset/issues" - }, - "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-histogram#readme", - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@data-ui/histogram": "^0.0.84", - "@data-ui/theme": "^0.0.84", - "@vx/legend": "^0.0.199", - "@vx/responsive": "^0.0.199", - "@vx/scale": "^0.0.199", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*", - "react": "^15 || ^16" - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx deleted file mode 100644 index c14b83c1c..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx +++ /dev/null @@ -1,160 +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 react/sort-prop-types */ -import PropTypes from 'prop-types'; -import { PureComponent } from 'react'; -import { Histogram, BarSeries, XAxis, YAxis } from '@data-ui/histogram'; -import { chartTheme } from '@data-ui/theme'; -import { LegendOrdinal } from '@vx/legend'; -import { scaleOrdinal } from '@vx/scale'; -import { CategoricalColorNamespace, styled, t } from '@superset-ui/core'; -import WithLegend from './WithLegend'; - -const propTypes = { - className: PropTypes.string, - data: PropTypes.arrayOf( - PropTypes.shape({ - key: PropTypes.string, - values: PropTypes.arrayOf(PropTypes.number), - }), - ).isRequired, - width: PropTypes.number.isRequired, - height: PropTypes.number.isRequired, - colorScheme: PropTypes.string, - normalized: PropTypes.bool, - cumulative: PropTypes.bool, - binCount: PropTypes.number, - opacity: PropTypes.number, - xAxisLabel: PropTypes.string, - yAxisLabel: PropTypes.string, - showLegend: PropTypes.bool, -}; -const defaultProps = { - binCount: 15, - className: '', - colorScheme: '', - normalized: false, - cumulative: false, - opacity: 1, - xAxisLabel: '', - yAxisLabel: '', -}; - -class CustomHistogram extends PureComponent { - render() { - const { - className, - data, - width, - height, - binCount, - colorScheme, - normalized, - cumulative, - opacity, - xAxisLabel, - yAxisLabel, - showLegend, - sliceId, - } = this.props; - const colorFn = CategoricalColorNamespace.getScale(colorScheme); - const keys = data.map(d => d.key); - const colorScale = scaleOrdinal({ - domain: keys, - range: keys.map(x => colorFn(x, sliceId)), - }); - - return ( - - showLegend && ( - - ) - } - renderChart={parent => ( - ( -
- - {datum.bin0} {t('to')} {datum.bin1} - -
- {t('count')} - {datum.count} -
-
- {t('cumulative')} - {datum.cumulative} -
-
- {t('percentile (exclusive)')} - {`${( - (datum.cumulativeDensity - datum.density) * - 100 - ).toPrecision(4)}th`} -
-
- )} - valueAccessor={datum => datum} - theme={chartTheme} - > - {data.map(series => ( - - ))} - - - - )} - /> - ); - } -} - -CustomHistogram.propTypes = propTypes; -CustomHistogram.defaultProps = defaultProps; - -export default styled(CustomHistogram)` - .superset-legacy-chart-histogram { - overflow: hidden; - } -`; diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/WithLegend.jsx b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/WithLegend.jsx deleted file mode 100644 index f127a0ec7..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/WithLegend.jsx +++ /dev/null @@ -1,153 +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 react/sort-prop-types, react/jsx-sort-default-props */ -import { Component } from 'react'; -import PropTypes from 'prop-types'; -import { ParentSize } from '@vx/responsive'; - -const propTypes = { - className: PropTypes.string, - width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), - height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), - renderChart: PropTypes.func.isRequired, - renderLegend: PropTypes.func.isRequired, - position: PropTypes.oneOf(['top', 'left', 'bottom', 'right']), - legendJustifyContent: PropTypes.oneOf(['center', 'flex-start', 'flex-end']), -}; -const defaultProps = { - className: '', - width: 'auto', - height: 'auto', - position: 'top', - legendJustifyContent: undefined, -}; - -const LEGEND_STYLE_BASE = { - display: 'flex', - flexGrow: 0, - flexShrink: 0, - order: -1, - paddingTop: '5px', - fontSize: '0.9em', -}; - -const CHART_STYLE_BASE = { - flexGrow: 1, - flexShrink: 1, - flexBasis: 'auto', - position: 'relative', -}; - -class WithLegend extends Component { - getContainerDirection() { - const { position } = this.props; - switch (position) { - case 'left': - return 'row'; - case 'right': - return 'row-reverse'; - case 'bottom': - return 'column-reverse'; - default: - case 'top': - return 'column'; - } - } - - getLegendJustifyContent() { - const { legendJustifyContent, position } = this.props; - if (legendJustifyContent) { - return legendJustifyContent; - } - switch (position) { - case 'left': - return 'flex-start'; - case 'right': - return 'flex-start'; - case 'bottom': - return 'flex-end'; - default: - case 'top': - return 'flex-end'; - } - } - - render() { - const { className, width, height, position, renderChart, renderLegend } = - this.props; - - const isHorizontal = position === 'left' || position === 'right'; - - const style = { - display: 'flex', - flexDirection: this.getContainerDirection(), - }; - if (width) { - style.width = width; - } - if (height) { - style.height = height; - } - - const chartStyle = { ...CHART_STYLE_BASE }; - if (isHorizontal) { - chartStyle.width = 0; - } else { - chartStyle.height = 0; - } - - const legendDirection = isHorizontal ? 'column' : 'row'; - const legendStyle = { - ...LEGEND_STYLE_BASE, - flexDirection: legendDirection, - justifyContent: this.getLegendJustifyContent(), - }; - const legendContainerStyle = { - flexWrap: 'wrap', - display: 'flex', - flexDirection: legendDirection, - }; - return ( -
-
- {renderLegend({ - // Pass flexDirection for @vx/legend to arrange legend items - direction: legendDirection, - style: legendContainerStyle, - })} -
-
- - {parent => - parent.width > 0 && parent.height > 0 - ? // Only render when necessary - renderChart(parent) - : null - } - -
-
- ); - } -} - -WithLegend.propTypes = propTypes; -WithLegend.defaultProps = defaultProps; - -export default WithLegend; diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts deleted file mode 100644 index 81ca460fe..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts +++ /dev/null @@ -1,152 +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, validateNonEmpty } from '@superset-ui/core'; -import { - columnChoices, - ControlPanelConfig, - ControlPanelState, - formatSelectOptions, - getStandardizedControls, - sharedControls, - ControlState, -} from '@superset-ui/chart-controls'; - -const columnsConfig = { - ...sharedControls.columns, - label: t('Columns'), - description: t('Select the numeric columns to draw the histogram'), - mapStateToProps: (state: ControlPanelState, controlState: ControlState) => ({ - ...(sharedControls.columns.mapStateToProps?.(state, controlState) || {}), - choices: columnChoices(state.datasource), - }), - validators: [validateNonEmpty], -}; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - [ - { - name: 'all_columns_x', - config: columnsConfig, - }, - ], - ['adhoc_filters'], - ['row_limit'], - ['groupby'], - ], - }, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - ['color_scheme'], - [ - { - name: 'link_length', - config: { - type: 'SelectControl', - renderTrigger: true, - freeForm: true, - label: t('No of Bins'), - default: 5, - choices: formatSelectOptions([ - '10', - '25', - '50', - '75', - '100', - '150', - '200', - '250', - ]), - description: t('Select the number of bins for the histogram'), - }, - }, - ], - [ - { - name: 'x_axis_label', - config: { - type: 'TextControl', - label: t('X Axis Label'), - renderTrigger: true, - default: '', - }, - }, - ], - [ - { - name: 'y_axis_label', - config: { - type: 'TextControl', - label: t('Y Axis Label'), - renderTrigger: true, - default: '', - }, - }, - ], - [ - { - name: 'show_legend', - config: { - type: 'CheckboxControl', - label: t('Legend'), - renderTrigger: true, - default: true, - description: t('Whether to display the legend (toggles)'), - }, - }, - ], - [ - { - name: 'normalized', - config: { - type: 'CheckboxControl', - label: t('Normalized'), - renderTrigger: true, - description: t('Whether to normalize the histogram'), - default: false, - }, - }, - ], - [ - { - name: 'cumulative', - config: { - type: 'CheckboxControl', - label: t('Cumulative'), - renderTrigger: true, - description: t('Whether to make the histogram cumulative'), - default: false, - }, - }, - ], - ], - }, - ], - formDataOverrides: formData => ({ - ...formData, - groupby: getStandardizedControls().popAllColumns(), - }), -}; -export default config; diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example1.jpg b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example1.jpg deleted file mode 100644 index 9bfacc4da..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example1.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example2.jpg b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example2.jpg deleted file mode 100644 index b4a55095d..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example3.jpg b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example3.jpg deleted file mode 100644 index 61006e5e1..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/example3.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png deleted file mode 100644 index 22e5ea424..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png deleted file mode 100644 index 3c63c0eb5..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/index.js deleted file mode 100644 index 5704f5833..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/index.js +++ /dev/null @@ -1,52 +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 example1 from './images/example1.jpg'; -import example2 from './images/example2.jpg'; -import example3 from './images/example3.jpg'; -import thumbnail from './images/thumbnail.png'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Distribution'), - description: t( - 'Take your data points, and group them into "bins" to see where the densest areas of information lie', - ), - exampleGallery: [ - { url: example1, caption: t('Population age data') }, - { url: example2 }, - { url: example3 }, - ], - name: t('Histogram (legacy)'), - tags: [t('Comparison'), t('Legacy'), t('Pattern'), t('Range')], - thumbnail, - useLegacyApi: true, -}); - -export default class HistogramChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('./Histogram'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/transformProps.js deleted file mode 100644 index 1de223240..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/transformProps.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. - */ -export default function transformProps(chartProps) { - const { width, height, formData, queriesData } = chartProps; - const { - colorScheme, - linkLength, - normalized, - cumulative, - globalOpacity, - xAxisLabel, - yAxisLabel, - showLegend, - sliceId, - } = formData; - - return { - width, - height, - data: queriesData[0].data, - binCount: parseInt(linkLength, 10), - colorScheme, - normalized, - cumulative, - opacity: globalOpacity, - xAxisLabel, - yAxisLabel, - showLegend, - sliceId, - }; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-histogram/tsconfig.json deleted file mode 100644 index b6bfaa2d9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-histogram/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "declarationDir": "lib", - "outDir": "lib", - "rootDir": "src" - }, - "exclude": [ - "lib", - "test" - ], - "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "types/**/*", - "../../types/**/*" - ], - "references": [ - { - "path": "../../packages/superset-ui-chart-controls" - }, - { - "path": "../../packages/superset-ui-core" - } - ] -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/CHANGELOG.md deleted file mode 100644 index ef201f3e8..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/CHANGELOG.md +++ /dev/null @@ -1,39 +0,0 @@ - - -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09) - -### Features - -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07) - -### Features - -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-sankey-loop diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/README.md b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/README.md deleted file mode 100644 index 631b00d62..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/README.md +++ /dev/null @@ -1,52 +0,0 @@ - - -## @superset-ui/legacy-plugin-chart-sankey-loop - -[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-sankey.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-sankey) -[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-sankey-loop?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-sankey-loop) - -This plugin provides Sankey Diagram with loops for Superset. - -### Usage - -Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to -lookup this chart throughout the app. - -```js -import SankeyLoopChartPlugin from '@superset-ui/legacy-plugin-chart-sankey-loop'; - -new SankeyLoopChartPlugin().configure({ key: 'sankey' }).register(); -``` - -Then use it via `SuperChart`. See -[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-sankey-loop) -for more details. - -```js - -``` diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json deleted file mode 100644 index 6ff25abf3..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "@superset-ui/legacy-plugin-chart-sankey-loop", - "version": "0.20.3", - "description": "Superset Legacy Chart - Sankey Diagram with Loops", - "keywords": [ - "superset" - ], - "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-sankey-loop#readme", - "bugs": { - "url": "https://github.com/apache/superset/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/apache/superset.git", - "directory": "superset-frontend/plugins/legacy-plugin-chart-sankey-loop" - }, - "license": "Apache-2.0", - "author": "Superset", - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "dependencies": { - "d3-sankey-diagram": "^0.7.3", - "d3-selection": "^3.0.0", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*", - "react": "^16.13.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx deleted file mode 100644 index 5f1e551b0..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx +++ /dev/null @@ -1,71 +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 { reactify, styled } from '@superset-ui/core'; -import Component from './SankeyLoop'; - -const ReactComponent = reactify(Component); - -const Sankey = ({ className, ...otherProps }) => ( -
- -
-); - -export default styled(Sankey)` - ${({ theme }) => ` - .superset-legacy-chart-sankey-loop .node rect { - cursor: move; - fill-opacity: ${theme.opacity.heavy}; - shape-rendering: crispEdges; - } - - .superset-legacy-chart-sankey-loop .node text { - pointer-events: none; - text-shadow: 0 1px 0 ${theme.colors.grayscale.light5}; - } - - .superset-legacy-chart-sankey-loop .link { - fill: none; - stroke: ${theme.colors.grayscale.dark2}; - stroke-opacity: ${theme.opacity.light}; - } - - .superset-legacy-chart-sankey-loop .link:hover { - stroke-opacity: ${theme.opacity.mediumHeavy}; - } - - .superset-legacy-chart-sankey-loop .link path { - opacity: ${theme.opacity.mediumLight}; - stroke-opacity: 0; - } - - .superset-legacy-chart-sankey-loop .link:hover path { - opacity: ${theme.opacity.heavy}; - } - - .superset-legacy-chart-sankey-loop .link text { - fill: ${theme.colors.grayscale.base}; - font-size: ${theme.gridUnit * 3}px; - } - - .superset-legacy-chart-sankey-loop .link:hover text { - opacity: 1; - } - `} -`; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js deleted file mode 100644 index c9fe27eb2..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js +++ /dev/null @@ -1,140 +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 react/sort-prop-types */ -import PropTypes from 'prop-types'; -import { select } from 'd3-selection'; -import { sankeyDiagram, sankey } from 'd3-sankey-diagram'; -import { - getNumberFormatter, - NumberFormats, - CategoricalColorNamespace, -} from '@superset-ui/core'; - -// a problem with 'd3-sankey-diagram' is that the sankey().extent() parameters, which -// informs the layout of the bounding box of the sankey columns, does not account -// for labels and paths which happen to be layed out outside that rectangle. -// for that reason i've selected relatively large default left/right margins, and have -// made 'margin' a property. i have raised an issue in the chart repo: -// -// https://github.com/ricklupton/d3-sankey-diagram/issues/20 - -const defaultMargin = { - top: 0, - right: 80, - bottom: 0, - left: 80, -}; - -const propTypes = { - data: PropTypes.arrayOf( - PropTypes.shape({ - source: PropTypes.string, - target: PropTypes.string, - value: PropTypes.number, - }), - ), - width: PropTypes.number, - height: PropTypes.number, - colorScheme: PropTypes.string, - margin: PropTypes.shape({ - top: PropTypes.number, - right: PropTypes.number, - bottom: PropTypes.number, - left: PropTypes.number, - }), -}; - -const percentFormat = getNumberFormatter(NumberFormats.PERCENT_1_POINT); -const countFormat = getNumberFormatter(); - -function computeGraph(links) { - // this assumes source and target are string values - const nodes = Array.from( - links.reduce( - (set, { source, target }) => set.add(source).add(target), - new Set(), - ), - ).map(id => ({ id, name: id })); - - return { - nodes, - - // links are shallow copied as the chart layout modifies them, and it is best to - // leave the passed data un-altered - links: links.map(d => ({ ...d })), - }; -} - -function SankeyLoop(element, props) { - const { data, width, height, colorScheme, sliceId } = props; - const colorFn = CategoricalColorNamespace.getScale(colorScheme); - const margin = { ...defaultMargin, ...props.margin }; - const innerWidth = width - margin.left - margin.right; - const innerHeight = height - margin.top - margin.bottom; - - const layout = sankey() - .nodeId(d => d.id) - .extent([ - [margin.left, margin.top], - [innerWidth, innerHeight], - ]); - - const diagram = sankeyDiagram() - .nodeTitle(d => d.name) - .linkTitle( - ({ - source: { name: sName, value: sValue }, - target: { name: tName }, - value, - }) => - `${sName} → ${tName}: ${countFormat(value)} (${percentFormat( - value / sValue, - )})`, - ) - .linkColor(d => colorFn(d.source.name, sliceId)); - - const div = select(element); - div.selectAll('*').remove(); - - const svg = div - .append('svg') - .classed('superset-legacy-chart-sankey-loop', true) - .style('width', width) - .style('height', height) - .datum(layout(computeGraph(data))) - .call(diagram); - - svg - .selectAll('g.link') - .classed('link', true) - .append('text') - .attr('x', d => d.points[0].x) - .attr('y', d => d.points[0].y) - .attr('dy', 3) - .attr('dx', 2) - .text( - d => - `${countFormat(d.value)} (${percentFormat(d.value / d.source.value)})`, - ); -} - -SankeyLoop.displayName = 'SankeyLoop'; -SankeyLoop.propTypes = propTypes; - -export default SankeyLoop; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts deleted file mode 100644 index 74d2b7ff7..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts +++ /dev/null @@ -1,48 +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 } from '@superset-ui/chart-controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - ['groupby'], - ['metric'], - ['adhoc_filters'], - ['row_limit'], - ], - }, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [['color_scheme']], - }, - ], - controlOverrides: { - groupby: { - label: t('Source / Target'), - description: t('Choose a source and a target'), - }, - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png deleted file mode 100644 index 5d814582a..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png deleted file mode 100644 index 5d814582a..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/index.js deleted file mode 100644 index 38922d5a7..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/index.js +++ /dev/null @@ -1,41 +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 controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - credits: ['https://github.com/ricklupton/d3-sankey-diagram'], - description: '', - name: t('Sankey Diagram with Loops'), - thumbnail, - useLegacyApi: true, -}); - -export default class SankeyChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('./ReactSankeyLoop'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/transformProps.js deleted file mode 100644 index 76c0c220a..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/transformProps.js +++ /dev/null @@ -1,31 +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. - */ -export default function transformProps(chartProps) { - const { width, height, formData, queriesData, margin } = chartProps; - const { colorScheme, sliceId } = formData; - - return { - width, - height, - data: queriesData[0].data, - colorScheme, - margin, - sliceId, - }; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json deleted file mode 100644 index b6bfaa2d9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "declarationDir": "lib", - "outDir": "lib", - "rootDir": "src" - }, - "exclude": [ - "lib", - "test" - ], - "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "types/**/*", - "../../types/**/*" - ], - "references": [ - { - "path": "../../packages/superset-ui-chart-controls" - }, - { - "path": "../../packages/superset-ui-core" - } - ] -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-sankey/CHANGELOG.md deleted file mode 100644 index c9fdad1a6..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/CHANGELOG.md +++ /dev/null @@ -1,55 +0,0 @@ - - -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09) - -### Bug Fixes - -- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964)) - -### Features - -- Adds the ECharts Sankey chart ([#29329](https://github.com/apache/superset/issues/29329)) ([c83d5b8](https://github.com/apache/superset/commit/c83d5b88e159413d09fb346a95201255b1b5e196)) -- apply standardized form data to tier 2 charts ([#20530](https://github.com/apache/superset/issues/20530)) ([de524bc](https://github.com/apache/superset/commit/de524bc59f011fd361dcdb7d35c2cb51f7eba442)) -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07) - -### Bug Fixes - -- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964)) - -### Features - -- Adds the ECharts Sankey chart ([#29329](https://github.com/apache/superset/issues/29329)) ([c83d5b8](https://github.com/apache/superset/commit/c83d5b88e159413d09fb346a95201255b1b5e196)) -- apply standardized form data to tier 2 charts ([#20530](https://github.com/apache/superset/issues/20530)) ([de524bc](https://github.com/apache/superset/commit/de524bc59f011fd361dcdb7d35c2cb51f7eba442)) -- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11)) - -# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-sankey - -## [0.17.61](https://github.com/apache-superset/superset-ui/compare/v0.17.60...v0.17.61) (2021-07-02) - -**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-sankey diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/README.md b/superset-frontend/plugins/legacy-plugin-chart-sankey/README.md deleted file mode 100644 index 675908523..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/README.md +++ /dev/null @@ -1,52 +0,0 @@ - - -## @superset-ui/legacy-plugin-chart-sankey - -[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-sankey.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-sankey) -[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-sankey?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-sankey) - -This plugin provides Sankey Diagram for Superset. - -### Usage - -Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to -lookup this chart throughout the app. - -```js -import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey'; - -new SankeyChartPlugin().configure({ key: 'sankey' }).register(); -``` - -Then use it via `SuperChart`. See -[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-sankey) -for more details. - -```js - -``` diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json b/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json deleted file mode 100644 index 5aceb132a..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@superset-ui/legacy-plugin-chart-sankey", - "version": "0.20.3", - "description": "Superset Legacy Chart - Sankey Diagram", - "sideEffects": [ - "*.css" - ], - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "repository": { - "type": "git", - "url": "https://github.com/apache/superset.git", - "directory": "superset-frontend/packages/legacy-plugin-chart-sankey" - }, - "keywords": [ - "superset" - ], - "author": "Superset", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/apache/superset/issues" - }, - "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-sankey#readme", - "publishConfig": { - "access": "public" - }, - "dependencies": { - "d3": "^3.5.17", - "d3-sankey": "^0.4.2", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*", - "react": "^16.13.1" - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/ReactSankey.jsx b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/ReactSankey.jsx deleted file mode 100644 index 48efa7b89..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/ReactSankey.jsx +++ /dev/null @@ -1,74 +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 { reactify, styled } from '@superset-ui/core'; -import PropTypes from 'prop-types'; -import SanKey from './Sankey'; - -const ReactSanKey = reactify(SanKey); - -const SankeyComponent = ({ className, ...otherProps }) => ( -
- -
-); - -SankeyComponent.propTypes = { - className: PropTypes.string.isRequired, -}; - -export default styled(SankeyComponent)` - ${({ theme }) => ` - .superset-legacy-chart-sankey { - .node { - rect { - cursor: move; - fill-opacity: ${theme.opacity.heavy}; - shape-rendering: crispEdges; - } - text { - pointer-events: none; - text-shadow: 0 1px 0 ${theme.colors.grayscale.light5}; - font-size: ${theme.typography.sizes.s}px; - } - } - .link { - fill: none; - stroke: ${theme.colors.grayscale.dark2}; - stroke-opacity: ${theme.opacity.light}; - &:hover { - stroke-opacity: ${theme.opacity.mediumLight}; - } - } - .opacity-0 { - opacity: 0; - } - } - .sankey-tooltip { - position: absolute; - width: auto; - background: ${theme.colors.grayscale.light2}; - padding: ${theme.gridUnit * 3}px; - font-size: ${theme.typography.sizes.s}px; - color: ${theme.colors.grayscale.dark2}; - border: 1px solid ${theme.colors.grayscale.light5}; - text-align: center; - pointer-events: none; - } - `} -`; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/Sankey.js b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/Sankey.js deleted file mode 100644 index a38142c56..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/Sankey.js +++ /dev/null @@ -1,248 +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 no-param-reassign */ -/* eslint-disable react/sort-prop-types */ -import d3 from 'd3'; -import PropTypes from 'prop-types'; -import { sankey as d3Sankey } from 'd3-sankey'; -import { - getNumberFormatter, - NumberFormats, - CategoricalColorNamespace, -} from '@superset-ui/core'; -import { getOverlappingElements } from './utils'; - -const propTypes = { - data: PropTypes.arrayOf( - PropTypes.shape({ - source: PropTypes.string, - target: PropTypes.string, - value: PropTypes.number, - }), - ), - width: PropTypes.number, - height: PropTypes.number, - colorScheme: PropTypes.string, -}; - -const formatNumber = getNumberFormatter(NumberFormats.FLOAT); - -function Sankey(element, props) { - const { data, width, height, colorScheme, sliceId } = props; - const div = d3.select(element); - div.classed(`superset-legacy-chart-sankey`, true); - const margin = { - top: 5, - right: 5, - bottom: 5, - left: 5, - }; - const innerWidth = width - margin.left - margin.right; - const innerHeight = height - margin.top - margin.bottom; - - div.selectAll('*').remove(); - const tooltip = div - .append('div') - .attr('class', 'sankey-tooltip') - .style('opacity', 0); - const svg = div - .append('svg') - .attr('width', innerWidth + margin.left + margin.right) - .attr('height', innerHeight + margin.top + margin.bottom) - .append('g') - .attr('transform', `translate(${margin.left},${margin.top})`); - const colorFn = CategoricalColorNamespace.getScale(colorScheme); - - const sankey = d3Sankey() - .nodeWidth(15) - .nodePadding(10) - .size([innerWidth, innerHeight]); - - const path = sankey.link(); - - let nodes = {}; - // Compute the distinct nodes from the links. - const links = data.map(row => { - const link = { ...row }; - link.source = - nodes[link.source] || (nodes[link.source] = { name: link.source }); - link.target = - nodes[link.target] || (nodes[link.target] = { name: link.target }); - link.value = Number(link.value); - - return link; - }); - nodes = d3.values(nodes); - - sankey.nodes(nodes).links(links).layout(32); - - function getTooltipHtml(d) { - let html; - - if (d.sourceLinks) { - // is node - html = `${d.name} Value: ${formatNumber( - d.value, - )}`; - } else { - const val = formatNumber(d.value); - const sourcePercent = d3.round((d.value / d.source.value) * 100, 1); - const targetPercent = d3.round((d.value / d.target.value) * 100, 1); - - html = [ - "
Path Value: ", - val, - '
', - "
", - "", - Number.isFinite(sourcePercent) ? sourcePercent : '100', - '% of ', - d.source.name, - '
', - `${ - Number.isFinite(targetPercent) ? targetPercent : '--' - }% of `, - d.target.name, - '
', - ].join(''); - } - - return html; - } - - function onmouseover(d) { - tooltip - .html(() => getTooltipHtml(d)) - .transition() - .duration(200); - const { height: tooltipHeight, width: tooltipWidth } = tooltip - .node() - .getBoundingClientRect(); - tooltip - .style( - 'left', - `${Math.min(d3.event.offsetX + 10, width - tooltipWidth)}px`, - ) - .style( - 'top', - `${Math.min(d3.event.offsetY + 10, height - tooltipHeight)}px`, - ) - .style('position', 'absolute') - .style('opacity', 0.95); - } - - function onmouseout() { - tooltip.transition().duration(100).style('opacity', 0); - } - - const link = svg - .append('g') - .selectAll('.link') - .data(links) - .enter() - .append('path') - .attr('class', 'link') - .attr('d', path) - .style('stroke-width', d => Math.max(1, d.dy)) - .sort((a, b) => b.dy - a.dy) - .on('mouseover', onmouseover) - .on('mouseout', onmouseout); - - function dragmove(d) { - d3.select(this).attr( - 'transform', - `translate(${d.x},${(d.y = Math.max( - 0, - Math.min(height - d.dy, d3.event.y), - ))})`, - ); - sankey.relayout(); - link.attr('d', path); - } - - function checkVisibility() { - const elements = div.selectAll('.node')[0] ?? []; - const overlappingElements = getOverlappingElements(elements); - - elements.forEach(el => { - const text = el.getElementsByTagName('text')[0]; - - if (text) { - if (overlappingElements.includes(el)) { - text.classList.add('opacity-0'); - } else { - text.classList.remove('opacity-0'); - } - } - }); - } - - const node = svg - .append('g') - .selectAll('.node') - .data(nodes) - .enter() - .append('g') - .attr('class', 'node') - .attr('transform', d => `translate(${d.x},${d.y})`) - .call( - d3.behavior - .drag() - .origin(d => d) - .on('dragstart', function dragStart() { - this.parentNode.append(this); - }) - .on('drag', dragmove) - .on('dragend', checkVisibility), - ); - const minRectHeight = 5; - node - .append('rect') - .attr('height', d => (d.dy > minRectHeight ? d.dy : minRectHeight)) - .attr('width', sankey.nodeWidth()) - .style('fill', d => { - const name = d.name || 'N/A'; - d.color = colorFn(name, sliceId); - - return d.color; - }) - .style('stroke', d => d3.rgb(d.color).darker(2)) - .on('mouseover', onmouseover) - .on('mouseout', onmouseout); - - node - .append('text') - .attr('x', -6) - .attr('y', d => d.dy / 2) - .attr('dy', '.35em') - .attr('text-anchor', 'end') - .attr('transform', null) - .text(d => d.name) - .attr('class', 'opacity-0') - .filter(d => d.x < innerWidth / 2) - .attr('x', 6 + sankey.nodeWidth()) - .attr('text-anchor', 'start'); - - checkVisibility(); -} - -Sankey.displayName = 'Sankey'; -Sankey.propTypes = propTypes; - -export default Sankey; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts deleted file mode 100644 index 7505f1a4a..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts +++ /dev/null @@ -1,68 +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, - getStandardizedControls, -} from '@superset-ui/chart-controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - [ - { - name: 'groupby', - override: { - label: t('Source / Target'), - description: t('Choose a source and a target'), - }, - }, - ], - ['metric'], - ['adhoc_filters'], - [ - { - name: 'row_limit', - override: { - description: t( - 'Limiting rows may result in incomplete data and misleading charts. Consider filtering or grouping source/target names instead.', - ), - }, - }, - ], - ['sort_by_metric'], - ], - }, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [['color_scheme']], - }, - ], - formDataOverrides: formData => ({ - ...formData, - groupby: getStandardizedControls().popAllColumns(), - metric: getStandardizedControls().shiftMetric(), - }), -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey.jpg b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey.jpg deleted file mode 100644 index 06b1fa8a4..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey2.jpg b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey2.jpg deleted file mode 100644 index 15bca65a1..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/Sankey2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png deleted file mode 100644 index 6bf13f8fd..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png deleted file mode 100644 index 231316b88..000000000 Binary files a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/index.js deleted file mode 100644 index e67944118..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/index.js +++ /dev/null @@ -1,58 +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 example1 from './images/Sankey.jpg'; -import example2 from './images/Sankey2.jpg'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Flow'), - credits: ['https://github.com/d3/d3-sankey'], - description: t( - "Visualizes the flow of different group's values through different stages of a system. New stages in the pipeline are visualized as nodes or layers. The thickness of the bars or edges represent the metric being visualized.", - ), - exampleGallery: [ - { url: example1, description: t('Demographics') }, - { url: example2, description: t('Survey Responses') }, - ], - name: t('Sankey Diagram (legacy)'), - tags: [ - t('Categorical'), - t('Directional'), - t('Legacy'), - t('Percentages'), - t('Proportional'), - t('Relational'), - ], - thumbnail, - useLegacyApi: true, -}); - -export default class SankeyChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('./ReactSankey'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/tests/utils.test.js b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/tests/utils.test.js deleted file mode 100644 index d679d6bbc..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/tests/utils.test.js +++ /dev/null @@ -1,93 +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 { getOverlappingElements, isOverlapping } from '../utils'; - -const overlapRects = [ - { - x: 10, - y: 10, - width: 10, - height: 10, - }, - { - x: 12, - y: 12, - width: 12, - height: 12, - }, - { - x: 32, - y: 32, - width: 32, - height: 32, - }, -]; - -const notOverlapRects = [ - { - x: 10, - y: 10, - width: 10, - height: 10, - }, - { - x: 24, - y: 15, - width: 15, - height: 15, - }, - { - x: 32, - y: 32, - width: 32, - height: 32, - }, -]; - -const createSVGs = objects => - objects.map(data => { - const el = document.createElementNS('http://www.w3.org/2000/svg', 'text'); - el.getBoundingClientRect = jest.fn(() => data); - - return el; - }); - -// https://www.khanacademy.org/computer-programming/rectx-y-width-height-radius/839496660 -describe('legacy-plugin-chart-sankey/utils', () => { - it('isOverlapping to be truthy', () => { - const [rect1, rect2] = overlapRects; - expect(isOverlapping(rect1, rect2)).toBeTruthy(); - }); - - it('isOverlapping to be falsy', () => { - const [rect1, rect2] = notOverlapRects; - expect(isOverlapping(rect1, rect2)).toBeFalsy(); - }); - - it('getOverlappingElements to be truthy', () => { - const elements = createSVGs(overlapRects); - expect(getOverlappingElements(elements).length).toBe(2); - }); - - it('getOverlappingElements to be falsy', () => { - const elements = createSVGs(notOverlapRects); - expect(getOverlappingElements(elements).length).toBe(0); - }); -}); diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/transformProps.js deleted file mode 100644 index b8e9f05b2..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/transformProps.js +++ /dev/null @@ -1,33 +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 { getLabelFontSize } from './utils'; - -export default function transformProps(chartProps) { - const { width, height, formData, queriesData } = chartProps; - const { colorScheme, sliceId } = formData; - - return { - width, - height, - data: queriesData[0].data, - colorScheme, - fontSize: getLabelFontSize(width), - sliceId, - }; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/utils.ts b/superset-frontend/plugins/legacy-plugin-chart-sankey/src/utils.ts deleted file mode 100644 index a68dd7bbf..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/src/utils.ts +++ /dev/null @@ -1,81 +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. - */ -type Rect = { - x: number; - y: number; - width: number; - height: number; -}; - -export function getLabelFontSize(width: number): number { - if (width > 550) { - return 0.8; - } - - if (width > 400 && width <= 550) { - return 0.55; - } - - return 0.45; -} - -export const isOverlapping = (rect1: Rect, rect2: Rect): boolean => { - const { x: x1, y: y1, width: width1, height: height1 } = rect1; - const { x: x2, y: y2, width: width2, height: height2 } = rect2; - - return !( - x1 > x2 + width2 || - x1 + width1 < x2 || - y1 > y2 + height2 || - y1 + height1 < y2 - ); -}; - -export const getRectangle = (element: SVGElement, offset = 0): Rect => { - const { x, y, width, height } = element.getBoundingClientRect(); - - return { - x, - y: y + offset, - width, - height: height - offset * 2, - }; -}; - -export const getOverlappingElements = ( - elements: SVGElement[], -): SVGElement[] => { - const overlappingElements: SVGElement[] = []; - - elements.forEach((e1, index1) => { - const rect1: Rect = getRectangle(e1, 1); - - elements.forEach((e2, index2) => { - if (index2 <= index1) return; - const rect2: Rect = getRectangle(e2, 1); - - if (isOverlapping(rect1, rect2)) { - overlappingElements.push(elements[index2]); - overlappingElements.push(elements[index1]); - } - }); - }); - - return overlappingElements; -}; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-sankey/tsconfig.json deleted file mode 100644 index b6bfaa2d9..000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compilerOptions": { - "declarationDir": "lib", - "outDir": "lib", - "rootDir": "src" - }, - "exclude": [ - "lib", - "test" - ], - "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "types/**/*", - "../../types/**/*" - ], - "references": [ - { - "path": "../../packages/superset-ui-chart-controls" - }, - { - "path": "../../packages/superset-ui-core" - } - ] -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts deleted file mode 100644 index d06883a22..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts +++ /dev/null @@ -1,92 +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 { - lineInterpolation, - showBrush, - showLegend, - showControls, - xAxisLabel, - bottomMargin, - xTicksLayout, - xAxisFormat, - yLogScale, - yAxisBounds, - xAxisShowMinmax, - richTooltip, - timeSeriesSection, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - sections.legacyTimeseriesTime, - timeSeriesSection[0], - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - [showBrush, showLegend], - [ - lineInterpolation, - { - name: 'stacked_style', - config: { - type: 'SelectControl', - label: t('Stacked Style'), - renderTrigger: true, - choices: [ - ['stack', t('stack')], - ['stream', t('stream')], - ['expand', t('expand')], - ], - default: 'stack', - description: '', - }, - }, - ], - ['color_scheme'], - [richTooltip, showControls], - ], - }, - { - label: t('X Axis'), - tabOverride: 'customize', - expanded: true, - controlSetRows: [ - [xAxisLabel, bottomMargin], - [xTicksLayout, xAxisFormat], - [xAxisShowMinmax, null], - ], - }, - { - label: t('Y Axis'), - tabOverride: 'customize', - expanded: true, - controlSetRows: [ - ['y_axis_format', yAxisBounds], - [yLogScale, null], - ], - }, - timeSeriesSection[1], - sections.annotations, - ], -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example1.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example1.jpg deleted file mode 100644 index 0887fa8fe..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example1.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example2.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example2.jpg deleted file mode 100644 index 9fa66adba..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example3.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example3.jpg deleted file mode 100644 index 1bd3cedda..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example3.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example4.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example4.jpg deleted file mode 100644 index b4e1ff07e..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/example4.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png deleted file mode 100644 index 270ed2339..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png deleted file mode 100644 index d8b23bea1..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js deleted file mode 100644 index d4af4e402..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js +++ /dev/null @@ -1,72 +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, ChartLabel } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import example1 from './images/example1.jpg'; -import example2 from './images/example2.jpg'; -import example3 from './images/example3.jpg'; -import example4 from './images/example4.jpg'; -import thumbnail from './images/thumbnail.png'; -import { ANNOTATION_TYPES } from '../vendor/superset/AnnotationTypes'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Evolution'), - credits: ['http://nvd3.org'], - description: t( - 'A time series chart that visualizes how a related metric from multiple groups vary over time. Each group is visualized using a different color.', - ), - exampleGallery: [ - { url: example1, caption: t('Stretched style') }, - { url: example2, caption: t('Stacked style') }, - { url: example3, caption: t('Video game consoles') }, - { url: example4, caption: t('Vehicle Types') }, - ], - label: ChartLabel.Deprecated, - name: t('Time-series Area Chart (legacy)'), - supportedAnnotationTypes: [ANNOTATION_TYPES.INTERVAL, ANNOTATION_TYPES.EVENT], - tags: [ - t('Comparison'), - t('Continuous'), - t('Legacy'), - t('Line'), - t('Percentages'), - t('Proportional'), - t('Stacked'), - t('Time'), - t('Trend'), - t('nvd3'), - ], - thumbnail, - useLegacyApi: true, -}); - -/** - * @deprecated in version 3.0. - */ -export default class AreaChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts deleted file mode 100644 index 47fbbd442..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts +++ /dev/null @@ -1,133 +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, - getStandardizedControls, - sections, - sharedControls, -} from '@superset-ui/chart-controls'; -import { - lineInterpolation, - showBrush, - showLegend, - showControls, - xAxisLabel, - yAxisLabel, - bottomMargin, - xTicksLayout, - xAxisFormat, - yLogScale, - yAxisBounds, - xAxisShowMinmax, - yAxisShowMinmax, - richTooltip, - showBarValue, - barStacked, - reduceXTicks, - leftMargin, - timeSeriesSection, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlOverrides: { - limit: { - rerender: ['timeseries_limit_metric', 'order_desc'], - }, - timeseries_limit_metric: { - label: t('Series Limit Sort By'), - description: t( - 'Metric used to order the limit if a series limit is present. ' + - 'If undefined reverts to the first metric (where appropriate).', - ), - visibility: ({ controls }) => Boolean(controls?.limit.value), - mapStateToProps: (state, controlState) => { - const timeserieslimitProps = - sharedControls.timeseries_limit_metric.mapStateToProps?.( - state, - controlState, - ) || {}; - timeserieslimitProps.value = state.controls?.limit?.value - ? controlState?.value - : []; - return timeserieslimitProps; - }, - }, - order_desc: { - label: t('Series Limit Sort Descending'), - default: false, - description: t( - 'Whether to sort descending or ascending if a series limit is present', - ), - visibility: ({ controls }) => Boolean(controls?.limit.value), - }, - }, - controlPanelSections: [ - sections.legacyTimeseriesTime, - timeSeriesSection[0], - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - ['color_scheme'], - [showBrush], - [showLegend], - [showBarValue], - [richTooltip], - [barStacked], - [lineInterpolation], - [showControls], - [bottomMargin], - ], - }, - { - label: t('X Axis'), - expanded: true, - controlSetRows: [ - [xAxisLabel], - [bottomMargin], - [xTicksLayout], - [xAxisFormat], - [xAxisShowMinmax], - [reduceXTicks], - ], - }, - { - label: t('Y Axis'), - expanded: true, - controlSetRows: [ - [yAxisLabel], - [leftMargin], - [yAxisShowMinmax], - [yLogScale], - ['y_axis_format'], - [yAxisBounds], - ], - }, - timeSeriesSection[1], - sections.annotations, - ], - formDataOverrides: formData => ({ - ...formData, - metrics: getStandardizedControls().popAllMetrics(), - groupby: getStandardizedControls().popAllColumns(), - }), -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart.jpg deleted file mode 100644 index f443980b3..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart2.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart2.jpg deleted file mode 100644 index 3f906a483..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart3.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart3.jpg deleted file mode 100644 index 4b48ccea9..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/Time_Series_Bar_Chart3.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png deleted file mode 100644 index e3ef12099..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png deleted file mode 100644 index 35c176e6d..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js deleted file mode 100644 index c9ac21f84..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js +++ /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 { t, ChartMetadata, ChartPlugin, ChartLabel } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import thumbnail from './images/thumbnail.png'; -import example1 from './images/Time_Series_Bar_Chart.jpg'; -import example2 from './images/Time_Series_Bar_Chart2.jpg'; -import example3 from './images/Time_Series_Bar_Chart3.jpg'; -import { ANNOTATION_TYPES } from '../vendor/superset/AnnotationTypes'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Evolution'), - credits: ['http://nvd3.org'], - description: t( - '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 }], - label: ChartLabel.Deprecated, - name: t('Time-series Bar Chart (legacy)'), - supportedAnnotationTypes: [ANNOTATION_TYPES.INTERVAL, ANNOTATION_TYPES.EVENT], - tags: [ - t('Bar'), - t('Time'), - t('Trend'), - t('Stacked'), - t('Percentages'), - t('Proportional'), - t('Advanced-Analytics'), - t('nvd3'), - t('Legacy'), - ], - thumbnail, - useLegacyApi: true, -}); - -/** - * @deprecated in version 3.0. - */ -export default class BarChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png deleted file mode 100644 index ece94d080..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png deleted file mode 100644 index 35eff285e..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/index.js deleted file mode 100644 index 1f5a5e99d..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/BoxPlot/index.js +++ /dev/null @@ -1,39 +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'; - -const metadata = new ChartMetadata({ - credits: ['http://nvd3.org'], - description: '', - name: t('Box Plot'), - thumbnail, - useLegacyApi: true, -}); - -export default class BoxPlotChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts deleted file mode 100644 index 9b992897b..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts +++ /dev/null @@ -1,152 +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 { ensureIsArray, t, validateNonEmpty } from '@superset-ui/core'; -import { - ColumnMeta, - ControlPanelConfig, - sharedControls, - getStandardizedControls, -} from '@superset-ui/chart-controls'; -import { - showLegend, - showControls, - xAxisLabel, - bottomMargin, - xTicksLayout, - showBarValue, - barStacked, - reduceXTicks, - yAxisLabel, - yAxisShowMinmax, - yAxisBounds, - richTooltip, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - ['metrics'], - ['adhoc_filters'], - ['groupby'], - ['columns'], - ['row_limit'], - ['timeseries_limit_metric'], - ['order_desc'], - [ - { - name: 'contribution', - config: { - type: 'CheckboxControl', - label: t('Contribution'), - default: false, - description: t('Compute the contribution to the total'), - }, - }, - ], - ], - }, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - ['color_scheme'], - [showLegend], - [showBarValue], - [richTooltip], - [barStacked], - [ - { - name: 'order_bars', - config: { - type: 'CheckboxControl', - label: t('Sort Bars'), - default: false, - renderTrigger: true, - description: t('Sort bars by x labels.'), - }, - }, - ], - ['y_axis_format'], - [yAxisLabel], - [showControls, null], - [yAxisShowMinmax], - [yAxisBounds], - ], - }, - { - label: t('X Axis'), - expanded: true, - controlSetRows: [ - [xAxisLabel], - [bottomMargin], - [xTicksLayout], - [reduceXTicks], - ], - }, - ], - controlOverrides: { - groupby: { - validators: [validateNonEmpty], - mapStateToProps: (state, controlState) => { - const groupbyProps = - sharedControls.groupby.mapStateToProps?.(state, controlState) || {}; - groupbyProps.canDropValue = (column: ColumnMeta) => - !ensureIsArray(state.controls?.columns?.value).includes( - column.column_name, - ); - return groupbyProps; - }, - rerender: ['columns'], - }, - columns: { - label: t('Breakdowns'), - description: t('Defines how each series is broken down'), - mapStateToProps: (state, controlState) => { - const columnsProps = - sharedControls.columns.mapStateToProps?.(state, controlState) || {}; - columnsProps.canDropValue = (column: ColumnMeta) => - !ensureIsArray(state.controls?.groupby?.value).includes( - column.column_name, - ); - return columnsProps; - }, - rerender: ['groupby'], - }, - }, - formDataOverrides: formData => { - const columns = getStandardizedControls().controls.columns.filter( - col => !ensureIsArray(formData.groupby).includes(col), - ); - getStandardizedControls().controls.columns = - getStandardizedControls().controls.columns.filter( - col => !columns.includes(col), - ); - - return { - ...formData, - metrics: getStandardizedControls().popAllMetrics(), - columns, - }; - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/BarChart3.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/BarChart3.jpg deleted file mode 100644 index f9d9bae8a..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/BarChart3.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart.jpg deleted file mode 100644 index ada903df0..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart_2.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart_2.jpg deleted file mode 100644 index 35eee2cbc..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/Bar_Chart_2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png deleted file mode 100644 index 8e9e6b600..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png deleted file mode 100644 index bfaeeb2df..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js deleted file mode 100644 index a505b8398..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js +++ /dev/null @@ -1,66 +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, ChartLabel } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import thumbnail from './images/thumbnail.png'; -import example1 from './images/Bar_Chart.jpg'; -import example2 from './images/Bar_Chart_2.jpg'; -import example3 from './images/BarChart3.jpg'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - category: t('Ranking'), - credits: ['http://nvd3.org'], - description: t( - 'Compares metrics from different categories using bars. Bar lengths are used to indicate the magnitude of each value and color is used to differentiate groups.', - ), - exampleGallery: [ - { url: example1, caption: 'Stacked style' }, - { url: example2, caption: 'Grouped style' }, - { url: example3 }, - ], - label: ChartLabel.Deprecated, - name: t('Bar Chart (legacy)'), - tags: [ - t('Additive'), - t('Bar'), - t('Categorical'), - t('Comparison'), - t('Legacy'), - t('Percentages'), - t('Stacked'), - t('nvd3'), - ], - thumbnail, - useLegacyApi: true, -}); - -/** - * @deprecated in version 3.0. - */ -export default class DistBarChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts deleted file mode 100644 index 9662cc11d..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts +++ /dev/null @@ -1,110 +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, - getStandardizedControls, -} from '@superset-ui/chart-controls'; -import { - lineInterpolation, - showBrush, - showLegend, - xAxisLabel, - bottomMargin, - xTicksLayout, - xAxisFormat, - yLogScale, - yAxisBounds, - yAxisLabel, - xAxisShowMinmax, - yAxisShowMinmax, - richTooltip, - leftMargin, - showMarkers, - timeSeriesSection, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - sections.legacyTimeseriesTime, - timeSeriesSection[0], - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - ['color_scheme'], - [showBrush], - [ - { - name: 'send_time_range', - config: { - type: 'CheckboxControl', - label: t('Propagate'), - renderTrigger: true, - default: false, - description: t('Send range filter events to other charts'), - }, - }, - ], - [showLegend], - [richTooltip], - [showMarkers], - [lineInterpolation], - ], - }, - { - label: t('X Axis'), - expanded: true, - controlSetRows: [ - [xAxisLabel], - [bottomMargin], - [xTicksLayout], - [xAxisFormat], - [xAxisShowMinmax, null], - ], - }, - { - label: t('Y Axis'), - expanded: true, - controlSetRows: [ - [yAxisLabel], - [leftMargin], - [yAxisShowMinmax], - [yLogScale], - ['y_axis_format'], - [yAxisBounds], - ], - }, - timeSeriesSection[1], - sections.annotations, - ], - controlOverrides: { - row_limit: { - default: 50000, - }, - }, - formDataOverrides: formData => ({ - ...formData, - metrics: getStandardizedControls().popAllMetrics(), - groupby: getStandardizedControls().popAllColumns(), - }), -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart.jpg deleted file mode 100644 index f141007b4..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart2.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart2.jpg deleted file mode 100644 index 994b632be..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/LineChart2.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/battery.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/battery.jpg deleted file mode 100644 index d6fb43219..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/battery.jpg and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png deleted file mode 100644 index 61a0d866a..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png deleted file mode 100644 index 8cae308c3..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js deleted file mode 100644 index 82bf21447..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js +++ /dev/null @@ -1,63 +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, ChartLabel } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import example1 from './images/LineChart.jpg'; -import example2 from './images/LineChart2.jpg'; -import battery from './images/battery.jpg'; -import thumbnail from './images/thumbnail.png'; -import { ANNOTATION_TYPES } from '../vendor/superset/AnnotationTypes'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - canBeAnnotationTypes: [ANNOTATION_TYPES.TIME_SERIES], - category: t('Evolution'), - credits: ['http://nvd3.org'], - description: t('Classic chart that visualizes how metrics change over time.'), - exampleGallery: [ - { url: example1 }, - { url: example2 }, - { url: battery, caption: t('Battery level over time') }, - ], - label: ChartLabel.Deprecated, - name: t('Time-series Line Chart (legacy)'), - supportedAnnotationTypes: [ - ANNOTATION_TYPES.TIME_SERIES, - ANNOTATION_TYPES.INTERVAL, - ANNOTATION_TYPES.EVENT, - ANNOTATION_TYPES.FORMULA, - ], - tags: [t('Legacy'), t('nvd3')], - thumbnail, - useLegacyApi: true, -}); - -/** - * @deprecated in version 3.0. - */ -export default class LineChartPlugin 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 5b70c24a3..0620103c7 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js @@ -44,21 +44,16 @@ import ANNOTATION_TYPES, { import isTruthy from './utils/isTruthy'; import { cleanColorInput, - computeBarChartWidth, computeYDomain, - computeStackedYDomain, drawBarValues, generateBubbleTooltipContent, generateCompareTooltipContent, - generateRichLineTooltipContent, generateTimePivotTooltip, generateTooltipClassName, - generateAreaChartTooltipContent, getMaxLabelSize, getTimeOrNumberFormatter, hideTooltips, tipFactory, - tryNumify, removeTooltip, setAxisShowMaxMin, stringifyTimeRange, @@ -129,13 +124,7 @@ const BREAKPOINTS = { small: 340, }; -const TIMESERIES_VIZ_TYPES = [ - VizType.LegacyLine, - VizType.LegacyArea, - VizType.Compare, - VizType.LegacyBar, - VizType.TimePivot, -]; +const TIMESERIES_VIZ_TYPES = [VizType.Compare, VizType.TimePivot]; const CHART_ID_PREFIX = 'chart-id-'; @@ -189,17 +178,12 @@ const propTypes = { onError: PropTypes.func, showLegend: PropTypes.bool, showMarkers: PropTypes.bool, - useRichTooltip: PropTypes.bool, vizType: PropTypes.oneOf([ - VizType.LegacyArea, - VizType.LegacyBar, VizType.BoxPlot, 'bubble', VizType.Bullet, VizType.Compare, 'column', - VizType.DistBar, - VizType.LegacyLine, VizType.TimePivot, 'pie', ]), @@ -214,15 +198,9 @@ const propTypes = { yAxisLabel: PropTypes.string, yAxisShowMinMax: PropTypes.bool, yIsLogScale: PropTypes.bool, - // 'dist-bar' only - orderBars: PropTypes.bool, // 'bar' or 'dist-bar' isBarStacked: PropTypes.bool, showBarValue: PropTypes.bool, - // 'bar', 'dist-bar' or 'column' - reduceXTicks: PropTypes.bool, - // 'bar', 'dist-bar' or 'area' - showControls: PropTypes.bool, // 'line' only showBrush: PropTypes.oneOf([true, 'yes', false, 'no', 'auto']), onBrushEnd: PropTypes.func, @@ -242,8 +220,6 @@ const propTypes = { 'key_value_percent', ]), showLabels: PropTypes.bool, - // 'area' only - areaStackedStyle: PropTypes.string, // 'bubble' only entity: PropTypes.string, maxBubbleSize: PropTypes.number, @@ -264,7 +240,6 @@ function nvd3Vis(element, props) { height: maxHeight, annotationData, annotationLayers = [], - areaStackedStyle, baseColor, bottomMargin, colorScheme, @@ -283,19 +258,15 @@ function nvd3Vis(element, props) { maxBubbleSize, onBrushEnd = NOOP, onError = NOOP, - orderBars, pieLabelType, rangeLabels, ranges, - reduceXTicks = false, showBarValue, showBrush, - showControls, showLabels, showLegend, showMarkers, sizeField, - useRichTooltip, vizType, xAxisFormat, numberFormat, @@ -332,7 +303,7 @@ function nvd3Vis(element, props) { } let chart; - let width = maxWidth; + const width = maxWidth; let colorKey = 'key'; container.style.width = `${maxWidth}px`; @@ -356,11 +327,7 @@ function nvd3Vis(element, props) { // Handling xAxis ticks settings const staggerLabels = xTicksLayout === 'staggered'; - const xLabelRotation = - (xTicksLayout === 'auto' && isVizTypes(['column', VizType.DistBar])) || - xTicksLayout === '45°' - ? 45 - : 0; + const xLabelRotation = xTicksLayout === '45°' ? 45 : 0; if (xLabelRotation === 45 && isTruthy(showBrush)) { onError( t('You cannot use 45° tick layout along with the time range filter'), @@ -377,68 +344,12 @@ function nvd3Vis(element, props) { const numberFormatter = getNumberFormatter(numberFormat); switch (vizType) { - case VizType.LegacyLine: - if (canShowBrush) { - chart = nv.models.lineWithFocusChart(); - if (staggerLabels) { - // Give a bit more room to focus area if X axis ticks are staggered - chart.focus.margin({ bottom: 40 }); - chart.focusHeight(80); - } - chart.focus.xScale(d3.time.scale.utc()); - } else { - chart = nv.models.lineChart(); - } - chart.xScale(d3.time.scale.utc()); - chart.interpolate(lineInterpolation); - chart.clipEdge(false); - break; - case VizType.TimePivot: chart = nv.models.lineChart(); chart.xScale(d3.time.scale.utc()); chart.interpolate(lineInterpolation); break; - case VizType.LegacyBar: - chart = nv.models - .multiBarChart() - .showControls(showControls) - .groupSpacing(0.1); - - if (!reduceXTicks) { - width = computeBarChartWidth(data, isBarStacked, maxWidth); - } - chart.width(width); - chart.xAxis.showMaxMin(false); - chart.stacked(isBarStacked); - break; - - case VizType.DistBar: - chart = nv.models - .multiBarChart() - .showControls(showControls) - .reduceXTicks(reduceXTicks) - .groupSpacing(0.1); // Distance between each group of bars. - - chart.xAxis.showMaxMin(false); - - chart.stacked(isBarStacked); - if (orderBars) { - data.forEach(d => { - const newValues = [...d.values]; // need to copy values to avoid redux store changed. - // eslint-disable-next-line no-param-reassign - d.values = newValues.sort((a, b) => - tryNumify(a.x) < tryNumify(b.x) ? -1 : 1, - ); - }); - } - if (!reduceXTicks) { - width = computeBarChartWidth(data, isBarStacked, maxWidth); - } - chart.width(width); - break; - case VizType.Pie: chart = nv.models.pieChart(); colorKey = 'x'; @@ -518,13 +429,6 @@ function nvd3Vis(element, props) { ]); break; - case VizType.LegacyArea: - chart = nv.models.stackedAreaChart(); - chart.showControls(showControls); - chart.style(areaStackedStyle); - chart.xScale(d3.time.scale.utc()); - break; - case VizType.BoxPlot: colorKey = 'label'; chart = nv.models.boxPlotChart(); @@ -608,7 +512,7 @@ function nvd3Vis(element, props) { chart.x2Axis.tickFormat(xAxisFormatter); } if (chart.xAxis && chart.xAxis.tickFormat) { - const isXAxisString = isVizTypes([VizType.DistBar, VizType.BoxPlot]); + const isXAxisString = isVizTypes([VizType.BoxPlot]); if (isXAxisString) { chart.xAxis.tickFormat(d => d.length > MAX_NO_CHARACTERS_IN_LABEL @@ -672,41 +576,6 @@ function nvd3Vis(element, props) { ); } - if ( - isVizTypes([ - VizType.LegacyLine, - VizType.LegacyArea, - VizType.LegacyBar, - VizType.DistBar, - ]) && - useRichTooltip - ) { - chart.useInteractiveGuideline(true); - if (vizType === VizType.LegacyLine || vizType === VizType.LegacyBar) { - chart.interactiveLayer.tooltip.contentGenerator(d => - generateRichLineTooltipContent( - d, - smartDateVerboseFormatter, - yAxisFormatter, - ), - ); - } else if (vizType === VizType.DistBar) { - chart.interactiveLayer.tooltip.contentGenerator(d => - generateCompareTooltipContent(d, yAxisFormatter), - ); - } else { - // area chart - chart.interactiveLayer.tooltip.contentGenerator(d => - generateAreaChartTooltipContent( - d, - smartDateVerboseFormatter, - yAxisFormatter, - chart, - ), - ); - } - } - if (isVizTypes([VizType.Compare])) { chart.interactiveLayer.tooltip.contentGenerator(d => generateCompareTooltipContent(d, yAxisFormatter), @@ -748,43 +617,13 @@ function nvd3Vis(element, props) { const hasCustomMin = isDefined(customMin) && !Number.isNaN(customMin); const hasCustomMax = isDefined(customMax) && !Number.isNaN(customMax); - if ( - (hasCustomMin || hasCustomMax) && - vizType === VizType.LegacyArea && - chart.style() === 'expand' - ) { - // Because there are custom bounds, we need to override them back to 0%-100% since this - // is an expanded area chart - chart.yDomain([0, 1]); - } else if ( - (hasCustomMin || hasCustomMax) && - vizType === VizType.LegacyArea && - chart.style() === 'stream' - ) { - // Because there are custom bounds, we need to override them back to the domain of the - // data since this is a stream area chart - chart.yDomain(computeStackedYDomain(data)); - } else if (hasCustomMin && hasCustomMax) { + if (hasCustomMin && hasCustomMax) { // Override the y domain if there's both a custom min and max chart.yDomain([customMin, customMax]); chart.clipEdge(true); } else if (hasCustomMin || hasCustomMax) { // Only one of the bounds has been set, so we need to manually calculate the other one - let [trueMin, trueMax] = [0, 1]; - - // These viz types can be stacked - // They correspond to the nvd3 stackedAreaChart and multiBarChart - if ( - vizType === VizType.LegacyArea || - (isVizTypes([VizType.LegacyBar, VizType.DistBar]) && - chart.stacked()) - ) { - // This is a stacked area chart or a stacked bar chart - [trueMin, trueMax] = computeStackedYDomain(data); - } else { - [trueMin, trueMax] = computeYDomain(data); - } - + const [trueMin, trueMax] = computeYDomain(data); const min = hasCustomMin ? customMin : trueMin; const max = hasCustomMax ? customMax : trueMax; chart.yDomain([min, max]); @@ -955,26 +794,15 @@ function nvd3Vis(element, props) { a => a.annotationType === ANNOTATION_TYPES.FORMULA, ); - let xMax; - let xMin; + const xMax = chart.xAxis.scale().domain()[1].valueOf(); + const xMin = chart.xAxis.scale().domain()[0].valueOf(); let xScale; - if (vizType === VizType.LegacyBar) { - xMin = d3.min(data[0].values, d => d.x); - xMax = d3.max(data[0].values, d => d.x); - xScale = d3.scale - .quantile() - .domain([xMin, xMax]) - .range(chart.xAxis.range()); + if (chart.xScale) { + xScale = chart.xScale(); + } else if (chart.xAxis.scale) { + xScale = chart.xAxis.scale(); } else { - xMin = chart.xAxis.scale().domain()[0].valueOf(); - xMax = chart.xAxis.scale().domain()[1].valueOf(); - if (chart.xScale) { - xScale = chart.xScale(); - } else if (chart.xAxis.scale) { - xScale = chart.xAxis.scale(); - } else { - xScale = d3.scale.linear(); - } + xScale = d3.scale.linear(); } if (xScale && xScale.clamp) { xScale.clamp(true); @@ -982,36 +810,21 @@ function nvd3Vis(element, props) { if (formulas.length > 0) { const xValues = []; - if (vizType === VizType.LegacyBar) { - // For bar-charts we want one data point evaluated for every - // data point that will be displayed. - const distinct = data.reduce((xVals, d) => { - d.values.forEach(x => xVals.add(x.x)); - - return xVals; - }, new Set()); - xValues.push(...distinct.values()); - xValues.sort(); - } else { - // For every other time visualization it should be ok, to have a - // data points in even intervals. - let period = Math.min( - ...data.map(d => - Math.min( - ...d.values.slice(1).map((v, i) => v.x - d.values[i].x), - ), - ), - ); - const dataPoints = (xMax - xMin) / (period || 1); - // make sure that there are enough data points and not too many - period = dataPoints < 100 ? (xMax - xMin) / 100 : period; - period = dataPoints > 500 ? (xMax - xMin) / 500 : period; - xValues.push(xMin); - for (let x = xMin; x < xMax; x += period) { - xValues.push(x); - } - xValues.push(xMax); + let period = Math.min( + ...data.map(d => + Math.min(...d.values.slice(1).map((v, i) => v.x - d.values[i].x)), + ), + ); + const dataPoints = (xMax - xMin) / (period || 1); + // make sure that there are enough data points and not too many + period = dataPoints < 100 ? (xMax - xMin) / 100 : period; + period = dataPoints > 500 ? (xMax - xMin) / 500 : period; + xValues.push(xMin); + for (let x = xMin; x < xMax; x += period) { + xValues.push(x); } + xValues.push(xMax); + const formulaData = formulas.map(fo => { const { value: expression } = fo; return { diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts deleted file mode 100644 index ca4bf6606..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts +++ /dev/null @@ -1,125 +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, - D3_FORMAT_DOCS, - D3_FORMAT_OPTIONS, - D3_NUMBER_FORMAT_DESCRIPTION_PERCENTAGE_TEXT, -} from '@superset-ui/chart-controls'; -import { showLegend } from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - ['groupby'], - ['metric'], - ['adhoc_filters'], - ['row_limit'], - ], - }, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [ - [ - { - name: 'pie_label_type', - config: { - type: 'SelectControl', - label: t('Label Type'), - default: 'key', - renderTrigger: true, - choices: [ - ['key', t('Category Name')], - ['value', t('Value')], - ['percent', t('Percentage')], - ['key_value', t('Category and Value')], - ['key_percent', t('Category and Percentage')], - ['key_value_percent', t('Category, Value and Percentage')], - ], - description: t('What should be shown on the label?'), - }, - }, - { - name: 'number_format', - config: { - type: 'SelectControl', - freeForm: true, - label: t('Number format'), - renderTrigger: true, - default: 'SMART_NUMBER', - choices: D3_FORMAT_OPTIONS, - description: `${D3_FORMAT_DOCS} ${D3_NUMBER_FORMAT_DESCRIPTION_PERCENTAGE_TEXT}`, - }, - }, - ], - [ - { - name: 'donut', - config: { - type: 'CheckboxControl', - label: t('Donut'), - default: false, - renderTrigger: true, - description: t('Do you want a donut or a pie?'), - }, - }, - showLegend, - ], - [ - { - name: 'show_labels', - config: { - type: 'CheckboxControl', - label: t('Show Labels'), - renderTrigger: true, - default: true, - description: t( - 'Whether to display the labels. Note that the label only displays when the 5% ' + - 'threshold.', - ), - }, - }, - { - name: 'labels_outside', - config: { - type: 'CheckboxControl', - label: t('Put labels outside'), - default: true, - renderTrigger: true, - description: t('Put the labels outside the pie?'), - }, - }, - ], - ['color_scheme'], - ], - }, - ], - controlOverrides: { - row_limit: { - default: 25, - }, - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png deleted file mode 100644 index 8dcb780d0..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png deleted file mode 100644 index 8115f25f1..000000000 Binary files a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png and /dev/null differ diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/index.js deleted file mode 100644 index 903ad154d..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/index.js +++ /dev/null @@ -1,46 +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, ChartLabel } from '@superset-ui/core'; -import transformProps from '../transformProps'; -import thumbnail from './images/thumbnail.png'; -import controlPanel from './controlPanel'; - -const metadata = new ChartMetadata({ - credits: ['http://nvd3.org'], - description: '', - label: ChartLabel.Deprecated, - name: t('Pie Chart (legacy)'), - thumbnail, - useLegacyApi: true, - tags: [t('Legacy'), t('nvd3')], -}); - -/** - * @deprecated in version 3.0. - */ -export default class PieChartPlugin extends ChartPlugin { - constructor() { - super({ - loadChart: () => import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} 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 4c7eeef57..2b26d4d67 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js @@ -18,13 +18,7 @@ */ export { default as NVD3ChartPreset } from './preset'; -export { default as AreaChartPlugin } from './Area'; -export { default as BarChartPlugin } from './Bar'; -export { default as BoxPlotChartPlugin } from './BoxPlot'; 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 LineChartPlugin } from './Line'; -export { default as PieChartPlugin } from './Pie'; export { default as TimePivotChartPlugin } from './TimePivot'; 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 a99c268fd..09a636b39 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js @@ -17,15 +17,9 @@ * under the License. */ import { Preset, VizType } from '@superset-ui/core'; -import AreaChartPlugin from './Area'; -import BarChartPlugin from './Bar'; -import BoxPlotChartPlugin from './BoxPlot'; import BubbleChartPlugin from './Bubble'; import BulletChartPlugin from './Bullet'; import CompareChartPlugin from './Compare'; -import DistBarChartPlugin from './DistBar'; -import LineChartPlugin from './Line'; -import PieChartPlugin from './Pie'; import TimePivotChartPlugin from './TimePivot'; export default class NVD3ChartPreset extends Preset { @@ -33,15 +27,9 @@ export default class NVD3ChartPreset extends Preset { super({ name: 'NVD3 charts', plugins: [ - new AreaChartPlugin().configure({ key: VizType.LegacyArea }), - new BarChartPlugin().configure({ key: VizType.LegacyBar }), - new BoxPlotChartPlugin().configure({ key: VizType.BoxPlot }), new BubbleChartPlugin().configure({ key: VizType.LegacyBubble }), new BulletChartPlugin().configure({ key: VizType.Bullet }), new CompareChartPlugin().configure({ key: VizType.Compare }), - new DistBarChartPlugin().configure({ key: VizType.DistBar }), - new LineChartPlugin().configure({ key: VizType.LegacyLine }), - new PieChartPlugin().configure({ key: VizType.Pie }), new TimePivotChartPlugin().configure({ key: VizType.TimePivot }), ], }); 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 4bd1fbd17..36465e97a 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js @@ -66,7 +66,6 @@ export default function transformProps(chartProps) { lineInterpolation, maxBubbleSize, metric, - metrics = [], orderBars, pieLabelType, reduceXTicks, @@ -91,6 +90,7 @@ export default function transformProps(chartProps) { yAxisBounds, yAxis2Bounds, yAxisLabel, + yAxisFormat, yAxisShowminmax, yAxis2Showminmax, yLogScale, @@ -105,7 +105,6 @@ export default function transformProps(chartProps) { numberFormat, rangeLabels, ranges, - yAxisFormat, } = formData; const rawData = queriesData[0].data || []; @@ -121,17 +120,6 @@ export default function transformProps(chartProps) { if (vizType === VizType.Pie) { numberFormat = numberFormat || grabD3Format(datasource, metric); - } else if ( - [ - VizType.LegacyLine, - VizType.DistBar, - VizType.LegacyBar, - VizType.LegacyArea, - ].includes(chartProps.formData.vizType) - ) { - yAxisFormat = - yAxisFormat || - grabD3Format(datasource, metrics.length > 0 ? metrics[0] : undefined); } else if (vizType === VizType.Bullet) { ranges = tokenizeToNumericArray(ranges) || [0, data.measures * 1.1]; rangeLabels = tokenizeToStringArray(rangeLabels); diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js index e31f39be2..dccc9e418 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js @@ -111,41 +111,6 @@ function getFormattedKey(seriesKey, shouldDompurify) { return shouldDompurify ? dompurify.sanitize(seriesKey) : seriesKey; } -// Custom sorted tooltip -// use a verbose formatter for times -export function generateRichLineTooltipContent( - d, - timeFormatter, - valueFormatter, -) { - let tooltip = ''; - tooltip += - "'; - d.series.sort((a, b) => (a.value >= b.value ? -1 : 1)); - d.series.forEach(series => { - const key = getFormattedKey(series.key, true); - tooltip += - `` + - `' + - `` + - `` + - ''; - }); - tooltip += '
" + - `${timeFormatter(d.value)}` + - '
` + - '
' + - '		${key}${valueFormatter(series.value)}
'; - - return dompurify.sanitize(tooltip); -} - export function generateCompareTooltipContent(d, valueFormatter) { let tooltip = ''; tooltip += @@ -175,46 +140,6 @@ export function generateCompareTooltipContent(d, valueFormatter) { return dompurify.sanitize(tooltip); } -export function generateAreaChartTooltipContent( - d, - timeFormatter, - valueFormatter, - chart, -) { - const total = - chart.style() === 'expand' - ? // expand mode does not include total row - d3.sum(d.series, s => s.value) - : // other modes include total row at the end - d.series[d.series.length - 1].value; - let tooltip = ''; - tooltip += - "' + - ''; - d.series.forEach(series => { - const key = getFormattedKey(series.key, true); - const isTotal = series.key === 'TOTAL'; - let trClass = ''; - if (series.highlight) { - trClass = 'superset-legacy-chart-nvd3-tr-highlight'; - } else if (isTotal) { - trClass = 'superset-legacy-chart-nvd3-tr-total'; - } - tooltip += - `` + - `` + - `` + - `` + - `` + - ''; - }); - tooltip += '
" + - `${timeFormatter(d.value)}` + - '
CategoryValue% to total
${isTotal ? '' : '◼'}${key}${valueFormatter(isTotal ? total : series?.point?.y)}${((100 * series.value) / total).toFixed(2)}%
'; - - return dompurify.sanitize(tooltip); -} - export function generateMultiLineTooltipContent(d, xFormatter, yFormatters) { const tooltipTitle = xFormatter(d.value); let tooltip = ''; @@ -392,25 +317,6 @@ export function formatLabel(input, verboseMap = {}) { : verboseLookup(input); } -const MIN_BAR_WIDTH = 18; - -export function computeBarChartWidth(data, stacked, maxWidth) { - const barCount = stacked - ? d3.max(data, d => d.values.length) - : d3.sum(data, d => d.values.length); - - const barWidth = barCount * MIN_BAR_WIDTH; - - return Math.max(barWidth, maxWidth); -} - -export function tryNumify(s) { - // Attempts casting to Number, returns string when failing - const n = Number(s); - - return Number.isNaN(n) ? s : n; -} - export function stringifyTimeRange(extent) { if (extent.some(d => d.toISOString === undefined)) { return null; @@ -438,18 +344,3 @@ export function computeYDomain(data) { return [0, 1]; } - -export function computeStackedYDomain(data) { - if (Array.isArray(data) && data.length > 0 && Array.isArray(data[0].values)) { - const series = data - .filter(d => !d.disabled) - .map(d => d.values.map(v => v.y)); - const stackedValues = series[0].map((_, i) => - series.reduce((acc, cur) => acc + cur[i], 0), - ); - - return [Math.min(0, ...stackedValues), Math.max(0, ...stackedValues)]; - } - - return [0, 1]; -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js index c4bb078fc..137a20e62 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js @@ -23,11 +23,9 @@ import { } from '@superset-ui/core'; import { - computeStackedYDomain, computeYDomain, getTimeOrNumberFormatter, formatLabel, - tryNumify, } from '../src/utils'; const DATA = [ @@ -167,15 +165,6 @@ describe('nvd3/utils', () => { }); }); - describe('tryNumify()', () => { - it('tryNumify works as expected', () => { - expect(tryNumify(5)).toBe(5); - expect(tryNumify('5')).toBe(5); - expect(tryNumify('5.1')).toBe(5.1); - expect(tryNumify('a string')).toBe('a string'); - }); - }); - describe('computeYDomain()', () => { it('works with invalid data', () => { expect(computeYDomain('foo')).toEqual([0, 1]); @@ -191,20 +180,4 @@ describe('nvd3/utils', () => { ]); }); }); - - describe('computeStackedYDomain()', () => { - it('works with invalid data', () => { - expect(computeStackedYDomain('foo')).toEqual([0, 1]); - }); - - it('works with all series enabled', () => { - expect(computeStackedYDomain(DATA)).toEqual([0, 2287437662.0]); - }); - - it('works with some series disabled', () => { - expect(computeStackedYDomain(DATA_WITH_DISABLED_SERIES)).toEqual([ - 0, 668526708.0, - ]); - }); - }); }); diff --git a/superset-frontend/spec/fixtures/mockSliceEntities.js b/superset-frontend/spec/fixtures/mockSliceEntities.js index 809989b0e..ccff1d4fa 100644 --- a/superset-frontend/spec/fixtures/mockSliceEntities.js +++ b/superset-frontend/spec/fixtures/mockSliceEntities.js @@ -139,7 +139,7 @@ export const sliceEntitiesForDashboard = { slice_url: '/explore/?form_data=%7B%22slice_id%22%3A%20130%7D', slice_name: 'Growth Rate', form_data: {}, - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, datasource: '2__table', description: '', description_markdown: '', @@ -223,7 +223,7 @@ export const sliceEntitiesForDashboard = { slice_url: '/explore/?form_data=%7B%22slice_id%22%3A%20134%7D', slice_name: "World's Pop Growth", form_data: {}, - viz_type: VizType.LegacyArea, + viz_type: VizType.Area, datasource: '2__table', description: '', description_markdown: '', diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx index db3501a16..0b06d95b5 100644 --- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx +++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx @@ -46,7 +46,7 @@ const { id: defaultChartId, form_data: defaultFormData } = const { slice_name: chartName } = defaultFormData; const unsupportedChartFormData = { ...defaultFormData, - viz_type: VizType.DistBar, + viz_type: VizType.Sankey, }; const noDimensionsFormData = { diff --git a/superset-frontend/src/components/CopyToClipboard/index.tsx b/superset-frontend/src/components/CopyToClipboard/index.tsx index fdaeb385c..10f2f7500 100644 --- a/superset-frontend/src/components/CopyToClipboard/index.tsx +++ b/superset-frontend/src/components/CopyToClipboard/index.tsx @@ -97,7 +97,7 @@ class CopyToClipboard extends Component { style={{ cursor }} title={this.props.tooltipText || ''} trigger={['hover']} - arrowPointAtCenter + arrow={{ pointAtCenter: true }} > {this.getDecoratedCopyNode()} diff --git a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx index fc41dee41..64a97f44d 100644 --- a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx +++ b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx @@ -129,12 +129,12 @@ const createProps = (overrides: any = {}) => ({ row_limit: 10000, show_legend: false, time_range: 'No filter', - viz_type: VizType.DistBar, + viz_type: VizType.Bar, x_ticks_layout: 'auto', y_axis_format: 'SMART_NUMBER', slice_id: 312, }, - viz_type: VizType.DistBar, + viz_type: VizType.Bar, datasource: '58__table', description: '', description_markeddown: '', diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigPane.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigPane.test.tsx index b927a51b4..83a64be2f 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigPane.test.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigPane.test.tsx @@ -18,7 +18,13 @@ */ import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout'; import { buildNativeFilter } from 'spec/fixtures/mockNativeFilters'; -import { act, fireEvent, render, screen } from 'spec/helpers/testing-library'; +import { + fireEvent, + render, + screen, + waitFor, +} from 'spec/helpers/testing-library'; +import userEvent from '@testing-library/user-event'; import FilterConfigPane from './FilterConfigurePane'; const scrollMock = jest.fn(); @@ -68,7 +74,7 @@ test('drag and drop', async () => { 'div[draggable=true]', ); // const productFilter = await screen.findByText('NATIVE_FILTER-3'); - await act(async () => { + await waitFor(() => { fireEvent.dragStart(productFilter); fireEvent.dragEnter(countryStateFilter); fireEvent.dragOver(countryStateFilter); @@ -83,15 +89,7 @@ test('remove filter', async () => { defaultRender(); // First trash icon const removeFilterIcon = document.querySelector("[alt='RemoveFilter']")!; - await act(async () => { - fireEvent( - removeFilterIcon, - new MouseEvent('click', { - bubbles: true, - cancelable: true, - }), - ); - }); + userEvent.click(removeFilterIcon); expect(defaultProps.onRemove).toHaveBeenCalledWith('NATIVE_FILTER-1'); }); @@ -99,31 +97,14 @@ test('add filter', async () => { defaultRender(); // First trash icon const addFilterButton = await screen.findByText('Add Filter'); - - await act(async () => { - fireEvent( - addFilterButton, - new MouseEvent('click', { - bubbles: true, - cancelable: true, - }), - ); - }); + userEvent.click(addFilterButton); expect(defaultProps.onAdd).toHaveBeenCalledWith('NATIVE_FILTER'); }); test('add divider', async () => { defaultRender(); const addFilterButton = await screen.findByText('Add Divider'); - await act(async () => { - fireEvent( - addFilterButton, - new MouseEvent('click', { - bubbles: true, - cancelable: true, - }), - ); - }); + userEvent.click(addFilterButton); expect(defaultProps.onAdd).toHaveBeenCalledWith('DIVIDER'); }); @@ -148,19 +129,11 @@ test('filter container should scroll to bottom when adding items', async () => { defaultRender(state, props); const addFilterButton = await screen.findByText('Add Filter'); - // add enough filters to make it scroll in the next expectation. - await act(async () => { - for (let i = 0; i < 3; i += 1) { - fireEvent( - addFilterButton, - new MouseEvent('click', { - bubbles: true, - cancelable: true, - }), - ); - } - }); - const containerElement = screen.getByTestId('filter-title-container'); - expect(containerElement.scroll).toHaveBeenCalled(); + userEvent.click(addFilterButton); + + await waitFor(() => { + const containerElement = screen.getByTestId('filter-title-container'); + expect(containerElement.scroll).toHaveBeenCalled(); + }); }); diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts index 54297a2c8..c5133ec11 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts @@ -684,7 +684,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in chartUpdateStartTime: 1673046994633, latestQueryFormData: { datasource: '20__table', - viz_type: VizType.LegacyHeatmap, + viz_type: VizType.Heatmap, slice_id: 93, url_params: {}, granularity_sqla: 'year', @@ -733,7 +733,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in errors: [], form_data: { datasource: '20__table', - viz_type: VizType.LegacyHeatmap, + viz_type: VizType.Heatmap, slice_id: 93, url_params: {}, granularity_sqla: 'year', @@ -2842,7 +2842,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in lastRendered: 0, form_data: { datasource: '20__table', - viz_type: VizType.LegacyHeatmap, + viz_type: VizType.Heatmap, slice_id: 93, url_params: {}, granularity_sqla: 'year', @@ -2886,7 +2886,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in lastRendered: 0, form_data: { datasource: '20__table', - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, slice_id: 95, url_params: { preselect_filters: @@ -2989,7 +2989,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in chartUpdateStartTime: 1673046994566, latestQueryFormData: { datasource: '20__table', - viz_type: VizType.LegacyArea, + viz_type: VizType.Area, slice_id: 103, url_params: { preselect_filters: @@ -3068,7 +3068,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in errors: [], form_data: { datasource: '20__table', - viz_type: VizType.LegacyArea, + viz_type: VizType.Area, slice_id: 103, url_params: { preselect_filters: @@ -16266,7 +16266,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in lastRendered: 0, form_data: { datasource: '20__table', - viz_type: VizType.LegacyArea, + viz_type: VizType.Area, slice_id: 103, url_params: { preselect_filters: @@ -16389,7 +16389,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in chartUpdateStartTime: 1673046994648, latestQueryFormData: { datasource: '20__table', - viz_type: VizType.DistBar, + viz_type: VizType.Bar, slice_id: 113, url_params: {}, granularity_sqla: 'year', @@ -16536,7 +16536,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in errors: [], form_data: { datasource: '20__table', - viz_type: VizType.DistBar, + viz_type: VizType.Bar, slice_id: 113, url_params: {}, granularity_sqla: 'year', @@ -17079,7 +17079,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in lastRendered: 0, form_data: { datasource: '20__table', - viz_type: VizType.DistBar, + viz_type: VizType.Bar, slice_id: 113, url_params: {}, granularity_sqla: 'year', @@ -17223,7 +17223,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in lastRendered: 0, form_data: { datasource: '20__table', - viz_type: VizType.DistBar, + viz_type: VizType.Bar, slice_id: 120, url_params: { preselect_filters: diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx index 0907dcc08..804fa88e8 100644 --- a/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx +++ b/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx @@ -27,7 +27,7 @@ import { } from '../types'; const queryFormData = { - viz_type: VizType.LegacyHeatmap, + viz_type: VizType.Heatmap, datasource: '34__table', slice_id: 456, url_params: {}, diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx index 601a6118c..3735f51cf 100644 --- a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx +++ b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx @@ -40,7 +40,7 @@ const createProps = (additionalProps = {}) => ({ chart: { id: 1, latestQueryFormData: { - viz_type: VizType.LegacyHistogram, + viz_type: VizType.Histogram, datasource: '49__table', slice_id: 318, url_params: {}, @@ -80,7 +80,7 @@ const createProps = (additionalProps = {}) => ({ slice_id: 318, time_range: 'No filter', url_params: {}, - viz_type: VizType.LegacyHistogram, + viz_type: VizType.Histogram, x_axis_label: 'age', y_axis_label: 'count', }, diff --git a/superset-frontend/src/explore/components/ExploreChartPanel/ExploreChartPanel.test.jsx b/superset-frontend/src/explore/components/ExploreChartPanel/ExploreChartPanel.test.jsx index ff9712e3c..fce164b59 100644 --- a/superset-frontend/src/explore/components/ExploreChartPanel/ExploreChartPanel.test.jsx +++ b/superset-frontend/src/explore/components/ExploreChartPanel/ExploreChartPanel.test.jsx @@ -36,11 +36,11 @@ const createProps = (overrides = {}) => ({ containerId: 'foo', width: '500px', isStarred: false, - vizType: VizType.LegacyHistogram, + vizType: VizType.Histogram, chart: { id: 1, latestQueryFormData: { - viz_type: VizType.LegacyHistogram, + viz_type: VizType.Histogram, datasource: '49__table', slice_id: 318, url_params: {}, @@ -74,7 +74,7 @@ describe('ChartContainer', () => { chart: { chartStatus: 'rendered', queriesResponse: [{}] }, }); getChartMetadataRegistry().registerValue( - VizType.LegacyHistogram, + VizType.Histogram, new ChartMetadata({ name: 'fake table', thumbnail: '.png', diff --git a/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx index 4d9b55474..49c5d3b04 100644 --- a/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx +++ b/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx @@ -79,7 +79,7 @@ fetchMock.get('glob:*/api/v1/chart/318', { params: '{"adhoc_filters": [], "all_columns_x": ["age"], "color_scheme": "supersetColors", "datasource": "42__table", "granularity_sqla": "time_start", "groupby": null, "label_colors": {}, "link_length": "25", "queryFields": {"groupby": "groupby"}, "row_limit": 10000, "slice_id": 1380, "time_range": "No filter", "url_params": {}, "viz_type": "histogram", "x_axis_label": "age", "y_axis_label": "count"}', slice_name: 'Age distribution of respondents', - viz_type: VizType.LegacyHistogram, + viz_type: VizType.Histogram, }, show_columns: [ 'cache_timeout', diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx index 3067758ea..0a1551429 100644 --- a/superset-frontend/src/explore/components/SaveModal.tsx +++ b/superset-frontend/src/explore/components/SaveModal.tsx @@ -27,6 +27,7 @@ import { css, DatasourceType, isDefined, + logging, styled, SupersetClient, t, @@ -132,7 +133,8 @@ class SaveModal extends Component { }); } } catch (error) { - this.props.actions.addDangerToast( + logging.warn(error); + this.props.addDangerToast( t('An error occurred while loading dashboard information.'), ); } diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.test.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.test.tsx index b1b1cbb34..3f3a592ea 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.test.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.test.tsx @@ -46,7 +46,7 @@ const withIdResult = { groupby: ['country'], }, }), - viz_type: VizType.LegacyLine, + viz_type: VizType.Line, }, }; diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx index d1e407100..57074a2b1 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx @@ -165,14 +165,14 @@ describe('VizTypeControl', () => { it('Render viz tiles when non-featured is rendered', async () => { const props = { ...defaultProps, - value: 'line', + value: VizType.Sankey, isModalOpenInit: false, }; const state = { charts: { 1: { latestQueryFormData: { - viz_type: VizType.LegacyLine, + viz_type: VizType.Sankey, }, }, }, diff --git a/superset-frontend/src/features/home/ChartTable.test.tsx b/superset-frontend/src/features/home/ChartTable.test.tsx index 79fe01e32..f03a70524 100644 --- a/superset-frontend/src/features/home/ChartTable.test.tsx +++ b/superset-frontend/src/features/home/ChartTable.test.tsx @@ -33,7 +33,7 @@ const mockCharts = [...new Array(3)].map((_, i) => ({ id: i, slice_name: `cool chart ${i}`, url: 'url', - viz_type: VizType.LegacyBar, + viz_type: VizType.Bar, datasource_title: `ds${i}`, thumbnail_url: '', })); diff --git a/superset-frontend/src/features/home/Menu.tsx b/superset-frontend/src/features/home/Menu.tsx index 3d83aded7..b91f71b20 100644 --- a/superset-frontend/src/features/home/Menu.tsx +++ b/superset-frontend/src/features/home/Menu.tsx @@ -309,7 +309,7 @@ export function Menu({ id="brand-tooltip" placement="bottomLeft" title={brand.tooltip} - arrowPointAtCenter + arrow={{ pointAtCenter: true }} > {isFrontendRoute(window.location.pathname) ? ( diff --git a/superset-frontend/src/pages/ChartList/ChartList.test.jsx b/superset-frontend/src/pages/ChartList/ChartList.test.jsx index 7b3c354b3..63e0c4f9d 100644 --- a/superset-frontend/src/pages/ChartList/ChartList.test.jsx +++ b/superset-frontend/src/pages/ChartList/ChartList.test.jsx @@ -53,7 +53,7 @@ const mockCharts = [...new Array(3)].map((_, i) => ({ id: i, slice_name: `cool chart ${i}`, url: 'url', - viz_type: uiCore.VizType.LegacyBar, + viz_type: uiCore.VizType.Bar, datasource_name: `ds${i}`, thumbnail_url: '/thumbnail', })); diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js index 5dee38e45..b79de8f26 100644 --- a/superset-frontend/src/visualizations/presets/MainPreset.js +++ b/superset-frontend/src/visualizations/presets/MainPreset.js @@ -25,27 +25,19 @@ import { import CalendarChartPlugin from '@superset-ui/legacy-plugin-chart-calendar'; import ChordChartPlugin from '@superset-ui/legacy-plugin-chart-chord'; import CountryMapChartPlugin from '@superset-ui/legacy-plugin-chart-country-map'; -import EventFlowChartPlugin from '@superset-ui/legacy-plugin-chart-event-flow'; -import HeatmapChartPlugin from '@superset-ui/legacy-plugin-chart-heatmap'; -import HistogramChartPlugin from '@superset-ui/legacy-plugin-chart-histogram'; import HorizonChartPlugin from '@superset-ui/legacy-plugin-chart-horizon'; import MapBoxChartPlugin from '@superset-ui/legacy-plugin-chart-map-box'; import PairedTTestChartPlugin from '@superset-ui/legacy-plugin-chart-paired-t-test'; import ParallelCoordinatesChartPlugin from '@superset-ui/legacy-plugin-chart-parallel-coordinates'; import PartitionChartPlugin from '@superset-ui/legacy-plugin-chart-partition'; import RoseChartPlugin from '@superset-ui/legacy-plugin-chart-rose'; -import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey'; import TableChartPlugin from '@superset-ui/plugin-chart-table'; import { WordCloudChartPlugin } from '@superset-ui/plugin-chart-word-cloud'; import WorldMapChartPlugin from '@superset-ui/legacy-plugin-chart-world-map'; import { - AreaChartPlugin, - BarChartPlugin, BubbleChartPlugin, BulletChartPlugin, CompareChartPlugin, - DistBarChartPlugin, - LineChartPlugin, TimePivotChartPlugin, } from '@superset-ui/legacy-preset-chart-nvd3'; import { DeckGLChartPreset } from '@superset-ui/legacy-preset-chart-deckgl'; @@ -105,8 +97,6 @@ export default class MainPreset extends Preset { name: 'Legacy charts', presets: [new DeckGLChartPreset()], plugins: [ - new AreaChartPlugin().configure({ key: VizType.LegacyArea }), - new BarChartPlugin().configure({ key: VizType.LegacyBar }), new BigNumberChartPlugin().configure({ key: VizType.BigNumber }), new BigNumberTotalChartPlugin().configure({ key: VizType.BigNumberTotal, @@ -118,8 +108,6 @@ export default class MainPreset extends Preset { new ChordChartPlugin().configure({ key: VizType.Chord }), new CompareChartPlugin().configure({ key: VizType.Compare }), new CountryMapChartPlugin().configure({ key: VizType.CountryMap }), - new DistBarChartPlugin().configure({ key: VizType.DistBar }), - new EventFlowChartPlugin().configure({ key: VizType.EventFlow }), new EchartsFunnelChartPlugin().configure({ key: VizType.Funnel }), new EchartsSankeyChartPlugin().configure({ key: VizType.Sankey }), new EchartsTreemapChartPlugin().configure({ key: VizType.Treemap }), @@ -129,10 +117,7 @@ export default class MainPreset extends Preset { new EchartsMixedTimeseriesChartPlugin().configure({ key: VizType.MixedTimeseries, }), - new HeatmapChartPlugin().configure({ key: VizType.LegacyHeatmap }), - new HistogramChartPlugin().configure({ key: VizType.LegacyHistogram }), new HorizonChartPlugin().configure({ key: VizType.Horizon }), - new LineChartPlugin().configure({ key: VizType.LegacyLine }), new MapBoxChartPlugin().configure({ key: VizType.MapBox }), new PairedTTestChartPlugin().configure({ key: VizType.PairedTTest }), new ParallelCoordinatesChartPlugin().configure({ @@ -142,7 +127,6 @@ export default class MainPreset extends Preset { new EchartsPieChartPlugin().configure({ key: VizType.Pie }), new PivotTableChartPluginV2().configure({ key: VizType.PivotTable }), new RoseChartPlugin().configure({ key: VizType.Rose }), - new SankeyChartPlugin().configure({ key: VizType.LegacySankey }), new TableChartPlugin().configure({ key: VizType.Table }), new TimePivotChartPlugin().configure({ key: VizType.TimePivot }), new TimeTableChartPlugin().configure({ key: VizType.TimeTable }), diff --git a/superset/examples/birth_names.py b/superset/examples/birth_names.py index 8d2b23e22..8d70e66fc 100644 --- a/superset/examples/birth_names.py +++ b/superset/examples/birth_names.py @@ -224,10 +224,10 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Trends", - viz_type="line", + viz_type="echarts_timeseries_line", params=get_slice_json( defaults, - viz_type="line", + viz_type="echarts_timeseries_line", groupby=["name"], granularity_sqla="ds", rich_tooltip=True, @@ -239,7 +239,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Genders by State", - viz_type="dist_bar", + viz_type="echarts_timeseries_bar", params=get_slice_json( defaults, adhoc_filters=[ @@ -252,7 +252,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: "subject": "state", } ], - viz_type="dist_bar", + viz_type="echarts_timeseries_bar", metrics=[ { "expressionType": "SIMPLE", @@ -338,7 +338,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Top 10 Girl Name Share", - viz_type="area", + viz_type="echarts_area", params=get_slice_json( defaults, adhoc_filters=[gen_filter("gender", "girl")], @@ -347,7 +347,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: limit=10, stacked_style="expand", time_grain_sqla="P1D", - viz_type="area", + viz_type="echarts_area", x_axis_forma="smart_date", metrics=metrics, ), @@ -356,7 +356,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Top 10 Boy Name Share", - viz_type="area", + viz_type="echarts_area", params=get_slice_json( defaults, adhoc_filters=[gen_filter("gender", "boy")], @@ -365,7 +365,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: limit=10, stacked_style="expand", time_grain_sqla="P1D", - viz_type="area", + viz_type="echarts_area", x_axis_forma="smart_date", metrics=metrics, ), @@ -421,8 +421,10 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Num Births Trend", - viz_type="line", - params=get_slice_json(defaults, viz_type="line", metrics=metrics), + viz_type="echarts_timeseries_line", + params=get_slice_json( + defaults, viz_type="echarts_timeseries_line", metrics=metrics + ), owners=[], ), Slice( @@ -471,7 +473,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Top 10 California Names Timeseries", - viz_type="line", + viz_type="echarts_timeseries_line", params=get_slice_json( defaults, metrics=[ @@ -485,7 +487,7 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: "label": "SUM(num_california)", } ], - viz_type="line", + viz_type="echarts_timeseries_line", granularity_sqla="ds", groupby=["name"], timeseries_limit_metric={ @@ -579,7 +581,7 @@ def create_dashboard(slices: list[Slice]) -> Dashboard: } }""" ) - # pylint: disable=line-too-long + # pylint: disable=echarts_timeseries_line-too-long pos = json.loads( textwrap.dedent( """\ @@ -854,7 +856,7 @@ def create_dashboard(slices: list[Slice]) -> Dashboard: """ # noqa: E501 ) ) - # pylint: enable=line-too-long + # pylint: enable=echarts_timeseries_line-too-long # dashboard v2 doesn't allow add markup slice dash.slices = [slc for slc in slices if slc.viz_type != "markup"] update_slice_ids(pos) diff --git a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Approach__Stage.yaml b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Approach__Stage.yaml index ac789d3a9..388a8504b 100644 --- a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Approach__Stage.yaml +++ b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Approach__Stage.yaml @@ -15,34 +15,33 @@ # specific language governing permissions and limitations # under the License. slice_name: Vaccine Candidates per Approach & Stage -viz_type: heatmap +viz_type: heatmap_v2 params: adhoc_filters: [] - all_columns_x: clinical_stage - all_columns_y: product_category + x_axis: clinical_stage + groupby: product_category bottom_margin: auto - canvas_image_rendering: pixelated datasource: 69__table left_margin: auto linear_color_scheme: schemeYlOrBr metric: count - normalize_across: heatmap + normalize_across: heatmap_v2 queryFields: metric: metrics row_limit: 10000 show_legend: false - show_perc: true + show_percentage: true show_values: true slice_id: 3962 sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Country__Stage_749.yaml b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Country__Stage_749.yaml index 216231b3e..13a761d9f 100644 --- a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Country__Stage_749.yaml +++ b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Country__Stage_749.yaml @@ -15,30 +15,29 @@ # specific language governing permissions and limitations # under the License. slice_name: Vaccine Candidates per Country & Stage -viz_type: heatmap +viz_type: heatmap_v2 params: adhoc_filters: [] - all_columns_x: clinical_stage - all_columns_y: country_name + x_axis: clinical_stage + groupby: country_name bottom_margin: auto - canvas_image_rendering: pixelated datasource: 14__table left_margin: auto linear_color_scheme: schemeYlOrBr metric: count - normalize_across: heatmap + normalize_across: heatmap_v2 row_limit: 10000 show_legend: true - show_perc: true + show_percentage: true sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Phase_587.yaml b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Phase_587.yaml index 78070fce7..906327ff6 100644 --- a/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Phase_587.yaml +++ b/superset/examples/configs/charts/COVID Vaccines/Vaccine_Candidates_per_Phase_587.yaml @@ -15,23 +15,22 @@ # specific language governing permissions and limitations # under the License. slice_name: Vaccine Candidates per Phase -viz_type: dist_bar +viz_type: echarts_timeseries_bar params: + x_axis: clinical_stage adhoc_filters: [] bottom_margin: auto color_scheme: SUPERSET_DEFAULT columns: [] datasource: 14__table - groupby: - - clinical_stage label_colors: {} metrics: - - count + - count row_limit: 10000 show_legend: false time_range: No filter url_params: {} - viz_type: dist_bar + viz_type: echarts_timeseries_bar x_ticks_layout: auto y_axis_format: SMART_NUMBER cache_timeout: null diff --git a/superset/examples/configs/charts/FCC New Coder Survey/Age_distribution_of_respondents.yaml b/superset/examples/configs/charts/FCC New Coder Survey/Age_distribution_of_respondents.yaml index 7b841611b..e4da5c3d6 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/Age_distribution_of_respondents.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/Age_distribution_of_respondents.yaml @@ -15,24 +15,24 @@ # specific language governing permissions and limitations # under the License. slice_name: Age distribution of respondents -viz_type: histogram +viz_type: histogram_v2 params: adhoc_filters: [] all_columns_x: - - age + - age color_scheme: supersetColors datasource: 42__table granularity_sqla: time_start groupby: null label_colors: {} - link_length: '25' + link_length: "25" queryFields: groupby: groupby row_limit: 10000 slice_id: 1380 time_range: No filter url_params: {} - viz_type: histogram + viz_type: histogram_v2 x_axis_label: age y_axis_label: count cache_timeout: null diff --git a/superset/examples/configs/charts/FCC New Coder Survey/Ethnic_Minority__Gender.yaml b/superset/examples/configs/charts/FCC New Coder Survey/Ethnic_Minority__Gender.yaml index 5f9449fc3..59492c614 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/Ethnic_Minority__Gender.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/Ethnic_Minority__Gender.yaml @@ -15,33 +15,32 @@ # specific language governing permissions and limitations # under the License. slice_name: Ethnic Minority & Gender -viz_type: sankey +viz_type: sankey_v2 params: adhoc_filters: - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_of9xf5uks2_5pisp1se9r5 - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: ethnic_minority - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_9ikn7htywfm_2579he7pk5x - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: gender + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_of9xf5uks2_5pisp1se9r5 + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: ethnic_minority + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_9ikn7htywfm_2579he7pk5x + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: gender color_scheme: supersetColors datasource: 42__table granularity_sqla: time_start - groupby: - - ethnic_minority - - gender + source: ethnic_minority + target: gender label_colors: {} metric: count queryFields: @@ -50,7 +49,7 @@ params: row_limit: null time_range: No filter url_params: {} - viz_type: sankey + viz_type: sankey_v2 cache_timeout: null uuid: 4880e4f4-b701-4be0-86f3-e7e89432e83b version: 1.0.0 diff --git a/superset/examples/configs/charts/FCC New Coder Survey/First_Time_Developer__Commute_Time.yaml b/superset/examples/configs/charts/FCC New Coder Survey/First_Time_Developer__Commute_Time.yaml index b8c7ca54f..40852776f 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/First_Time_Developer__Commute_Time.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/First_Time_Developer__Commute_Time.yaml @@ -15,42 +15,41 @@ # specific language governing permissions and limitations # under the License. slice_name: First Time Developer & Commute Time -viz_type: sankey +viz_type: sankey_v2 params: adhoc_filters: - - clause: WHERE - comparator: '1' - expressionType: SIMPLE - filterOptionName: filter_9hkcdqhiqor_84pk01t2k9 - isExtra: false - isNew: false - operator: == - sqlExpression: null - subject: is_software_dev - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_d5l1qwsthl_okyuouvmors - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: first_time_developer - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_95548uvadi_f990s8nzl4 - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: communite_time + - clause: WHERE + comparator: "1" + expressionType: SIMPLE + filterOptionName: filter_9hkcdqhiqor_84pk01t2k9 + isExtra: false + isNew: false + operator: == + sqlExpression: null + subject: is_software_dev + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_d5l1qwsthl_okyuouvmors + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: first_time_developer + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_95548uvadi_f990s8nzl4 + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: communite_time color_scheme: supersetColors datasource: 42__table granularity_sqla: time_start - groupby: - - first_time_developer - - communite_time + source: first_time_developer + target: communite_time label_colors: {} metric: count queryFields: @@ -59,7 +58,7 @@ params: row_limit: 10000 time_range: No filter url_params: {} - viz_type: sankey + viz_type: sankey_v2 cache_timeout: null uuid: 067c4a1e-ae03-4c0c-8e2a-d2c0f4bf43c3 version: 1.0.0 diff --git a/superset/examples/configs/charts/FCC New Coder Survey/How_do_you_prefer_to_work.yaml b/superset/examples/configs/charts/FCC New Coder Survey/How_do_you_prefer_to_work.yaml index c37c4f0bd..55594c52d 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/How_do_you_prefer_to_work.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/How_do_you_prefer_to_work.yaml @@ -15,61 +15,60 @@ # specific language governing permissions and limitations # under the License. slice_name: How do you prefer to work? -viz_type: heatmap +viz_type: heatmap_v2 params: adhoc_filters: - - clause: WHERE - comparator: '0' - expressionType: SIMPLE - filterOptionName: filter_v65f0j14bk_35oi0g94srk - isExtra: false - isNew: false - operator: == - sqlExpression: null - subject: is_software_dev - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_qb5ionb8wcq_ki4aimey4do - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: school_degree - - clause: WHERE - comparator: 'NULL' - expressionType: SIMPLE - filterOptionName: filter_3n0z71frg5c_xqnl179to7 - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: job_pref - all_columns_x: job_pref - all_columns_y: school_degree + - clause: WHERE + comparator: "0" + expressionType: SIMPLE + filterOptionName: filter_v65f0j14bk_35oi0g94srk + isExtra: false + isNew: false + operator: == + sqlExpression: null + subject: is_software_dev + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_qb5ionb8wcq_ki4aimey4do + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: school_degree + - clause: WHERE + comparator: "NULL" + expressionType: SIMPLE + filterOptionName: filter_3n0z71frg5c_xqnl179to7 + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: job_pref + x_axis: job_pref + groupby: school_degree bottom_margin: auto - canvas_image_rendering: pixelated datasource: 42__table granularity_sqla: time_start left_margin: auto linear_color_scheme: blue_white_yellow metric: count - normalize_across: heatmap + normalize_across: heatmap_v2 queryFields: metric: metrics row_limit: null show_legend: true - show_perc: true + show_percentage: true slice_id: 1367 sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/FCC New Coder Survey/How_much_do_you_expect_to_earn_0_-_100k.yaml b/superset/examples/configs/charts/FCC New Coder Survey/How_much_do_you_expect_to_earn_0_-_100k.yaml index 60fe3a03e..4211ca5b5 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/How_much_do_you_expect_to_earn_0_-_100k.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/How_much_do_you_expect_to_earn_0_-_100k.yaml @@ -15,80 +15,80 @@ # specific language governing permissions and limitations # under the License. slice_name: How much do you expect to earn? ($0 - 100k) -viz_type: histogram +viz_type: histogram_v2 params: adhoc_filters: - - clause: WHERE - comparator: Aspiring Developer - expressionType: SIMPLE - filterOptionName: filter_dfz5l631lx_lb7f2rlmjdl - isExtra: false - isNew: false - operator: == - sqlExpression: null - subject: developer_type - - clause: WHERE - comparator: '200000' - expressionType: SIMPLE - filterOptionName: filter_6nmi4fk837u_6lvcpn3zzvf - isExtra: false - isNew: false - operator: <= - sqlExpression: null - subject: expected_earn + - clause: WHERE + comparator: Aspiring Developer + expressionType: SIMPLE + filterOptionName: filter_dfz5l631lx_lb7f2rlmjdl + isExtra: false + isNew: false + operator: == + sqlExpression: null + subject: developer_type + - clause: WHERE + comparator: "200000" + expressionType: SIMPLE + filterOptionName: filter_6nmi4fk837u_6lvcpn3zzvf + isExtra: false + isNew: false + operator: <= + sqlExpression: null + subject: expected_earn all_columns_x: - - expected_earn + - expected_earn color_scheme: supersetColors datasource: 42__table granularity_sqla: time_start groupby: null label_colors: - '0': '#FCC700' - '1': '#A868B7' - '15': '#3CCCCB' - '30': '#A38F79' - '45': '#8FD3E4' - : '#5AC189' - Female: '#454E7C' - From Home: '#1FA8C9' - I: '#FEC0A1' - In an Office (with Other Developers): '#9EE5E5' - Less: '#ACE1C4' - Male: '#666666' - More: '#A1A6BD' - 'No': '#666666' - No Answer: '#D3B3DA' - No Preference: '#D1C6BC' - No,: '#FF7F44' - No, not an ethnic minority: '#1FA8C9' - 'No: Not Willing to': '#FDE380' - Ph.D.: '#FCC700' - Prefer: '#5AC189' - Prefer not to say: '#E04355' - 'Yes': '#FF7F44' - Yes,: '#1FA8C9' - Yes, an ethnic minority: '#454E7C' - 'Yes: Willing To': '#EFA1AA' - age: '#1FA8C9' - associate's degree: '#A868B7' - bachelor's degree: '#3CCCCB' - expected_earn: '#B2B2B2' - high school diploma or equivalent (GED): '#A38F79' - last_yr_income: '#E04355' - master's degree (non-professional): '#8FD3E4' - no high school (secondary school): '#A1A6BD' - professional degree (MBA, MD, JD, etc.): '#ACE1C4' - some college credit, no degree: '#FEC0A1' - some high school: '#B2B2B2' - trade, technical, or vocational training: '#EFA1AA' - link_length: '10' + "0": "#FCC700" + "1": "#A868B7" + "15": "#3CCCCB" + "30": "#A38F79" + "45": "#8FD3E4" + : "#5AC189" + Female: "#454E7C" + From Home: "#1FA8C9" + I: "#FEC0A1" + In an Office (with Other Developers): "#9EE5E5" + Less: "#ACE1C4" + Male: "#666666" + More: "#A1A6BD" + "No": "#666666" + No Answer: "#D3B3DA" + No Preference: "#D1C6BC" + No,: "#FF7F44" + No, not an ethnic minority: "#1FA8C9" + "No: Not Willing to": "#FDE380" + Ph.D.: "#FCC700" + Prefer: "#5AC189" + Prefer not to say: "#E04355" + "Yes": "#FF7F44" + Yes,: "#1FA8C9" + Yes, an ethnic minority: "#454E7C" + "Yes: Willing To": "#EFA1AA" + age: "#1FA8C9" + associate's degree: "#A868B7" + bachelor's degree: "#3CCCCB" + expected_earn: "#B2B2B2" + high school diploma or equivalent (GED): "#A38F79" + last_yr_income: "#E04355" + master's degree (non-professional): "#8FD3E4" + no high school (secondary school): "#A1A6BD" + professional degree (MBA, MD, JD, etc.): "#ACE1C4" + some college credit, no degree: "#FEC0A1" + some high school: "#B2B2B2" + trade, technical, or vocational training: "#EFA1AA" + link_length: "10" queryFields: groupby: groupby row_limit: null slice_id: 1366 time_range: No filter url_params: {} - viz_type: histogram + viz_type: histogram_v2 cache_timeout: null uuid: 6d0ceb30-2008-d19c-d285-cf77dc764433 version: 1.0.0 diff --git a/superset/examples/configs/charts/FCC New Coder Survey/Last_Year_Income_Distribution.yaml b/superset/examples/configs/charts/FCC New Coder Survey/Last_Year_Income_Distribution.yaml index 9d17de60e..413448f0a 100644 --- a/superset/examples/configs/charts/FCC New Coder Survey/Last_Year_Income_Distribution.yaml +++ b/superset/examples/configs/charts/FCC New Coder Survey/Last_Year_Income_Distribution.yaml @@ -15,41 +15,41 @@ # specific language governing permissions and limitations # under the License. slice_name: Last Year Income Distribution -viz_type: histogram +viz_type: histogram_v2 params: adhoc_filters: - - clause: WHERE - comparator: Currently A Developer - expressionType: SIMPLE - filterOptionName: filter_fvi0jg9aii_2lekqrhy7qk - isExtra: false - isNew: false - operator: == - sqlExpression: null - subject: developer_type - - clause: WHERE - comparator: '100000' - expressionType: SIMPLE - filterOptionName: filter_khdc3iypzjg_3g6h02b4f2p - isExtra: false - isNew: false - operator: <= - sqlExpression: null - subject: last_yr_income + - clause: WHERE + comparator: Currently A Developer + expressionType: SIMPLE + filterOptionName: filter_fvi0jg9aii_2lekqrhy7qk + isExtra: false + isNew: false + operator: == + sqlExpression: null + subject: developer_type + - clause: WHERE + comparator: "100000" + expressionType: SIMPLE + filterOptionName: filter_khdc3iypzjg_3g6h02b4f2p + isExtra: false + isNew: false + operator: <= + sqlExpression: null + subject: last_yr_income all_columns_x: - - last_yr_income + - last_yr_income color_scheme: supersetColors datasource: 42__table granularity_sqla: time_start groupby: [] label_colors: {} - link_length: '10' + link_length: "10" queryFields: groupby: groupby row_limit: null time_range: No filter url_params: {} - viz_type: histogram + viz_type: histogram_v2 cache_timeout: null uuid: a2ec5256-94b4-43c4-b8c7-b83f70c5d4df version: 1.0.0 diff --git a/superset/examples/configs/charts/Featured Charts/Area.yaml b/superset/examples/configs/charts/Featured Charts/Area.yaml index de053bfa6..157aaff70 100644 --- a/superset/examples/configs/charts/Featured Charts/Area.yaml +++ b/superset/examples/configs/charts/Featured Charts/Area.yaml @@ -73,7 +73,7 @@ params: y_axis_title_position: Left sort_series_type: sum color_scheme: supersetColors - seriesType: line + seriesType: echarts_timeseries_line opacity: 0.2 only_total: true markerSize: 6 diff --git a/superset/examples/configs/charts/Featured Charts/Line.yaml b/superset/examples/configs/charts/Featured Charts/Line.yaml index 285121f74..4f241cf81 100644 --- a/superset/examples/configs/charts/Featured Charts/Line.yaml +++ b/superset/examples/configs/charts/Featured Charts/Line.yaml @@ -50,7 +50,7 @@ params: y_axis_title_position: Left sort_series_type: sum color_scheme: supersetColors - seriesType: line + seriesType: echarts_timeseries_line only_total: true opacity: 0.2 markerSize: 6 diff --git a/superset/examples/configs/charts/Featured Charts/Mixed.yaml b/superset/examples/configs/charts/Featured Charts/Mixed.yaml index 86cd8df7b..fc63e11a9 100644 --- a/superset/examples/configs/charts/Featured Charts/Mixed.yaml +++ b/superset/examples/configs/charts/Featured Charts/Mixed.yaml @@ -78,11 +78,11 @@ params: y_axis_title_margin: 15 y_axis_title_position: Left color_scheme: supersetColors - seriesType: line + seriesType: echarts_timeseries_line opacity: 0.2 markerSize: 6 yAxisIndex: 1 - seriesTypeB: bar + seriesTypeB: echarts_timeseries_bar opacityB: 0.2 markerSizeB: 6 yAxisIndexB: 0 diff --git a/superset/examples/configs/charts/Slack Dashboard/Cross_Channel_Relationship_heatmap_2786.yaml b/superset/examples/configs/charts/Slack Dashboard/Cross_Channel_Relationship_heatmap_2786.yaml index e08a915f8..f06924f37 100644 --- a/superset/examples/configs/charts/Slack Dashboard/Cross_Channel_Relationship_heatmap_2786.yaml +++ b/superset/examples/configs/charts/Slack Dashboard/Cross_Channel_Relationship_heatmap_2786.yaml @@ -14,14 +14,13 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -slice_name: Cross Channel Relationship heatmap -viz_type: heatmap +slice_name: Cross Channel Relationship heatmap_v2 +viz_type: heatmap_v2 params: adhoc_filters: [] - all_columns_x: channel_1 - all_columns_y: channel_2 + x_axis: channel_1 + groupby: channel_2 bottom_margin: auto - canvas_image_rendering: pixelated datasource: 35__table left_margin: auto linear_color_scheme: schemeBlues @@ -45,20 +44,20 @@ params: label: SUM(cnt) optionName: metric_i1djbl8i2y_2vdl690dkyu sqlExpression: null - normalize_across: heatmap + normalize_across: heatmap_v2 row_limit: 1000 show_legend: true - show_perc: false + show_percentage: false show_values: true sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/Slack Dashboard/Messages_per_Channel.yaml b/superset/examples/configs/charts/Slack Dashboard/Messages_per_Channel.yaml index c24918af7..a1c5e33c0 100644 --- a/superset/examples/configs/charts/Slack Dashboard/Messages_per_Channel.yaml +++ b/superset/examples/configs/charts/Slack Dashboard/Messages_per_Channel.yaml @@ -15,18 +15,18 @@ # specific language governing permissions and limitations # under the License. slice_name: Messages per Channel -viz_type: area +viz_type: echarts_area params: adhoc_filters: - - clause: WHERE - comparator: github-notifications - expressionType: SIMPLE - filterOptionName: filter_7ud3u2eujnw_1pmeehxvw0b - isExtra: false - isNew: false - operator: '!=' - sqlExpression: null - subject: name + - clause: WHERE + comparator: github-notifications + expressionType: SIMPLE + filterOptionName: filter_7ud3u2eujnw_1pmeehxvw0b + isExtra: false + isNew: false + operator: "!=" + sqlExpression: null + subject: name annotation_layers: [] bottom_margin: auto color_scheme: supersetColors @@ -34,44 +34,44 @@ params: datasource: 56__table granularity_sqla: ts groupby: - - name + - name label_colors: - '0': '#1FA8C9' - '1': '#454E7C' - announcements: '#A868B7' - apache-releases: '#666666' - beginners: '#666666' - commits: '#E04355' - community-feedback: '#EFA1AA' - contributing: '#8FD3E4' - cypress-tests: '#FDE380' - dashboard-filters: '#FCC700' - dashboard-level-access: '#D1C6BC' - dashboards: '#3CCCCB' - design: '#1FA8C9' - developers: '#9EE5E5' - embedded-dashboards: '#ACE1C4' - feature-requests: '#454E7C' - general: '#3CCCCB' - github-notifications: '#E04355' - globalnav_search: '#A1A6BD' - graduation: '#A1A6BD' - helm-k8-deployment: '#FEC0A1' - introductions: '#5AC189' - jobs: '#FF7F44' - localization: '#5AC189' - newsletter: '#FF7F44' - product_feedback: '#D3B3DA' - pull-requests: '#A38F79' - superset-champions: '#FCC700' - superset_prod_reports: '#A868B7' - superset_stage_alerts: '#A38F79' - support: '#8FD3E4' - visualization_plugins: '#B2B2B2' + "0": "#1FA8C9" + "1": "#454E7C" + announcements: "#A868B7" + apache-releases: "#666666" + beginners: "#666666" + commits: "#E04355" + community-feedback: "#EFA1AA" + contributing: "#8FD3E4" + cypress-tests: "#FDE380" + dashboard-filters: "#FCC700" + dashboard-level-access: "#D1C6BC" + dashboards: "#3CCCCB" + design: "#1FA8C9" + developers: "#9EE5E5" + embedded-dashboards: "#ACE1C4" + feature-requests: "#454E7C" + general: "#3CCCCB" + github-notifications: "#E04355" + globalnav_search: "#A1A6BD" + graduation: "#A1A6BD" + helm-k8-deployment: "#FEC0A1" + introductions: "#5AC189" + jobs: "#FF7F44" + localization: "#5AC189" + newsletter: "#FF7F44" + product_feedback: "#D3B3DA" + pull-requests: "#A38F79" + superset-champions: "#FCC700" + superset_prod_reports: "#A868B7" + superset_stage_alerts: "#A38F79" + support: "#8FD3E4" + visualization_plugins: "#B2B2B2" limit: 10 line_interpolation: linear metrics: - - count + - count min_periods: 0 order_desc: true queryFields: @@ -89,13 +89,13 @@ params: time_grain_sqla: P1D time_range: No filter url_params: {} - viz_type: area + viz_type: echarts_area x_axis_format: smart_date x_axis_showminmax: true x_ticks_layout: auto y_axis_bounds: - - 0 - - null + - 0 + - null y_axis_format: SMART_NUMBER y_log_scale: false cache_timeout: null diff --git a/superset/examples/configs/charts/Vehicle Sales/Number_of_Deals_for_each_Combination.yaml b/superset/examples/configs/charts/Vehicle Sales/Number_of_Deals_for_each_Combination.yaml index 2d47ee5b6..414b0f0f8 100644 --- a/superset/examples/configs/charts/Vehicle Sales/Number_of_Deals_for_each_Combination.yaml +++ b/superset/examples/configs/charts/Vehicle Sales/Number_of_Deals_for_each_Combination.yaml @@ -15,36 +15,35 @@ # specific language governing permissions and limitations # under the License. slice_name: Number of Deals (for each Combination) -viz_type: heatmap +viz_type: heatmap_v2 params: adhoc_filters: [] - all_columns_x: deal_size - all_columns_y: product_line + x_axis: deal_size + groupby: product_line bottom_margin: 100 - canvas_image_rendering: pixelated datasource: 23__table granularity_sqla: order_date left_margin: 75 linear_color_scheme: schemePuBuGn metric: count - normalize_across: heatmap + normalize_across: heatmap_v2 normalized: true queryFields: metric: metrics row_limit: null show_legend: true - show_perc: true + show_percentage: true show_values: true slice_id: 2810 sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/Vehicle Sales/Proportion_of_Revenue_by_Product_Line.yaml b/superset/examples/configs/charts/Vehicle Sales/Proportion_of_Revenue_by_Product_Line.yaml index b24afc025..5ccb305b6 100644 --- a/superset/examples/configs/charts/Vehicle Sales/Proportion_of_Revenue_by_Product_Line.yaml +++ b/superset/examples/configs/charts/Vehicle Sales/Proportion_of_Revenue_by_Product_Line.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Proportion of Revenue by Product Line -viz_type: area +viz_type: echarts_area params: adhoc_filters: [] annotation_layers: [] @@ -26,29 +26,29 @@ params: datasource: 23__table granularity_sqla: order_date groupby: - - product_line + - product_line label_colors: {} line_interpolation: linear metrics: - - aggregate: SUM - column: - column_name: sales - description: null - expression: null - filterable: true - groupby: true - id: 917 - is_dttm: false - optionName: _col_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: false - isNew: false - label: (Sales) - optionName: metric_3is69ofceho_6d0ezok7ry6 - sqlExpression: null + - aggregate: SUM + column: + column_name: sales + description: null + expression: null + filterable: true + groupby: true + id: 917 + is_dttm: false + optionName: _col_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: false + isNew: false + label: (Sales) + optionName: metric_3is69ofceho_6d0ezok7ry6 + sqlExpression: null order_desc: true queryFields: groupby: groupby @@ -60,14 +60,14 @@ params: show_legend: true stacked_style: stack time_grain_sqla: P1M - time_range: '2003-01-01T00:00:00 : 2005-06-01T00:00:00' + time_range: "2003-01-01T00:00:00 : 2005-06-01T00:00:00" url_params: {} - viz_type: area + viz_type: echarts_area x_axis_format: smart_date x_ticks_layout: auto y_axis_bounds: - - null - - null + - null + - null y_axis_format: SMART_NUMBER cache_timeout: null uuid: 08aff161-f60c-4cb3-a225-dc9b1140d2e3 diff --git a/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales.yaml b/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales.yaml index 9479fd9d3..a575c47be 100644 --- a/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales.yaml +++ b/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Quarterly Sales -viz_type: bar +viz_type: echarts_timeseries_bar params: adhoc_filters: [] annotation_layers: [] @@ -26,37 +26,37 @@ params: granularity_sqla: order_date groupby: [] label_colors: - Classic Cars: '#5AC189' - Motorcycles: '#666666' - Planes: '#FCC700' - QuantityOrdered: '#454E7C' - SUM(Sales): '#1FA8C9' - Ships: '#A868B7' - Trains: '#3CCCCB' - Trucks and Buses: '#E04355' - Vintage Cars: '#FF7F44' + Classic Cars: "#5AC189" + Motorcycles: "#666666" + Planes: "#FCC700" + QuantityOrdered: "#454E7C" + SUM(Sales): "#1FA8C9" + Ships: "#A868B7" + Trains: "#3CCCCB" + Trucks and Buses: "#E04355" + Vintage Cars: "#FF7F44" left_margin: auto line_interpolation: linear metrics: - - aggregate: SUM - column: - column_name: sales - description: null - expression: null - filterable: true - groupby: true - id: 917 - is_dttm: false - optionName: _col_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: false - isNew: false - label: SUM(Sales) - optionName: metric_tjn8bh6y44_7o4etwsqhal - sqlExpression: null + - aggregate: SUM + column: + column_name: sales + description: null + expression: null + filterable: true + groupby: true + id: 917 + is_dttm: false + optionName: _col_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: false + isNew: false + label: SUM(Sales) + optionName: metric_tjn8bh6y44_7o4etwsqhal + sqlExpression: null order_desc: true queryFields: groupby: groupby @@ -71,13 +71,13 @@ params: time_grain_sqla: P3M time_range: No filter url_params: {} - viz_type: bar - x_axis_format: '%m/%d/%Y' + viz_type: echarts_timeseries_bar + x_axis_format: "%m/%d/%Y" x_axis_label: Quarter starting x_ticks_layout: auto y_axis_bounds: - - null - - null + - null + - null y_axis_format: null y_axis_label: Total Sales cache_timeout: null diff --git a/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales_By_Product_Line.yaml b/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales_By_Product_Line.yaml index 35a135e81..7f5e039c8 100644 --- a/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales_By_Product_Line.yaml +++ b/superset/examples/configs/charts/Vehicle Sales/Quarterly_Sales_By_Product_Line.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Quarterly Sales (By Product Line) -viz_type: bar +viz_type: echarts_timeseries_bar params: adhoc_filters: [] annotation_layers: [] @@ -26,39 +26,39 @@ params: datasource: 23__table granularity_sqla: order_date groupby: - - product_line + - product_line label_colors: - Classic Cars: '#5AC189' - Motorcycles: '#666666' - Planes: '#FCC700' - QuantityOrdered: '#454E7C' - SUM(Sales): '#1FA8C9' - Ships: '#A868B7' - Trains: '#3CCCCB' - Trucks and Buses: '#E04355' - Vintage Cars: '#FF7F44' + Classic Cars: "#5AC189" + Motorcycles: "#666666" + Planes: "#FCC700" + QuantityOrdered: "#454E7C" + SUM(Sales): "#1FA8C9" + Ships: "#A868B7" + Trains: "#3CCCCB" + Trucks and Buses: "#E04355" + Vintage Cars: "#FF7F44" left_margin: auto line_interpolation: linear metrics: - - aggregate: SUM - column: - column_name: sales - description: null - expression: null - filterable: true - groupby: true - id: 917 - is_dttm: false - optionName: _col_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: false - isNew: false - label: SUM(Sales) - optionName: metric_tjn8bh6y44_7o4etwsqhal - sqlExpression: null + - aggregate: SUM + column: + column_name: sales + description: null + expression: null + filterable: true + groupby: true + id: 917 + is_dttm: false + optionName: _col_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: false + isNew: false + label: SUM(Sales) + optionName: metric_tjn8bh6y44_7o4etwsqhal + sqlExpression: null order_desc: true queryFields: groupby: groupby @@ -74,13 +74,13 @@ params: time_grain_sqla: P3M time_range: No filter url_params: {} - viz_type: bar - x_axis_format: '%m/%d/%Y' + viz_type: echarts_timeseries_bar + x_axis_format: "%m/%d/%Y" x_axis_label: Quarter starting x_ticks_layout: "45\xB0" y_axis_bounds: - - null - - null + - null + - null y_axis_format: null y_axis_label: Revenue ($) cache_timeout: null diff --git a/superset/examples/configs/charts/Vehicle Sales/Revenue_by_Deal_Size.yaml b/superset/examples/configs/charts/Vehicle Sales/Revenue_by_Deal_Size.yaml index 547d1804b..7ab51d2ef 100644 --- a/superset/examples/configs/charts/Vehicle Sales/Revenue_by_Deal_Size.yaml +++ b/superset/examples/configs/charts/Vehicle Sales/Revenue_by_Deal_Size.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Revenue by Deal Size -viz_type: bar +viz_type: echarts_timeseries_bar params: adhoc_filters: [] annotation_layers: [] @@ -27,30 +27,30 @@ params: datasource: 23__table granularity_sqla: order_date groupby: - - deal_size + - deal_size label_colors: {} left_margin: auto line_interpolation: linear metrics: - - aggregate: SUM - column: - column_name: sales - description: null - expression: null - filterable: true - groupby: true - id: 917 - is_dttm: false - optionName: _col_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: false - isNew: false - label: (Sales) - optionName: metric_3is69ofceho_6d0ezok7ry6 - sqlExpression: null + - aggregate: SUM + column: + column_name: sales + description: null + expression: null + filterable: true + groupby: true + id: 917 + is_dttm: false + optionName: _col_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: false + isNew: false + label: (Sales) + optionName: metric_3is69ofceho_6d0ezok7ry6 + sqlExpression: null order_desc: true queryFields: groupby: groupby @@ -61,14 +61,14 @@ params: show_brush: auto show_legend: true time_grain_sqla: P1M - time_range: '2003-01-01T00:00:00 : 2005-06-01T00:00:00' + time_range: "2003-01-01T00:00:00 : 2005-06-01T00:00:00" url_params: {} - viz_type: bar + viz_type: echarts_timeseries_bar x_axis_format: smart_date x_ticks_layout: auto y_axis_bounds: - - null - - null + - null + - null y_axis_format: SMART_NUMBER cache_timeout: null uuid: f065a533-2e13-42b9-bd19-801a21700dff diff --git a/superset/examples/configs/charts/Video Game Sales/Games_per_Genre_over_time.yaml b/superset/examples/configs/charts/Video Game Sales/Games_per_Genre_over_time.yaml index f3e61d694..d57f8f64c 100644 --- a/superset/examples/configs/charts/Video Game Sales/Games_per_Genre_over_time.yaml +++ b/superset/examples/configs/charts/Video Game Sales/Games_per_Genre_over_time.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Games per Genre over time -viz_type: line +viz_type: echarts_timeseries_line params: adhoc_filters: [] annotation_layers: [] @@ -26,64 +26,64 @@ params: datasource: 21__table granularity_sqla: year groupby: - - genre + - genre label_colors: - '0': '#1FA8C9' - '1': '#454E7C' - '2600': '#666666' - 3DO: '#B2B2B2' - 3DS: '#D1C6BC' - Action: '#1FA8C9' - Adventure: '#454E7C' - DC: '#A38F79' - DS: '#8FD3E4' - Europe: '#5AC189' - Fighting: '#5AC189' - GB: '#FDE380' - GBA: '#ACE1C4' - GC: '#5AC189' - GEN: '#3CCCCB' - GG: '#EFA1AA' - Japan: '#FF7F44' - Microsoft Game Studios: '#D1C6BC' - Misc: '#FF7F44' - N64: '#1FA8C9' - NES: '#9EE5E5' - NG: '#A1A6BD' - Nintendo: '#D3B3DA' - North America: '#666666' - Other: '#E04355' - PC: '#EFA1AA' - PCFX: '#FDE380' - PS: '#A1A6BD' - PS2: '#FCC700' - PS3: '#3CCCCB' - PS4: '#B2B2B2' - PSP: '#FEC0A1' - PSV: '#FCC700' - Platform: '#666666' - Puzzle: '#E04355' - Racing: '#FCC700' - Role-Playing: '#A868B7' - SAT: '#A868B7' - SCD: '#8FD3E4' - SNES: '#454E7C' - Shooter: '#3CCCCB' - Simulation: '#A38F79' - Sports: '#8FD3E4' - Strategy: '#A1A6BD' - TG16: '#FEC0A1' - Take-Two Interactive: '#9EE5E5' - WS: '#ACE1C4' - Wii: '#A38F79' - WiiU: '#E04355' - X360: '#A868B7' - XB: '#D3B3DA' - XOne: '#FF7F44' + "0": "#1FA8C9" + "1": "#454E7C" + "2600": "#666666" + 3DO: "#B2B2B2" + 3DS: "#D1C6BC" + Action: "#1FA8C9" + Adventure: "#454E7C" + DC: "#A38F79" + DS: "#8FD3E4" + Europe: "#5AC189" + Fighting: "#5AC189" + GB: "#FDE380" + GBA: "#ACE1C4" + GC: "#5AC189" + GEN: "#3CCCCB" + GG: "#EFA1AA" + Japan: "#FF7F44" + Microsoft Game Studios: "#D1C6BC" + Misc: "#FF7F44" + N64: "#1FA8C9" + NES: "#9EE5E5" + NG: "#A1A6BD" + Nintendo: "#D3B3DA" + North America: "#666666" + Other: "#E04355" + PC: "#EFA1AA" + PCFX: "#FDE380" + PS: "#A1A6BD" + PS2: "#FCC700" + PS3: "#3CCCCB" + PS4: "#B2B2B2" + PSP: "#FEC0A1" + PSV: "#FCC700" + Platform: "#666666" + Puzzle: "#E04355" + Racing: "#FCC700" + Role-Playing: "#A868B7" + SAT: "#A868B7" + SCD: "#8FD3E4" + SNES: "#454E7C" + Shooter: "#3CCCCB" + Simulation: "#A38F79" + Sports: "#8FD3E4" + Strategy: "#A1A6BD" + TG16: "#FEC0A1" + Take-Two Interactive: "#9EE5E5" + WS: "#ACE1C4" + Wii: "#A38F79" + WiiU: "#E04355" + X360: "#A868B7" + XB: "#D3B3DA" + XOne: "#FF7F44" left_margin: auto line_interpolation: linear metrics: - - count + - count order_desc: true queryFields: groupby: groupby @@ -98,18 +98,19 @@ params: time_grain_sqla: null time_range: No filter url_params: - preselect_filters: '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": + preselect_filters: + '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": null, "__time_range": "No filter"}}' - viz_type: line + viz_type: echarts_timeseries_line x_axis_format: smart_date x_axis_label: Year Published x_axis_showminmax: true x_ticks_layout: auto y_axis_bounds: - - null - - null + - null + - null y_axis_format: SMART_NUMBER - y_axis_label: '# of Games Published' + y_axis_label: "# of Games Published" y_axis_showminmax: true cache_timeout: null uuid: 0f8976aa-7bb4-40c7-860b-64445a51aaaf diff --git a/superset/examples/configs/charts/Video Game Sales/Popular_Genres_Across_Platforms.yaml b/superset/examples/configs/charts/Video Game Sales/Popular_Genres_Across_Platforms.yaml index a0a111d8d..f73b29c83 100644 --- a/superset/examples/configs/charts/Video Game Sales/Popular_Genres_Across_Platforms.yaml +++ b/superset/examples/configs/charts/Video Game Sales/Popular_Genres_Across_Platforms.yaml @@ -15,34 +15,33 @@ # specific language governing permissions and limitations # under the License. slice_name: Popular Genres Across Platforms -viz_type: heatmap +viz_type: heatmap_v2 params: adhoc_filters: [] - all_columns_x: platform - all_columns_y: genre + x_axis: platform + groupby: genre bottom_margin: auto - canvas_image_rendering: pixelated datasource: 64__table granularity_sqla: year left_margin: auto linear_color_scheme: blue_white_yellow metric: count - normalize_across: heatmap + normalize_across: heatmap_v2 queryFields: metric: metrics row_limit: 10000 show_legend: true - show_perc: true + show_percentage: true show_values: true sort_x_axis: alpha_asc sort_y_axis: alpha_asc time_range: No filter url_params: {} - viz_type: heatmap + viz_type: heatmap_v2 xscale_interval: null - y_axis_bounds: - - null - - null + value_bounds: + - null + - null y_axis_format: SMART_NUMBER yscale_interval: null cache_timeout: null diff --git a/superset/examples/configs/charts/Video Game Sales/Rise__Fall_of_Video_Game_Consoles.yaml b/superset/examples/configs/charts/Video Game Sales/Rise__Fall_of_Video_Game_Consoles.yaml index 1e73b329c..b370ba6db 100644 --- a/superset/examples/configs/charts/Video Game Sales/Rise__Fall_of_Video_Game_Consoles.yaml +++ b/superset/examples/configs/charts/Video Game Sales/Rise__Fall_of_Video_Game_Consoles.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Rise & Fall of Video Game Consoles -viz_type: area +viz_type: echarts_area params: adhoc_filters: [] annotation_layers: [] @@ -26,81 +26,81 @@ params: datasource: 21__table granularity_sqla: year groupby: - - platform + - platform label_colors: - '0': '#1FA8C9' - '1': '#454E7C' - '2600': '#666666' - 3DO: '#B2B2B2' - 3DS: '#D1C6BC' - Action: '#1FA8C9' - Adventure: '#454E7C' - DC: '#A38F79' - DS: '#8FD3E4' - Europe: '#5AC189' - Fighting: '#5AC189' - GB: '#FDE380' - GBA: '#ACE1C4' - GC: '#5AC189' - GEN: '#3CCCCB' - GG: '#EFA1AA' - Japan: '#FF7F44' - Microsoft Game Studios: '#D1C6BC' - Misc: '#FF7F44' - N64: '#1FA8C9' - NES: '#9EE5E5' - NG: '#A1A6BD' - Nintendo: '#D3B3DA' - North America: '#666666' - Other: '#E04355' - PC: '#EFA1AA' - PCFX: '#FDE380' - PS: '#A1A6BD' - PS2: '#FCC700' - PS3: '#3CCCCB' - PS4: '#B2B2B2' - PSP: '#FEC0A1' - PSV: '#FCC700' - Platform: '#666666' - Puzzle: '#E04355' - Racing: '#FCC700' - Role-Playing: '#A868B7' - SAT: '#A868B7' - SCD: '#8FD3E4' - SNES: '#454E7C' - Shooter: '#3CCCCB' - Simulation: '#A38F79' - Sports: '#8FD3E4' - Strategy: '#A1A6BD' - TG16: '#FEC0A1' - Take-Two Interactive: '#9EE5E5' - WS: '#ACE1C4' - Wii: '#A38F79' - WiiU: '#E04355' - X360: '#A868B7' - XB: '#D3B3DA' - XOne: '#FF7F44' + "0": "#1FA8C9" + "1": "#454E7C" + "2600": "#666666" + 3DO: "#B2B2B2" + 3DS: "#D1C6BC" + Action: "#1FA8C9" + Adventure: "#454E7C" + DC: "#A38F79" + DS: "#8FD3E4" + Europe: "#5AC189" + Fighting: "#5AC189" + GB: "#FDE380" + GBA: "#ACE1C4" + GC: "#5AC189" + GEN: "#3CCCCB" + GG: "#EFA1AA" + Japan: "#FF7F44" + Microsoft Game Studios: "#D1C6BC" + Misc: "#FF7F44" + N64: "#1FA8C9" + NES: "#9EE5E5" + NG: "#A1A6BD" + Nintendo: "#D3B3DA" + North America: "#666666" + Other: "#E04355" + PC: "#EFA1AA" + PCFX: "#FDE380" + PS: "#A1A6BD" + PS2: "#FCC700" + PS3: "#3CCCCB" + PS4: "#B2B2B2" + PSP: "#FEC0A1" + PSV: "#FCC700" + Platform: "#666666" + Puzzle: "#E04355" + Racing: "#FCC700" + Role-Playing: "#A868B7" + SAT: "#A868B7" + SCD: "#8FD3E4" + SNES: "#454E7C" + Shooter: "#3CCCCB" + Simulation: "#A38F79" + Sports: "#8FD3E4" + Strategy: "#A1A6BD" + TG16: "#FEC0A1" + Take-Two Interactive: "#9EE5E5" + WS: "#ACE1C4" + Wii: "#A38F79" + WiiU: "#E04355" + X360: "#A868B7" + XB: "#D3B3DA" + XOne: "#FF7F44" line_interpolation: linear metrics: - - aggregate: SUM - column: - column_name: global_sales - description: null - expression: null - filterable: true - groupby: true - id: 887 - is_dttm: false - optionName: _col_Global_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: false - isNew: false - label: SUM(Global_Sales) - optionName: metric_ufl75addr8c_oqqhdumirpn - sqlExpression: null + - aggregate: SUM + column: + column_name: global_sales + description: null + expression: null + filterable: true + groupby: true + id: 887 + is_dttm: false + optionName: _col_Global_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: false + isNew: false + label: SUM(Global_Sales) + optionName: metric_ufl75addr8c_oqqhdumirpn + sqlExpression: null order_desc: true queryFields: groupby: groupby @@ -115,16 +115,17 @@ params: time_grain_sqla: null time_range: No filter url_params: - preselect_filters: '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": + preselect_filters: + '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": null, "__time_range": "No filter"}}' - viz_type: area + viz_type: echarts_area x_axis_format: smart_date x_axis_label: Year Published x_axis_showminmax: true x_ticks_layout: auto y_axis_bounds: - - null - - null + - null + - null y_axis_format: SMART_NUMBER cache_timeout: null uuid: 83b0e2d0-d38b-d980-ed8e-e1c9846361b6 diff --git a/superset/examples/configs/charts/Video Game Sales/Top_10_Games_Proportion_of_Sales_in_Markets.yaml b/superset/examples/configs/charts/Video Game Sales/Top_10_Games_Proportion_of_Sales_in_Markets.yaml index d8a80afae..344122d25 100644 --- a/superset/examples/configs/charts/Video Game Sales/Top_10_Games_Proportion_of_Sales_in_Markets.yaml +++ b/superset/examples/configs/charts/Video Game Sales/Top_10_Games_Proportion_of_Sales_in_Markets.yaml @@ -14,19 +14,19 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -slice_name: 'Top 10 Games: Proportion of Sales in Markets' -viz_type: dist_bar +slice_name: "Top 10 Games: Proportion of Sales in Markets" +viz_type: echarts_timeseries_bar params: adhoc_filters: - - clause: WHERE - comparator: '10' - expressionType: SIMPLE - filterOptionName: filter_juemdnqji5_d6fm8tuf4rc - isExtra: false - isNew: false - operator: <= - sqlExpression: null - subject: rank + - clause: WHERE + comparator: "10" + expressionType: SIMPLE + filterOptionName: filter_juemdnqji5_d6fm8tuf4rc + isExtra: false + isNew: false + operator: <= + sqlExpression: null + subject: rank bar_stacked: true bottom_margin: auto color_scheme: supersetColors @@ -35,85 +35,85 @@ params: datasource: 21__table granularity_sqla: year groupby: - - name + - name label_colors: {} metrics: - - aggregate: SUM - column: - column_name: na_sales - description: null - expression: null - filterable: true - groupby: true - id: 883 - is_dttm: false - optionName: _col_NA_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: North America - optionName: metric_a943v7wg5g_0mm03hrsmpf - sqlExpression: null - - aggregate: SUM - column: - column_name: eu_sales - description: null - expression: null - filterable: true - groupby: true - id: 884 - is_dttm: false - optionName: _col_EU_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Europe - optionName: metric_bibau54x0rb_dwrjtqkbyso - sqlExpression: null - - aggregate: SUM - column: - column_name: jp_sales - description: null - expression: null - filterable: true - groupby: true - id: 885 - is_dttm: false - optionName: _col_JP_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Japan - optionName: metric_06whpr2oyhw_4l88xxu6zvd - sqlExpression: null - - aggregate: SUM - column: - column_name: other_sales - description: null - expression: null - filterable: true - groupby: true - id: 886 - is_dttm: false - optionName: _col_Other_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Other - optionName: metric_pcx05ioxums_ibr16zvi74 - sqlExpression: null + - aggregate: SUM + column: + column_name: na_sales + description: null + expression: null + filterable: true + groupby: true + id: 883 + is_dttm: false + optionName: _col_NA_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: North America + optionName: metric_a943v7wg5g_0mm03hrsmpf + sqlExpression: null + - aggregate: SUM + column: + column_name: eu_sales + description: null + expression: null + filterable: true + groupby: true + id: 884 + is_dttm: false + optionName: _col_EU_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Europe + optionName: metric_bibau54x0rb_dwrjtqkbyso + sqlExpression: null + - aggregate: SUM + column: + column_name: jp_sales + description: null + expression: null + filterable: true + groupby: true + id: 885 + is_dttm: false + optionName: _col_JP_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Japan + optionName: metric_06whpr2oyhw_4l88xxu6zvd + sqlExpression: null + - aggregate: SUM + column: + column_name: other_sales + description: null + expression: null + filterable: true + groupby: true + id: 886 + is_dttm: false + optionName: _col_Other_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Other + optionName: metric_pcx05ioxums_ibr16zvi74 + sqlExpression: null queryFields: columns: groupby groupby: groupby @@ -123,7 +123,7 @@ params: slice_id: 3546 time_range: No filter url_params: {} - viz_type: dist_bar + viz_type: echarts_timeseries_bar x_ticks_layout: staggered y_axis_format: SMART_NUMBER cache_timeout: null diff --git a/superset/examples/configs/charts/Video Game Sales/Total_Sales_per_Market_Grouped_by_Genre.yaml b/superset/examples/configs/charts/Video Game Sales/Total_Sales_per_Market_Grouped_by_Genre.yaml index 196631386..78ddf4bbe 100644 --- a/superset/examples/configs/charts/Video Game Sales/Total_Sales_per_Market_Grouped_by_Genre.yaml +++ b/superset/examples/configs/charts/Video Game Sales/Total_Sales_per_Market_Grouped_by_Genre.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. slice_name: Total Sales per Market (Grouped by Genre) -viz_type: dist_bar +viz_type: echarts_timeseries_bar params: adhoc_filters: [] bar_stacked: true @@ -26,137 +26,137 @@ params: datasource: 21__table granularity_sqla: year groupby: - - genre + - genre label_colors: - '0': '#1FA8C9' - '1': '#454E7C' - '2600': '#666666' - 3DO: '#B2B2B2' - 3DS: '#D1C6BC' - Action: '#1FA8C9' - Adventure: '#454E7C' - DC: '#A38F79' - DS: '#8FD3E4' - Europe: '#5AC189' - Fighting: '#5AC189' - GB: '#FDE380' - GBA: '#ACE1C4' - GC: '#5AC189' - GEN: '#3CCCCB' - GG: '#EFA1AA' - Japan: '#FF7F44' - Microsoft Game Studios: '#D1C6BC' - Misc: '#FF7F44' - N64: '#1FA8C9' - NES: '#9EE5E5' - NG: '#A1A6BD' - Nintendo: '#D3B3DA' - North America: '#666666' - Other: '#E04355' - PC: '#EFA1AA' - PCFX: '#FDE380' - PS: '#A1A6BD' - PS2: '#FCC700' - PS3: '#3CCCCB' - PS4: '#B2B2B2' - PSP: '#FEC0A1' - PSV: '#FCC700' - Platform: '#666666' - Puzzle: '#E04355' - Racing: '#FCC700' - Role-Playing: '#A868B7' - SAT: '#A868B7' - SCD: '#8FD3E4' - SNES: '#454E7C' - Shooter: '#3CCCCB' - Simulation: '#A38F79' - Sports: '#8FD3E4' - Strategy: '#A1A6BD' - TG16: '#FEC0A1' - Take-Two Interactive: '#9EE5E5' - WS: '#ACE1C4' - Wii: '#A38F79' - WiiU: '#E04355' - X360: '#A868B7' - XB: '#D3B3DA' - XOne: '#FF7F44' + "0": "#1FA8C9" + "1": "#454E7C" + "2600": "#666666" + 3DO: "#B2B2B2" + 3DS: "#D1C6BC" + Action: "#1FA8C9" + Adventure: "#454E7C" + DC: "#A38F79" + DS: "#8FD3E4" + Europe: "#5AC189" + Fighting: "#5AC189" + GB: "#FDE380" + GBA: "#ACE1C4" + GC: "#5AC189" + GEN: "#3CCCCB" + GG: "#EFA1AA" + Japan: "#FF7F44" + Microsoft Game Studios: "#D1C6BC" + Misc: "#FF7F44" + N64: "#1FA8C9" + NES: "#9EE5E5" + NG: "#A1A6BD" + Nintendo: "#D3B3DA" + North America: "#666666" + Other: "#E04355" + PC: "#EFA1AA" + PCFX: "#FDE380" + PS: "#A1A6BD" + PS2: "#FCC700" + PS3: "#3CCCCB" + PS4: "#B2B2B2" + PSP: "#FEC0A1" + PSV: "#FCC700" + Platform: "#666666" + Puzzle: "#E04355" + Racing: "#FCC700" + Role-Playing: "#A868B7" + SAT: "#A868B7" + SCD: "#8FD3E4" + SNES: "#454E7C" + Shooter: "#3CCCCB" + Simulation: "#A38F79" + Sports: "#8FD3E4" + Strategy: "#A1A6BD" + TG16: "#FEC0A1" + Take-Two Interactive: "#9EE5E5" + WS: "#ACE1C4" + Wii: "#A38F79" + WiiU: "#E04355" + X360: "#A868B7" + XB: "#D3B3DA" + XOne: "#FF7F44" metrics: - - aggregate: SUM - column: - column_name: na_sales - description: null - expression: null - filterable: true - groupby: true - id: 883 - is_dttm: false - optionName: _col_NA_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: North America - optionName: metric_3pl6jwmyd72_p9o4j2xxgyp - sqlExpression: null - - aggregate: SUM - column: - column_name: eu_sales - description: null - expression: null - filterable: true - groupby: true - id: 884 - is_dttm: false - optionName: _col_EU_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Europe - optionName: metric_e8rdyfxxjdu_6dgyhf7xcne - sqlExpression: null - - aggregate: SUM - column: - column_name: jp_sales - description: null - expression: null - filterable: true - groupby: true - id: 885 - is_dttm: false - optionName: _col_JP_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Japan - optionName: metric_6gesefugzy6_517l3wowdwu - sqlExpression: null - - aggregate: SUM - column: - column_name: other_sales - description: null - expression: null - filterable: true - groupby: true - id: 886 - is_dttm: false - optionName: _col_Other_Sales - python_date_format: null - type: DOUBLE PRECISION - verbose_name: null - expressionType: SIMPLE - hasCustomLabel: true - isNew: false - label: Other - optionName: metric_cf6kbre28f_2sg5b5pfq5a - sqlExpression: null + - aggregate: SUM + column: + column_name: na_sales + description: null + expression: null + filterable: true + groupby: true + id: 883 + is_dttm: false + optionName: _col_NA_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: North America + optionName: metric_3pl6jwmyd72_p9o4j2xxgyp + sqlExpression: null + - aggregate: SUM + column: + column_name: eu_sales + description: null + expression: null + filterable: true + groupby: true + id: 884 + is_dttm: false + optionName: _col_EU_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Europe + optionName: metric_e8rdyfxxjdu_6dgyhf7xcne + sqlExpression: null + - aggregate: SUM + column: + column_name: jp_sales + description: null + expression: null + filterable: true + groupby: true + id: 885 + is_dttm: false + optionName: _col_JP_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Japan + optionName: metric_6gesefugzy6_517l3wowdwu + sqlExpression: null + - aggregate: SUM + column: + column_name: other_sales + description: null + expression: null + filterable: true + groupby: true + id: 886 + is_dttm: false + optionName: _col_Other_Sales + python_date_format: null + type: DOUBLE PRECISION + verbose_name: null + expressionType: SIMPLE + hasCustomLabel: true + isNew: false + label: Other + optionName: metric_cf6kbre28f_2sg5b5pfq5a + sqlExpression: null order_bars: false queryFields: columns: groupby @@ -169,9 +169,10 @@ params: slice_id: 3548 time_range: No filter url_params: - preselect_filters: '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": + preselect_filters: + '{"1389": {"platform": ["PS", "PS2", "PS3", "PS4"], "genre": null, "__time_range": "No filter"}}' - viz_type: dist_bar + viz_type: echarts_timeseries_bar x_axis_label: Genre x_ticks_layout: flat y_axis_format: SMART_NUMBER diff --git a/superset/examples/energy.py b/superset/examples/energy.py index d7e46ec5d..8ec066bc2 100644 --- a/superset/examples/energy.py +++ b/superset/examples/energy.py @@ -29,6 +29,7 @@ from superset.utils.core import DatasourceType from .helpers import ( get_example_url, + get_slice_json, get_table_connector_registry, merge_slice, misc_dash_slices, @@ -81,21 +82,19 @@ def load_energy( slc = Slice( slice_name="Energy Sankey", - viz_type="sankey", + viz_type="sankey_v2", datasource_type=DatasourceType.TABLE, datasource_id=tbl.id, params=textwrap.dedent( """\ { "collapsed_fieldsets": "", - "groupby": [ - "source", - "target" - ], + "source": "source", + "target": "target", "metric": "sum__value", "row_limit": "5000", "slice_name": "Energy Sankey", - "viz_type": "sankey" + "viz_type": "sankey_v2" } """ ), @@ -129,25 +128,18 @@ def load_energy( slc = Slice( slice_name="Heatmap", - viz_type="heatmap", + viz_type="heatmap_v2", datasource_type=DatasourceType.TABLE, datasource_id=tbl.id, - params=textwrap.dedent( - """\ - { - "all_columns_x": "source", - "all_columns_y": "target", - "canvas_image_rendering": "pixelated", - "collapsed_fieldsets": "", - "linear_color_scheme": "blue_white_yellow", - "metric": "sum__value", - "normalize_across": "heatmap", - "slice_name": "Heatmap", - "viz_type": "heatmap", - "xscale_interval": "1", - "yscale_interval": "1" - } - """ + params=get_slice_json( + defaults={}, + viz_type="heatmap_v2", + x_axis="source", + groupby="target", + legend_type="continuous", + metric="sum__value", + sort_x_axis="value_asc", + sort_y_axis="value_asc", ), ) misc_dash_slices.add(slc.slice_name) diff --git a/superset/examples/supported_charts_dashboard.py b/superset/examples/supported_charts_dashboard.py index c605bf88c..c620379a9 100644 --- a/superset/examples/supported_charts_dashboard.py +++ b/superset/examples/supported_charts_dashboard.py @@ -124,7 +124,7 @@ def create_slices(tbl: SqlaTable) -> list[Slice]: ), Slice( **slice_kwargs, - slice_name="Bar Chart V2", + slice_name="Bar Chart", viz_type="echarts_timeseries_bar", params=get_slice_json( defaults, @@ -156,17 +156,6 @@ def create_slices(tbl: SqlaTable) -> list[Slice]: adhoc_filters=[], ), ), - Slice( - **slice_kwargs, - slice_name="Bar Chart", - viz_type="dist_bar", - params=get_slice_json( - defaults, - viz_type="dist_bar", - metrics=["sum__num"], - groupby=["gender"], - ), - ), # --------------------- # TIER 2 # --------------------- @@ -304,13 +293,15 @@ def create_slices(tbl: SqlaTable) -> list[Slice]: Slice( **slice_kwargs, slice_name="Heatmap Chart", - viz_type="heatmap", + viz_type="heatmap_v2", params=get_slice_json( defaults, - viz_type="funnel", + viz_type="heatmap_v2", metric="sum__num", - all_columns_x="gender", - all_columns_y="state", + x_axis="gender", + groupby="state", + sort_x_axis="value_asc", + sort_y_axis="value_asc", ), ), Slice( @@ -385,12 +376,13 @@ def create_slices(tbl: SqlaTable) -> list[Slice]: Slice( **slice_kwargs, slice_name="Sankey Chart", - viz_type="sankey", + viz_type="sankey_v2", params=get_slice_json( defaults, - viz_type="sankey", + viz_type="sankey_v2", metric="sum__num", - groupby=["gender", "state"], + source="gender", + target="state", ), ), Slice( @@ -561,7 +553,7 @@ def load_supported_charts_dashboard() -> None: "meta": { "chartId": 6, "height": 50, - "sliceName": "Bar Chart V2", + "sliceName": "Bar Chart", "width": 4 }, "type": "CHART" @@ -617,23 +609,6 @@ def load_supported_charts_dashboard() -> None: }, "type": "CHART" }, - "CHART-10": { - "children": [], - "parents": [ - "ROOT_ID", - "TABS-TOP", - "TAB-TOP-1", - "ROW-4" - ], - "id": "CHART-10", - "meta": { - "chartId": 10, - "height": 50, - "sliceName": "Bar Chart", - "width": 4 - }, - "type": "CHART" - }, "CHART-11": { "children": [], "parents": [ diff --git a/superset/examples/world_bank.py b/superset/examples/world_bank.py index a9c06dfa2..f86b0ecbe 100644 --- a/superset/examples/world_bank.py +++ b/superset/examples/world_bank.py @@ -192,12 +192,12 @@ def create_slices(tbl: BaseDatasource) -> list[Slice]: ), Slice( slice_name="Growth Rate", - viz_type="line", + viz_type="echarts_timeseries_line", datasource_type=DatasourceType.TABLE, datasource_id=tbl.id, params=get_slice_json( defaults, - viz_type="line", + viz_type="echarts_timeseries_line", since="1960-01-01", metrics=["sum__SP_POP_TOTL"], num_period_compare="10", @@ -278,14 +278,14 @@ def create_slices(tbl: BaseDatasource) -> list[Slice]: ), Slice( slice_name="World's Pop Growth", - viz_type="area", + viz_type="echarts_area", datasource_type=DatasourceType.TABLE, datasource_id=tbl.id, params=get_slice_json( defaults, since="1960-01-01", until="now", - viz_type="area", + viz_type="echarts_area", groupby=["region"], metrics=metrics, ), diff --git a/superset/migrations/versions/2025-01-08_09-34_d482d51c15ca_remove_legacy_plugins_5_0.py b/superset/migrations/versions/2025-01-08_09-34_d482d51c15ca_remove_legacy_plugins_5_0.py new file mode 100644 index 000000000..22b174cf3 --- /dev/null +++ b/superset/migrations/versions/2025-01-08_09-34_d482d51c15ca_remove_legacy_plugins_5_0.py @@ -0,0 +1,78 @@ +# 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. +"""remove_legacy_plugins_5_0 + +Revision ID: d482d51c15ca +Revises: eb1c288c71c4 +Create Date: 2025-01-08 09:34:57.533332 + +""" + +from alembic import op + +from superset import db +from superset.migrations.shared.migrate_viz.processors import ( + MigrateAreaChart, + MigrateBarChart, + MigrateDistBarChart, + MigrateHeatmapChart, + MigrateHistogramChart, + MigrateLineChart, + MigrateSankey, +) + +# revision identifiers, used by Alembic. +revision = "d482d51c15ca" +down_revision = "eb1c288c71c4" + + +def upgrade(): + bind = op.get_bind() + session = db.Session(bind=bind) + try: + MigrateAreaChart.upgrade(session) + MigrateBarChart.upgrade(session) + MigrateDistBarChart.upgrade(session) + MigrateHeatmapChart.upgrade(session) + MigrateHistogramChart.upgrade(session) + MigrateLineChart.upgrade(session) + MigrateSankey.upgrade(session) + session.commit() + except Exception as e: + session.rollback() + raise Exception(f"Error upgrading legacy viz types: {e}") from e + finally: + session.close() + + +def downgrade(): + bind = op.get_bind() + session = db.Session(bind=bind) + try: + MigrateAreaChart.downgrade(session) + MigrateBarChart.downgrade(session) + MigrateDistBarChart.downgrade(session) + MigrateHeatmapChart.downgrade(session) + MigrateHistogramChart.downgrade(session) + MigrateLineChart.downgrade(session) + MigrateSankey.downgrade(session) + session.commit() + except Exception as e: + session.rollback() + raise Exception(f"Error downgrading legacy viz types: {e}") from e + finally: + session.close() diff --git a/superset/viz.py b/superset/viz.py index a8f9e7664..7e13402f6 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -27,7 +27,6 @@ import copy import dataclasses import logging import math -import re from collections import defaultdict, OrderedDict from datetime import datetime, timedelta from itertools import product @@ -46,7 +45,6 @@ from pandas.tseries.frequencies import to_offset from superset import app from superset.common.db_query_status import QueryStatus -from superset.constants import NULL_STRING from superset.errors import ErrorLevel, SupersetError, SupersetErrorType from superset.exceptions import ( CacheLoadError, @@ -632,9 +630,11 @@ class BaseViz: # pylint: disable=too-many-public-methods "stacktrace": stacktrace, "rowcount": len(df.index) if df is not None else 0, "colnames": list(df.columns) if df is not None else None, - "coltypes": utils.extract_dataframe_dtypes(df, self.datasource) - if df is not None - else None, + "coltypes": ( + utils.extract_dataframe_dtypes(df, self.datasource) + if df is not None + else None + ), } @staticmethod @@ -1121,14 +1121,6 @@ class NVD3TimeSeriesViz(NVD3Viz): return chart_data -class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz): - """A bar chart where the x axis is time""" - - viz_type = "bar" - sort_series = True - verbose_name = _("Time Series - Bar Chart") - - class NVD3TimePivotViz(NVD3TimeSeriesViz): """Time Series - Periodicity Pivot""" @@ -1184,235 +1176,6 @@ class NVD3CompareTimeSeriesViz(NVD3TimeSeriesViz): verbose_name = _("Time Series - Percent Change") -class NVD3TimeSeriesStackedViz(NVD3TimeSeriesViz): - """A rich stack area chart""" - - viz_type = "area" - verbose_name = _("Time Series - Stacked") - sort_series = True - pivot_fill_value = 0 - - -class HistogramViz(BaseViz): - """Histogram""" - - viz_type = "histogram" - verbose_name = _("Histogram") - is_timeseries = False - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - """Returns the query object for this visualization""" - query_obj = super().query_obj() - numeric_columns = self.form_data.get("all_columns_x") - if numeric_columns is None: - raise QueryObjectValidationError( - _("Must have at least one numeric column specified") - ) - self.columns = ( # pylint: disable=attribute-defined-outside-init - numeric_columns - ) - query_obj["columns"] = numeric_columns + self.groupby - # override groupby entry to avoid aggregation - query_obj["groupby"] = None - query_obj["metrics"] = None - return query_obj - - @deprecated(deprecated_in="3.0") - def labelify(self, keys: list[str] | str, column: str) -> str: - if isinstance(keys, str): - keys = [keys] - # removing undesirable characters - labels = [re.sub(r"\W+", r"_", k) for k in keys] - if len(self.columns) > 1 or not self.groupby: - # Only show numeric column in label if there are many - labels = [column] + labels - return "__".join(labels) - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: - """Returns the chart data""" - if df.empty: - return None - - chart_data = [] - if len(self.groupby) > 0: - groups = df.groupby(get_column_names(self.groupby)) - else: - groups = [((), df)] - for keys, data in groups: - chart_data.extend( - [ - { - "key": self.labelify(keys, get_column_name(column)), - "values": data[get_column_name(column)].tolist(), - } - for column in self.columns - ] - ) - return chart_data - - -class DistributionBarViz(BaseViz): - """A good old bar chart""" - - viz_type = "dist_bar" - verbose_name = _("Distribution - Bar Chart") - is_timeseries = False - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - query_obj = super().query_obj() - if len(query_obj["groupby"]) < len(self.form_data.get("groupby") or []) + len( - self.form_data.get("columns") or [] - ): - raise QueryObjectValidationError( - _("Can't have overlap between Series and Breakdowns") - ) - if not self.form_data.get("metrics"): - raise QueryObjectValidationError(_("Pick at least one metric")) - if not self.form_data.get("groupby"): - raise QueryObjectValidationError(_("Pick at least one field for [Series]")) - - if sort_by := self.form_data.get("timeseries_limit_metric"): - sort_by_label = utils.get_metric_name(sort_by) - if sort_by_label not in utils.get_metric_names(query_obj["metrics"]): - query_obj["metrics"].append(sort_by) - query_obj["orderby"] = [ - (sort_by, not self.form_data.get("order_desc", True)) - ] - elif query_obj["metrics"]: - # Legacy behavior of sorting by first metric by default - first_metric = query_obj["metrics"][0] - query_obj["orderby"] = [ - (first_metric, not self.form_data.get("order_desc", True)) - ] - - return query_obj - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: # pylint: disable=too-many-locals - if df.empty: - return None - - metrics = self.metric_labels - columns = get_column_names(self.form_data.get("columns")) - groupby = get_column_names(self.groupby) - - # pandas will throw away nulls when grouping/pivoting, - # so we substitute NULL_STRING for any nulls in the necessary columns - filled_cols = groupby + columns - df = df.copy() - df[filled_cols] = df[filled_cols].fillna(value=NULL_STRING) - - sortby = utils.get_metric_name( - self.form_data.get("timeseries_limit_metric") or metrics[0] - ) - row = df.groupby(groupby)[sortby].sum().copy() - is_asc = not self.form_data.get("order_desc") - row.sort_values(ascending=is_asc, inplace=True) - pt = df.pivot_table(index=groupby, columns=columns, values=metrics) - if self.form_data.get("contribution"): - pt = pt.T - pt = (pt / pt.sum()).T - pt = pt.reindex(row.index) - - # Re-order the columns adhering to the metric ordering. - pt = pt[metrics] - chart_data = [] - for name, ys in pt.items(): - if pt[name].dtype.kind not in "biufc" or name in groupby: - continue - if isinstance(name, str): - series_title = name - else: - offset = 0 if len(metrics) > 1 else 1 - series_title = ", ".join([str(s) for s in name[offset:]]) - values = [] - for i, v in ys.items(): - x = i - if isinstance(x, (tuple, list)): - x = ", ".join([str(s) for s in x]) - else: - x = str(x) - values.append({"x": x, "y": v}) - chart_data.append({"key": series_title, "values": values}) - return chart_data - - -class SankeyViz(BaseViz): - """A Sankey diagram that requires a parent-child dataset""" - - viz_type = "sankey" - verbose_name = _("Sankey") - is_timeseries = False - credits = 'd3-sankey on npm' - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - query_obj = super().query_obj() - if len(query_obj["groupby"]) != 2: - raise QueryObjectValidationError( - _("Pick exactly 2 columns as [Source / Target]") - ) - query_obj["metrics"] = [self.form_data["metric"]] - if self.form_data.get("sort_by_metric", False): - query_obj["orderby"] = [(query_obj["metrics"][0], False)] - return query_obj - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: - if df.empty: - return None - source, target = get_column_names(self.groupby) - (value,) = self.metric_labels - df.rename( - columns={ - source: "source", - target: "target", - value: "value", - }, - inplace=True, - ) - df["source"] = df["source"].astype(str) - df["target"] = df["target"].astype(str) - recs = df.to_dict(orient="records") - - hierarchy: dict[str, set[str]] = defaultdict(set) - for row in recs: - hierarchy[row["source"]].add(row["target"]) - - @deprecated(deprecated_in="3.0") - def find_cycle(graph: dict[str, set[str]]) -> tuple[str, str] | None: - """Whether there's a cycle in a directed graph""" - path = set() - - @deprecated(deprecated_in="3.0") - def visit(vertex: str) -> tuple[str, str] | None: - path.add(vertex) - for neighbour in graph.get(vertex, ()): - if neighbour in path or visit(neighbour): - return (vertex, neighbour) - path.remove(vertex) - return None - - for vertex in graph: - cycle = visit(vertex) - if cycle: - return cycle - return None - - cycle = find_cycle(hierarchy) - if cycle: - raise QueryObjectValidationError( - _( - "There's a loop in your Sankey, please provide a tree. " - "Here's a faulty link: {}" - ).format(cycle) - ) - return recs - - class ChordViz(BaseViz): """A Chord diagram""" @@ -1586,65 +1349,6 @@ class ParallelCoordinatesViz(BaseViz): return df.to_dict(orient="records") -class HeatmapViz(BaseViz): - """A nice heatmap visualization that support high density through canvas""" - - viz_type = "heatmap" - verbose_name = _("Heatmap") - is_timeseries = False - credits = ( - 'inspired from mbostock @' - "bl.ocks.org" - ) - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - query_obj = super().query_obj() - query_obj["metrics"] = [self.form_data.get("metric")] - query_obj["groupby"] = [ - self.form_data.get("all_columns_x"), - self.form_data.get("all_columns_y"), - ] - - if self.form_data.get("sort_by_metric", False): - query_obj["orderby"] = [(query_obj["metrics"][0], False)] - - return query_obj - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: - if df.empty: - return None - - x = get_column_name(self.form_data.get("all_columns_x")) # type: ignore - y = get_column_name(self.form_data.get("all_columns_y")) # type: ignore - v = self.metric_labels[0] - if x == y: - df.columns = ["x", "y", "v"] - else: - df = df[[x, y, v]] - df.columns = ["x", "y", "v"] - norm = self.form_data.get("normalize_across") - overall = False - max_ = df.v.max() - min_ = df.v.min() - if norm == "heatmap": - overall = True - else: - gb = df.groupby(norm, group_keys=False) - if len(gb) <= 1: - overall = True - else: - df["perc"] = gb.apply( - lambda x: (x.v - x.v.min()) / (x.v.max() - x.v.min()) - ) - df["rank"] = gb.apply(lambda x: x.v.rank(pct=True)) - if overall: - df["perc"] = (df.v - min_) / (max_ - min_) - df["rank"] = df.v.rank(pct=True) - return {"records": df.to_dict(orient="records"), "extents": [min_, max_]} - - class HorizonViz(NVD3TimeSeriesViz): """Horizon chart @@ -2041,11 +1745,13 @@ class DeckScatterViz(BaseDeckGLViz): def get_properties(self, data: dict[str, Any]) -> dict[str, Any]: return { "metric": data.get(self.metric_label) if self.metric_label else None, - "radius": self.fixed_value - if self.fixed_value - else data.get(self.metric_label) - if self.metric_label - else None, + "radius": ( + self.fixed_value + if self.fixed_value + else data.get(self.metric_label) + if self.metric_label + else None + ), "cat_color": data.get(self.dim) if self.dim else None, "position": data.get("spatial"), DTTM_ALIAS: data.get(DTTM_ALIAS), diff --git a/tests/unit_tests/models/core_test.py b/tests/unit_tests/models/core_test.py index 36ce618f8..7722578a1 100644 --- a/tests/unit_tests/models/core_test.py +++ b/tests/unit_tests/models/core_test.py @@ -728,13 +728,13 @@ def test_compile_sqla_query_no_optimization(query: Select) -> None: ) space = " " - + # assert ( database.compile_sqla_query(query, is_virtual=True) == f"""SELECT anon_1.a, anon_1.b{space} FROM (SELECT some_table.a AS a, some_table.b AS b, some_table.c AS c{space} FROM some_table) AS anon_1{space} -WHERE anon_1.a > 1 AND anon_1.b = 2""" +WHERE anon_1.a > 1 AND anon_1.b = 2""" # noqa: S608 )