Merge pull request #232 from CBIIT/CRDCDH-561

CRDCDH-561 Added "Update" upload Metadata Intention
CBIIT · Dec 6, 2023 · b304aa8 · b304aa8
2 parents e0c9c79 + e64c92f
commit b304aa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/components/DataSubmissions/DataSubmissionUpload.tsx b/src/components/DataSubmissions/DataSubmissionUpload.tsx
@@ -109,8 +109,6 @@ const VisuallyHiddenInput = styled("input")(() => ({
 
 const UploadRoles: User["role"][] = ["Organization Owner"]; // and submission owner
 
-type UploadType = "New" | "Update";
-
 type Props = {
   submitterID: string;
   readOnly?: boolean;
@@ -121,7 +119,7 @@ const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
   const { submissionId } = useParams();
   const { user } = useAuthContext();
 
-  const [uploadType, setUploadType] = useState<UploadType>("New");
+  const [metadataIntention, setMetadataIntention] = useState<MetadataIntention>("New");
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [isUploading, setIsUploading] = useState<boolean>(false);
   const uploadMetatadataInputRef = useRef<HTMLInputElement>(null);
@@ -195,7 +193,7 @@ const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
         variables: {
           submissionID: submissionId,
           type: "metadata",
-          metadataIntention: "New",
+          metadataIntention,
           files: formattedFiles,
         }
       });
@@ -299,9 +297,9 @@ const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
       <RadioInput
         id="data-submission-dashboard-upload-type"
         label="Upload Type"
-        value={uploadType}
-        onChange={(event, value: UploadType) => setUploadType(value)}
-        options={[{ label: "New", value: "New" }, { label: "Update", value: "Update", disabled: true }]}
+        value={metadataIntention}
+        onChange={(_event, value: MetadataIntention) => setMetadataIntention(value)}
+        options={[{ label: "New", value: "New", disabled: !canUpload }, { label: "Update", value: "Update", disabled: !canUpload }]}
         gridWidth={4}
         readOnly={readOnly}
         inline

diff --git a/src/components/DataSubmissions/RadioInput.tsx b/src/components/DataSubmissions/RadioInput.tsx
@@ -73,7 +73,7 @@ const StyledAsterisk = styled("span")(() => ({
 
 const StyledRadio = styled(Radio)((props) => ({
   "& input": {
-    cursor: props.readOnly ? "not-allowed" : "initial",
+    cursor: props.readOnly ? "not-allowed" : "pointer",
   },
   "& .radio-icon": {
     backgroundColor: props.readOnly ? "#D2DFE9 !important" : "initial",
@@ -173,6 +173,10 @@ const RadioYesNoInput: FC<Props> = ({
     };
   }, [radioGroupInputRef]);
 
+  useEffect(() => {
+    setVal(value?.toString() ?? null);
+  }, [value]);
+
   return (
     <GridStyled md={gridWidth || 6} xs={12} item $containerWidth={containerWidth}>
       <FormControl className="formControl" error={error}>