diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js index 4726a9aef2e07..d159ab92e341d 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js +++ b/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js @@ -32,13 +32,7 @@ const metadata = new ChartMetadata({ { url: example, caption: t('Relationships between community channels') }, ], name: t('Chord Diagram'), - tags: [ - t('Aesthetic'), - t('Circular'), - t('Legacy'), - t('Proportional'), - t('Relational'), - ], + tags: [t('Circular'), t('Legacy'), t('Proportional'), t('Relational')], thumbnail, useLegacyApi: true, }); diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js index 0a6ff7bb5aac2..74b985e7cff6f 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js +++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js @@ -31,7 +31,7 @@ const metadata = new ChartMetadata({ ), exampleGallery: [{ url: example1 }, { url: example2 }], name: t('Parallel Coordinates'), - tags: [t('Coordinates'), t('Directional'), t('Legacy'), t('Relational')], + tags: [t('Directional'), t('Legacy'), t('Relational')], thumbnail, useLegacyApi: true, }); diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js index 8c2cf10d4f60b..2a687597f0dd1 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js +++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js @@ -33,7 +33,6 @@ const metadata = new ChartMetadata({ name: t('World Map'), tags: [ t('2D'), - t('Aesthetic'), t('Comparison'), t('Intensity'), t('Legacy'), diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts index bc0bd8c1f6ccc..2dd9e4cc54408 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({ name: t('deck.gl Contour'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('Spatial'), t('Comparison'), t('Experimental')], + tags: [t('deckGL'), t('Spatial'), t('Comparison')], }); export default class ContourChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts index 23708a2d24a61..d611f39ba757d 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({ name: t('deck.gl Geojson'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('2D'), t('Aesthetic')], + tags: [t('deckGL'), t('2D')], }); export default class GeojsonChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts index b9d45ddaff91b..a8c0b31856f0a 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({ thumbnail, exampleGallery: [{ url: example }], useLegacyApi: true, - tags: [t('deckGL'), t('3D'), t('Comparison'), t('Experimental')], + tags: [t('deckGL'), t('3D'), t('Comparison')], }); export default class GridChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts index adf4ed393e4d1..f9a6f1cffc757 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({ name: t('deck.gl Heatmap'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('Spatial'), t('Comparison'), t('Experimental')], + tags: [t('deckGL'), t('Spatial'), t('Comparison')], }); export default class HeatmapChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts index 1b67fbb657a3d..cd22289578fe6 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts @@ -32,7 +32,7 @@ const metadata = new ChartMetadata({ name: t('deck.gl 3D Hexagon'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('3D'), t('Geo'), t('Comparison'), t('Experimental')], + tags: [t('deckGL'), t('3D'), t('Geo'), t('Comparison')], }); export default class HexChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts index d6852144938d1..4b74cf87f672f 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts @@ -32,13 +32,7 @@ const metadata = new ChartMetadata({ thumbnail, exampleGallery: [{ url: example }], useLegacyApi: true, - tags: [ - t('deckGL'), - t('3D'), - t('Multi-Dimensions'), - t('Geo'), - t('Experimental'), - ], + tags: [t('deckGL'), t('3D'), t('Multi-Dimensions'), t('Geo')], }); export default class PolygonChartPlugin extends ChartPlugin { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts index a106d3d8a955a..13ff95b724c44 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts @@ -32,13 +32,7 @@ const metadata = new ChartMetadata({ thumbnail, exampleGallery: [{ url: example }], useLegacyApi: true, - tags: [ - t('deckGL'), - t('Comparison'), - t('Intensity'), - t('Experimental'), - t('Density'), - ], + tags: [t('deckGL'), t('Comparison'), t('Intensity'), t('Density')], }); export default class ScreengridChartPlugin extends ChartPlugin { 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 index b85a645792409..3c8b79ec8a1e8 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js @@ -42,7 +42,6 @@ const metadata = new ChartMetadata({ name: t('Area Chart (legacy)'), supportedAnnotationTypes: [ANNOTATION_TYPES.INTERVAL, ANNOTATION_TYPES.EVENT], tags: [ - t('Aesthetic'), t('Comparison'), t('Continuous'), t('Legacy'), @@ -53,7 +52,6 @@ const metadata = new ChartMetadata({ t('Time'), t('Trend'), t('nvd3'), - t('Deprecated'), ], thumbnail, useLegacyApi: true, 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 index d2f14b4b71c9f..c9ac21f84c99f 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js @@ -40,13 +40,11 @@ const metadata = new ChartMetadata({ t('Time'), t('Trend'), t('Stacked'), - t('Vertical'), t('Percentages'), t('Proportional'), t('Advanced-Analytics'), t('nvd3'), t('Legacy'), - t('Deprecated'), ], thumbnail, useLegacyApi: true, diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js index f3cf1f2435a8f..6c259a35e664d 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js @@ -33,14 +33,12 @@ const metadata = new ChartMetadata({ name: t('Bubble Chart (legacy)'), tags: [ t('Multi-Dimensions'), - t('Aesthetic'), t('Comparison'), t('Legacy'), t('Scatter'), t('Time'), t('Trend'), t('nvd3'), - t('Deprecated'), ], thumbnail, useLegacyApi: true, 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 index b29277f8c73bd..a505b8398bf44 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js @@ -42,14 +42,10 @@ const metadata = new ChartMetadata({ t('Bar'), t('Categorical'), t('Comparison'), - t('Discrete'), t('Legacy'), t('Percentages'), - t('Popular'), t('Stacked'), - t('Vertical'), t('nvd3'), - t('Deprecated'), ], thumbnail, useLegacyApi: true, 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 index c848e7accd7b5..7a08a99418c16 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js @@ -43,7 +43,7 @@ const metadata = new ChartMetadata({ ANNOTATION_TYPES.EVENT, ANNOTATION_TYPES.FORMULA, ], - tags: [t('Aesthetic'), t('Legacy'), t('nvd3'), t('Deprecated')], + tags: [t('Legacy'), t('nvd3')], thumbnail, useLegacyApi: true, }); 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 index 408656ea12023..903ad154da604 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/index.js @@ -28,7 +28,7 @@ const metadata = new ChartMetadata({ name: t('Pie Chart (legacy)'), thumbnail, useLegacyApi: true, - tags: [t('Legacy'), t('nvd3'), t('Deprecated')], + tags: [t('Legacy'), t('nvd3')], }); /** diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts index a2730641533c9..04f3e938afae6 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts @@ -34,7 +34,6 @@ export default class PopKPIPlugin extends ChartPlugin { t('Business'), t('Percentages'), t('Report'), - t('Description'), t('Advanced-Analytics'), ], thumbnail, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts index 5137f8192036a..a33ea731cc167 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts @@ -43,7 +43,6 @@ const metadata = { t('Percentages'), t('Popular'), t('Report'), - t('Description'), ], thumbnail, behaviors: [Behavior.DrillToDetail], diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts index 2f8da6ef0f057..b02a123b3f665 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts @@ -41,7 +41,6 @@ const metadata = { t('Percentages'), t('Popular'), t('Report'), - t('Description'), t('Trend'), ], thumbnail, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/index.ts index 362e75556a8ea..26b82308d7902 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/index.ts @@ -45,7 +45,6 @@ export default class EchartsBubbleChartPlugin extends ChartPlugin< name: t('Bubble Chart'), tags: [ t('Multi-Dimensions'), - t('Aesthetic'), t('Comparison'), t('Scatter'), t('Time'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/index.ts index bdab9b6da86e7..87be95f2a4f57 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/index.ts @@ -39,7 +39,6 @@ export default class EchartsGraphChartPlugin extends EchartsChartPlugin { exampleGallery: [{ url: example }], name: t('Graph Chart'), tags: [ - t('Aesthetic'), t('Circular'), t('Comparison'), t('Directional'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/index.ts index 3ebc7c4f0d5f5..c65da2514406f 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/index.ts @@ -69,9 +69,7 @@ export default class EchartsTimeseriesChartPlugin extends EchartsChartPlugin< thumbnail, tags: [ t('Advanced-Analytics'), - t('Aesthetic'), t('ECharts'), - t('Experimental'), t('Line'), t('Multi-Variables'), t('Time'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/index.ts index 6c022ec723521..eecf8d2ddb98e 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/index.ts @@ -67,7 +67,6 @@ export default class EchartsPieChartPlugin extends EchartsChartPlugin< ], name: t('Pie Chart'), tags: [ - t('Aesthetic'), t('Categorical'), t('Circular'), t('Comparison'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/index.ts index 5a919febbcf46..41feb2ff9073b 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/index.ts @@ -62,7 +62,6 @@ export default class EchartsRadarChartPlugin extends EchartsChartPlugin< tags: [ t('Business'), t('Comparison'), - t('Coordinates'), t('Multi-Variables'), t('Report'), t('Web'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/index.ts index 94fb33c90448e..fc3e75473d39d 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/index.ts @@ -44,12 +44,7 @@ export default class EchartsSunburstChartPlugin extends EchartsChartPlugin { ), exampleGallery: [{ url: example1 }, { url: example2 }], name: t('Sunburst Chart'), - tags: [ - t('ECharts'), - t('Aesthetic'), - t('Multi-Levels'), - t('Proportional'), - ], + tags: [t('ECharts'), t('Multi-Levels'), t('Proportional')], thumbnail, }, transformProps, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/index.ts index eb3564bb91750..3380727d1c176 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/index.ts @@ -66,7 +66,6 @@ export default class EchartsAreaChartPlugin extends EchartsChartPlugin< t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Time'), t('Line'), t('Transformable'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts index 6e1962b4cfbdb..70b42e7518882 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/index.ts @@ -76,11 +76,9 @@ export default class EchartsTimeseriesBarChartPlugin extends EchartsChartPlugin< t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Time'), t('Transformable'), t('Stacked'), - t('Vertical'), t('Bar'), t('Popular'), ], diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts index c778e0719bc76..7b4eb09a4bccd 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/index.ts @@ -71,7 +71,6 @@ export default class EchartsTimeseriesLineChartPlugin extends EchartsChartPlugin t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Line'), t('Popular'), ], diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts index 931a790cc039c..24d02a066a741 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts @@ -70,7 +70,6 @@ export default class EchartsTimeseriesScatterChartPlugin extends EchartsChartPlu t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Time'), t('Transformable'), t('Scatter'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts index 320e4752e4391..b3fd174772c05 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts @@ -70,7 +70,6 @@ export default class EchartsTimeseriesSmoothLineChartPlugin extends EchartsChart t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Time'), t('Line'), t('Transformable'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts index c581da3e00179..fcdbc52468b57 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts @@ -61,7 +61,6 @@ export default class EchartsTimeseriesStepChartPlugin extends EchartsChartPlugin t('ECharts'), t('Predictive'), t('Advanced-Analytics'), - t('Aesthetic'), t('Time'), t('Transformable'), t('Stacked'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts index 33623952e7d0e..781aedfad9740 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts @@ -58,7 +58,6 @@ export default class EchartsTimeseriesChartPlugin extends EchartsChartPlugin< name: t('Generic Chart'), tags: [ t('Advanced-Analytics'), - t('Aesthetic'), t('Line'), t('Predictive'), t('Time'), diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts index e461e68605a4c..47d541e738030 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts @@ -60,7 +60,6 @@ export default class EchartsTreemapChartPlugin extends EchartsChartPlugin< exampleGallery: [{ url: example1 }, { url: example2 }], name: t('Treemap'), tags: [ - t('Aesthetic'), t('Categorical'), t('Comparison'), t('ECharts'), diff --git a/superset-frontend/plugins/plugin-chart-table/src/index.ts b/superset-frontend/plugins/plugin-chart-table/src/index.ts index ce250aa87c216..f7a861edba904 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/index.ts +++ b/superset-frontend/plugins/plugin-chart-table/src/index.ts @@ -51,7 +51,6 @@ const metadata = new ChartMetadata({ t('Report'), t('Sequential'), t('Tabular'), - t('Description'), ], thumbnail, }); diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/index.ts b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/index.ts index 4b484ccf6d3ba..f50064bfe4eff 100644 --- a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/index.ts +++ b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/index.ts @@ -37,14 +37,7 @@ const metadata = new ChartMetadata({ ), exampleGallery: [{ url: example1 }, { url: example2 }], name: t('Word Cloud'), - tags: [ - t('Aesthetic'), - t('Categorical'), - t('Comparison'), - t('Description'), - t('Density'), - t('Single Metric'), - ], + tags: [t('Categorical'), t('Comparison'), t('Density'), t('Single Metric')], thumbnail, }); diff --git a/superset-frontend/src/assets/images/icons/ballot.svg b/superset-frontend/src/assets/images/icons/ballot.svg index 00d1a235ce111..e235f13378a26 100644 --- a/superset-frontend/src/assets/images/icons/ballot.svg +++ b/superset-frontend/src/assets/images/icons/ballot.svg @@ -17,6 +17,6 @@ specific language governing permissions and limitations under the License. --> - - + + diff --git a/superset-frontend/src/assets/images/icons/category.svg b/superset-frontend/src/assets/images/icons/category.svg index 471cf254d0225..6392c58b6e317 100644 --- a/superset-frontend/src/assets/images/icons/category.svg +++ b/superset-frontend/src/assets/images/icons/category.svg @@ -17,6 +17,6 @@ specific language governing permissions and limitations under the License. --> - - + + diff --git a/superset-frontend/src/assets/images/icons/tags.svg b/superset-frontend/src/assets/images/icons/tags.svg index 36a061ecf33b6..413b57aaeadac 100644 --- a/superset-frontend/src/assets/images/icons/tags.svg +++ b/superset-frontend/src/assets/images/icons/tags.svg @@ -17,6 +17,6 @@ specific language governing permissions and limitations under the License. --> - - + + diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx index ac84bd260c6c6..900947343843d 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx @@ -18,6 +18,7 @@ */ import React, { ChangeEventHandler, + ReactElement, useCallback, useEffect, useMemo, @@ -60,9 +61,9 @@ type VizEntry = { enum Sections { AllCharts = 'ALL_CHARTS', + Featured = 'FEATURED', Category = 'CATEGORY', Tags = 'TAGS', - RecommendedTags = 'RECOMMENDED_TAGS', } const DEFAULT_ORDER = [ @@ -125,6 +126,8 @@ const OTHER_CATEGORY = t('Other'); const ALL_CHARTS = t('All charts'); +const FEATURED = t('Featured'); + const RECOMMENDED_TAGS = [t('Popular'), t('ECharts'), t('Advanced-Analytics')]; export const VIZ_TYPE_CONTROL_TEST_ID = 'viz-type-control'; @@ -238,8 +241,8 @@ const SelectorLabel = styled.button` } } - & span:first-of-type svg { - margin-top: ${theme.gridUnit * 1.5}px; + & > span[role="img"] { + margin-right: ${theme.gridUnit * 2}px; } .cancel { @@ -450,7 +453,7 @@ const ThumbnailGallery: React.FC = ({ const Selector: React.FC<{ selector: string; sectionId: string; - icon: JSX.Element; + icon: ReactElement; isSelected: boolean; onClick: (selector: string, sectionId: string) => void; className?: string; @@ -569,13 +572,11 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) { ); const [activeSelector, setActiveSelector] = useState( - () => selectedVizMetadata?.category || RECOMMENDED_TAGS[0], + () => selectedVizMetadata?.category || FEATURED, ); const [activeSection, setActiveSection] = useState(() => - selectedVizMetadata?.category - ? Sections.Category - : Sections.RecommendedTags, + selectedVizMetadata?.category ? Sections.Category : Sections.Featured, ); // get a fuse instance for fuzzy search @@ -667,19 +668,14 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) { const sectionMap = useMemo( () => ({ - [Sections.RecommendedTags]: { - title: t('Recommended tags'), - icon: , - selectors: RECOMMENDED_TAGS, - }, [Sections.Category]: { title: t('Category'), - icon: , + icon: , selectors: categories, }, [Sections.Tags]: { title: t('Tags'), - icon: , + icon: , selectors: tags, }, }), @@ -693,17 +689,20 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) { if (activeSelector === ALL_CHARTS && activeSection === Sections.AllCharts) { return sortedMetadata; } + if ( + activeSelector === FEATURED && + activeSection === Sections.Featured && + chartsByTags[t('Popular')] + ) { + return chartsByTags[t('Popular')]; + } if ( activeSection === Sections.Category && chartsByCategory[activeSelector] ) { return chartsByCategory[activeSelector]; } - if ( - (activeSection === Sections.Tags || - activeSection === Sections.RecommendedTags) && - chartsByTags[activeSelector] - ) { + if (activeSection === Sections.Tags && chartsByTags[activeSelector]) { return chartsByTags[activeSelector]; } return []; @@ -725,7 +724,7 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) { } sectionId={Sections.AllCharts} selector={ALL_CHARTS} - icon={} + icon={} isSelected={ !isActivelySearching && ALL_CHARTS === activeSelector && @@ -733,10 +732,28 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) { } onClick={clickSelector} /> + + // adjust style for not being inside a collapse + css` + margin: ${gridUnit * 2}px; + margin-bottom: 0; + ` + } + sectionId={Sections.Featured} + selector={FEATURED} + icon={} + isSelected={ + !isActivelySearching && + FEATURED === activeSelector && + Sections.Featured === activeSection + } + onClick={clickSelector} + /> {Object.keys(sectionMap).map(sectionId => { const section = sectionMap[sectionId];