From d2a2581497b1a31eaca084416d175c9714f6b9b4 Mon Sep 17 00:00:00 2001
From: Khayal Alasgarov <khayal.alasgarov@gsa.gov>
Date: Wed, 8 Jan 2025 09:15:22 -0800
Subject: [PATCH] refactor: clean up old files tckt-310

---
 apps/spotlight/src/components/SplashPage.tsx  |  3 ---
 .../components/PhoneNumber/PhoneNumber.tsx    |  2 +-
 .../Form/components/RadioGroup/RadioGroup.tsx |  6 ++----
 .../src/Form/components/TextInput/index.tsx   |  4 +---
 packages/forms/src/components.ts              |  3 ---
 packages/forms/src/documents/document.ts      |  6 +-----
 packages/forms/src/documents/pdf/generate.ts  |  6 +-----
 packages/forms/src/documents/pdf/index.ts     |  1 -
 .../forms/src/documents/pdf/parsing-api.ts    | 19 +------------------
 packages/forms/src/documents/types.ts         |  8 --------
 packages/forms/src/pattern.ts                 |  4 ++--
 packages/forms/src/patterns/input/prompt.ts   |  6 ------
 packages/forms/src/patterns/input/response.ts |  4 ----
 packages/forms/src/session.ts                 |  2 ++
 14 files changed, 11 insertions(+), 63 deletions(-)
 delete mode 100644 apps/spotlight/src/components/SplashPage.tsx

diff --git a/apps/spotlight/src/components/SplashPage.tsx b/apps/spotlight/src/components/SplashPage.tsx
deleted file mode 100644
index 0dac27d2..00000000
--- a/apps/spotlight/src/components/SplashPage.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default () => {
-  return <h1>Hero</h1>
-}
\ No newline at end of file
diff --git a/packages/design/src/Form/components/PhoneNumber/PhoneNumber.tsx b/packages/design/src/Form/components/PhoneNumber/PhoneNumber.tsx
index 78934302..f32b8873 100644
--- a/packages/design/src/Form/components/PhoneNumber/PhoneNumber.tsx
+++ b/packages/design/src/Form/components/PhoneNumber/PhoneNumber.tsx
@@ -39,7 +39,7 @@ export const PhoneNumberPattern: PatternComponent<PhoneNumberProps> = ({
           })}
           htmlFor={phoneId}
         >
