Feat para assignment css (#254)

* Add duration assigment step and create task on save Closes #238. * Fix type issues * added tests for iep.getSubgoal and iep.assignTaskToParas * added some brute force css on buttons and benchmarks as placeholders for MUI themes for primary and secondary buttons and comments on future fixes * made Next button disabled unless at least one Staff member is selected and fixed "focus" state of "Save" button to unfocused until selected --------- Co-authored-by: Max Isom <[email protected]>
sfbrigade · Nov 18, 2023 · 0d7fe11 · 0d7fe11
1 parent 40d75bd
commit 0d7fe11
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 57 deletions.
diff --git a/src/components/subgoal/Subgoal-Assignment-Modal.tsx b/src/components/subgoal/Subgoal-Assignment-Modal.tsx
@@ -13,8 +13,9 @@ import {
   DialogContent,
   DialogActions,
 } from "@mui/material";
-import { useState } from "react";
+import { useState, useRef } from "react";
 import $subgoal from "./Subgoal-Assignment-Modal.module.css";
+
 import {
   AssignmentDuration,
   DurationSelectionStep,
@@ -41,6 +42,7 @@ type Step = (typeof STEPS)[number];
 
 export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
   const [selectedParaIds, setSelectedParaIds] = useState<string[]>([]);
+  const nextButtonRef = useRef<HTMLButtonElement>(null);
   const [assignmentDuration, setAssignmentDuration] =
     useState<AssignmentDuration>({ type: "forever" });
   const [currentModalSelection, setCurrentModalSelection] =
@@ -77,6 +79,9 @@ export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
   };
 
   const handleNext = async () => {
+    if (nextButtonRef.current) {
+      nextButtonRef.current.blur();
+    }
     const currentStepIndex = STEPS.indexOf(currentModalSelection);
     const nextStep = STEPS[currentStepIndex + 1];
     if (nextStep) {
@@ -123,7 +128,6 @@ export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
             </p>
           ))}
         </Box>
-        {/* we could make this and the 2nd selection process with a reusable component, e.g. labels in the <p> below could be from rendering {selectionLabel} but this is one solution to start */}
         {currentModalSelection === "PARA_SELECTION" && (
           <Box>
             <p>Select one or more paras:</p>
@@ -136,11 +140,11 @@ export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
                 borderRadius: 1,
               }}
             >
