From 68533fa751b37f7ae259d3b1c4bef0d7acee0905 Mon Sep 17 00:00:00 2001
From: niestrow <wojciech.niestroj@contractors.roche.com>
Date: Fri, 29 Nov 2024 16:45:22 +0100
Subject: [PATCH 1/5] Fix project description not working

---
 frontend-v2/src/features/projects/Project.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/frontend-v2/src/features/projects/Project.tsx b/frontend-v2/src/features/projects/Project.tsx
index 4a90759c..7ac934c8 100644
--- a/frontend-v2/src/features/projects/Project.tsx
+++ b/frontend-v2/src/features/projects/Project.tsx
@@ -120,6 +120,8 @@ const ProjectRow: FC<Props> = ({
     reset,
     handleSubmit,
     control,
+    setValue,
+    register,
     formState: { isDirty },
   } = useForm<FormData>({
     defaultValues: { project, compound: defaultCompound },
@@ -158,6 +160,7 @@ const ProjectRow: FC<Props> = ({
               () => dispatch(decrementDirtyCount()),
             );
           }
+          console.log('project', project, data.project)
           if (JSON.stringify(project) !== JSON.stringify(data.project)) {
             dispatch(incrementDirtyCount());
             updateProject({ id: project.id, project: data.project }).then(() =>
@@ -169,13 +172,8 @@ const ProjectRow: FC<Props> = ({
     [handleSubmit, compound, project, updateCompound, updateProject],
   );
 
-  const [fieldValue, setFieldValue] = useFieldState({
-    name: "project.description",
-    control,
-  });
-
   const onCancel = () => {
-    setFieldValue(project.description);
+    setValue('project.description', project.description);
   };
 
   if (isLoading) {
@@ -414,8 +412,7 @@ const ProjectRow: FC<Props> = ({
           project={project}
         >
           <MaterialTextField
-            onChange={(event) => setFieldValue(event.target.value)}
-            value={fieldValue}
+            {...register('project.description')}
             sx={{ width: "50vw" }}
             disabled={!isEditMode}
             multiline

From c83602296e1216f4264b17d085d893f8fcb13607 Mon Sep 17 00:00:00 2001
From: niestrow <wojciech.niestroj@contractors.roche.com>
Date: Fri, 29 Nov 2024 16:49:46 +0100
Subject: [PATCH 2/5] Fix doses input getting narrow on large scales

---
 frontend-v2/src/features/trial/Doses.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend-v2/src/features/trial/Doses.tsx b/frontend-v2/src/features/trial/Doses.tsx
index 323064a0..d4da0a82 100644
--- a/frontend-v2/src/features/trial/Doses.tsx
+++ b/frontend-v2/src/features/trial/Doses.tsx
@@ -195,6 +195,7 @@ const Doses: FC<Props> = ({ onChange, project, protocol, units }) => {
         <TableRow key={dose.id}>
           <TableCell>
             <FloatField
+              sx={{ minWidth: '6rem'}}
               size="small"
               label={"Dose"}
               name={`doses.${index}.amount`}

From 5a5afaed37f22cfa7356cceddf4b765d97f9e6b2 Mon Sep 17 00:00:00 2001
From: niestrow <wojciech.niestroj@contractors.roche.com>
Date: Fri, 29 Nov 2024 16:54:53 +0100
Subject: [PATCH 3/5] Fix unit showing id instead of symbol

---
 frontend-v2/src/features/drug/Drug.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend-v2/src/features/drug/Drug.tsx b/frontend-v2/src/features/drug/Drug.tsx
index 24b8eaa8..4d2e2cb3 100644
--- a/frontend-v2/src/features/drug/Drug.tsx
+++ b/frontend-v2/src/features/drug/Drug.tsx
@@ -224,7 +224,7 @@ const Drug: FC = () => {
     setIsEditIndex(isEdit ? index : null);
   };
 
-  console.log("efficacy_experiments", efficacy_experiments);
+  console.log("units", units);
 
   return (
     <div style={{ display: "flex", flexDirection: "column" }}>
@@ -408,7 +408,9 @@ const Drug: FC = () => {
                     />
                   ) : (
                     <Typography>
-                      {getValues(`efficacy_experiments.${index}.c50_unit`) ||
+                      {units.find(
+                        (u) => u.id === getValues(`efficacy_experiments.${index}.c50_unit`),
+                      )?.symbol ||
                         "-"}
                     </Typography>
                   )}

From 87e3c59da8b2594cdc40a784c3a038db4b3d9eee Mon Sep 17 00:00:00 2001
From: niestrow <wojciech.niestroj@contractors.roche.com>
Date: Fri, 29 Nov 2024 17:24:40 +0100
Subject: [PATCH 4/5] FIx sharing project not saving

---
 frontend-v2/src/features/projects/Project.tsx | 35 ++++++++++++-------
 .../src/features/projects/UserAccess.tsx      | 10 +++++-
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/frontend-v2/src/features/projects/Project.tsx b/frontend-v2/src/features/projects/Project.tsx
index 7ac934c8..7db9a7fe 100644
--- a/frontend-v2/src/features/projects/Project.tsx
+++ b/frontend-v2/src/features/projects/Project.tsx
@@ -160,7 +160,6 @@ const ProjectRow: FC<Props> = ({
               () => dispatch(decrementDirtyCount()),
             );
           }
-          console.log('project', project, data.project)
           if (JSON.stringify(project) !== JSON.stringify(data.project)) {
             dispatch(incrementDirtyCount());
             updateProject({ id: project.id, project: data.project }).then(() =>
@@ -173,9 +172,15 @@ const ProjectRow: FC<Props> = ({
   );
 
   const onCancel = () => {
-    setValue('project.description', project.description);
+    setValue("project.description", project.description);
   };
 
+  const onShareCanel = () => {
+    setValue("project.user_access", project.user_access);
+    setUserAccessOpen(false);
+    setIsEditMode(false);
+  }
+
   if (isLoading) {
     return <div>Loading...</div>;
   }
@@ -341,7 +346,10 @@ const ProjectRow: FC<Props> = ({
 
               <Tooltip title="Share Project">
                 <IconButton
-                  onClick={() => setUserAccessOpen(true)}
+                  onClick={() => {
+                    setIsEditMode(true);
+                    setUserAccessOpen(true);
+                  }}
                   disabled={isSharedWithMe}
                 >
                   <PersonAdd />
@@ -352,15 +360,6 @@ const ProjectRow: FC<Props> = ({
                   <Delete />
                 </IconButton>
               </Tooltip>
-              <UserAccess
-                open={userAccessOpen}
-                onClose={userAccessClose}
-                control={control}
-                userAccess={userAccess as ProjectAccess[]}
-                append={append}
-                remove={remove}
-                project={project}
-              />
               {isSharedWithMe && (
                 <Tooltip title="This project is shared with me as view-only">
                   <div>
@@ -402,6 +401,16 @@ const ProjectRow: FC<Props> = ({
           )}
         </TableCell>
       </TableRow>
+      <UserAccess
+        open={userAccessOpen}
+        onClose={userAccessClose}
+        onCancel={onShareCanel}
+        control={control}
+        userAccess={userAccess as ProjectAccess[]}
+        append={append}
+        remove={remove}
+        project={project}
+      />
       {isDescriptionModalOpen && (
         <DescriptionModal
           isOpen={isDescriptionModalOpen}
@@ -412,7 +421,7 @@ const ProjectRow: FC<Props> = ({
           project={project}
         >
           <MaterialTextField
-            {...register('project.description')}
+            {...register("project.description")}
             sx={{ width: "50vw" }}
             disabled={!isEditMode}
             multiline
diff --git a/frontend-v2/src/features/projects/UserAccess.tsx b/frontend-v2/src/features/projects/UserAccess.tsx
index 02fca709..bbded8b7 100644
--- a/frontend-v2/src/features/projects/UserAccess.tsx
+++ b/frontend-v2/src/features/projects/UserAccess.tsx
@@ -32,6 +32,7 @@ interface Props {
   userAccess: ProjectAccess[];
   append: (value: ProjectAccess) => void;
   remove: (index: number) => void;
+  onCancel: () => void;
   control: Control<FormData>;
   onClose: () => void;
 }
@@ -41,7 +42,7 @@ const UserAccess: FC<Props> = ({
   userAccess,
   append,
   remove,
-  control,
+  onCancel,
   onClose,
 }) => {
   const { data: users } = useUserListQuery();
@@ -122,6 +123,13 @@ const UserAccess: FC<Props> = ({
               margin: ".5rem",
             }}
           >
+            <Button
+              variant="outlined"
+              sx={{ marginLeft: "1rem" }}
+              onClick={onCancel}
+            >
+              Cancel
+            </Button>
             <Button
               variant="contained"
               sx={{ marginLeft: "1rem" }}

From efb0614c1415f07a02488c165e694f2ce6170235 Mon Sep 17 00:00:00 2001
From: niestrow <wojciech.niestroj@contractors.roche.com>
Date: Fri, 29 Nov 2024 17:32:54 +0100
Subject: [PATCH 5/5] Remove unintentional console.log

---
 frontend-v2/src/features/drug/Drug.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend-v2/src/features/drug/Drug.tsx b/frontend-v2/src/features/drug/Drug.tsx
index 4d2e2cb3..3fbc1f0c 100644
--- a/frontend-v2/src/features/drug/Drug.tsx
+++ b/frontend-v2/src/features/drug/Drug.tsx
@@ -224,8 +224,6 @@ const Drug: FC = () => {
     setIsEditIndex(isEdit ? index : null);
   };
 
-  console.log("units", units);
-
   return (
     <div style={{ display: "flex", flexDirection: "column" }}>
       <TableHeader variant="h4" label="Drug & Target" />