Merge remote-tracking branch 'origin/main' into jim/demo011425

GSA-TTS · Jan 22, 2025 · b56544e · b56544e
2 parents f3d4cf1 + ef8c283
commit b56544e
Show file tree

Hide file tree

Showing 57 changed files with 16,101 additions and 11,867 deletions.
diff --git a/.github/workflows/_terraform-apply.yml b/.github/workflows/_terraform-apply.yml
@@ -6,11 +6,6 @@ on:
       deploy-env:
         type: string
         required: true
-      terraform_version:
-        description: Terraform version
-        required: false
-        default: "1.10.4"
-        type: string
 
 env:
   DEPLOY_ENV: ${{ inputs.deploy-env }}
@@ -44,7 +39,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
@@ -55,23 +50,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - uses: actions/cache@v3
-        name: Check Cache for Terraform CLI
-        id: terraform-cache
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
         with:
-          path: /usr/local/bin/terraform
-          key: terraform-${{ inputs.terraform_version }}
-
-      - name: Install Terraform CLI
-        if: steps.terraform-cache.outputs.cache-hit != 'true'
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget unzip
-          wget https://releases.hashicorp.com/terraform/${{ inputs.terraform_version }}/terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          unzip terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          sudo mv terraform /usr/local/bin/
-
-      - name: Verify Terraform Installation
-        run: terraform --version
+          terraform_version: "1.10.4"
 
       - name: Initialize Terraform CDK configuration
         shell: bash

diff --git a/.github/workflows/_terraform-plan-pr-comment.yml b/.github/workflows/_terraform-plan-pr-comment.yml
@@ -6,11 +6,6 @@ on:
       deploy-env:
         required: true
         type: string
-      terraform_version:
-        description: Terraform version
-        required: false
-        default: "1.10.4"
-        type: string
 
 jobs:
   terraform:
@@ -46,7 +41,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
@@ -57,23 +52,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - uses: actions/cache@v3
-        name: Check Cache for Terraform CLI
-        id: terraform-cache
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
         with:
-          path: /usr/local/bin/terraform
-          key: terraform-${{ inputs.terraform_version }}
-
-      - name: Install Terraform CLI
-        if: steps.terraform-cache.outputs.cache-hit != 'true'
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget unzip
-          wget https://releases.hashicorp.com/terraform/${{ inputs.terraform_version }}/terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          unzip terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          sudo mv terraform /usr/local/bin/
-
-      - name: Verify Terraform Installation
-        run: terraform --version
+          terraform_version: "1.10.4"
 
       - name: Initialize Terraform CDK configuration
         shell: bash

diff --git a/.github/workflows/_validate.yml b/.github/workflows/_validate.yml
@@ -8,11 +8,6 @@ on:
         required: false
         default: "1.48.1"
         type: string
-      terraform_version:
-        description: Terraform version
-        required: false
-        default: "1.10.4"
-        type: string
 
 jobs:
   run-tests:
@@ -97,23 +92,10 @@ jobs:
         shell: bash
         run: AUTH_SECRET=not-super-secret pnpm test:ci
 
-      - uses: actions/cache@v3
-        name: Check Cache for Terraform CLI
-        id: terraform-cache
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
         with:
-          path: /usr/local/bin/terraform
-          key: terraform-${{ inputs.terraform_version }}
-
-      - name: Install Terraform CLI
-        if: steps.terraform-cache.outputs.cache-hit != 'true'
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget unzip
-          wget https://releases.hashicorp.com/terraform/${{ inputs.terraform_version }}/terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          unzip terraform_${{ inputs.terraform_version }}_linux_amd64.zip
-          sudo mv terraform /usr/local/bin/
-
-      - name: Verify Terraform Installation
-        run: terraform --version
+          terraform_version: "1.10.4"
 
       - name: Initialize Terraform CDK configuration
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 _site
 .turbo/
 .vscode/
+.idea/
 coverage/
 html/
 node_modules/

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 pnpm lint
 pnpm format
