Merge branch 'mvp-2.1.0' into CRDCDH-689-Fix

src/components/DataSubmissions/DataSubmissionUpload.tsx

@@ -114,10 +114,11 @@ const UploadRoles: User["role"][] = ["Organization Owner"]; // and submission ow
 type Props = {
   submitterID: string;
   readOnly?: boolean;
+  onCreateBatch: () => void;
   onUpload: (message: string, severity: VariantType) => void;
 };
 
-const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
+const DataSubmissionUpload = ({ submitterID, readOnly, onCreateBatch, onUpload }: Props) => {
   const { submissionId } = useParams();
   const { user } = useAuthContext();
 
@@ -228,6 +229,7 @@ const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
     if (!newBatch) {
       return;
     }
+    onCreateBatch();
 
     const uploadResult: UploadResult[] = [];
 

src/content/dataSubmissions/DataSubmission.tsx

@@ -293,7 +293,7 @@ const columns: Column<Batch>[] = [
     }
   },
   {
-    label: "Errors",
+    label: "Upload Errors",
     renderValue: (data) => (
       <BatchTableContext.Consumer>
         {({ handleOpenErrorDialog }) => {
@@ -322,7 +322,7 @@ const columns: Column<Batch>[] = [
 
 const URLTabs = {
   DATA_UPLOAD: "data-upload",
-  QUALITY_CONTROL: "quality-control"
+  VALIDATION_RESULTS: "validation-results"
 };
 
 const submissionLockedStatuses: SubmissionStatus[] = ["Submitted", "Released", "Completed", "Canceled", "Archived"];
@@ -531,10 +531,10 @@ const DataSubmission = () => {
                 selected={tab === URLTabs.DATA_UPLOAD}
               />
               <LinkTab
-                value={URLTabs.QUALITY_CONTROL}
-                label="Quality Control"
-                to={`/data-submission/${submissionId}/${URLTabs.QUALITY_CONTROL}`}
-                selected={tab === URLTabs.QUALITY_CONTROL}
+                value={URLTabs.VALIDATION_RESULTS}
+                label="Validation Results"
+                to={`/data-submission/${submissionId}/${URLTabs.VALIDATION_RESULTS}`}
+                selected={tab === URLTabs.VALIDATION_RESULTS}
               />
             </StyledTabs>
 
@@ -544,6 +544,7 @@ const DataSubmission = () => {
                   <DataSubmissionUpload
                     submitterID={data?.getSubmission?.submitterID}
                     readOnly={submissionLockedStatuses.includes(data?.getSubmission?.status)}
+                    onCreateBatch={refreshBatchTable}
                     onUpload={handleOnUpload}
                   />
                   <GenericTable

src/content/dataSubmissions/DataSubmissionsListView.tsx

@@ -174,6 +174,11 @@ const columns: Column[] = [
     value: (a) => a.dataCommons,
     field: "dataCommons",
   },
+  {
+    label: "DM Versison",
+    value: (a) => a.modelVersion,
+    field: "modelVersion",
+  },
   {
     label: "Organization",
     value: (a) => a.organization.name,

src/content/dataSubmissions/ErrorDialog.tsx

@@ -69,6 +69,7 @@ const StyledTitle = styled(Typography)({
   fontStyle: "normal",
   fontWeight: "900",
   lineHeight: "30px",
+  paddingBottom: "8px"
 });
 
 const StyledUploadedDate = styled(Typography)({
@@ -78,8 +79,6 @@ const StyledUploadedDate = styled(Typography)({
   fontStyle: "normal",
   fontWeight: 400,
   lineHeight: "19.6px",
-  marginTop: "8px",
-  marginBottom: "35px"
 });
 
 const StyledSubtitle = styled(Typography)({
@@ -91,6 +90,7 @@ const StyledSubtitle = styled(Typography)({
   lineHeight: "20px",
   letterSpacing: "0.14px",
   textTransform: "uppercase",
+  marginTop: "35px"
 });
 
 const StyledErrorItem = styled(Typography)({
@@ -113,7 +113,8 @@ type Props = {
   title?: string;
   closeText?: string;
   errors: string[];
-  uploadedDate: string;
+  errorCount?: string;
+  uploadedDate?: string;
   onClose?: () => void;
 } & Omit<DialogProps, "onClose">;
 
@@ -122,6 +123,7 @@ const ErrorDialog = ({
   title,
   closeText = "Close",
   errors,
+  errorCount,
   uploadedDate,
   onClose,
   open,
@@ -138,20 +140,24 @@ const ErrorDialog = ({
       <StyledCloseDialogButton aria-label="close" onClick={handleCloseDialog}>
         <CloseIconSvg />
       </StyledCloseDialogButton>
-      <StyledHeader variant="h3">
-        {header}
-      </StyledHeader>
+      {header && (
+        <StyledHeader variant="h3">
+          {header}
+        </StyledHeader>
+      )}
       <StyledTitle variant="h6">
         {title}
       </StyledTitle>
-      <StyledUploadedDate>
-        Uploaded on
-        {" "}
-        {FormatDate(uploadedDate, "M/D/YYYY", "N/A")}
-      </StyledUploadedDate>
+      {uploadedDate && (
+        <StyledUploadedDate>
+          Uploaded on
+          {" "}
+          {FormatDate(uploadedDate, "M/D/YYYY", "N/A")}
+        </StyledUploadedDate>
+      )}
       <StyledErrorDetails direction="column" spacing={2.5}>
         <StyledSubtitle variant="body2">
-          {`${errors?.length || 0} ${errors?.length === 1 ? "ERROR" : "ERRORS"}`}
+          {errorCount || `${errors?.length || 0} ${errors?.length === 1 ? "ERROR" : "ERRORS"}`}
         </StyledSubtitle>
         <Stack direction="column" spacing={2.75} padding={1.25}>
           {errors?.map((error: string, idx: number) => (

src/content/dataSubmissions/QualityControl.tsx

@@ -6,7 +6,7 @@ import { Box, Button, FormControl, MenuItem, Select, styled } from "@mui/materia
 import { Controller, useForm } from 'react-hook-form';
 import { LIST_BATCHES, LIST_NODE_TYPES, ListBatchesResp, ListNodeTypesResp, SUBMISSION_QC_RESULTS, SubmissionQCResultsResp } from "../../graphql";
 import GenericTable, { Column, FetchListing, TableMethods } from "../../components/DataSubmissions/GenericTable";
-import { FormatDate } from "../../utils";
+import { FormatDate, capitalizeFirstLetter } from "../../utils";
 import ErrorDialog from "./ErrorDialog";
 import QCResultsContext from "./Contexts/QCResultsContext";
 
@@ -103,14 +103,20 @@ const StyledSelect = styled(Select)(baseTextFieldStyles);
 
 const columns: Column<QCResult>[] = [
   {
-    label: "Type",
+    label: "Batch ID",
+    renderValue: (data) => <StyledBreakAll>{data?.displayID}</StyledBreakAll>,
+    field: "displayID",
+    default: true
+  },
+  {
+    label: "Node Type",
     renderValue: (data) => <StyledNodeType>{data?.nodeType}</StyledNodeType>,
     field: "nodeType",
   },
   {
-    label: "Batch ID",
-    renderValue: (data) => <StyledBreakAll>{data?.displayID}</StyledBreakAll>,
-    field: "displayID",
+    label: "Validation Type",
+    renderValue: (data) => <StyledNodeType>{data?.validationType}</StyledNodeType>,
+    field: "validationType",
   },
   {
     label: "Node ID",
@@ -128,18 +134,17 @@ const columns: Column<QCResult>[] = [
     field: "severity",
   },
   {
-    label: "Uploaded Date",
-    renderValue: (data) => (data?.uploadedDate ? `${FormatDate(data.uploadedDate, "MM-DD-YYYY [at] hh:mm A")}` : ""),
-    field: "uploadedDate",
-    default: true
+    label: "Validated Date",
+    renderValue: (data) => (data?.validatedDate ? `${FormatDate(data?.validatedDate, "MM-DD-YYYY [at] hh:mm A")}` : ""),
+    field: "validatedDate",
   },
   {
-    label: "Reasons",
-    renderValue: (data) => data?.description?.length > 0 && (
+    label: "Issues",
+    renderValue: (data) => (data?.errors?.length > 0 || data?.warnings?.length > 0) && (
       <QCResultsContext.Consumer>
         {({ handleOpenErrorDialog }) => (
           <>
-            <span>{data.description[0]?.title}</span>
+            <span>{data.errors?.length > 0 ? data.errors[0].title : data.warnings[0]?.title }</span>
             {" "}
             <StyledErrorDetailsButton
               onClick={() => handleOpenErrorDialog && handleOpenErrorDialog(data)}
@@ -154,7 +159,6 @@ const columns: Column<QCResult>[] = [
         )}
       </QCResultsContext.Consumer>
     ),
-    field: "description",
     sortDisabled: true,
   },
 ];
@@ -173,6 +177,10 @@ const QualityControl: FC = () => {
   const [selectedRow, setSelectedRow] = useState<QCResult | null>(null);
   const tableRef = useRef<TableMethods>(null);
 
+  const errorDescriptions = selectedRow?.errors?.map((error) => `(Error) ${error.description}`) ?? [];
+  const warningDescriptions = selectedRow?.warnings?.map((warning) => `(Warning) ${warning.description}`) ?? [];
+  const allDescriptions = [...errorDescriptions, ...warningDescriptions];
+
   const [submissionQCResults] = useLazyQuery<SubmissionQCResultsResp>(SUBMISSION_QC_RESULTS, {
     variables: { id: submissionId },
     context: { clientName: 'backend' },
@@ -332,17 +340,18 @@ const QualityControl: FC = () => {
           total={totalData || 0}
           loading={loading}
           defaultRowsPerPage={20}
+          defaultOrder="desc"
           setItemKey={(item, idx) => `${idx}_${item.batchID}_${item.nodeID}`}
           onFetchData={handleFetchQCResults}
         />
       </QCResultsContext.Provider>
       <ErrorDialog
         open={openErrorDialog}
         onClose={() => setOpenErrorDialog(false)}
-        header="Data Submission"
-        title="Reasons"
-        errors={selectedRow?.description?.map((error) => error.description)}
-        uploadedDate={selectedRow?.uploadedDate}
+        header={null}
+        title={`Validation Issues for ${capitalizeFirstLetter(selectedRow?.nodeType)} Node ID ${selectedRow?.nodeID}.`}
+        errors={allDescriptions}
+        errorCount={`${allDescriptions?.length || 0} ${allDescriptions?.length === 1 ? "ISSUE" : "ISSUES"}`}
       />
     </>
   );

src/graphql/listSubmissions.ts

@@ -15,6 +15,7 @@ export const query = gql`
         dataCommons
         studyAbbreviation
         dbGaPID
+        modelVersion
         status
         conciergeName
         createdAt

src/graphql/submissionQCResults.ts

@@ -25,13 +25,19 @@ export const query = gql`
       results {
         submissionID
         nodeType
+        validationType
         batchID
         displayID
         nodeID
         CRDC_ID
         severity
         uploadedDate
-        description {
+        validatedDate
+        errors {
+          title
+          description
+        }
+        warnings {
           title
           description
         }

src/types/Submissions.d.ts

@@ -175,13 +175,16 @@ type QCResults = {
 type QCResult = {
   submissionID: string;
   nodeType: string;
+  validationType: "metadata" | "file"; // [metadata, file]
   batchID: string;
   displayID: number;
   nodeID: string;
   CRDC_ID: string;
   severity: "Error" | "Warning"; // [Error, Warning]
-  uploadedDate: string // batch.updatedAt
-  description: ErrorMessage[];
+  uploadedDate: string; // batch.updatedAt
+  validatedDate: string;
+  errors: ErrorMessage[];
+  warnings: ErrorMessage[];
 };
 
 type ErrorMessage = {

src/utils/stringUtils.ts

@@ -1,3 +1,12 @@
+/**
+ * Capitalizes the first letter of a given string.
+ * If the input string is empty, it returns an empty string.
+ *
+ * @param {string} str - The string to capitalize.
+ * @returns {string} - The capitalized string or an empty string if the input is empty.
+ */
+export const capitalizeFirstLetter = (str: string): string => (str ? str[0].toUpperCase() + str.slice(1) : "");
+
 /**
  * Function to add a space between a number and a letter in a string.
  * @param input - The input string to be processed. It should be a string where a number is directly followed by a letter.