fix(form-service): corrections to API docs

Also form app state adjustments for redirecting from anonymous form routes.
Also check form definition for if PDF is generated.

apps/form-app/src/app/components/SubmittedForm.tsx

@@ -71,7 +71,7 @@ export const SubmittedForm: FunctionComponent<ApplicationStatusProps> = ({ defin
   };
 
   useEffect(() => {
-    if (pdfFileExists === null && form?.urn) {
+    if (definition.generatesPdf && pdfFileExists === null && form?.urn) {
       dispatch(checkPdfFile(form.urn));
     }
 
@@ -86,7 +86,7 @@ export const SubmittedForm: FunctionComponent<ApplicationStatusProps> = ({ defin
     }, 10000);
 
     return () => clearInterval(intervalId);
-  }, [dispatch, form, pdfFile, pdfFileExists]);
+  }, [dispatch, definition, form, pdfFile, pdfFileExists]);
 
   const metadata = useSelector(metaDataSelector);
 

apps/form-app/src/app/containers/AnonymousForm.tsx

@@ -1,7 +1,9 @@
 import { Container, Recaptcha } from '@core-services/app-common';
 import { FunctionComponent } from 'react';
+import { Navigate } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { DraftForm } from '../components/DraftForm';
+import { LoadingIndicator } from '../components/LoadingIndicator';
 import { SubmittedForm } from '../components/SubmittedForm';
 import {
   ValidationError,
@@ -32,29 +34,33 @@ export const AnonymousForm: FunctionComponent = () => {
 
   return (
     <div key={`anonymous-${definition?.id}`}>
+      <LoadingIndicator isLoading={!initialized} />
       <Container vs={3} hs={1}>
-        {definition && (
-          <>
-            {form?.status === 'submitted' && <SubmittedForm definition={definition} form={form} data={data} />}
-            {!form && (
-              <DraftForm
-                definition={definition}
-                form={form}
-                data={data}
-                canSubmit={canSubmit}
-                showSubmit={showSubmit}
-                saving={busy.saving}
-                submitting={busy.submitting}
-                onChange={function ({ data, errors }: { data: unknown; errors?: ValidationError[] }) {
-                  dispatch(updateForm({ data: data as Record<string, unknown>, files, errors }));
-                }}
-                onSubmit={function () {
-                  dispatch(submitAnonymousForm());
-                }}
-              />
-            )}
-          </>
-        )}
+        {initialized &&
+          (definition?.anonymousApply ? (
+            <>
+              {form?.status === 'submitted' && <SubmittedForm definition={definition} form={form} data={data} />}
+              {!form && (
+                <DraftForm
+                  definition={definition}
+                  form={form}
+                  data={data}
+                  canSubmit={canSubmit}
+                  showSubmit={showSubmit}
+                  saving={busy.saving}
+                  submitting={busy.submitting}
+                  onChange={function ({ data, errors }: { data: unknown; errors?: ValidationError[] }) {
+                    dispatch(updateForm({ data: data as Record<string, unknown>, files, errors }));
+                  }}
+                  onSubmit={function () {
+                    dispatch(submitAnonymousForm());
+                  }}
+                />
+              )}
+            </>
+          ) : (
+            <Navigate to=".." />
+          ))}
       </Container>
       <Recaptcha siteKey={recaptchaKey} />
     </div>

apps/form-app/src/app/state/form.slice.spec.ts

@@ -40,6 +40,7 @@ const definitionsToTest: FormState = {
       uiSchema: { type: 'Categorization' },
       applicantRoles: ['Admin'],
       clerkRoles: [],
+      anonymousApply: false,
     },
   },
   selected: null,
@@ -73,6 +74,7 @@ const loadedFormDefinition: FormDefinition = {
   uiSchema: { type: 'Categorization' },
   applicantRoles: ['Admin'],
   clerkRoles: [],
+  anonymousApply: false,
 };
 const payload = {
   form: {
@@ -104,7 +106,11 @@ describe('form slice unit tests', () => {
     });
 
     it('can fulfilled load form definition with data', () => {
-      const action = { type: loadDefinition.fulfilled, payload: 'TEST' };
+      const action = {
+        type: loadDefinition.fulfilled,
+        payload: loadedFormDefinition,
+        meta: { arg: loadedFormDefinition.id },
+      };
       const definition = formReducer(definitionsToTest, action);
       expect(definition.definitions.TEST.id).toEqual(loadedFormDefinition.id);
     });

apps/form-app/src/app/state/form.slice.ts

@@ -21,6 +21,7 @@ export interface FormDefinition {
   clerkRoles: string[];
   registerData?: RegisterData;
   anonymousApply: boolean;
+  generatesPdf?: boolean;
 }
 
 export interface Form {
@@ -328,8 +329,8 @@ export const updateForm = createAsyncThunk(
   ) => {
     const { form, user } = getState() as AppState;
 
-    // Dispatch saving the draft if there is a logged in user.
-    if (user.user) {
+    // Dispatch saving the draft if there is a logged in user with a draft form.
+    if (user.user && form.form?.id) {
       dispatch(formActions.setSaving(true));
       dispatch(saveForm(form.form.id));
     }
@@ -491,9 +492,9 @@ export const formSlice = createSlice({
       .addCase(loadDefinition.pending, (state) => {
         state.busy.loading = true;
       })
-      .addCase(loadDefinition.fulfilled, (state, { payload }) => {
+      .addCase(loadDefinition.fulfilled, (state, { payload, meta }) => {
         state.busy.loading = false;
-        state.definitions[payload.id] = payload;
+        state.definitions[meta.arg] = payload;
 
         //Check form definition id case sensitivity, and use the definition id in the payload object,
         //instead of using the value in querystring because if the case is not the same

apps/form-service/src/form/mapper.ts

@@ -15,6 +15,7 @@ export function mapFormDefinition(entity: FormDefinitionEntity) {
     dataSchema: entity.dataSchema,
     uiSchema: entity.uiSchema,
     dispositionStates: entity.dispositionStates,
+    generatesPdf: !!entity.submissionPdfTemplate
   };
 }
 

apps/form-service/src/form/model/form.ts

@@ -12,7 +12,8 @@ import { Form, FormStatus, SecurityClassificationType } from '../types';
 import { FormSubmissionEntity } from './formSubmission';
 import { PdfService } from '../pdf';
 
-// Any form created by user with the intake app role is treated as anonymous.
+// NOTE: True if form has an applicant and was not created by the applicant user (i.e. created by an intake application under a service account)
+// Not True if the form does not include applicant at all, which is the case for 'simple' forms where form is directly submitted.
 function isAnonymousApplicant(user: User, applicant?: Subscriber): boolean {
   return !!(user?.roles.includes(FormServiceRoles.IntakeApp) && applicant && applicant.userId !== user.id);
 }

apps/form-service/src/form/router/form.swagger.yml

@@ -36,6 +36,8 @@ components:
               type: string
             description:
               type: string
+        generatesPdf:
+          type: boolean
     Form:
       type: object
       properties:
@@ -245,7 +247,7 @@ components:
             schema:
               type: object
               properties:
-                anonymousApplicant:
+                anonymousApplicantEquals:
                   type: boolean
                 definitionIdEquals:
                   type: string
@@ -260,6 +262,8 @@ components:
                   format: date-time
                 createdByIdEquals:
                   type: string
+                hashEquals:
+                  type: string
     responses:
       200:
         description: Successfully created a form.