Merge pull request #530 from vizzuhq/release_fix

Fix empty datacube calculation

Author: schaumb

src/dataframe/old/datatable.cpp

@@ -120,7 +120,7 @@ SeriesIndex::SeriesIndex(std::string const &str,
 
 DataCube::iterator_t DataCube::begin() const
 {
-	if (df->get_record_count() == 0) return {};
+	if (!has_element) return {};
 	iterator_t res{this,
 	    {},
 	    {{}, std::vector<std::size_t>(dim_reindex.size())}};
@@ -201,13 +201,14 @@ DataCube::DataCube(const DataTable &table,
 	}
 
 	df->finalize();
+	has_element = true;
 	for (std::size_t ix{}; const auto &dim : dimensions) {
 		auto &&dimName = dim.getColIndex();
 		auto &&cats = table.getDf().get_categories(dimName);
-		dim_reindex.push_back(DimensionInfo{dimName,
-		    cats,
-		    cats.size() + df->has_na(dimName),
-		    ix++});
+		auto &&size = cats.size() + df->has_na(dimName);
+		dim_reindex.push_back(
+		    DimensionInfo{dimName, cats, size, ix++});
+		has_element &= size > 0;
 	}
 
 	auto stackInhibitingShape =

src/dataframe/old/datatable.h

@@ -84,6 +84,7 @@ class DataCube
 		}
 	};
 	Type::UniqueList<DimensionInfo> dim_reindex;
+	bool has_element{};
 
 	std::map<Gen::ChannelId,
 	    std::shared_ptr<dataframe::dataframe_interface>>

test/e2e/tests/fixes.json

@@ -28,6 +28,9 @@
 		"450": {
 			"refs": ["761380e"]
 		},
+		"530": {
+			"refs": ["1ad4684"]
+		},
 		"32303048": {
 			"refs": ["b5d95ea"]
 		},

test/e2e/tests/fixes/530.mjs

@@ -0,0 +1,44 @@
+const testSteps = [
+	(chart) =>
+		chart.animate({
+			data: {
+				series: [
+					{
+						name: 'Year',
+						type: 'dimension',
+						values: ['2005', 'Total']
+					},
+					{
+						name: 'Result',
+						type: 'dimension',
+						values: ['Won', 'Lost']
+					}
+				]
+			}
+		}),
+	(chart) =>
+		chart.animate({
+			data: {
+				filter: (record) => {
+					return record.Year !== 'Total'
+				}
+			},
+			config: {
+				x: 'Year'
+			}
+		}),
+
+	(chart) =>
+		chart.animate({
+			data: {
+				filter: (record) => {
+					return record.Year === 'Total'
+				}
+			},
+			config: {
+				y: 'Result'
+			}
+		})
+]
+
+export default testSteps