From d78b3d883e6fbf65be94aebe7bbe790776ffb4ce Mon Sep 17 00:00:00 2001 From: Jordan Dachroeden Date: Tue, 24 Sep 2024 16:43:53 -0500 Subject: [PATCH 1/3] FDG-9594 Check meta for empty data --- .../table-section-container/table-section-container.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/dataset-data/table-section-container/table-section-container.jsx b/src/components/dataset-data/table-section-container/table-section-container.jsx index 554c31c4b..0b5c538f9 100644 --- a/src/components/dataset-data/table-section-container/table-section-container.jsx +++ b/src/components/dataset-data/table-section-container/table-section-container.jsx @@ -383,7 +383,9 @@ const TableSectionContainer = ({ userFilterUnmatchedForDateRange={userFilterUnmatchedForDateRange} apiFilterDefault={apiFilterDefault && !selectedTable?.apiFilter?.displayDefaultData} onToggleLegend={legendToggler} - emptyData={!isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && !apiError} + emptyData={ + !isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && !tableMeta?.count === 0 && !apiError + } unchartable={noChartMessage !== undefined} currentTab={selectedTab} datasetName={config?.name} From 039510028a937c079cb5ab8938089a25d9ec5196 Mon Sep 17 00:00:00 2001 From: Jordan Dachroeden Date: Wed, 25 Sep 2024 08:12:28 -0500 Subject: [PATCH 2/3] FDG-9594 Update empty data logic --- .../table-section-container/table-section-container.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/dataset-data/table-section-container/table-section-container.jsx b/src/components/dataset-data/table-section-container/table-section-container.jsx index 0b5c538f9..746eb35b1 100644 --- a/src/components/dataset-data/table-section-container/table-section-container.jsx +++ b/src/components/dataset-data/table-section-container/table-section-container.jsx @@ -384,7 +384,11 @@ const TableSectionContainer = ({ apiFilterDefault={apiFilterDefault && !selectedTable?.apiFilter?.displayDefaultData} onToggleLegend={legendToggler} emptyData={ - !isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && !tableMeta?.count === 0 && !apiError + !isLoading && + !serverSidePagination && + (!apiData || !apiData.data || !apiData.data.length) && + (!tableMeta || tableMeta?.count !== 0) && + !apiError } unchartable={noChartMessage !== undefined} currentTab={selectedTab} From c1c6e1b02e404095a94946de61f358e5daced41c Mon Sep 17 00:00:00 2001 From: Jordan Dachroeden Date: Wed, 25 Sep 2024 08:35:18 -0500 Subject: [PATCH 3/3] FDG-9594 Update empty data logic --- .../table-section-container/table-section-container.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/dataset-data/table-section-container/table-section-container.jsx b/src/components/dataset-data/table-section-container/table-section-container.jsx index 746eb35b1..c4942310c 100644 --- a/src/components/dataset-data/table-section-container/table-section-container.jsx +++ b/src/components/dataset-data/table-section-container/table-section-container.jsx @@ -387,7 +387,7 @@ const TableSectionContainer = ({ !isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && - (!tableMeta || tableMeta?.count !== 0) && + (!tableMeta || tableMeta?.count === 0) && !apiError } unchartable={noChartMessage !== undefined}