CRDCDH-1094 Create new Data Submission changes. New intention and added dataType

src/components/DataSubmissions/CrossValidationButton.test.tsx

@@ -31,7 +31,8 @@ const baseSubmission: Omit<
   conciergeEmail: "",
   createdAt: "",
   updatedAt: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
 };
 
 const baseContext: ContextState = {

src/components/DataSubmissions/DataUpload.test.tsx

@@ -37,7 +37,8 @@ const baseSubmission: Omit<Submission, "_id"> = {
   history: [],
   conciergeName: "",
   conciergeEmail: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   createdAt: "",
   updatedAt: "",
   crossSubmissionStatus: null,

src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx

@@ -41,7 +41,8 @@ const baseSubmission: Submission = {
   conciergeEmail: "",
   createdAt: "",
   updatedAt: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   status: "In Progress",
   crossSubmissionStatus: "Passed",
   otherSubmissions: "",

src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx

@@ -41,7 +41,8 @@ const baseSubmission: Submission = {
   conciergeEmail: "",
   createdAt: "",
   updatedAt: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   status: "In Progress",
   crossSubmissionStatus: "Passed",
   otherSubmissions: "",

src/components/DataSubmissions/ExportValidationButton.test.tsx

@@ -48,7 +48,8 @@ describe("ExportValidationButton cases", () => {
     conciergeEmail: "",
     createdAt: "",
     updatedAt: "",
-    intention: "New",
+    intention: "New/Update",
+    dataType: "Metadata and Data Files",
   };
 
   const baseQCResult: Omit<QCResult, "submissionID"> = {

src/components/DataSubmissions/MetadataUpload.test.tsx

@@ -30,7 +30,8 @@ const baseSubmission: Omit<
   conciergeEmail: "",
   createdAt: "",
   updatedAt: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   status: "New",
 };
 

src/components/DataSubmissions/ValidationControls.test.tsx

@@ -31,7 +31,8 @@ const baseSubmission: Omit<
   conciergeEmail: "",
   createdAt: "",
   updatedAt: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
 };
 
 const baseContext: ContextState = {

src/components/DataSubmissions/ValidationStatistics.test.tsx

@@ -20,7 +20,8 @@ const baseSubmission: Omit<Submission, "_id"> = {
   history: [],
   conciergeName: "",
   conciergeEmail: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   createdAt: "",
   updatedAt: "",
   crossSubmissionStatus: "New",

src/content/dataSubmissions/CreateDataSubmissionDialog.tsx

@@ -201,7 +201,7 @@ const StyledOutlinedInputMultiline = styled(StyledOutlinedInput)({
 
 type CreateSubmissionParams = Pick<
   Submission,
-  "studyAbbreviation" | "dataCommons" | "name" | "dbGaPID" | "intention"
+  "studyAbbreviation" | "dataCommons" | "name" | "dbGaPID" | "intention" | "dataType"
 >;
 
 type Props = {
@@ -216,13 +216,15 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
     register,
     reset,
     control,
+    watch,
     formState: { errors },
     setValue,
   } = useForm<CreateSubmissionParams>({
     defaultValues: {
       dataCommons: "CDS",
       studyAbbreviation: "",
-      intention: "New",
+      intention: "New/Update",
+      dataType: "Metadata and Data Files",
       dbGaPID: "",
       name: "",
     },
@@ -239,6 +241,7 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
       name: string;
       dbGaPID: string;
       intention: SubmissionIntention;
+      dataType: SubmissionDataType;
     }
   >(CREATE_SUBMISSION, {
     context: { clientName: "backend" },
@@ -264,13 +267,35 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
     });
     return result;
   }, [approvedStudiesData]);
+  const intention = watch("intention");
 
   const submissionTypeOptions = [
-    { label: "New", value: "New", disabled: false },
-    { label: "Update", value: "Update", disabled: false },
+    { label: "New/Update", value: "New/Update", disabled: false },
     { label: "Delete", value: "Delete", disabled: false },
   ];
 
+  const submissionDataTypeOptions: {
+    label: string;
+    value: SubmissionDataType;
+    disabled: boolean;
+  }[] = [
+    {
+      label: "Metadata and Data Files",
+      value: "Metadata and Data Files",
+      disabled: intention === "Delete",
+    },
+    { label: "Metadata Only", value: "Metadata Only", disabled: false },
+  ];
+
+  useEffect(() => {
+    if (intention === "New/Update") {
+      setValue("dataType", "Metadata and Data Files");
+    }
+    if (intention === "Delete") {
+      setValue("dataType", "Metadata Only");
+    }
+  }, [intention]);
+
   /**
    * Updates the default form values after save or initial fetch
    *
@@ -284,6 +309,7 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
       "dbGaPID",
       "intention",
       "studyAbbreviation",
+      "dataType",
     ]
   ) => {
     const resetData = {};
@@ -299,7 +325,8 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
     setFormValues({
       dataCommons: "CDS",
       studyAbbreviation: "",
-      intention: "New",
+      intention: "New/Update",
+      dataType: "Metadata and Data Files",
       dbGaPID: "",
       name: "",
     });
@@ -315,6 +342,7 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
     name,
     dbGaPID,
     intention,
+    dataType,
   }: CreateSubmissionParams) => {
     await createDataSubmission({
       variables: {
@@ -323,6 +351,7 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
         name,
         dbGaPID,
         intention,
+        dataType,
       },
     })
       .then(() => {
@@ -335,6 +364,7 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
             name,
             dbGaPID,
             intention,
+            dataType,
           });
         }
       })
@@ -390,6 +420,56 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
               onSubmit={handleSubmit(onSubmit)}
             >
               <Stack direction="column">
+                <StyledField>
+                  <Controller
+                    name="intention"
+                    control={control}
+                    rules={{ required: "This field is required" }}
+                    render={({ field }) => (
+                      <Grid container>
+                        <StyledRadioInput
+                          {...field}
+                          id="create-data-submission-dialog-submission-type"
+                          label="Submission Type"
+                          value={field.value || ""}
+                          options={submissionTypeOptions}
+                          gridWidth={12}
+                          required
+                          row
+                          aria-describedby="submission-intention-helper-text"
+                        />
+                      </Grid>
+                    )}
+                  />
+                  <StyledHelperText id="submission-intention-helper-text">
+                    {errors?.intention?.message}
+                  </StyledHelperText>
+                </StyledField>
+                <StyledField>
+                  <Controller
+                    name="dataType"
+                    control={control}
+                    rules={{ required: "This field is required" }}
+                    render={({ field }) => (
+                      <Grid container>
+                        <StyledRadioInput
+                          {...field}
+                          id="create-data-submission-dialog-data-type"
+                          label="Data Type"
+                          value={field.value || ""}
+                          options={submissionDataTypeOptions}
+                          gridWidth={12}
+                          required
+                          row
+                          aria-describedby="submission-data-type-helper-text"
+                        />
+                      </Grid>
+                    )}
+                  />
+                  <StyledHelperText id="submission-data-type-helper-text">
+                    {errors?.intention?.message}
+                  </StyledHelperText>
+                </StyledField>
                 <StyledOrganizationField>
                   <StyledLabel id="organization">Organization</StyledLabel>
                   <StyledOutlinedInput value={user.organization?.orgName} readOnly />
@@ -486,31 +566,6 @@ const CreateDataSubmissionDialog: FC<Props> = ({ organizations, onCreate }) => {
                     {errors?.name?.message}
                   </StyledHelperText>
                 </StyledField>
-                <StyledField>
-                  <Controller
-                    name="intention"
-                    control={control}
-                    rules={{ required: "This field is required" }}
-                    render={({ field }) => (
-                      <Grid container>
-                        <StyledRadioInput
-                          {...field}
-                          id="create-data-submission-dialog-submission-type"
-                          label="Submission Type"
-                          value={field.value || ""}
-                          options={submissionTypeOptions}
-                          gridWidth={12}
-                          required
-                          row
-                          aria-describedby="submission-intention-helper-text"
-                        />
-                      </Grid>
-                    )}
-                  />
-                  <StyledHelperText id="submission-intention-helper-text">
-                    {errors?.intention?.message}
-                  </StyledHelperText>
-                </StyledField>
               </Stack>
             </form>
           </StyledFormWrapper>

src/graphql/createSubmission.ts

@@ -7,13 +7,15 @@ export const mutation = gql`
     $name: String!
     $dbGaPID: String
     $intention: String!
+    $dataType: String!
   ) {
     createSubmission(
       studyAbbreviation: $studyAbbreviation
       dataCommons: $dataCommons
       name: $name
       dbGaPID: $dbGaPID
       intention: $intention
+      dataType: $dataType
     ) {
       _id
       status

src/graphql/getSubmission.ts

@@ -49,6 +49,7 @@ export const query = gql`
       conciergeName
       conciergeEmail
       intention
+      dataType
       otherSubmissions
       createdAt
       updatedAt

src/types/Submissions.d.ts

@@ -19,6 +19,7 @@ type Submission = {
   conciergeName: string; // Concierge name
   conciergeEmail: string; // Concierge email
   intention: SubmissionIntention;
+  dataType: SubmissionDataType;
   /**
    * A JSON string containing information for related submissions. Mapped by SubmissionStatus, related by studyAbbreviation.
    *
@@ -74,7 +75,9 @@ type SubmissionAction =
   | "Cancel"
   | "Archive";
 
-type SubmissionIntention = "New" | "Update" | "Delete";
+type SubmissionIntention = "New/Update" | "Delete";
+
+type SubmissionDataType = "Metadata Only" | "Metadata and Data Files";
 
 type FileInput = {
   fileName: string;

src/utils/dataSubmissionUtils.test.ts

@@ -22,7 +22,8 @@ const baseSubmission: Submission = {
   history: [],
   conciergeName: "",
   conciergeEmail: "",
-  intention: "New",
+  intention: "New/Update",
+  dataType: "Metadata and Data Files",
   createdAt: "",
   updatedAt: "",
 };
@@ -139,12 +140,12 @@ describe("General Submit", () => {
     expect(result.isAdminOverride).toBe(false);
   });
 
-  it("should disable submit when file validation is null and intention is 'Update'", () => {
+  it("should disable submit when file validation is null and intention is 'New/Update'", () => {
     const submission: Submission = {
       ...baseSubmission,
       metadataValidationStatus: "Passed",
       fileValidationStatus: null,
-      intention: "Update",
+      intention: "New/Update",
     };
     const result: SubmitInfo = utils.shouldDisableSubmit(submission, "Submitter");
     expect(result.disable).toBe(true);