Componentize more sections of publish button

app/src/components/publish/PublishSurveyButton.tsx

@@ -0,0 +1,145 @@
+import { Button, DialogContent, DialogContentText } from '@material-ui/core';
+import { mdiShareAllOutline } from '@mdi/js';
+import Icon from '@mdi/react';
+import ComponentDialog from 'components/dialog/ComponentDialog';
+import SubmitBiohubDialog from 'components/dialog/SubmitBiohubDialog';
+import SubmitSurvey, {
+  ISurveySubmitForm,
+  SurveySubmitFormInitialValues,
+  SurveySubmitFormYupSchema
+} from 'components/publish/SubmitSurvey';
+import { SUBMISSION_STATUS_TYPE } from 'constants/submissions';
+import { SurveyContext } from 'contexts/surveyContext';
+import { useBiohubApi } from 'hooks/useBioHubApi';
+import { IGetObservationSubmissionResponse } from 'interfaces/useObservationApi.interface';
+import { IGetSummaryResultsResponse } from 'interfaces/useSummaryResultsApi.interface';
+import { IGetSurveyAttachment, IGetSurveyReportAttachment } from 'interfaces/useSurveyApi.interface';
+import React, { useContext, useState } from 'react';
+
+export interface IPublishSurveyButton {}
+
+/**
+ * Survey header for a single-survey view.
+ *
+ * @param {*} props
+ * @return {*}
+ */
+const PublishSurveyButton: React.FC<IPublishSurveyButton> = (props) => {
+  const biohubApi = useBiohubApi();
+  const surveyContext = useContext(SurveyContext);
+
+  const surveyWithDetails = surveyContext.surveyDataLoader.data;
+
+  const [finishSubmission, setFinishSubmission] = useState(false);
+  const [noSubmissionData, setNoSubmissionData] = useState(false);
+  const [openSubmitSurveyDialog, setOpenSubmitSurveyDialog] = useState(false);
+
+  if (!surveyWithDetails) {
+    return <></>;
+  }
+
+  return (
+    <>
+      <Button
+        title="Submit Survey Data and Documents"
+        color="primary"
+        variant="contained"
+        startIcon={<Icon path={mdiShareAllOutline} size={1} />}
+        onClick={() => setOpenSubmitSurveyDialog(!openSubmitSurveyDialog)}
+        style={{ minWidth: '7rem' }}>
+        Submit Data
+      </Button>
+
+      <ComponentDialog
+        dialogTitle="Survey data submitted!"
+        open={finishSubmission}
+        onClose={() => {
+          surveyContext.surveyDataLoader.refresh(surveyContext.projectId, surveyContext.surveyId);
+          surveyContext.artifactDataLoader.refresh(surveyContext.projectId, surveyContext.surveyId);
+          setFinishSubmission(false);
+          setOpenSubmitSurveyDialog(!openSubmitSurveyDialog);
+        }}>
+        <DialogContent>
+          <DialogContentText id="alert-dialog-description">
+            Thank you for submitting your survey data to Biohub.
+          </DialogContentText>
+        </DialogContent>
+      </ComponentDialog>
+
+      <ComponentDialog
+        dialogTitle="No Survey Data to Submit"
+        open={noSubmissionData}
+        onClose={() => {
+          surveyContext.surveyDataLoader.refresh(surveyContext.projectId, surveyContext.surveyId);
+          surveyContext.artifactDataLoader.refresh(surveyContext.projectId, surveyContext.surveyId);
+          setNoSubmissionData(false);
+          setOpenSubmitSurveyDialog(!openSubmitSurveyDialog);
+        }}>
+        <DialogContent>
+          <DialogContentText id="alert-dialog-description">Thank you!</DialogContentText>
+        </DialogContent>
+      </ComponentDialog>
+
+      <SubmitBiohubDialog
+        dialogTitle="Submit Survey Information"
+        open={openSubmitSurveyDialog}
+        onClose={() => setOpenSubmitSurveyDialog(!openSubmitSurveyDialog)}
+        onSubmit={async (values: ISurveySubmitForm) => {
+          await biohubApi.publish.publishSurvey(
+            surveyContext.projectId,
+            surveyWithDetails.surveyData.survey_details.id,
+            values
+          );
+          setFinishSubmission(true);
+        }}
+        formikProps={{
+          initialValues: SurveySubmitFormInitialValues,
+          validationSchema: SurveySubmitFormYupSchema
+        }}>
+        <SubmitSurvey
+          unSubmittedObservation={unSubmittedObservation}
+          unSubmittedSummary={unSubmittedSummary}
+          unSumittedArtifacts={unSumittedArtifacts}
+        />
+      </SubmitBiohubDialog>
+    </>
+  );
+};
+
+export default PublishSurveyButton;
+
+const idExists = (item: any) => {
+  if (item) {
+    return true;
+  }
+  return false;
+};
+
+const unSubmittedObservation = (data: IGetObservationSubmissionResponse) => {
+  if (
+    data.surveyObservationData &&
+    !idExists(data.surveyObservationSupplementaryData?.occurrence_submission_id) &&
+    data.surveyObservationData.status === SUBMISSION_STATUS_TYPE.TEMPLATE_TRANSFORMED
+  ) {
+    return [data.surveyObservationData];
+  }
+  return [];
+};
+
+const unSubmittedSummary = (data: IGetSummaryResultsResponse) => {
+  if (
+    data.surveySummaryData &&
+    !idExists(data.surveySummarySupplementaryData?.survey_summary_submission_id) &&
+    data.surveySummaryData.messages.length === 0
+  ) {
+    return [data.surveySummaryData];
+  }
+  return [];
+};
+
+const unSumittedArtifacts = (data: IGetSurveyAttachment[] | IGetSurveyReportAttachment[]) => {
+  if (data) {
+    return data.filter((item) => !idExists(item.supplementaryAttachmentData?.artifact_revision_id));
+  }
+  return [];
+};

