From ed7e6dc338082b1e10eb224e582944924f16820c Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Thu, 5 Jan 2017 18:37:31 -0800
Subject: [PATCH] Fix visualualization names. Resolves #4084
---
.../query_builder/components/VisualizationSettings.jsx | 4 ++--
frontend/src/metabase/visualizations/AreaChart.jsx | 2 +-
frontend/src/metabase/visualizations/BarChart.jsx | 2 +-
frontend/src/metabase/visualizations/Funnel.jsx | 2 +-
frontend/src/metabase/visualizations/LineChart.jsx | 2 +-
frontend/src/metabase/visualizations/Map.jsx | 2 +-
frontend/src/metabase/visualizations/PieChart.jsx | 2 +-
frontend/src/metabase/visualizations/PinMap.jsx | 2 +-
frontend/src/metabase/visualizations/Progress.jsx | 2 +-
frontend/src/metabase/visualizations/Scalar.jsx | 2 +-
frontend/src/metabase/visualizations/ScatterPlot.jsx | 2 +-
frontend/src/metabase/visualizations/Table.jsx | 2 +-
frontend/src/metabase/visualizations/XKCDChart.jsx | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx b/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
index 8ea7b0a1366..04224216d24 100644
--- a/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
+++ b/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
@@ -40,7 +40,7 @@ export default class VisualizationSettings extends React.Component {
name={CardVisualization.iconName}
size={12}
/>
- {CardVisualization.displayName}
+ {CardVisualization.uiName}
<Icon className="ml1" name="chevrondown" size={8} />
</span>
);
@@ -73,7 +73,7 @@ export default class VisualizationSettings extends React.Component {
onClick={this.setDisplay.bind(null, vizType)}
>
<Icon name={viz.iconName} size={12} />
- <span className="ml1">{viz.displayName}</span>
+ <span className="ml1">{viz.uiName}</span>
</li>
)}
</ul>
diff --git a/frontend/src/metabase/visualizations/AreaChart.jsx b/frontend/src/metabase/visualizations/AreaChart.jsx
index c9c08e1ebf7..2d1d2e4c07c 100644
--- a/frontend/src/metabase/visualizations/AreaChart.jsx
+++ b/frontend/src/metabase/visualizations/AreaChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
export default class AreaChart extends LineAreaBarChart {
- static displayName = "Area";
+ static uiName = "Area";
static identifier = "area";
static iconName = "area";
static noun = "area chart";
diff --git a/frontend/src/metabase/visualizations/BarChart.jsx b/frontend/src/metabase/visualizations/BarChart.jsx
index f267dc73b80..c00633c36ca 100644
--- a/frontend/src/metabase/visualizations/BarChart.jsx
+++ b/frontend/src/metabase/visualizations/BarChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
export default class BarChart extends LineAreaBarChart {
- static displayName = "Bar";
+ static uiName = "Bar";
static identifier = "bar";
static iconName = "bar";
static noun = "bar chart";
diff --git a/frontend/src/metabase/visualizations/Funnel.jsx b/frontend/src/metabase/visualizations/Funnel.jsx
index 7dcbbd2e1a2..16d0c8a00a4 100644
--- a/frontend/src/metabase/visualizations/Funnel.jsx
+++ b/frontend/src/metabase/visualizations/Funnel.jsx
@@ -8,7 +8,7 @@ import { getSettings } from "metabase/lib/visualization_settings";
import i from "icepick";
export default class Funnel extends Component {
- static displayName = "Funnel";
+ static uiName = "Funnel";
static identifier = "funnel";
static iconName = "funnel";
diff --git a/frontend/src/metabase/visualizations/LineChart.jsx b/frontend/src/metabase/visualizations/LineChart.jsx
index 45406129e96..88a0dba4c41 100644
--- a/frontend/src/metabase/visualizations/LineChart.jsx
+++ b/frontend/src/metabase/visualizations/LineChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
export default class LineChart extends LineAreaBarChart {
- static displayName = "Line";
+ static uiName = "Line";
static identifier = "line";
static iconName = "line";
static noun = "line chart";
diff --git a/frontend/src/metabase/visualizations/Map.jsx b/frontend/src/metabase/visualizations/Map.jsx
index 1fa4d557f49..85d4d4c4259 100644
--- a/frontend/src/metabase/visualizations/Map.jsx
+++ b/frontend/src/metabase/visualizations/Map.jsx
@@ -6,7 +6,7 @@ import PinMap from "./PinMap.jsx";
import { ChartSettingsError } from "metabase/visualizations/lib/errors";
export default class Map extends Component {
- static displayName = "Map";
+ static uiName = "Map";
static identifier = "map";
static iconName = "pinmap";
diff --git a/frontend/src/metabase/visualizations/PieChart.jsx b/frontend/src/metabase/visualizations/PieChart.jsx
index 4490dc65694..91b0eff5512 100644
--- a/frontend/src/metabase/visualizations/PieChart.jsx
+++ b/frontend/src/metabase/visualizations/PieChart.jsx
@@ -27,7 +27,7 @@ const OTHER_SLICE_MIN_PERCENTAGE = 0.003;
const PERCENT_REGEX = /percent/i;
export default class PieChart extends Component {
- static displayName = "Pie";
+ static uiName = "Pie";
static identifier = "pie";
static iconName = "pie";
diff --git a/frontend/src/metabase/visualizations/PinMap.jsx b/frontend/src/metabase/visualizations/PinMap.jsx
index a43c7025d1d..6874ac44beb 100644
--- a/frontend/src/metabase/visualizations/PinMap.jsx
+++ b/frontend/src/metabase/visualizations/PinMap.jsx
@@ -17,7 +17,7 @@ const MAP_COMPONENTS_BY_TYPE = {
}
export default class PinMap extends Component {
- static displayName = "Pin Map";
+ static uiName = "Pin Map";
static identifier = "pin_map";
static iconName = "pinmap";
diff --git a/frontend/src/metabase/visualizations/Progress.jsx b/frontend/src/metabase/visualizations/Progress.jsx
index 0377fbc4719..ad1e11cabb0 100644
--- a/frontend/src/metabase/visualizations/Progress.jsx
+++ b/frontend/src/metabase/visualizations/Progress.jsx
@@ -11,7 +11,7 @@ import Color from "color";
const BORDER_RADIUS = 5;
export default class Progress extends Component {
- static displayName = "Progress";
+ static uiName = "Progress";
static identifier = "progress";
static iconName = "progress";
diff --git a/frontend/src/metabase/visualizations/Scalar.jsx b/frontend/src/metabase/visualizations/Scalar.jsx
index 3b08089c20d..ff1ffe39c7d 100644
--- a/frontend/src/metabase/visualizations/Scalar.jsx
+++ b/frontend/src/metabase/visualizations/Scalar.jsx
@@ -14,7 +14,7 @@ import i from "icepick";
import d3 from "d3";
export default class Scalar extends Component {
- static displayName = "Number";
+ static uiName = "Number";
static identifier = "scalar";
static iconName = "number";
diff --git a/frontend/src/metabase/visualizations/ScatterPlot.jsx b/frontend/src/metabase/visualizations/ScatterPlot.jsx
index 0f5af3c5857..0f90ba6ad33 100644
--- a/frontend/src/metabase/visualizations/ScatterPlot.jsx
+++ b/frontend/src/metabase/visualizations/ScatterPlot.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
export default class ScatterPlot extends LineAreaBarChart {
- static displayName = "Scatter";
+ static uiName = "Scatter";
static identifier = "scatter";
static iconName = "bubble";
static noun = "scatter plot";
diff --git a/frontend/src/metabase/visualizations/Table.jsx b/frontend/src/metabase/visualizations/Table.jsx
index fa9c2708f75..51813928bcb 100644
--- a/frontend/src/metabase/visualizations/Table.jsx
+++ b/frontend/src/metabase/visualizations/Table.jsx
@@ -7,7 +7,7 @@ import * as DataGrid from "metabase/lib/data_grid";
import _ from "underscore";
export default class Bar extends Component {
- static displayName = "Table";
+ static uiName = "Table";
static identifier = "table";
static iconName = "table";
diff --git a/frontend/src/metabase/visualizations/XKCDChart.jsx b/frontend/src/metabase/visualizations/XKCDChart.jsx
index a8a61456dc9..58a86f42c71 100644
--- a/frontend/src/metabase/visualizations/XKCDChart.jsx
+++ b/frontend/src/metabase/visualizations/XKCDChart.jsx
@@ -19,7 +19,7 @@ import "xkcdplot/humor-sans";
import cx from "classnames";
export default class XKCDChart extends Component {
- static displayName = "XKCD"
+ static uiName = "XKCD"
static identifier = "xkcd";
static iconName = "pinmap";
--
GitLab