Merge pull request #2044 from bcgov/community-progress-report-save-(db)

Community progress report save (db)
bcgov · Aug 4, 2023 · 6782a23 · 6782a23
2 parents 8c36731 + 6ed9232
commit 6782a23
Show file tree

Hide file tree

Showing 10 changed files with 4,060 additions and 1,841 deletions.
diff --git a/app/components/Analyst/Project/CommunityProgressReport/CommunityProgressReportForm.tsx b/app/components/Analyst/Project/CommunityProgressReport/CommunityProgressReportForm.tsx
@@ -1,6 +1,8 @@
 import communityProgressReport from 'formSchema/analyst/communityProgressReport';
 import communityProgressReportUiSchema from 'formSchema/uiSchema/analyst/communityProgressReportUiSchema';
 import { useState } from 'react';
+import { useCreateCommunityProgressReportMutation } from 'schema/mutations/project/createCommunityProgressReport';
+import { graphql, useFragment } from 'react-relay';
 import ProjectTheme from '../ProjectTheme';
 import ProjectForm from '../ProjectForm';
 import AddButton from '../AddButton';
@@ -11,9 +13,36 @@ interface FormData {
   dateReceived?: string;
 }
 
-const CommunityProgressReportForm = () => {
+const CommunityProgressReportForm = ({ application }) => {
+  const queryFragment = useFragment(
+    graphql`
+      fragment CommunityProgressReportForm_application on Application {
+        id
+        rowId
+        applicationCommunityProgressReportDataByApplicationId(
+          filter: { archivedAt: { isNull: true } }
+          first: 1000
+        )
+          @connection(
+            key: "CommunityProgressReportForm_applicationCommunityProgressReportDataByApplicationId"
+          ) {
+          __id
+          edges {
+            node {
+              id
+              jsonData
+            }
+          }
+        }
+      }
+    `,
+    application
+  );
+  const { rowId } = queryFragment;
   const [formData, setFormData] = useState({} as FormData);
   const [isFormEditMode, setIsFormEditMode] = useState(false);
+  const [createCommunityProgressReport] =
+    useCreateCommunityProgressReportMutation();
 
   const handleResetFormData = () => {
     setIsFormEditMode(false);
@@ -22,8 +51,19 @@ const CommunityProgressReportForm = () => {
 
   const handleSubmit = (e) => {
     e.preventDefault();
-    handleResetFormData();
-    // TODO
+    createCommunityProgressReport({
+      variables: {
+        input: {
+          applicationCommunityProgressReportData: {
+            jsonData: formData,
+            applicationId: rowId,
+          },
+        },
+      },
+      onCompleted: () => {
+        handleResetFormData();
+      },
+    });
   };
 
   return (

diff --git a/app/components/Analyst/Project/fields/ProjectObjectFieldTemplate.tsx b/app/components/Analyst/Project/fields/ProjectObjectFieldTemplate.tsx
@@ -83,7 +83,11 @@ const ProjectObjectFieldTemplate: React.FC<ObjectFieldTemplateProps> = ({
                     if (columns === 1) {
                       return <div key={fieldName}>{content}</div>;
                     }
-                    return <>{content}</>;
+                    return (
+                      <div key={fieldName} style={{ paddingRight: '4px' }}>
+                        {content}
+                      </div>
+                    );
                   }
                 })
               }

diff --git a/app/formSchema/uiSchema/analyst/communityProgressReportUiSchema.ts b/app/formSchema/uiSchema/analyst/communityProgressReportUiSchema.ts
@@ -14,7 +14,7 @@ const communityProgressReportUiSchema = {
   },
   'ui:inline': [
     {
-      columns: 3,
+      columns: 6,
       dueDate: 1,
       dateReceived: 2,
     },

diff --git a/app/pages/analyst/application/[applicationId]/project.tsx b/app/pages/analyst/application/[applicationId]/project.tsx
@@ -17,6 +17,7 @@ const getProjectQuery = graphql`
       sub
     }
     applicationByRowId(rowId: $rowId) {
+      ...CommunityProgressReportForm_application
       ...ConditionalApprovalForm_application
       ...ProjectInformationForm_application
     }
@@ -48,7 +49,9 @@ const Project = ({
         {showProjectInformation && (
           <ProjectInformationForm application={applicationByRowId} />
         )}
-        {showCommunityProgressReport && <CommunityProgressReportForm />}
+        {showCommunityProgressReport && (
+          <CommunityProgressReportForm application={applicationByRowId} />
+        )}
       </AnalystLayout>
     </Layout>
   );

diff --git a/app/schema/mutations/project/createCommunityProgressReport.ts b/app/schema/mutations/project/createCommunityProgressReport.ts
@@ -0,0 +1,26 @@
+import { graphql } from 'react-relay';
+import { createCommunityProgressReportMutation } from '__generated__/createCommunityProgressReportMutation.graphql';
+import useMutationWithErrorMessage from '../useMutationWithErrorMessage';
+
+const mutation = graphql`
+  mutation createCommunityProgressReportMutation(
+    $input: CreateApplicationCommunityProgressReportDataInput!
+  ) {
+    createApplicationCommunityProgressReportData(input: $input) {
+      applicationCommunityProgressReportData {
+        id
+        jsonData
+        rowId
+      }
+    }
+  }
+`;
+
+const useCreateCommunityProgressReportMutation = () =>
+  useMutationWithErrorMessage<createCommunityProgressReportMutation>(
+    mutation,
+    () =>
+      'An error occurred while attempting to create the community progress report'
+  );
+
+export { mutation, useCreateCommunityProgressReportMutation };