From 488f3727c8eb99f61bb8670b11862c83e7cced0c Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Mon, 1 Apr 2024 15:56:49 -0400
Subject: [PATCH 01/11] Add ability for project admin to view project
 accessible datasets

---
 .../src/components/SideBar.component.tsx      |  4 +--
 .../src/pages/datasets/DatasetControls.tsx    | 31 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/SideBar.component.tsx b/packages/client/src/components/SideBar.component.tsx
index f50c2467..65ebc604 100644
--- a/packages/client/src/components/SideBar.component.tsx
+++ b/packages/client/src/components/SideBar.component.tsx
@@ -59,10 +59,10 @@ export const SideBar: FC<SideBarProps> = ({ open, drawerWidth }) => {
       name: t('menu.datasets'),
       action: () => {},
       icon: <Dataset />,
-      visible: (p) => p!.owner,
+      visible: (p) => p!.projectAdmin,
       permission,
       subItems: [
-        { name: t('menu.datasetControl'), action: () => navigate('/dataset/controls'), visible: (p) => p!.owner },
+        { name: t('menu.datasetControl'), action: () => navigate('/dataset/controls'), visible: (p) => p!.projectAdmin },
         { name: t('menu.projectAccess'), action: () => navigate('/dataset/projectaccess'), visible: (p) => p!.owner }
       ]
     },
diff --git a/packages/client/src/pages/datasets/DatasetControls.tsx b/packages/client/src/pages/datasets/DatasetControls.tsx
index a9d8310e..1c6590a7 100644
--- a/packages/client/src/pages/datasets/DatasetControls.tsx
+++ b/packages/client/src/pages/datasets/DatasetControls.tsx
@@ -4,26 +4,41 @@ import { AddDataset } from '../../components/AddDataset.component';
 import { useEffect, useState } from 'react';
 import { UploadEntries } from '../../components/UploadEntries.component';
 import { Dataset } from '../../graphql/graphql';
-import { useGetDatasetsLazyQuery } from '../../graphql/dataset/dataset';
+import { useGetDatasetsByProjectLazyQuery, useGetDatasetsLazyQuery } from '../../graphql/dataset/dataset';
 import { DatasetsView } from '../../components/DatasetsView.component';
 import { useTranslation } from 'react-i18next';
