Adds logic for NULL values

superset-frontend/packages/superset-ui-chart-controls/src/operators/histogramOperator.ts

@@ -23,7 +23,7 @@ import { PostProcessingFactory } from './types';
 export const histogramOperator: PostProcessingFactory<
  PostProcessingHistogram
 > = (formData, queryObject) => {
- const { bins, column, cumulative, groupby, normalize } = formData;
+ const { bins, column, cumulative, groupby = [], normalize } = formData;
  const parsedBins = Number.isNaN(Number(bins)) ? 5 : Number(bins);
  const parsedColumn = getColumnLabel(column);
  const parsedGroupBy = groupby!.map(getColumnLabel);

superset-frontend/plugins/plugin-chart-echarts/src/Histogram/buildQuery.ts

@@ -25,8 +25,10 @@ export default function buildQuery(formData: HistogramFormData) {
  return buildQueryContext(formData, baseQueryObject => [
  {
  ...baseQueryObject,
+ extras: { where: `${column} IS NOT NULL` },
  columns: [...groupby, column],
  post_processing: [histogramOperator(formData, baseQueryObject)],
+ metrics: undefined,
  },
  ]);
 }

superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts

@@ -136,9 +136,10 @@ export default function transformProps(
  const echartOptions: EChartsOption = {
  grid: {
  ...defaultGrid,
- bottom: 30,
- left: 30,
- right: 30,
+ left: '5%',
+ right: '5%',
+ top: '10%',
+ bottom: '10%',
  },
  xAxis: {
  data: xAxisData,

superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx

@@ -123,6 +123,7 @@ const ColumnSelectPopoverTrigger = ({
  isTemporal,
  onColumnEdit,
  popoverLabel,
+ disabledTabs,
  ],
  );
 

superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx

@@ -207,6 +207,7 @@ function DndColumnSelect(props: DndColumnSelectProps) {
  closePopover={closePopover}
  visible={newColumnPopoverVisible}
  isTemporal={isTemporal}
+ disabledTabs={disabledTabs}
  >
  <div />
  </ColumnSelectPopoverTrigger>

superset/migrations/shared/migrate_viz/processors.py

@@ -290,7 +290,7 @@ class MigrateHistogramChart(MigrateViz):
  "y_axis_label": "y_axis_title",
  "normalized": "normalize",
  }
- remove_keys = {"all_columns_x", "link_length"}
+ remove_keys = {"all_columns_x", "link_length", "queryFields"}
 
  def _pre_action(self) -> None:
  all_columns_x = self.data.get("all_columns_x")
@@ -299,3 +299,7 @@ def _pre_action(self) -> None:
 
  link_length = self.data.get("link_length")
  self.data["bins"] = int(link_length) if link_length else 5
+
+ groupby = self.data.get("groupby")
+ if not groupby:
+ self.data["groupby"] = []

superset/utils/pandas_postprocessing/histogram.py

@@ -53,7 +53,7 @@ def histogram(
  raise ValueError(f"The column '{column}' must be numeric.")
 
  # calculate the histogram bin edges
- bin_edges = np.histogram_bin_edges(df[column], bins=bins)
+ bin_edges = np.histogram_bin_edges(df[column].dropna(), bins=bins)
 
  # convert the bin edges to strings
  bin_edges_str = [
@@ -62,7 +62,7 @@ def histogram(
  ]
 
  def hist_values(series: Series) -> np.ndarray:
- result = np.histogram(series, bins=bin_edges)[0]
+ result = np.histogram(series.dropna(), bins=bin_edges)[0]
  return result if not cumulative else np.cumsum(result)
 
  if len(groupby) == 0:

tests/unit_tests/pandas_postprocessing/test_histogram.py

@@ -120,3 +120,25 @@ def test_histogram_with_non_numeric_column():
  histogram(data, "b", ["group"], bins)
  except ValueError as e:
  assert str(e) == "The column 'b' must be numeric."
+
+
+# test histogram ignore null values
+def test_histogram_ignore_null_values():
+ data_with_null = DataFrame(
+ {
+ "group": ["A", "A", "B", "B", "A", "A", "B", "B", "A", "A"],
+ "a": [1, 2, 3, 4, 5, 6, 7, 8, 9, None],
+ "b": [1, 2, 3, 4, 5, 6, 7, 8, 9, None],
+ }
+ )
+ result = histogram(data_with_null, "a", ["group"], bins)
+ assert result.shape == (2, bins + 1)
+ assert result.columns.tolist() == [
+ "group",
+ "1 - 2",
+ "2 - 4",
+ "4 - 5",
+ "5 - 7",
+ "7 - 9",
+ ]
+ assert result.values.tolist() == [["A", 2, 0, 1, 1, 1], ["B", 0, 2, 0, 1, 1]]