-pnpm test
+pnpm test:ci
diff --git a/package.json b/package.json
@@ -16,9 +16,9 @@
     "lint": "turbo run lint",
     "pages": "rm -rf node_modules && npm i -g pnpm turbo && pnpm i && pnpm build && ln -sf ./apps/spotlight/dist _site",
     "test": "vitest run",
-    "test:ci": "vitest run # --coverage.enabled --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=json-summary --coverage.reporter=json --coverage.reportOnFailure",
+    "test:ci": "CI=true vitest run # --coverage.enabled --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=json-summary --coverage.reporter=json --coverage.reportOnFailure",
     "test:infra": "turbo run --filter=infra-cdktf test",
-    "typecheck": "tsc --build",
+    "typecheck": "tsc --build --noEmit",
     "prepare": "husky"
   },
   "hooks": {

diff --git a/packages/common/src/locales/en/app.ts b/packages/common/src/locales/en/app.ts
@@ -99,5 +99,10 @@ export const en = {
       preferNotToAnswerTextLabel:
         'Prefer not to share my gender identity checkbox label',
     },
+    repeater: {
+      ...defaults,
+      displayName: 'Repeatable Group',
+      errorTextMustContainChar: 'String must contain at least 1 character(s)',
+    },
   },
 };
diff --git a/packages/design/src/Form/components/DateOfBirth/DateOfBirth.tsx b/packages/design/src/Form/components/DateOfBirth/DateOfBirth.tsx
@@ -35,94 +35,104 @@ export const DateOfBirthPattern: PatternComponent<DateOfBirthProps> = ({
   hint,
   required,
   error,
+  value,
 }) => {
   const { register } = useFormContext();
   const errorId = `input-error-message-${monthId}`;
   const hintId = `hint-${monthId}`;
 
   return (
     <fieldset className="usa-fieldset">
-      <legend className="usa-legend">
-        {label}
-        {required && <span className="required-indicator">*</span>}
-      </legend>
-      {hint && (
-        <span className="usa-hint" id={hintId}>
-          {hint}
-        </span>
-      )}
-      {error && (
-        <div className="usa-error-message" id={errorId} role="alert">
-          {error.message}
-        </div>
-      )}
-      <div className="usa-memorable-date">
-        <div className="usa-form-group usa-form-group--month usa-form-group--select">
-          <label className="usa-label" htmlFor={monthId}>
-            Month
-          </label>
-          <select
-            className={classNames('usa-input', {
-              'usa-input--error': !!error,
-            })}
-            id={monthId}
-            {...register(monthId)}
-            aria-describedby={
-              getAriaDescribedBy(
-                error ? errorId : null,
-                hint ? hintId : null
-              ) || undefined
-            }
-          >
-            <option key="default" value="">
-              - Select -
-            </option>
-            {months.map((option, index) => (
-              <option key={index} value={option.value}>
-                {option.label}
+      <div className={classNames('usa-form-group margin-top-2')}>
+        <legend
+          className={classNames('usa-legend', {
+            'usa-legend--error': error,
+          })}
+        >
+          {label}
+          {required && <span className="required-indicator">*</span>}
+        </legend>
+        {hint && (
+          <div className="usa-hint" id={hintId}>
+            {hint}
+          </div>
+        )}
+        {error && (
+          <div className="usa-error-message" id={errorId} role="alert">
+            {error.message}
+          </div>
+        )}
+        <div className="usa-memorable-date">
+          <div className="usa-form-group usa-form-group--month usa-form-group--select">
+            <label className="usa-label" htmlFor={monthId}>
+              Month
+            </label>
+            <select
+              className={classNames('usa-input', {
+                'usa-input--error': !!error,
+              })}
+              id={monthId}
+              {...register(monthId)}
+              defaultValue={value?.month}
+              aria-describedby={
+                getAriaDescribedBy(
+                  error ? errorId : null,
+                  hint ? hintId : null
+                ) || undefined
+              }
+            >
+              <option key="default" value="">
+                - Select -
               </option>
-            ))}
-          </select>
-        </div>
-        <div className="usa-form-group usa-form-group--day">
-          <label className="usa-label" htmlFor={dayId}>
-            Day
-          </label>
-          <input
-            className={classNames('usa-input', {
-              'usa-input--error': !!error,
-            })}
-            id={dayId}
-            {...register(dayId, { required })}
-            minLength={2}
-            maxLength={2}
-            pattern="[0-9]*"
-            inputMode="numeric"
-            aria-describedby={getAriaDescribedBy(
-              error ? `input-error-message-${dayId}` : null,
-              hint ? hintId : null
-            )}
-          />
-        </div>
-        <div className="usa-form-group usa-form-group--year">
-          <label className="usa-label" htmlFor={yearId}>
-            Year
-          </label>
-          <input
-            className={classNames('usa-input', {
-              'usa-input--error': !!error,
-            })}
-            id={yearId}
-            {...register(yearId, { required })}
-            minLength={4}
-            maxLength={4}
-            pattern="[0-9]*"
-            inputMode="numeric"
-            aria-describedby={getAriaDescribedBy(
-              error ? `input-error-message-${yearId}` : null,
-              hint ? hintId : null
-            )}
-          />
+              {months.map((option, index) => (
+                <option key={index} value={option.value}>
+                  {option.label}
+                </option>
+              ))}
+            </select>
+          </div>
+          <div className="usa-form-group usa-form-group--day">
+            <label className="usa-label" htmlFor={dayId}>
+              Day
+            </label>
+            <input
+              className={classNames('usa-input', {
+                'usa-input--error': !!error,
+              })}
+              id={dayId}
+              {...register(dayId, { required })}
+              minLength={2}
+              maxLength={2}
+              pattern="[0-9]*"
+              inputMode="numeric"
+              aria-describedby={getAriaDescribedBy(
+                error ? `input-error-message-${dayId}` : null,
+                hint ? hintId : null
+              )}
+              defaultValue={value?.day}
+            />
+          </div>
+          <div className="usa-form-group usa-form-group--year">
+            <label className="usa-label" htmlFor={yearId}>
+              Year
+            </label>
+            <input
+              className={classNames('usa-input', {
+                'usa-input--error': !!error,
+              })}
+              id={yearId}
+              {...register(yearId, { required })}
+              minLength={4}
+              maxLength={4}
+              pattern="[0-9]*"
+              inputMode="numeric"
+              aria-describedby={getAriaDescribedBy(
+                error ? `input-error-message-${yearId}` : null,
+                hint ? hintId : null
+              )}
+              defaultValue={value?.year}
+            />
+          </div>
         </div>
       </div>
     </fieldset>

diff --git a/packages/design/src/Form/components/EmailInput/EmailInput.tsx b/packages/design/src/Form/components/EmailInput/EmailInput.tsx
@@ -9,14 +9,20 @@ export const EmailInputPattern: PatternComponent<EmailInputProps> = ({
   label,
   required,
   error,
+  value,
 }) => {
   const { register } = useFormContext();
   const errorId = `input-error-message-${emailId}`;
 
   return (
     <fieldset className="usa-fieldset">
-      <div className="usa-form-group">
-        <label className="usa-label" htmlFor={emailId}>
+      <div className={classNames('usa-form-group margin-top-2')}>
+        <label
+          className={classNames('usa-label', {
+            'usa-label--error': error,
+          })}
+          htmlFor={emailId}
+        >
           {label}
           {required && <span className="required-indicator">*</span>}
         </label>
@@ -26,14 +32,15 @@ export const EmailInputPattern: PatternComponent<EmailInputProps> = ({
           </div>
         )}
         <input
-          className={classNames('usa-input margin-bottom-1', {
+          className={classNames('usa-input usa-input--xl', {
             'usa-input--error': error,
           })}
           id={emailId}
           type="email"
           autoCapitalize="off"
           autoCorrect="off"
           {...register(emailId, { required })}
+          defaultValue={value?.email || ''}
           aria-describedby={error ? errorId : undefined}
         />
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     _site
     .turbo/
     .vscode/
+    .idea/
     coverage/
     html/
     node_modules/
@@ Expand Down @@