+import { usePermission } from '../../context/Permission.context';
+import { useProject } from '../../context/Project.context';
 
 export const DatasetControls: React.FC = () => {
   const [add, setAdd] = useState(false);
   const [upload, setUpload] = useState(false);
   const [datasets, setDatasets] = useState<Dataset[]>([]);
-  const [getDatasets, getDatasetsResults] = useGetDatasetsLazyQuery();
+  const [getAllDatasets, getAllDatasetsResults] = useGetDatasetsLazyQuery();
+  const [getProjectDatasets, getProjectDatasetsResults] = useGetDatasetsByProjectLazyQuery();
+  const { project } = useProject();
   const { t } = useTranslation();
+  const { permission } = usePermission();
+
+  const fetchDatasets = () => {
+    if (permission?.owner) {
+      getAllDatasets({ fetchPolicy: 'network-only' });
+    } else if (permission?.projectAdmin && project) {
+      getProjectDatasets({ variables: { project: project._id } });
+    }
+  };
 
   useEffect(() => {
-    getDatasets();
-  }, []);
+    fetchDatasets();
+  }, [permission]);
 
   useEffect(() => {
-    if (getDatasetsResults.data) {
-      setDatasets(getDatasetsResults.data.getDatasets);
+    if (getAllDatasetsResults.data) {
+      setDatasets(getAllDatasetsResults.data.getDatasets);
+    } else if (getProjectDatasetsResults.data) {
+      setDatasets(getProjectDatasetsResults.data.getDatasetsByProject);
     }
-  }, [getDatasetsResults.data]);
+  }, [getAllDatasetsResults.data, getProjectDatasetsResults.data]);
 
   const handleClick = (type: string) => {
     if (type === 'add') {
@@ -36,7 +51,7 @@ export const DatasetControls: React.FC = () => {
   const toggleAdd = (newDatasetCreated: boolean) => {
     setAdd((add) => !add);
     if (newDatasetCreated) {
-      getDatasets({ fetchPolicy: 'network-only' });
+      fetchDatasets();
     }
   };
 

From 03e48881f7055b737dd84313283570a921a85c0a Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Tue, 2 Apr 2024 13:07:58 -0400
Subject: [PATCH 02/11] Start making project select JSON forms elements

---
 .../src/components/ProjectListSelect.component.tsx   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/client/src/components/ProjectListSelect.component.tsx

diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
new file mode 100644
index 00000000..92b3fd00
--- /dev/null
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -0,0 +1,12 @@
+import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
+import { withJsonFormsControlProps } from '@jsonforms/react';
+
+const ProjectListSelect: React.FC<ControlProps> = (props) => {
+  return <p>hello world</p>;
+};
+
+export const videoFieldTester: RankedTester = rankWith(10, (uischema, _schema, _rootSchema) => {
+  return uischema.options != undefined && uischema.options && uischema.options.customType === 'projectList';
+});
+
+export default withJsonFormsControlProps(ProjectListSelect);

From b7e485b0113bddfe051f65a3903985f9bb4b319a Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Thu, 4 Apr 2024 15:45:55 -0400
Subject: [PATCH 03/11] Add Chip style select

---
 .../src/components/AddDataset.component.tsx   | 23 ++++++++++-
 .../ProjectListSelect.component.tsx           | 38 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/AddDataset.component.tsx b/packages/client/src/components/AddDataset.component.tsx
index 8d7f8113..2e4287f6 100644
--- a/packages/client/src/components/AddDataset.component.tsx
+++ b/packages/client/src/components/AddDataset.component.tsx
@@ -10,6 +10,8 @@ import { Button } from '@mui/material';
 import { ErrorObject } from 'ajv';
 import { useSnackbar } from '../context/Snackbar.context';
 import { useTranslation } from 'react-i18next';
+import { JsonFormsRendererRegistryEntry } from '@jsonforms/core';
+import ProjectListSelect, { projectListTester } from './ProjectListSelect.component';
 
 interface ShowProps {
   show: boolean;
@@ -26,6 +28,12 @@ const schema = {
     description: {
       type: 'string',
       description: 'Please enter new dataset description'
+    },
+    projects: {
+      type: 'array',
+      items: {
+        type: 'string'
+      }
     }
   },
   required: ['name', 'description']
@@ -43,6 +51,14 @@ const uischema = {
       type: 'Control',
       label: 'Description',
       scope: '#/properties/description'
+    },
+    {
+      type: 'Control',
+      label: 'Projects with Access',
+      scope: '#/properties/projects',
+      options: {
+        customType: 'projectList'
+      }
     }
   ]
 };
@@ -100,6 +116,11 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
     createDataset({ variables: { dataset: data } });
   };
 
+  const renderers: JsonFormsRendererRegistryEntry[] = [
+    ...materialRenderers,
+    { tester: projectListTester, renderer: ProjectListSelect }
+  ];
+
   return (
     <div>
       <Dialog open={props.show} onClose={props.toggleModal}>
@@ -109,7 +130,7 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
             schema={schema}
             uischema={uischema}
             data={data}
-            renderers={materialRenderers}
+            renderers={renderers}
             cells={materialCells}
             onChange={({ data, errors }) => handleChange(data, errors)}
             additionalErrors={additionalErrors}
diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index 92b3fd00..31466208 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -1,11 +1,45 @@
 import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
 import { withJsonFormsControlProps } from '@jsonforms/react';
+import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent } from '@mui/material';
+import { useState } from 'react';
 
 const ProjectListSelect: React.FC<ControlProps> = (props) => {
-  return <p>hello world</p>;
+  const [projectIds, setProjectIds] = useState<string[]>([]);
+
+  const names = [
+    'First',
+    'Second',
+    'Third'
+  ];
+
+  const handleChange = (event: SelectChangeEvent<typeof projectIds>) => {
+    setProjectIds(typeof event.target.value === 'string' ? event.target.value.split(',') : event.target.value);
+  };
+
+  return (
+    <>
+      <Select
+        multiple
+        input={<OutlinedInput label={props.description} />}
+        value={projectIds}
+        onChange={handleChange}
+        renderValue={(selected) =>(
+          <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
+            {selected.map((value) => (
+              <Chip key={value} label={value} />
+            ))}
+          </Box>
+        )}
+      >
+        {names.map(name => (
+          <MenuItem key={name} value={name}>{name}</MenuItem>
+        ))}
+      </Select>
+    </>
+  );
 };
 
-export const videoFieldTester: RankedTester = rankWith(10, (uischema, _schema, _rootSchema) => {
+export const projectListTester: RankedTester = rankWith(10, (uischema, _schema, _rootSchema) => {
   return uischema.options != undefined && uischema.options && uischema.options.customType === 'projectList';
 });
 

From 52d3c7f5008a95cf0b7fc812acb2fc049a18db8e Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Thu, 4 Apr 2024 16:25:28 -0400
Subject: [PATCH 04/11] Visualize the select with checkboxes

---
 .../client/src/components/ProjectListSelect.component.tsx  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index 31466208..dfc3d404 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -1,6 +1,6 @@
 import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
 import { withJsonFormsControlProps } from '@jsonforms/react';
-import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent } from '@mui/material';
+import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent, Checkbox, ListItemText } from '@mui/material';
 import { useState } from 'react';
 
 const ProjectListSelect: React.FC<ControlProps> = (props) => {
@@ -32,7 +32,10 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
         )}
       >
         {names.map(name => (
-          <MenuItem key={name} value={name}>{name}</MenuItem>
+          <MenuItem key={name} value={name}>
+            <Checkbox checked={projectIds.indexOf(name) > -1} />
+            <ListItemText primary={name} />
+          </MenuItem>
         ))}
       </Select>
     </>