app/src/components/publish/SubmitSection.tsx

@@ -58,6 +58,10 @@ const DisplayFiles: React.FC<IDisplayFilesProps> = (props) => {
     );
   }
 
+  const isChecked = (item: any) => {
+    return values[formikName].find((value: any) => getName(value) === getName(item)) ? true : false;
+  };
+
   return (
     <List disablePadding>
       <FieldArray
@@ -81,7 +85,7 @@ const DisplayFiles: React.FC<IDisplayFilesProps> = (props) => {
                 <ListItemIcon>
                   <Checkbox
                     edge="start"
-                    checked={!values[formikName].find((value: any) => getName(value) === getName(item)) ? false : true}
+                    checked={isChecked(item)}
                     name={`${formikName}[${index}]`}
                     color="primary"></Checkbox>
                 </ListItemIcon>

app/src/components/publish/SubmitSurvey.tsx

@@ -13,6 +13,13 @@ import yup from 'utils/YupSchema';
 import SelectAllButton from './SelectAllButton';
 import SubmitSection from './SubmitSection';
 
+export interface ISubmitSurvey {
+  unSubmittedObservation: (data: IGetObservationSubmissionResponse) => ISurveyObservationData[];
+  unSubmittedSummary: (data: IGetSummaryResultsResponse) => ISurveySummaryData[];
+  unSumittedArtifacts: (
+    data: IGetSurveyAttachment[] | IGetSurveyReportAttachment[]
+  ) => IGetSurveyAttachment[] | IGetSurveyReportAttachment[];
+}
 export interface ISurveySubmitForm {
   observations: IGetObservationSubmissionResponse[];
   summary: IGetSummaryResultsResponse[];
@@ -34,7 +41,9 @@ export const SurveySubmitFormYupSchema = yup.object().shape({
   attachments: yup.array()
 });
 
-const SubmitSurvey: React.FC = () => {
+const SubmitSurvey: React.FC<ISubmitSurvey> = (props) => {
+  const { unSubmittedObservation, unSubmittedSummary, unSumittedArtifacts } = props;
+
   const biohubApi = useBiohubApi();
   const surveyContext = useContext(SurveyContext);
 
@@ -91,7 +100,7 @@ const SubmitSurvey: React.FC = () => {
     );
   }
 
-  if (attachmentAndReportDataLoader.isLoading || observationDataLoader.isLoading || summaryDataLoader.isLoading) {
+  if (!attachmentAndReportDataLoader.data || !observationDataLoader.data || !summaryDataLoader.data) {
     return <CircularProgress className="pageProgress" size={40} />;
   }
 
@@ -108,79 +117,61 @@ const SubmitSurvey: React.FC = () => {
         formikData={[
           {
             key: 'observations',
-            value: observationDataLoader.data?.surveyObservationData
-              ? [observationDataLoader.data.surveyObservationData]
-              : []
+            value: unSubmittedObservation(observationDataLoader.data)
           },
           {
             key: 'summary',
-            value: summaryDataLoader.data?.surveySummaryData ? [summaryDataLoader.data.surveySummaryData] : []
+            value: unSubmittedSummary(summaryDataLoader.data)
           },
           {
             key: 'reports',
-            value:
-              attachmentAndReportDataLoader.data && attachmentAndReportDataLoader.data.reportAttachmentsList
-                ? attachmentAndReportDataLoader.data.reportAttachmentsList
-                : []
+            value: unSumittedArtifacts(attachmentAndReportDataLoader.data.reportAttachmentsList)
           },
           {
             key: 'attachments',
-            value:
-              attachmentAndReportDataLoader.data && attachmentAndReportDataLoader.data.attachmentsList
-                ? attachmentAndReportDataLoader.data.attachmentsList
-                : []
+            value: unSumittedArtifacts(attachmentAndReportDataLoader.data.attachmentsList)
           }
         ]}
       />
 
-      {observationDataLoader.isReady && (
+      {unSubmittedObservation(observationDataLoader.data).length !== 0 && (
         <SubmitSection
           subHeader="Observations"
           formikName="observations"
-          data={
-            observationDataLoader.data?.surveyObservationData ? [observationDataLoader.data.surveyObservationData] : []
-          }
+          data={unSubmittedObservation(observationDataLoader.data)}
           getName={(item: ISurveyObservationData) => {
             return item.inputFileName;
           }}
         />
       )}
 
-      {summaryDataLoader.isReady && (
+      {unSubmittedSummary(summaryDataLoader.data).length !== 0 && (
         <SubmitSection
           subHeader="Summary Results"
           formikName="summary"
-          data={summaryDataLoader.data?.surveySummaryData ? [summaryDataLoader.data.surveySummaryData] : []}
+          data={unSubmittedSummary(summaryDataLoader.data)}
           getName={(item: ISurveySummaryData) => {
             return item.fileName;
           }}
         />
       )}
 
-      {attachmentAndReportDataLoader.isReady && (
+      {unSumittedArtifacts(attachmentAndReportDataLoader.data.reportAttachmentsList).length !== 0 && (
         <SubmitSection
           subHeader="Reports"
           formikName="reports"
-          data={
-            attachmentAndReportDataLoader.data && attachmentAndReportDataLoader.data.reportAttachmentsList
-              ? attachmentAndReportDataLoader.data.reportAttachmentsList
-              : []
-          }
+          data={unSumittedArtifacts(attachmentAndReportDataLoader.data.reportAttachmentsList)}
           getName={(item: IGetSurveyReportAttachment) => {
             return item.fileName;
           }}
         />
       )}
 
-      {attachmentAndReportDataLoader.isReady && (
+      {unSumittedArtifacts(attachmentAndReportDataLoader.data.attachmentsList).length !== 0 && (
         <SubmitSection
           subHeader="Other Documents"
           formikName="attachments"
-          data={
-            attachmentAndReportDataLoader.data && attachmentAndReportDataLoader.data.attachmentsList
-              ? attachmentAndReportDataLoader.data.attachmentsList
-              : []
-          }
+          data={unSumittedArtifacts(attachmentAndReportDataLoader.data.attachmentsList)}
           getName={(item: IGetSurveyAttachment) => {
             return item.fileName;
           }}

app/src/constants/submissions.ts

@@ -0,0 +1,28 @@
+/**
+ * Submission Status Types.
+ *
+ * See submission_status_type table -> name.
+ *
+ * @export
+ * @enum {number}
+ */
+export enum SUBMISSION_STATUS_TYPE {
+  'SUBMITTED' = 'Submitted',
+  'TEMPLATE_VALIDATED' = 'Template Validated',
+  'DARWIN_CORE_VALIDATED' = 'Darwin Core Validated',
+  'TEMPLATE_TRANSFORMED' = 'Template Transformed',
+  'SUBMISSION_DATA_INGESTED' = 'Submission Data Ingested',
+  'SECURED' = 'Secured',
+  'AWAITING CURRATION' = 'Awaiting Curration',
+  'REJECTED' = 'Rejected',
+  'ON HOLD' = 'On Hold',
+  'SYSTEM_ERROR' = 'System Error',
+
+  //Failure
+  'FAILED_OCCURRENCE_PREPARATION' = 'Failed to prepare submission',
+  'INVALID_MEDIA' = 'Media is not valid',
+  'FAILED_VALIDATION' = 'Failed to validate',
+  'FAILED_TRANSFORMED' = 'Failed to transform',
+  'FAILED_PROCESSING_OCCURRENCE_DATA' = 'Failed to process occurrence data',
+  'FAILED_SUMMARY_PREPARATION' = 'Failed to prepare summary submission'
+}