-          {label || 'Phone Number'}
+          {label}
           {required && <span className="required-indicator">*</span>}
         </label>
         {hint && (
diff --git a/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx b/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
index 686f8d3b..5a8f1902 100644
--- a/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
+++ b/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
@@ -13,16 +13,14 @@ export const RadioGroupPattern: PatternComponent<RadioGroupProps> = props => {
         {props.legend}
       </legend>
       {props.options.map((option, index) => {
-        const id = props.idSuffix ? `${option.id}${props.idSuffix}` : option.id;
+        const id = option.id;
         return (
           <div key={index} className="usa-radio">
             <input
               className="usa-radio__input"
               type="radio"
               id={`input-${id}`}
-              {...register(
-                `${props.groupId}${props.idSuffix ? props.idSuffix : ''}`
-              )}
+              {...register(`${props.groupId}`)}
               value={option.id}
               defaultChecked={option.defaultChecked}
             />
diff --git a/packages/design/src/Form/components/TextInput/index.tsx b/packages/design/src/Form/components/TextInput/index.tsx
index 1b875902..64e1dc41 100644
--- a/packages/design/src/Form/components/TextInput/index.tsx
+++ b/packages/design/src/Form/components/TextInput/index.tsx
@@ -7,9 +7,7 @@ import { type PatternComponent } from '../../../Form/index.js';
 
 const TextInput: PatternComponent<TextInputProps> = props => {
   const { register } = useFormContext();
-  const id = props.idSuffix
-    ? `${props.inputId}${props.idSuffix}`
-    : props.inputId;
+  const id = props.inputId;
   return (
     <div className="usa-form-group-wrapper" key={props.inputId}>
       <div
diff --git a/packages/forms/src/components.ts b/packages/forms/src/components.ts
index d493cc22..780399ed 100644
--- a/packages/forms/src/components.ts
+++ b/packages/forms/src/components.ts
@@ -18,7 +18,6 @@ export type PackageDownloadProps = PatternProps<{
 export type TextInputProps = PatternProps<{
   type: 'input';
   inputId: string;
-  idSuffix?: string;
   value: string;
   label: string;
   required: boolean;
@@ -75,7 +74,6 @@ export type ZipcodeProps = PatternProps<{
 export type CheckboxProps = PatternProps<{
   type: 'checkbox';
   id: string;
-  idSuffix?: string;
   label: string;
   defaultChecked: boolean;
 }>;
@@ -95,7 +93,6 @@ export type RadioGroupProps = PatternProps<{
   type: 'radio-group';
   groupId: string;
   legend: string;
-  idSuffix?: string;
   options: {
     id: string;
     name: string;
diff --git a/packages/forms/src/documents/document.ts b/packages/forms/src/documents/document.ts
index d1fd1abe..2338834b 100644
--- a/packages/forms/src/documents/document.ts
+++ b/packages/forms/src/documents/document.ts
@@ -167,11 +167,7 @@ export const addDocumentFieldsToForm = (
           maxLength: 128,
         },
       } satisfies InputPattern);
-    } else if (
-      field.type === 'Paragraph' ||
-      field.type === 'RichText' ||
-      field.type === 'Repeater'
-    ) {
+    } else if (field.type === 'Paragraph' || field.type === 'RichText') {
       // skip purely presentational fields
     } else if (field.type === 'not-supported') {
       console.error(`Skipping field: ${field.error}`);
diff --git a/packages/forms/src/documents/pdf/generate.ts b/packages/forms/src/documents/pdf/generate.ts
index 73c04868..63aade0e 100644
--- a/packages/forms/src/documents/pdf/generate.ts
+++ b/packages/forms/src/documents/pdf/generate.ts
@@ -132,11 +132,7 @@ const setFormFieldData = (
         field.uncheck();
       }
     }
-  } else if (
-    fieldType === 'Paragraph' ||
-    fieldType === 'RichText' ||
-    fieldType === 'Repeater'
-  ) {
+  } else if (fieldType === 'Paragraph' || fieldType === 'RichText') {
     // do nothing
   } else {
     const exhaustiveCheck: never = fieldType;
diff --git a/packages/forms/src/documents/pdf/index.ts b/packages/forms/src/documents/pdf/index.ts
index 60b3e06f..edafb097 100644
--- a/packages/forms/src/documents/pdf/index.ts
+++ b/packages/forms/src/documents/pdf/index.ts
@@ -27,7 +27,6 @@ export type PDFFieldType =
   | 'OptionList'
   | 'RadioGroup'
   | 'Paragraph'
-  | 'Repeater'
   | 'RichText';
 
 export type ParsePdf = (
diff --git a/packages/forms/src/documents/pdf/parsing-api.ts b/packages/forms/src/documents/pdf/parsing-api.ts
index 750a3e09..d24b9a86 100644
--- a/packages/forms/src/documents/pdf/parsing-api.ts
+++ b/packages/forms/src/documents/pdf/parsing-api.ts
@@ -8,7 +8,6 @@ import { type ParagraphPattern } from '../../patterns/paragraph.js';
 import { type CheckboxPattern } from '../../patterns/checkbox.js';
 import { type RadioGroupPattern } from '../../patterns/radio-group.js';
 import { RichTextPattern } from '../../patterns/rich-text.js';
-import { type RepeaterPattern } from '../../patterns/repeater/index.js';
 
 import { uint8ArrayToBase64 } from '../../util/base64.js';
 import { type DocumentFieldMap } from '../types.js';
@@ -80,26 +79,11 @@ const Fieldset = z.object({
   page: z.union([z.number(), z.string()]),
 });
 
-const Repeater = z.object({
-  component_type: z.literal('repeater'),
-  legend: z.string(),
-  fields: z.union([TxInput, Checkbox]).array(),
-  page: z.union([z.number(), z.string()]),
-});
-
 const ExtractedObject = z.object({
   raw_text: z.string(),
   form_summary: FormSummary,
   elements: z
-    .union([
-      TxInput,
-      Checkbox,
-      RadioGroup,
-      Paragraph,
-      Fieldset,
-      RichText,
-      Repeater,
-    ])
+    .union([TxInput, Checkbox, RadioGroup, Paragraph, Fieldset, RichText])
     .array(),
 });
 
@@ -173,7 +157,6 @@ export const processApiResponse = async (json: any): Promise<ParsedPdf> => {
 
   for (const element of extracted.elements) {
     const fieldsetPatterns: PatternId[] = [];
-
     // Add paragraph elements
     if (element.component_type === 'paragraph') {
       const paragraph = processPatternData<ParagraphPattern>(
diff --git a/packages/forms/src/documents/types.ts b/packages/forms/src/documents/types.ts
index 329f7f72..a94d4d2a 100644
--- a/packages/forms/src/documents/types.ts
+++ b/packages/forms/src/documents/types.ts
@@ -44,14 +44,6 @@ export type DocumentFieldValue =
       value: string;
       required: boolean;
     }
-  | {
-      type: 'Repeater';
-      name: string;
-      options: string[];
-      label: string;
-      value: string;
-      required: boolean;
-    }
   | {
       type: 'RichText';
       name: string;
diff --git a/packages/forms/src/pattern.ts b/packages/forms/src/pattern.ts
index b41f25d4..c560ec98 100644
--- a/packages/forms/src/pattern.ts
+++ b/packages/forms/src/pattern.ts
@@ -173,7 +173,7 @@ const setNestedValue = (
   }, obj);
 };
 
-const aggregateValuesByPrefix = (
+export const aggregateValuesByPrefix = (
   values: Record<string, any>
 ): Record<string, any> => {
   const aggregatedValues: Record<string, any> = {};
@@ -204,7 +204,7 @@ export const aggregatePatternSessionValues = (
   if (patternConfig.parseUserInput) {
     const isRepeaterType = pattern.type === 'repeater';
     const patternValues = aggregatedValues[pattern.id];
-    let parseResult: any = patternConfig.parseUserInput(
+    const parseResult: any = patternConfig.parseUserInput(
       pattern,
       patternValues,
       config,
diff --git a/packages/forms/src/patterns/input/prompt.ts b/packages/forms/src/patterns/input/prompt.ts
index e9dd710d..dad73435 100644
--- a/packages/forms/src/patterns/input/prompt.ts
+++ b/packages/forms/src/patterns/input/prompt.ts
@@ -20,12 +20,6 @@ export const createPrompt: CreatePrompt<InputPattern> = (
     }
   }
 
-  console.group('input/createprompt');
-  console.log(session);
-  console.log(options);
-  console.log(pattern);
-  console.groupEnd();
-
   return {
     props: {
       _patternId: pattern.id,
diff --git a/packages/forms/src/patterns/input/response.ts b/packages/forms/src/patterns/input/response.ts
index 068bedce..c2ff986e 100644
--- a/packages/forms/src/patterns/input/response.ts
+++ b/packages/forms/src/patterns/input/response.ts
@@ -27,9 +27,5 @@ export const parseUserInput: ParseUserInput<
   InputPattern,
   InputPatternOutput
 > = (pattern, obj) => {
-  console.group('parseUserInput');
-  console.log(pattern);
-  console.log(obj);
-  console.groupEnd();
   return safeZodParseToFormError(createSchema(pattern['data']), obj);
 };
diff --git a/packages/forms/src/session.ts b/packages/forms/src/session.ts
index d5c793b8..2800096d 100644
--- a/packages/forms/src/session.ts
+++ b/packages/forms/src/session.ts
@@ -6,6 +6,8 @@ import {
   type PatternId,
   type PatternValue,
   type PatternValueMap,
+  aggregatePatternSessionValues,
+  aggregateValuesByPrefix,
   getPatternConfig,
   validatePattern,
 } from './pattern.js';