chore: move bullet string manipulation to frontend (#9773)

apache · May 11, 2020 · f369ab3 · f369ab3
1 parent a8d5a8a
commit f369ab3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 44 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -87,7 +87,7 @@
     "@superset-ui/legacy-plugin-chart-world-map": "^0.13.6",
     "@superset-ui/legacy-preset-chart-big-number": "^0.13.5",
     "@superset-ui/legacy-preset-chart-deckgl": "^0.2.3",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.13.5",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.13.9",
     "@superset-ui/number-format": "^0.13.3",
     "@superset-ui/plugin-chart-word-cloud": "^0.13.9",
     "@superset-ui/preset-chart-xy": "^0.13.5",

diff --git a/superset/viz.py b/superset/viz.py
@@ -1091,20 +1091,6 @@ def query_obj(self):
         d = super().query_obj()
         self.metric = form_data.get("metric")
 
-        def as_strings(field):
-            value = form_data.get(field)
-            return value.split(",") if value else []
-
-        def as_floats(field):
-            return [float(x) for x in as_strings(field)]
-
-        self.ranges = as_floats("ranges")
-        self.range_labels = as_strings("range_labels")
-        self.markers = as_floats("markers")
-        self.marker_labels = as_strings("marker_labels")
-        self.marker_lines = as_floats("marker_lines")
-        self.marker_line_labels = as_strings("marker_line_labels")
-
         d["metrics"] = [self.metric]
         if not self.metric:
             raise QueryObjectValidationError(_("Pick a metric to display"))
@@ -1115,12 +1101,6 @@ def get_data(self, df: pd.DataFrame) -> VizData:
         values = df["metric"].values
         return {
             "measures": values.tolist(),
-            "ranges": self.ranges or [0, values.max() * 1.1],
-            "rangeLabels": self.range_labels or None,
-            "markers": self.markers or None,
-            "markerLabels": self.marker_labels or None,
-            "markerLines": self.marker_lines or None,
-            "markerLineLabels": self.marker_line_labels or None,
         }
 
 

diff --git a/superset/viz_sip38.py b/superset/viz_sip38.py
@@ -1120,20 +1120,6 @@ def query_obj(self):
         d = super().query_obj()
         self.metric = form_data.get("metric")
 
-        def as_strings(field):
-            value = form_data.get(field)
-            return value.split(",") if value else []
-
-        def as_floats(field):
-            return [float(x) for x in as_strings(field)]
-
-        self.ranges = as_floats("ranges")
-        self.range_labels = as_strings("range_labels")
-        self.markers = as_floats("markers")
-        self.marker_labels = as_strings("marker_labels")
-        self.marker_lines = as_floats("marker_lines")
-        self.marker_line_labels = as_strings("marker_line_labels")
-
         d["metrics"] = [self.metric]
         if not self.metric:
             raise QueryObjectValidationError(_("Pick a metric to display"))
@@ -1144,12 +1130,6 @@ def get_data(self, df: pd.DataFrame) -> VizData:
         values = df["metric"].values
         return {
             "measures": values.tolist(),
-            "ranges": self.ranges or [0, values.max() * 1.1],
-            "rangeLabels": self.range_labels or None,
-            "markers": self.markers or None,
-            "markerLabels": self.marker_labels or None,
-            "markerLines": self.marker_lines or None,
-            "markerLineLabels": self.marker_line_labels or None,
         }