fix: use the accessManagement property for filters

DataBiosphere · Nov 16, 2023 · c93b48f · c93b48f
1 parent 0ac2a75
commit c93b48f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/src/components/data_search/DatasetFilterList.js b/src/components/data_search/DatasetFilterList.js
@@ -12,6 +12,8 @@ import { Checkbox } from '@mui/material';
 export const DatasetFilterList = (props) => {
   const { datasets, filters, filterHandler } = props;
 
+  const accessManagementFilters = ['Controlled', 'Open', 'External'];
+
   const isFiltered = (filter) => filters.indexOf(filter) > -1;
 
   return (
@@ -24,22 +26,21 @@ export const DatasetFilterList = (props) => {
         Access Type
       </Typography>
       <List sx={{ margin: '-0.5em -0.5em'}}>
-        <ListItem disablePadding>
-          <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, 'open')}>
-            <ListItemIcon>
-              <Checkbox checked={isFiltered('open')} />
-            </ListItemIcon>
-            <ListItemText primary="Open" sx={{ fontFamily: 'Montserrat', transform: 'scale(1.2)' }} />
-          </ListItemButton>
-        </ListItem>
-        <ListItem disablePadding>
-          <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, 'controlled')}>
-            <ListItemIcon>
-              <Checkbox checked={isFiltered('controlled')} />
-            </ListItemIcon>
-            <ListItemText primary="Controlled" sx={{ fontFamily: 'Montserrat', transform: 'scale(1.2)' }} />
-          </ListItemButton>
-        </ListItem>
+        {
+          accessManagementFilters.map((filterName) => {
+            const filter = filterName.toLowerCase();
+            return (
+              <ListItem disablePadding key={filter}>
+                <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, filter)}>
+                  <ListItemIcon>
+                    <Checkbox checked={isFiltered(filter)} />
+                  </ListItemIcon>
+                  <ListItemText primary={filterName} sx={{ fontFamily: 'Montserrat', transform: 'scale(1.2)' }} />
+                </ListItemButton>
+              </ListItem>
+            );
+          })
+        }
       </List>
     </Box>
   );

diff --git a/src/components/data_search/DatasetSearchTable.js b/src/components/data_search/DatasetSearchTable.js
@@ -51,10 +51,14 @@ export const DatasetSearchTable = (props) => {
       newFiltered = data;
     } else {
       newFiltered = data.filter((dataset) => {
-        if (newFilters.includes('open') && dataset.openAccess) {
+        // TODO: remove extra checks when openAccess property is deprecated
+        if (newFilters.includes('open') && (dataset.openAccess || dataset.accessManagement === 'open')) {
           return true;
         }
-        if (newFilters.includes('controlled') && !dataset.openAccess) {
+        if (newFilters.includes('controlled') && (!dataset.openAccess || dataset.accessManagement === 'controlled')) {
+          return true;
+        }
+        if (newFilters.includes('external') && dataset.accessManagement === 'external') {
           return true;
         }
         return false;