+              {/* Design ask is to reorder the mapped staff so that the selected staff are moved to the top of the list */}
               <List sx={{ p: 0 }} className={$subgoal.staffListItemText}>
                 {myParas
                   ?.filter((para): para is ParaProps => para !== undefined)
                   .map((para) => (
-                    // CSS ask is to reorder the mapped staff so that the selected staff are moved to the top of the list
                     <ListItem key={para.user_id} sx={{ px: 0, py: 0 }}>
                       <ListItemButton
                         dense
@@ -164,7 +168,6 @@ export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
             </Box>
           </Box>
         )}
-        {/* Enter 2nd selection process here, utilizing selected staff at the end of the process */}
         {currentModalSelection === "DURATION_SELECTION" && (
           <Box>
             <DurationSelectionStep
@@ -177,21 +180,61 @@ export const SubgoalAssignmentModal = (props: SubgoalAssignmentModalProps) => {
         <DialogActions>
           {currentModalSelection !== STEPS[0] && (
             <Button
-              variant="contained"
+              variant="outlined"
               className={$subgoal.button}
               onClick={handleBack}
-              sx={{ mr: "auto" }}
+              sx={{
+                mr: "auto",
+                height: "24px",
+                flex: "flex-end",
+                width: "auto",
+                padding: "20px 10px",
+                backgroundColor: "#fff ",
+                borderWidth: "1px",
+                borderColor: "#20159E",
+                borderRadius: "8px",
+                color: "#20159E",
+                fontFamily: "Quicksand",
+                textTransform: "none",
+                "&:hover": {
+                  backgroundColor: "#F6F5FF",
+                },
+              }}
               disabled={assignTaskToPara.isLoading}
             >
               Back
             </Button>
           )}
-
+          {/* we should have reusable variables/classNames for all of this sx:CSS once the global themes are resolved */}
           <Button
+            sx={{
+              height: "24px",
+              flex: "flex-end",
+              width: "auto",
+              padding: "20px 10px",
+              backgroundColor: "#20159E ",
+              borderRadius: "8px",
+              color: "#FFFFFF",
+              fontFamily: "Quicksand",
+              textTransform: "none",
+              boxShadow: "none",
+              "&:hover": {
+                backgroundColor: "#20159E ",
+                boxShadow: "0px 1px 3px 1px rgba(0, 0, 0, .30)",
+              },
+              "&:focus": {
+                backgroundColor: "#5347D7",
+              },
+              "&:active": {
+                backgroundColor: "#140B7A",
+              },
+            }}
             variant="contained"
-            className={$subgoal.button}
             onClick={handleNext}
-            disabled={assignTaskToPara.isLoading}
+            ref={nextButtonRef}
+            disabled={
+              assignTaskToPara.isLoading || selectedParaIds.length === 0
+            }
           >
             {currentModalSelection === STEPS[STEPS.length - 1]
               ? "Save"

diff --git a/src/components/subgoal/Subgoal.tsx b/src/components/subgoal/Subgoal.tsx
@@ -11,72 +11,63 @@ interface SubgoalProps {
 
 const Subgoals = ({ subgoal }: SubgoalProps) => {
   const [isAssignmentModalOpen, setIsAssignmentModalOpen] = useState(false);
-  const task = trpc.iep.tempAddTaskToSelf.useMutation();
-
-  const assignToPara = async () => {
-    const result = await task.mutateAsync({
-      subgoal_id: subgoal.subgoal_id,
-      due_date: new Date(2023, 8, 20),
-      trial_count: 5,
-    });
-    if (!result) {
-      alert("Error: Benchmark already assigned to self.");
-    } else {
-      alert("Success! Benchmark assigned to self.");
-    }
-  };
 
   return (
-    <>
+    <Box sx={{ border: "1px solid #B9C1C6" }}>
       <Box
         sx={{
-          display: "flex",
+          display: "flex-col",
           justifyContent: "space-between",
-          backgroundColor: "#f4d5d5",
+          backgroundColor: "#fff",
           padding: "1rem",
         }}
       >
         <p>{subgoal.description}</p>
-        <Button
-          sx={{
-            height: "24px",
-            width: "auto",
-            padding: "0px 20px",
-            backgroundColor: "#5347d7",
-            borderRadius: "5px",
-            border: "none",
-            color: "#ffffff",
-            fontFamily: "Quicksand",
-          }}
-          variant="contained"
-          onClick={assignToPara}
-        >
-          Assign
-        </Button>
-
-        <Button
+        <Box
           sx={{
-            height: "24px",
-            width: "auto",
-            padding: "0px 20px",
-            backgroundColor: "#5347d7",
-            borderRadius: "5px",
-            border: "none",
-            color: "#ffffff",
-            fontFamily: "Quicksand",
+            display: "flex",
+            justifyContent: "space-between",
           }}
-          variant="contained"
-          onClick={() => setIsAssignmentModalOpen(true)}
         >
-          [Draft] Assign
-        </Button>
+          <p> BASELINE</p>
+          <p> CURRENT</p>
+          <Box
+            sx={{
+              display: "flex-col",
+            }}
+          >
+            <p>STAFF</p>
+            <Button
+              sx={{
+                height: "24px",
+                flex: "flex-end",
+                width: "auto",
+                padding: "20px 10px",
+                backgroundColor: "#fff ",
+                borderWidth: "1px",
+                borderColor: "#20159E",
+                borderRadius: "8px",
+                color: "#20159E",
+                fontFamily: "Quicksand",
+                textTransform: "none",
+                "&:hover": {
+                  backgroundColor: "#F6F5FF",
+                },
+              }}
+              variant="outlined"
+              onClick={() => setIsAssignmentModalOpen(true)}
+            >
+              Assign Staff
+            </Button>
+          </Box>
+        </Box>
       </Box>
       <SubgoalAssignmentModal
         isOpen={isAssignmentModalOpen}
         onClose={() => setIsAssignmentModalOpen(false)}
         subgoal_id={subgoal.subgoal_id}
       />
-    </>
+    </Box>
   );
 };