From 69c213fe4b3a7a8f9772b63321cb3ca0e3d53b25 Mon Sep 17 00:00:00 2001
From: Sky Rubenstein <blrubenstein@wpi.edu>
Date: Fri, 20 Dec 2024 16:02:52 -0500
Subject: [PATCH 1/3] Add count to top of data library

---
 .../data_search/DatasetSearchTable.jsx        |  2 +-
 .../DatasetSearchTableConstants.tsx           |  9 ++++++---
 .../data_search/DatasetSearchTableDisplay.tsx | 20 +++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/data_search/DatasetSearchTable.jsx b/src/components/data_search/DatasetSearchTable.jsx
index a9d916f9b..1e5529c99 100644
--- a/src/components/data_search/DatasetSearchTable.jsx
+++ b/src/components/data_search/DatasetSearchTable.jsx
@@ -281,7 +281,7 @@ export const DatasetSearchTable = (props) => {
           >
             {Object.values(datasetSearchTableTabs).map((tab) => <Tab
               key={tab.key}
-              label={tab.label}
+              label={`View By ${_.capitalize(tab.plural)}`}
               style={{
                 ...styles.subTab,
                 ...(tab.key === selectedTable.key ? styles.subTabActive : {})
diff --git a/src/components/data_search/DatasetSearchTableConstants.tsx b/src/components/data_search/DatasetSearchTableConstants.tsx
index 46c369e3c..10b5f1467 100644
--- a/src/components/data_search/DatasetSearchTableConstants.tsx
+++ b/src/components/data_search/DatasetSearchTableConstants.tsx
@@ -11,7 +11,8 @@ import './DatasetSearch.css';
 
 export interface DatasetSearchTableTab<T> {
   key: string;
-  label: string;
+  singular: string;
+  plural: string;
   makeHeaders: (datasets: DatasetTerm[], selected: number[], onSelect: (datasetIds: number[]) => void, exportableDatasets: { [duosId: string]: SnapshotSummaryModel[] }) => HeaderData<T>[];
   makeRows: (datasets: DatasetTerm[], headers: HeaderData<T>[]) => CellData[][];
 }
@@ -442,13 +443,15 @@ export const makeDatasetTableRows = (datasets: DatasetTerm[], headers: HeaderDat
 export const datasetSearchTableTabs: DatasetSearchTableTabs = {
   study: {
     key: 'study-table-tab',
-    label: 'View By Studies',
+    singular: 'study',
+    plural: 'studies',
     makeHeaders: makeStudyTableHeaders,
     makeRows: makeStudyTableRowData,
   },
   dataset: {
     key: 'datasets-table-tab',
-    label: 'View By Datasets',
+    singular: 'dataset',
+    plural: 'datasets',
     makeHeaders: makeDatasetTableHeader,
     makeRows: makeDatasetTableRows,
   }
diff --git a/src/components/data_search/DatasetSearchTableDisplay.tsx b/src/components/data_search/DatasetSearchTableDisplay.tsx
index f469a8e77..ab9d5123b 100644
--- a/src/components/data_search/DatasetSearchTableDisplay.tsx
+++ b/src/components/data_search/DatasetSearchTableDisplay.tsx
@@ -8,6 +8,7 @@ import {
   DatasetSearchTableTab,
 } from './DatasetSearchTableConstants';
 import {SnapshotSummaryModel} from '../../types/tdrModel';
+import * as _ from 'lodash';
 
 const styles = {
   baseStyle: {
@@ -62,13 +63,16 @@ export const DatasetSearchTableDisplay = (props: DatasetSearchTableDisplayProps)
     </Box>
   )
     : (
-      <SimpleTable
-        rowData={rowData}
-        columnHeaders={headers}
-        selected={selected}
-        styles={styles}
-        tableSize={10}
-        summary='faceted dataset search table'
-      />
+      <>
+        <div style={{ fontWeight: 600, borderBottom: '1px solid black' }}>{rowData.length} {_.capitalize(rowData.length > 1 ? tab.plural : tab.singular)}</div>
+        <SimpleTable
+          rowData={rowData}
+          columnHeaders={headers}
+          selected={selected}
+          styles={styles}
+          tableSize={10}
+          summary='faceted dataset search table'
+        />
+      </>
     );
 };

From 9eff72246e3cd918bafd15e1519ebf0034451185 Mon Sep 17 00:00:00 2001
From: Sky Rubenstein <blrubenstein@wpi.edu>
Date: Mon, 6 Jan 2025 10:57:11 -0500
Subject: [PATCH 2/3] Always have count and move up the no datasets fit

---
 .../data_search/DatasetSearchTableDisplay.tsx | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/data_search/DatasetSearchTableDisplay.tsx b/src/components/data_search/DatasetSearchTableDisplay.tsx
index ab9d5123b..ccee9a899 100644
--- a/src/components/data_search/DatasetSearchTableDisplay.tsx
+++ b/src/components/data_search/DatasetSearchTableDisplay.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import {Box} from '@mui/material';
 import {isEmpty} from 'lodash';
 import {DatasetTerm} from 'src/types/model';
 import SimpleTable from '../SimpleTable';
@@ -55,24 +54,23 @@ export const DatasetSearchTableDisplay = (props: DatasetSearchTableDisplayProps)
   const headers = tab.makeHeaders(filteredData, selected, onSelect, exportableDatasets);
   const rowData = tab.makeRows(filteredData, headers);
 
-  return isEmpty(filteredData) ? (
-    <Box sx={{
-      display: 'flex',
-      flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
-      <h1>There are no datasets that fit these criteria.</h1>
-    </Box>
-  )
-    : (
-      <>
-        <div style={{ fontWeight: 600, borderBottom: '1px solid black' }}>{rowData.length} {_.capitalize(rowData.length > 1 ? tab.plural : tab.singular)}</div>
+  return <>
+    <div style={{
+      fontWeight: 600,
+      borderBottom: '1px solid black'
+    }}>
+      {rowData.length} {_.capitalize(rowData.length !== 1 ? tab.plural : tab.singular)}
+    </div>
+    {
+      isEmpty(filteredData) ?
+        <div style={{fontWeight: 600, marginTop: '0.5rem'}}>There are no datasets that fit these criteria.</div> :
         <SimpleTable
           rowData={rowData}
           columnHeaders={headers}
           selected={selected}
           styles={styles}
           tableSize={10}
-          summary='faceted dataset search table'
-        />
-      </>
-    );
+          summary='faceted dataset search table' />
+    }
+  </>;
 };

From d8686286710db26a3f317e1f2cb2570d2c1926ef Mon Sep 17 00:00:00 2001
From: Sky Rubenstein <blrubenstein@wpi.edu>
Date: Mon, 6 Jan 2025 13:52:25 -0500
Subject: [PATCH 3/3] PR feedback

---
 src/components/data_search/DatasetSearchTableDisplay.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/data_search/DatasetSearchTableDisplay.tsx b/src/components/data_search/DatasetSearchTableDisplay.tsx
index ccee9a899..71f33f2e9 100644
--- a/src/components/data_search/DatasetSearchTableDisplay.tsx
+++ b/src/components/data_search/DatasetSearchTableDisplay.tsx
@@ -63,14 +63,14 @@ export const DatasetSearchTableDisplay = (props: DatasetSearchTableDisplayProps)
     </div>
     {
       isEmpty(filteredData) ?
-        <div style={{fontWeight: 600, marginTop: '0.5rem'}}>There are no datasets that fit these criteria.</div> :
+        <div style={{fontWeight: 600, marginTop: '0.5rem'}}>There are no {tab.plural} that fit these criteria.</div> :
         <SimpleTable
           rowData={rowData}
           columnHeaders={headers}
           selected={selected}
           styles={styles}
           tableSize={10}
-          summary='faceted dataset search table' />
+          summary={`faceted ${tab.singular} search table`} />
     }
   </>;
 };