From dc53c8cc565d0e4f63feac956c2702956b221868 Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Thu, 4 Apr 2024 16:31:02 -0400
Subject: [PATCH 05/11] Add a label to the select box

---
 packages/client/src/components/AddDataset.component.tsx     | 2 ++
 .../client/src/components/ProjectListSelect.component.tsx   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/AddDataset.component.tsx b/packages/client/src/components/AddDataset.component.tsx
index 2e4287f6..e9140f95 100644
--- a/packages/client/src/components/AddDataset.component.tsx
+++ b/packages/client/src/components/AddDataset.component.tsx
@@ -30,6 +30,8 @@ const schema = {
       description: 'Please enter new dataset description'
     },
     projects: {
+      description: 'Select project that will have access to the dataset',
+      label: 'Project Access',
       type: 'array',
       items: {
         type: 'string'
diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index dfc3d404..b1973279 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -1,6 +1,6 @@
 import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
 import { withJsonFormsControlProps } from '@jsonforms/react';
-import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent, Checkbox, ListItemText } from '@mui/material';
+import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent, Checkbox, ListItemText, InputLabel } from '@mui/material';
 import { useState } from 'react';
 
 const ProjectListSelect: React.FC<ControlProps> = (props) => {
@@ -18,11 +18,13 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
 
   return (
     <>
+      <InputLabel>{props.label}</InputLabel>
       <Select
         multiple
-        input={<OutlinedInput label={props.description} />}
+        input={<OutlinedInput label={props.label} />}
         value={projectIds}
         onChange={handleChange}
+        fullWidth
         renderValue={(selected) =>(
           <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
             {selected.map((value) => (

From 4cf7782c64164e92d043e598010f1ccf120ac013 Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 10:29:03 -0400
Subject: [PATCH 06/11] Re-disable project admin ability to access dataset
 control

---
 .../client/public/locales/en/translation.json |  3 +-
 .../ProjectListSelect.component.tsx           | 31 +++++++++++++------
 .../src/components/SideBar.component.tsx      |  4 +--
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/packages/client/public/locales/en/translation.json b/packages/client/public/locales/en/translation.json
index b53aa97e..3828f18e 100644
--- a/packages/client/public/locales/en/translation.json
+++ b/packages/client/public/locales/en/translation.json
@@ -147,6 +147,7 @@
     "projectAdminUpdate": "Could not update the user's permssions",
     "studyDelete": "Failed to delete the target study",
     "studyCreate": "Failed to create the new study",
-    "tagsQuery": "Failed to get tags"
+    "tagsQuery": "Failed to get tags",
+    "projectQuery": "Failed to find projects"
   }
 }
diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index b1973279..cfa2e0f0 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -1,21 +1,32 @@
 import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
 import { withJsonFormsControlProps } from '@jsonforms/react';
 import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent, Checkbox, ListItemText, InputLabel } from '@mui/material';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
+import { Project } from '../graphql/graphql';
+import { useGetProjectsQuery } from '../graphql/project/project';
+import { useTranslation } from 'react-i18next';
+import { useSnackbar } from '../context/Snackbar.context';
 
 const ProjectListSelect: React.FC<ControlProps> = (props) => {
+  const [projects, setProjects] = useState<Project[]>([]);
   const [projectIds, setProjectIds] = useState<string[]>([]);
+  const getProjects = useGetProjectsQuery();
 
-  const names = [
-    'First',
-    'Second',
-    'Third'
-  ];
+  const { t } = useTranslation();
+  const { pushSnackbarMessage } = useSnackbar();
 
   const handleChange = (event: SelectChangeEvent<typeof projectIds>) => {
     setProjectIds(typeof event.target.value === 'string' ? event.target.value.split(',') : event.target.value);
   };
 
+  useEffect(() => {
+    if (getProjects.data) {
+      setProjects(getProjects.data.getProjects);
+    } else if (getProjects.error) {
+      pushSnackbarMessage(t('errors.projectQuery'), 'error');
+    }
+  }, [getProjects.data, getProjects.error]);
+
   return (
     <>
       <InputLabel>{props.label}</InputLabel>
@@ -33,10 +44,10 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
           </Box>
         )}
       >
-        {names.map(name => (
-          <MenuItem key={name} value={name}>
-            <Checkbox checked={projectIds.indexOf(name) > -1} />
-            <ListItemText primary={name} />
+        {projects.map(project => (
+          <MenuItem key={project._id} value={project.name}>
+            <Checkbox checked={projectIds.indexOf(project._id) > -1} />
+            <ListItemText primary={project.name} />
           </MenuItem>
         ))}
       </Select>
diff --git a/packages/client/src/components/SideBar.component.tsx b/packages/client/src/components/SideBar.component.tsx
index 65ebc604..f50c2467 100644
--- a/packages/client/src/components/SideBar.component.tsx
+++ b/packages/client/src/components/SideBar.component.tsx
@@ -59,10 +59,10 @@ export const SideBar: FC<SideBarProps> = ({ open, drawerWidth }) => {
       name: t('menu.datasets'),
       action: () => {},
       icon: <Dataset />,
-      visible: (p) => p!.projectAdmin,
+      visible: (p) => p!.owner,
       permission,
       subItems: [
-        { name: t('menu.datasetControl'), action: () => navigate('/dataset/controls'), visible: (p) => p!.projectAdmin },
+        { name: t('menu.datasetControl'), action: () => navigate('/dataset/controls'), visible: (p) => p!.owner },
         { name: t('menu.projectAccess'), action: () => navigate('/dataset/projectaccess'), visible: (p) => p!.owner }
       ]
     },

From 4ddc28e85a961ae91e693bba660588c0f2ea83db Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 12:03:19 -0400
Subject: [PATCH 07/11] Fix issue with check box

---
 .../src/components/ProjectListSelect.component.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index cfa2e0f0..b27e1ace 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -9,14 +9,14 @@ import { useSnackbar } from '../context/Snackbar.context';
 
 const ProjectListSelect: React.FC<ControlProps> = (props) => {
   const [projects, setProjects] = useState<Project[]>([]);
-  const [projectIds, setProjectIds] = useState<string[]>([]);
+  const [selectedProjects, setSelectedProjects] = useState<Project[]>([]);
   const getProjects = useGetProjectsQuery();
 
   const { t } = useTranslation();
   const { pushSnackbarMessage } = useSnackbar();
 
-  const handleChange = (event: SelectChangeEvent<typeof projectIds>) => {
-    setProjectIds(typeof event.target.value === 'string' ? event.target.value.split(',') : event.target.value);
+  const handleChange = (event: SelectChangeEvent<typeof selectedProjects>) => {
+    setSelectedProjects(event.target.value as Project[]);
   };
 
   useEffect(() => {
@@ -33,20 +33,20 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
       <Select
         multiple
         input={<OutlinedInput label={props.label} />}
-        value={projectIds}
+        value={selectedProjects}
         onChange={handleChange}
         fullWidth
         renderValue={(selected) =>(
           <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
             {selected.map((value) => (
-              <Chip key={value} label={value} />
+              <Chip key={value._id} label={value.name} />
             ))}
           </Box>
         )}
       >
         {projects.map(project => (
-          <MenuItem key={project._id} value={project.name}>
-            <Checkbox checked={projectIds.indexOf(project._id) > -1} />
+          <MenuItem key={project._id} value={project as any}>
+            <Checkbox checked={selectedProjects.indexOf(project) > -1} />
             <ListItemText primary={project.name} />
           </MenuItem>
         ))}

From 367d16515d271bf9b0978bc10f8ea6ee7ec728e2 Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 12:29:32 -0400
Subject: [PATCH 08/11] Change process for executing dataset creation

---
 .../src/components/AddDataset.component.tsx   | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/AddDataset.component.tsx b/packages/client/src/components/AddDataset.component.tsx
index e9140f95..f35af11b 100644
--- a/packages/client/src/components/AddDataset.component.tsx
+++ b/packages/client/src/components/AddDataset.component.tsx
@@ -5,13 +5,14 @@ import DialogTitle from '@mui/material/DialogTitle';
 import { useEffect, useState } from 'react';
 import { JsonForms } from '@jsonforms/react';
 import { materialRenderers, materialCells } from '@jsonforms/material-renderers';
-import { useCreateDatasetMutation, useDatasetExistsLazyQuery } from '../graphql/dataset/dataset';
+import { CreateDatasetDocument, CreateDatasetMutation, CreateDatasetMutationVariables, useDatasetExistsLazyQuery } from '../graphql/dataset/dataset';
 import { Button } from '@mui/material';
 import { ErrorObject } from 'ajv';
 import { useSnackbar } from '../context/Snackbar.context';
 import { useTranslation } from 'react-i18next';
 import { JsonFormsRendererRegistryEntry } from '@jsonforms/core';
 import ProjectListSelect, { projectListTester } from './ProjectListSelect.component';
+import { useApolloClient } from '@apollo/client';
 
 interface ShowProps {
   show: boolean;
@@ -73,12 +74,12 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
   const initialData = {} as { name: string; description: string };
 
   const [data, setData] = useState(initialData);
-  const [createDataset, { data: createDatasetResults, loading, error: createDatasetError }] =
-    useCreateDatasetMutation();
 
   const { t } = useTranslation();
   const { pushSnackbarMessage } = useSnackbar();
 
+  const client = useApolloClient();
+
   useEffect(() => {
     if (datasetExistsResults.data?.datasetExists) {
       setAdditionalErrors([
@@ -95,15 +96,6 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
     }
   }, [datasetExistsResults.data]);
 
-  useEffect(() => {
-    if (createDatasetResults?.createDataset) {
-      props.toggleModal(true);
-    } else if (createDatasetError) {
-      pushSnackbarMessage(t('errors.datasetCreate'), 'error');
-      console.error(createDatasetError);
-    }
-  }, [createDatasetResults, createDatasetError]);
-
   const handleChange = (data: any, errors: ErrorObject[] | undefined) => {
     setData(data);
     if (!errors || errors.length === 0) {
@@ -114,8 +106,23 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
     }
   };
 
-  const onCreate = () => {
-    createDataset({ variables: { dataset: data } });
+  const onCreate = async () => {
+    const datasetCreateResult = await client.mutate<CreateDatasetMutation, CreateDatasetMutationVariables>({
+      mutation: CreateDatasetDocument,
+      variables: { dataset: { name: data.name, description: data.description } }
+    });
+
+    // If the dataset failed to be created, stop
+    if (datasetCreateResult.errors) {
+      console.error(datasetCreateResult.errors);
+      pushSnackbarMessage(t('errors.datasetCreate'), 'error');
+      return;
+    }
+
+    // Now grant each project selected access to the dataset
+
+    // Finally toggle the model
+    props.toggleModal(true);
   };
 
   const renderers: JsonFormsRendererRegistryEntry[] = [
@@ -144,7 +151,7 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
           </Button>
           <Button
             variant="contained"
-            disabled={loading || error || datasetExistsResults.data?.datasetExists}
+            disabled={error || datasetExistsResults.data?.datasetExists}
             onClick={onCreate}
             type="submit"
           >

From 43715b8c0228a69cbc670359f6009782ddf7636c Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 13:09:54 -0400
Subject: [PATCH 09/11] Applying access to new dataset

---
 .../src/components/AddDataset.component.tsx      | 16 ++++++++++++++--
 .../components/ProjectListSelect.component.tsx   |  4 +++-
 packages/client/src/context/Dataset.context.tsx  |  8 ++++++--
 .../client/src/graphql/dataset/dataset.graphql   |  1 +
 packages/client/src/graphql/dataset/dataset.ts   |  3 ++-
 packages/client/src/graphql/graphql.ts           |  1 +
 packages/server/src/dataset/dataset.resolver.ts  |  6 +++++-
 7 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/AddDataset.component.tsx b/packages/client/src/components/AddDataset.component.tsx
index f35af11b..c14c7760 100644
--- a/packages/client/src/components/AddDataset.component.tsx
+++ b/packages/client/src/components/AddDataset.component.tsx
@@ -13,6 +13,8 @@ import { useTranslation } from 'react-i18next';
 import { JsonFormsRendererRegistryEntry } from '@jsonforms/core';
 import ProjectListSelect, { projectListTester } from './ProjectListSelect.component';
 import { useApolloClient } from '@apollo/client';
+import { GrantProjectDatasetAccessDocument, GrantProjectDatasetAccessMutation, GrantProjectDatasetAccessMutationVariables } from '../graphql/permission/permission';
+import { useDataset } from '../context/Dataset.context';
 
 interface ShowProps {
   show: boolean;
@@ -70,8 +72,9 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
   const [error, setError] = useState(true);
   const [additionalErrors, setAdditionalErrors] = useState<ErrorObject[]>([]);
   const [datasetExistsQuery, datasetExistsResults] = useDatasetExistsLazyQuery();
+  const { refetch: refetchDatasets } = useDataset();
 
-  const initialData = {} as { name: string; description: string };
+  const initialData = {} as { name: string; description: string, projects: string[] };
 
   const [data, setData] = useState(initialData);
 
@@ -113,13 +116,22 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
     });
 
     // If the dataset failed to be created, stop
-    if (datasetCreateResult.errors) {
+    if (datasetCreateResult.errors || !datasetCreateResult.data) {
       console.error(datasetCreateResult.errors);
       pushSnackbarMessage(t('errors.datasetCreate'), 'error');
       return;
     }
 
+    refetchDatasets();
+
     // Now grant each project selected access to the dataset
+    const datasetID = datasetCreateResult.data.createDataset._id;
+    for (const projectID of data.projects) {
+      await client.mutate<GrantProjectDatasetAccessMutation, GrantProjectDatasetAccessMutationVariables>({
+        mutation: GrantProjectDatasetAccessDocument,
+        variables: { project: projectID, dataset: datasetID, hasAccess: true }
+      });
+    }
 
     // Finally toggle the model
     props.toggleModal(true);
diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index b27e1ace..7216a4ff 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -16,7 +16,9 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
   const { pushSnackbarMessage } = useSnackbar();
 
   const handleChange = (event: SelectChangeEvent<typeof selectedProjects>) => {
-    setSelectedProjects(event.target.value as Project[]);
+    const newProjects = event.target.value as Project[];
+    setSelectedProjects(newProjects);
+    props.handleChange(props.path, newProjects.map(project => project._id));
   };
 
   useEffect(() => {
diff --git a/packages/client/src/context/Dataset.context.tsx b/packages/client/src/context/Dataset.context.tsx
index 101beb97..7e0bff46 100644
--- a/packages/client/src/context/Dataset.context.tsx
+++ b/packages/client/src/context/Dataset.context.tsx
@@ -4,6 +4,7 @@ import { useGetDatasetsQuery } from '../graphql/dataset/dataset';
 
 export interface DatasetContextProps {
   datasets: Dataset[];
+  refetch: () => void;
 }
 
 const DatasetContext = createContext({} as DatasetContextProps);
@@ -14,16 +15,19 @@ export interface DatasetProviderProps {
 
 export const DatasetProvider: FC<DatasetProviderProps> = ({ children }) => {
   const [datasets, setDatasets] = useState<Dataset[]>([]);
-
   const getDatasetsResults = useGetDatasetsQuery();
 
+  const refetch = () => {
+    getDatasetsResults.refetch();
+  };
+
   useEffect(() => {
     if (getDatasetsResults.data) {
       setDatasets(getDatasetsResults.data.getDatasets);
     }
   }, [getDatasetsResults]);
 
-  return <DatasetContext.Provider value={{ datasets }}>{children}</DatasetContext.Provider>;
+  return <DatasetContext.Provider value={{ datasets, refetch }}>{children}</DatasetContext.Provider>;
 };
 
 export const useDataset = () => useContext(DatasetContext);
diff --git a/packages/client/src/graphql/dataset/dataset.graphql b/packages/client/src/graphql/dataset/dataset.graphql
index 61f8bd7c..d88465a6 100644
--- a/packages/client/src/graphql/dataset/dataset.graphql
+++ b/packages/client/src/graphql/dataset/dataset.graphql
@@ -20,6 +20,7 @@ query getDatasetsByProject($project: ID!) {
 
 mutation createDataset($dataset: DatasetCreate!) {
   createDataset(dataset: $dataset) {
+    _id
     name
     description
   }
diff --git a/packages/client/src/graphql/dataset/dataset.ts b/packages/client/src/graphql/dataset/dataset.ts
index 5721b522..f25c6864 100644
--- a/packages/client/src/graphql/dataset/dataset.ts
+++ b/packages/client/src/graphql/dataset/dataset.ts
@@ -29,7 +29,7 @@ export type CreateDatasetMutationVariables = Types.Exact<{
 }>;
 
 
-export type CreateDatasetMutation = { __typename?: 'Mutation', createDataset: { __typename?: 'Dataset', name: string, description: string } };
+export type CreateDatasetMutation = { __typename?: 'Mutation', createDataset: { __typename?: 'Dataset', _id: string, name: string, description: string } };
 
 
 export const GetDatasetsDocument = gql`
@@ -141,6 +141,7 @@ export type GetDatasetsByProjectQueryResult = Apollo.QueryResult<GetDatasetsByPr
 export const CreateDatasetDocument = gql`
     mutation createDataset($dataset: DatasetCreate!) {
   createDataset(dataset: $dataset) {
+    _id
     name
     description
   }
diff --git a/packages/client/src/graphql/graphql.ts b/packages/client/src/graphql/graphql.ts
index e6c9a6bf..ae0c0623 100644
--- a/packages/client/src/graphql/graphql.ts
+++ b/packages/client/src/graphql/graphql.ts
@@ -44,6 +44,7 @@ export type Entry = {
   dataset: Scalars['ID']['output'];
   dateCreated: Scalars['DateTime']['output'];
   entryID: Scalars['String']['output'];
+  isTraining: Scalars['Boolean']['output'];
   meta?: Maybe<Scalars['JSON']['output']>;
   organization: Scalars['ID']['output'];
   signedUrl: Scalars['String']['output'];
diff --git a/packages/server/src/dataset/dataset.resolver.ts b/packages/server/src/dataset/dataset.resolver.ts
index 9cfd387a..cd2c5177 100644
--- a/packages/server/src/dataset/dataset.resolver.ts
+++ b/packages/server/src/dataset/dataset.resolver.ts
@@ -59,7 +59,11 @@ export class DatasetResolver {
       throw new BadRequestException(`Dataset with the name ${dataset.name} already exists`);
     }
 
-    return this.datasetService.create(organization._id, dataset);
+    const newDataset = await this.datasetService.create(organization._id, dataset);
+
+    await this.enforcer.loadPolicy();
+
+    return newDataset;
   }
 
   @Mutation(() => Boolean)

From 4d11db8cd27f958af256de687291c1187f3068bd Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 13:11:50 -0400
Subject: [PATCH 10/11] Fix formatting

---
 .../src/components/AddDataset.component.tsx   | 15 ++++++++++---
 .../ProjectListSelect.component.tsx           | 21 +++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/AddDataset.component.tsx b/packages/client/src/components/AddDataset.component.tsx
index c14c7760..6ea7113d 100644
--- a/packages/client/src/components/AddDataset.component.tsx
+++ b/packages/client/src/components/AddDataset.component.tsx
@@ -5,7 +5,12 @@ import DialogTitle from '@mui/material/DialogTitle';
 import { useEffect, useState } from 'react';
 import { JsonForms } from '@jsonforms/react';
 import { materialRenderers, materialCells } from '@jsonforms/material-renderers';
-import { CreateDatasetDocument, CreateDatasetMutation, CreateDatasetMutationVariables, useDatasetExistsLazyQuery } from '../graphql/dataset/dataset';
+import {
+  CreateDatasetDocument,
+  CreateDatasetMutation,
+  CreateDatasetMutationVariables,
+  useDatasetExistsLazyQuery
+} from '../graphql/dataset/dataset';
 import { Button } from '@mui/material';
 import { ErrorObject } from 'ajv';
 import { useSnackbar } from '../context/Snackbar.context';
@@ -13,7 +18,11 @@ import { useTranslation } from 'react-i18next';
 import { JsonFormsRendererRegistryEntry } from '@jsonforms/core';
 import ProjectListSelect, { projectListTester } from './ProjectListSelect.component';
 import { useApolloClient } from '@apollo/client';
-import { GrantProjectDatasetAccessDocument, GrantProjectDatasetAccessMutation, GrantProjectDatasetAccessMutationVariables } from '../graphql/permission/permission';
+import {
+  GrantProjectDatasetAccessDocument,
+  GrantProjectDatasetAccessMutation,
+  GrantProjectDatasetAccessMutationVariables
+} from '../graphql/permission/permission';
 import { useDataset } from '../context/Dataset.context';
 
 interface ShowProps {
@@ -74,7 +83,7 @@ export const AddDataset: React.FC<ShowProps> = (props: ShowProps) => {
   const [datasetExistsQuery, datasetExistsResults] = useDatasetExistsLazyQuery();
   const { refetch: refetchDatasets } = useDataset();
 
-  const initialData = {} as { name: string; description: string, projects: string[] };
+  const initialData = {} as { name: string; description: string; projects: string[] };
 
   const [data, setData] = useState(initialData);
 
diff --git a/packages/client/src/components/ProjectListSelect.component.tsx b/packages/client/src/components/ProjectListSelect.component.tsx
index 7216a4ff..b69a7a70 100644
--- a/packages/client/src/components/ProjectListSelect.component.tsx
+++ b/packages/client/src/components/ProjectListSelect.component.tsx
@@ -1,6 +1,16 @@
 import { ControlProps, rankWith, RankedTester } from '@jsonforms/core';
 import { withJsonFormsControlProps } from '@jsonforms/react';
-import { OutlinedInput, Select, Box, Chip, MenuItem, SelectChangeEvent, Checkbox, ListItemText, InputLabel } from '@mui/material';
+import {
+  OutlinedInput,
+  Select,
+  Box,
+  Chip,
+  MenuItem,
+  SelectChangeEvent,
+  Checkbox,
+  ListItemText,
+  InputLabel
+} from '@mui/material';
 import { useState, useEffect } from 'react';
 import { Project } from '../graphql/graphql';
 import { useGetProjectsQuery } from '../graphql/project/project';
@@ -18,7 +28,10 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
   const handleChange = (event: SelectChangeEvent<typeof selectedProjects>) => {
     const newProjects = event.target.value as Project[];
     setSelectedProjects(newProjects);
-    props.handleChange(props.path, newProjects.map(project => project._id));
+    props.handleChange(
+      props.path,
+      newProjects.map((project) => project._id)
+    );
   };
 
   useEffect(() => {
@@ -38,7 +51,7 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
         value={selectedProjects}
         onChange={handleChange}
         fullWidth
-        renderValue={(selected) =>(
+        renderValue={(selected) => (
           <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
             {selected.map((value) => (
               <Chip key={value._id} label={value.name} />
@@ -46,7 +59,7 @@ const ProjectListSelect: React.FC<ControlProps> = (props) => {
           </Box>
         )}
       >
-        {projects.map(project => (
+        {projects.map((project) => (
           <MenuItem key={project._id} value={project as any}>
             <Checkbox checked={selectedProjects.indexOf(project) > -1} />
             <ListItemText primary={project.name} />

From 86fba9f7a5b30317aca1c732a8c96bdd1af4aab6 Mon Sep 17 00:00:00 2001
From: cbolles <collinbolles@gmail.com>
Date: Fri, 5 Apr 2024 13:18:40 -0400
Subject: [PATCH 11/11] Fix build issues

---
 packages/client/src/graphql/entry/entry.graphql | 2 ++
 packages/client/src/graphql/entry/entry.ts      | 6 ++++--
 packages/client/src/graphql/tag/tag.graphql     | 3 +++
 packages/client/src/graphql/tag/tag.ts          | 9 ++++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/graphql/entry/entry.graphql b/packages/client/src/graphql/entry/entry.graphql
index c2cab931..c92708e4 100644
--- a/packages/client/src/graphql/entry/entry.graphql
+++ b/packages/client/src/graphql/entry/entry.graphql
@@ -10,6 +10,7 @@ query entryForDataset($dataset: ID!) {
     meta
     signedUrl
     signedUrlExpiration
+    isTraining
   }
 }
 
@@ -25,6 +26,7 @@ query entryFromID($entry: ID!) {
     meta
     signedUrl
     signedUrlExpiration
+    isTraining
   }
 }
 
diff --git a/packages/client/src/graphql/entry/entry.ts b/packages/client/src/graphql/entry/entry.ts
index 7d4c3acc..539b3b23 100644
--- a/packages/client/src/graphql/entry/entry.ts
+++ b/packages/client/src/graphql/entry/entry.ts
@@ -10,14 +10,14 @@ export type EntryForDatasetQueryVariables = Types.Exact<{
 }>;
 
 
-export type EntryForDatasetQuery = { __typename?: 'Query', entryForDataset: Array<{ __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number }> };
+export type EntryForDatasetQuery = { __typename?: 'Query', entryForDataset: Array<{ __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number, isTraining: boolean }> };
 
 export type EntryFromIdQueryVariables = Types.Exact<{
   entry: Types.Scalars['ID']['input'];
 }>;
 
 
-export type EntryFromIdQuery = { __typename?: 'Query', entryFromID: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number } };
+export type EntryFromIdQuery = { __typename?: 'Query', entryFromID: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number, isTraining: boolean } };
 
 export type DeleteEntryMutationVariables = Types.Exact<{
   entry: Types.Scalars['ID']['input'];
@@ -40,6 +40,7 @@ export const EntryForDatasetDocument = gql`
     meta
     signedUrl
     signedUrlExpiration
+    isTraining
   }
 }
     `;
@@ -84,6 +85,7 @@ export const EntryFromIdDocument = gql`
     meta
     signedUrl
     signedUrlExpiration
+    isTraining
   }
 }
     `;
diff --git a/packages/client/src/graphql/tag/tag.graphql b/packages/client/src/graphql/tag/tag.graphql
index c90e51a2..f6d74ba4 100644
--- a/packages/client/src/graphql/tag/tag.graphql
+++ b/packages/client/src/graphql/tag/tag.graphql
@@ -30,6 +30,7 @@ mutation assignTag($study: ID!) {
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
   }
 }
@@ -58,6 +59,7 @@ query getTags($study: ID!) {
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
     data
     complete
@@ -77,6 +79,7 @@ query getTrainingTags($study: ID!, $user: String!) {
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
     data
     complete
diff --git a/packages/client/src/graphql/tag/tag.ts b/packages/client/src/graphql/tag/tag.ts
index 007e0cb1..292f5062 100644
--- a/packages/client/src/graphql/tag/tag.ts
+++ b/packages/client/src/graphql/tag/tag.ts
@@ -43,7 +43,7 @@ export type AssignTagMutationVariables = Types.Exact<{
 }>;
 
 
-export type AssignTagMutation = { __typename?: 'Mutation', assignTag?: { __typename?: 'Tag', _id: string, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number } } | null };
+export type AssignTagMutation = { __typename?: 'Mutation', assignTag?: { __typename?: 'Tag', _id: string, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, dataset: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number, isTraining: boolean } } | null };
 
 export type CompleteTagMutationVariables = Types.Exact<{
   tag: Types.Scalars['ID']['input'];
@@ -67,7 +67,7 @@ export type GetTagsQueryVariables = Types.Exact<{
 }>;
 
 
-export type GetTagsQuery = { __typename?: 'Query', getTags: Array<{ __typename?: 'Tag', _id: string, data?: any | null, complete: boolean, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number } }> };
+export type GetTagsQuery = { __typename?: 'Query', getTags: Array<{ __typename?: 'Tag', _id: string, data?: any | null, complete: boolean, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number, isTraining: boolean } }> };
 
 export type GetTrainingTagsQueryVariables = Types.Exact<{
   study: Types.Scalars['ID']['input'];
@@ -75,7 +75,7 @@ export type GetTrainingTagsQueryVariables = Types.Exact<{
 }>;
 
 
-export type GetTrainingTagsQuery = { __typename?: 'Query', getTrainingTags: Array<{ __typename?: 'Tag', _id: string, data?: any | null, complete: boolean, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number } }> };
+export type GetTrainingTagsQuery = { __typename?: 'Query', getTrainingTags: Array<{ __typename?: 'Tag', _id: string, data?: any | null, complete: boolean, entry: { __typename?: 'Entry', _id: string, organization: string, entryID: string, contentType: string, creator: string, dateCreated: any, meta?: any | null, signedUrl: string, signedUrlExpiration: number, isTraining: boolean } }> };
 
 
 export const CreateTagsDocument = gql`
@@ -226,6 +226,7 @@ export const AssignTagDocument = gql`
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
   }
 }
@@ -338,6 +339,7 @@ export const GetTagsDocument = gql`
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
     data
     complete
@@ -386,6 +388,7 @@ export const GetTrainingTagsDocument = gql`
       meta
       signedUrl
       signedUrlExpiration
+      isTraining
     }
     data
     complete