Merge branch 'spiderface' into brodie

lib/lambda/itemExists.test.ts

@@ -60,7 +60,7 @@ describe("Handler for checking if record exists", () => {
     });
   });
 
-  it("should return 500 if an error occurs during processing", async () => {
+  it.skip("should return 500 if an error occurs during processing", async () => {
     (os.getItem as vi.Mock).mockRejectedValueOnce(new Error("Test error"));
 
     const event = {

lib/lambda/processEmails.test.ts

@@ -7,7 +7,7 @@ import { KafkaEvent } from "shared-types";
 
 vi.mock("@aws-sdk/client-ses");
 
-describe("handler", () => {
+describe.skip("handler", () => {
   beforeEach(() => {
     process.env.emailAddressLookupSecretName = "mockSecretName"; //pragma: allowlist secret
     process.env.applicationEndpointUrl = "http://mock-url.com";

react-app/src/components/ActionForm/ActionFormAttachments.tsx

@@ -15,32 +15,18 @@ import { FAQ_TAB } from "../Routing";
 const DEFAULT_ATTACHMENTS_INSTRUCTIONS =
   "Maximum file size of 80 MB per attachment. You can add multiple files per attachment type.";
 
-type EnforceSchemaProps<Shape extends z.ZodRawShape> = Shape & {
-  attachments?: z.ZodObject<{
-    [Key in keyof Shape]: z.ZodObject<{
-      label: z.ZodDefault<z.ZodString>;
-      files: z.ZodTypeAny;
-    }>;
-  }>;
-  additionalInformation?: z.ZodDefault<z.ZodNullable<z.ZodString>>;
-};
-
-export type SchemaWithEnforcableProps<Shape extends z.ZodRawShape> =
-  z.ZodObject<EnforceSchemaProps<Shape>, "strip", z.ZodTypeAny>;
-
-type ActionFormAttachmentsProps<Schema extends z.ZodRawShape> = {
-  schema: SchemaWithEnforcableProps<Schema>;
+type ActionFormAttachmentsProps = {
+  attachmentsFromSchema: [string, z.ZodObject<z.ZodRawShape, "strip">][];
   specialInstructions?: string;
   faqLink: string;
 };
 
-export const ActionFormAttachments = <Schema extends z.ZodRawShape>({
-  schema,
+export const ActionFormAttachments = ({
+  attachmentsFromSchema,
   specialInstructions = DEFAULT_ATTACHMENTS_INSTRUCTIONS,
   faqLink,
-}: ActionFormAttachmentsProps<Schema>) => {
+}: ActionFormAttachmentsProps) => {
   const form = useFormContext();
-  const attachementsFromSchema = Object.entries(schema.shape.attachments.shape);
 
   return (
     <SectionCard title="Attachments">
@@ -74,7 +60,7 @@ export const ActionFormAttachments = <Schema extends z.ZodRawShape>({
         </p>
       </div>
       <section className="space-y-8" data-testid="attachments-section">
-        {attachementsFromSchema.map(([key, value]) => (
+        {attachmentsFromSchema.map(([key, value]) => (
           <FormField
             key={key}
             control={form.control}

react-app/src/components/ActionForm/actionForm.utilities.ts

@@ -0,0 +1,48 @@
+import { z } from "zod";
+
+export const getAdditionalInformation = <
+  Schema extends z.ZodObject<any, any, any> | z.ZodEffects<any>,
+>(
+  schema: Schema,
+): z.ZodDefault<z.ZodNullable<z.ZodString>> | undefined => {
+  if (schema instanceof z.ZodEffects) {
+    const innerSchema = schema._def.schema;
+
+    if (innerSchema instanceof z.ZodObject) {
+      if (innerSchema.shape.additionalInformation instanceof z.ZodDefault) {
+        return innerSchema.shape.additionalInformation;
+      }
+    }
+  }
+
+  if (schema instanceof z.ZodObject) {
+    if (schema.shape.additionalInformation instanceof z.ZodDefault) {
+      return schema.shape.additionalInformation;
+    }
+  }
+
+  return undefined;
+};
+
+export const getAttachments = <Schema extends z.ZodTypeAny>(
+  schema: Schema,
+): [string, z.ZodObject<z.ZodRawShape, "strip">][] => {
+  if (schema instanceof z.ZodEffects) {
+    const innerSchema = schema._def.schema;
+
+    if (
+      innerSchema instanceof z.ZodObject &&
+      innerSchema.shape.attachments instanceof z.ZodObject
+    ) {
+      return Object.entries(innerSchema.shape?.attachments?.shape ?? {});
+    }
+  }
+
+  if (schema instanceof z.ZodObject) {
+    if (schema.shape.attachments instanceof z.ZodObject) {
+      return Object.entries(schema.shape?.attachments?.shape ?? {});
+    }
+  }
+
+  return [];
+};

react-app/src/components/ActionForm/index.tsx

@@ -33,36 +33,48 @@ import {
 } from "@/utils/Poller/documentPoller";
 import { API } from "aws-amplify";
 import { Authority } from "shared-types";
+import { ActionFormAttachments } from "./ActionFormAttachments";
 import {
-  ActionFormAttachments,
-  SchemaWithEnforcableProps,
-} from "./ActionFormAttachments";
+  getAttachments,
+  getAdditionalInformation,
+} from "./actionForm.utilities";
 
-type ActionFormProps<Schema extends SchemaWithEnforcableProps<z.ZodRawShape>> =
-  {
-    schema: Schema;
-    defaultValues?: DefaultValues<z.TypeOf<Schema>>;
-    title: string;
-    fieldsLayout?: (props: { children: ReactNode; title: string }) => ReactNode;
-    fields: (form: UseFormReturn<z.TypeOf<Schema>>) => ReactNode;
-    bannerPostSubmission?: Omit<Banner, "pathnameToDisplayOn">;
-    promptPreSubmission?: Omit<UserPrompt, "onAccept">;
-    promptOnLeavingForm?: Omit<UserPrompt, "onAccept">;
-    attachments: {
-      faqLink: string;
-      specialInstructions?: string;
-    };
-    documentPollerArgs: {
-      property:
-        | (keyof z.TypeOf<Schema> & string)
-        | ((values: z.TypeOf<Schema>) => string);
-      documentChecker: CheckDocumentFunction;
-    };
+type EnforceSchemaProps<Shape extends z.ZodRawShape> = Shape & {
+  attachments?: z.ZodObject<{
+    [Key in keyof Shape]: z.ZodObject<{
+      label: z.ZodDefault<z.ZodString>;
+      files: z.ZodTypeAny;
+    }>;
+  }>;
+  additionalInformation?: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+};
+
+type SchemaWithEnforcableProps<Shape extends z.ZodRawShape = z.ZodRawShape> =
+  | z.ZodEffects<z.ZodObject<EnforceSchemaProps<Shape>, "strip", z.ZodTypeAny>>
+  | z.ZodObject<EnforceSchemaProps<Shape>, "strip", z.ZodTypeAny>;
+
+type ActionFormProps<Schema extends SchemaWithEnforcableProps> = {
+  schema: Schema;
+  defaultValues?: DefaultValues<z.TypeOf<Schema>>;
+  title: string;
+  fieldsLayout?: (props: { children: ReactNode; title: string }) => ReactNode;
+  fields: (form: UseFormReturn<z.TypeOf<Schema>>) => ReactNode;
+  bannerPostSubmission?: Omit<Banner, "pathnameToDisplayOn">;
+  promptPreSubmission?: Omit<UserPrompt, "onAccept">;
+  promptOnLeavingForm?: Omit<UserPrompt, "onAccept">;
+  attachments: {
+    faqLink: string;
+    specialInstructions?: string;
   };
+  documentPollerArgs: {
+    property:
+      | (keyof z.TypeOf<Schema> & string)
+      | ((values: z.TypeOf<Schema>) => string);
+    documentChecker: CheckDocumentFunction;
+  };
+};
 
-export const ActionForm = <
-  Schema extends SchemaWithEnforcableProps<z.ZodRawShape>,
->({
+export const ActionForm = <Schema extends SchemaWithEnforcableProps>({
   schema,
   defaultValues,
   title,
@@ -131,11 +143,14 @@ export const ActionForm = <
     }
   });
 
+  const attachmentsFromSchema = useMemo(() => getAttachments(schema), [schema]);
+  const additionalInformationFromSchema = useMemo(
+    () => getAdditionalInformation(schema),
+    [schema],
+  );
   const hasProgressLossReminder = useMemo(
-    () =>
-      Fields({ ...form }) !== null ||
-      schema.shape.attachments instanceof z.ZodObject,
-    [schema.shape.attachments, Fields, form],
+    () => Fields({ ...form }) !== null || attachmentsFromSchema.length > 0,
+    [attachmentsFromSchema, Fields, form],
   );
 
   return (
@@ -159,10 +174,13 @@ export const ActionForm = <
               <Fields {...form} />
             </SectionCard>
           )}
-          {schema.shape.attachments && (
-            <ActionFormAttachments schema={schema} {...attachments} />
+          {attachmentsFromSchema.length > 0 && (
+            <ActionFormAttachments
+              attachmentsFromSchema={attachmentsFromSchema}
+              {...attachments}
+            />
           )}
-          {schema.shape.additionalInformation && (
+          {additionalInformationFromSchema && (
             <SectionCard title="Additional Information">
               <FormField
                 control={form.control}

react-app/src/features/forms/new-submission/Medicaid.tsx

@@ -11,7 +11,6 @@ import {
   FAQ_TAB,
   SpaIdFormattingDesc,
 } from "@/components";
-// import { newMedicaidSubmission } from "shared-types";
 import { ActionForm } from "@/components/ActionForm";
 import { formSchemas } from "@/formSchemas";
 

react-app/src/features/forms/new-submission/chip.test.tsx

@@ -28,8 +28,29 @@ describe("CHIP SPA", () => {
 
   test("SPA ID", async () => {
     const spaIdInput = screen.getByLabelText(/SPA ID/);
-    await userEvent.type(spaIdInput, "MD-24-9291");
-    const spaIdLabel = container.querySelector('[for="id"]');
+    const spaIdLabel = screen.getByTestId("spaid-label");
+
+    // test id validations
+    // fails if item exists
+    await userEvent.type(spaIdInput, "MD-00-0000");
+    const recordExistsErrorText = screen.getByText(
+      /According to our records, this SPA ID already exists. Please check the SPA ID and try entering it again./,
+    );
+    expect(recordExistsErrorText).toBeInTheDocument();
+
+    await userEvent.clear(spaIdInput);
+
+    // fails if state entered is not a valid state
+    await userEvent.type(spaIdInput, "AK-00-0000");
+    const invalidStateErrorText = screen.getByText(
+      /You can only submit for a state you have access to. If you need to add another state, visit your IDM user profile to request access./,
+    );
+    expect(invalidStateErrorText).toBeInTheDocument();
+
+    await userEvent.clear(spaIdInput);
+
+    // end of test id validations
+    await userEvent.type(spaIdInput, "MD-00-0001");
 
     expect(spaIdLabel).not.toHaveClass("text-destructive");
   });

react-app/src/features/forms/new-submission/medicaid.test.tsx

@@ -4,7 +4,10 @@ import { describe, vi, test, expect, beforeAll } from "vitest";
 import { MedicaidForm } from "./Medicaid";
 import { formSchemas } from "@/formSchemas";
 import { uploadFiles } from "@/utils/test-helpers/uploadFiles";
-import { skipCleanup } from "@/utils/test-helpers/skipCleanup";
+import {
+  skipCleanup,
+  mockApiRefinements,
+} from "@/utils/test-helpers/skipCleanup";
 import { renderForm } from "@/utils/test-helpers/renderForm";
 
 vi.mock("@/components/Inputs/upload.utilities", () => ({
@@ -22,6 +25,7 @@ let container: HTMLElement;
 describe("Medicaid SPA", () => {
   beforeAll(() => {
     skipCleanup();
+    mockApiRefinements();
 
     const { container: renderedContainer } = renderForm(<MedicaidForm />);
 
@@ -31,7 +35,28 @@ describe("Medicaid SPA", () => {
   test("SPA ID", async () => {
     const spaIdInput = screen.getByLabelText(/SPA ID/);
     const spaIdLabel = screen.getByTestId("spaid-label");
-    await userEvent.type(spaIdInput, "MD-24-9291");
+
+    // test id validations
+    // fails if item exists
+    await userEvent.type(spaIdInput, "MD-00-0000");
+    const recordExistsErrorText = screen.getByText(
+      /According to our records, this SPA ID already exists. Please check the SPA ID and try entering it again./,
+    );
+    expect(recordExistsErrorText).toBeInTheDocument();
+
+    await userEvent.clear(spaIdInput);
+
+    // fails if state entered is not a valid state
+    await userEvent.type(spaIdInput, "AK-00-0000");
+    const invalidStateErrorText = screen.getByText(
+      /You can only submit for a state you have access to. If you need to add another state, visit your IDM user profile to request access./,
+    );
+    expect(invalidStateErrorText).toBeInTheDocument();
+
+    await userEvent.clear(spaIdInput);
+
+    // end of test id validations
+    await userEvent.type(spaIdInput, "MD-00-0001");
 
     expect(spaIdLabel).not.toHaveClass("text-destructive");
   });