Merge pull request #558 from Enterprise-CMCS/master

Release to val
Enterprise-CMCS · May 23, 2024 · 584d767 · 584d767
2 parents a0fabe3 + 11542ac
commit 584d767
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/docs/_deploy-metrics/package.json b/docs/_deploy-metrics/package.json
@@ -20,9 +20,9 @@
     "jszip": "^3.10.1",
     "next": "^13.5.4",
     "octokit": "^3.2.0",
-    "react": "18.2.0",
+    "react": "18.3.0",
     "react-aws-icons": "^1.2.1",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.0",
     "react-icons": "^4.8.0",
     "react-json-to-csv": "^1.2.0",
     "recharts": "^2.12.5"

diff --git a/docs/_deploy-metrics/yarn.lock b/docs/_deploy-metrics/yarn.lock
@@ -3610,13 +3610,13 @@ react-clientside-effect@^1.2.6:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-dom@18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
-  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
+react-dom@18.3.0:
+  version "18.3.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.0.tgz#98a3a1cc4e471d517c2a084f38ab1d58d02cada7"
+  integrity sha512-zaKdLBftQJnvb7FtDIpZtsAIb2MZU087RM8bRDZU8LVCCFYjPTsDZJNFUWPcVz3HFSN1n/caxi0ca4B/aaVQGQ==
   dependencies:
     loose-envify "^1.1.0"
-    scheduler "^0.23.0"
+    scheduler "^0.23.1"
 
 [email protected]:
   version "3.2.2"
@@ -3699,10 +3699,10 @@ react-transition-group@^4.4.5:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
-  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
+react@18.3.0:
+  version "18.3.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.0.tgz#84386d0a36fdf5ef50fa5755b7812bdfb76194a5"
+  integrity sha512-RPutkJftSAldDibyrjuku7q11d3oy6wKOyPe5K1HA/HwwrXcEqBdHsLypkC2FFYjP7bPUa6gbzSBhw4sY2JcDg==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -3842,10 +3842,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-scheduler@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
-  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
+scheduler@^0.23.1:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
     loose-envify "^1.1.0"
 

diff --git a/src/packages/shared-types/forms.ts b/src/packages/shared-types/forms.ts
@@ -76,7 +76,7 @@ type RHFTextItemType =
   | "default";
 
 export type RHFOption = {
-  label: string;
+  label?: string;
   value: string;
   styledLabel?: RHFTextField;
   dependency?: DependencyRule;

diff --git a/src/services/api/webforms/ABP2A/v202401.ts b/src/services/api/webforms/ABP2A/v202401.ts
@@ -92,7 +92,6 @@ export const v202401: FormSchema = {
                       "state_territory_must_have_a_process_that_meets_exemption_criteria",
                   },
                   {
-                    label: "",
                     styledLabel: [
                       {
                         text: "Once an individual is identified, the state/territory assures it will effectively inform the individual of the following:",
@@ -135,7 +134,6 @@ export const v202401: FormSchema = {
                         classname: "block py-1",
                       },
                     ],
-                    label: "",
                     value:
                       "state_territory_assures_it_will_inform_the_individual",
                   },
@@ -242,7 +240,6 @@ export const v202401: FormSchema = {
               props: {
                 options: [
                   {
-                    label: "",
                     styledLabel: [
                       {
                         text: "The state/territory assures it will document in the exempt individual's eligibility file that the individual:",

diff --git a/src/services/api/webforms/ABP2B/v202401.ts b/src/services/api/webforms/ABP2B/v202401.ts
@@ -36,7 +36,6 @@ export const v202401: FormSchema = {
                       "inform_exempt_and_comply_with_requirements_related_to_voluntary_enrollment",
                   },
                   {
-                    label: "",
                     styledLabel: [
                       {
                         text: "Effectively inform individuals who voluntarily enroll:",
@@ -80,7 +79,6 @@ export const v202401: FormSchema = {
                         classname: "block py-1",
                       },
                     ],
-                    label: "",
                     value:
                       "inform_individuals_of_abp_benefits_and_costs_of_different_packages",
                   },
@@ -187,7 +185,6 @@ export const v202401: FormSchema = {
               props: {
                 options: [
                   {
-                    label: "",
                     styledLabel: [
                       {
                         text: "The state/territory assures it will document in the exempt individual's eligibility file that the individual:",

diff --git a/src/services/ui/src/components/Inputs/checkbox.tsx b/src/services/ui/src/components/Inputs/checkbox.tsx
@@ -8,7 +8,7 @@ const Checkbox = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root> &
     DependencyWrapperProps & {
       className?: string;
-      label: string;
+      label?: string;
       value?: string;
       styledLabel?: React.ReactNode;
       description?: string;
@@ -19,7 +19,7 @@ const Checkbox = React.forwardRef<
     <div className="items-top flex space-x-2">
       <CheckboxPrimitive.Root
         ref={ref}
-        id={props.label ?? props.styledLabel}
+        id={(props.label || props.styledLabel) as string}
         className={cn(
           "peer h-7 w-7 my-2 shrink-0 border-black border-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:border-primary data-[state=checked]:text-primary-foreground",
           className,
@@ -35,13 +35,13 @@ const Checkbox = React.forwardRef<
       <div className="grid gap-1.5 leading-none">
         {!!(props.label || props.styledLabel) && (
           <label
-            htmlFor={props.label ?? props.styledLabel}
+            htmlFor={(props.label || props.styledLabel) as string}
             className={cn(
               "mt-2 text-md font-medium leading-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
               props.optionlabelClassName,
             )}
           >
-            {props.label ?? props.styledLabel}
+            {props.label || props.styledLabel}
           </label>
         )}
         {!!props.description && (

diff --git a/src/services/ui/src/components/RHF/Slot.tsx b/src/services/ui/src/components/RHF/Slot.tsx
@@ -44,9 +44,9 @@ export const RHFSlot = <
         }`}
         data-testid={rest.name + "Wrapper"}
       >
-        {(label ?? styledLabel) && (
+        {(label || styledLabel) && (
           <FormLabel className={labelClassName}>
-            <RHFTextDisplay text={(styledLabel ?? label) as RHFTextField} />
+            <RHFTextDisplay text={(styledLabel || label) as RHFTextField} />
           </FormLabel>
         )}
         {descriptionAbove && description && (

diff --git a/src/services/ui/src/components/RHF/SlotField.tsx b/src/services/ui/src/components/RHF/SlotField.tsx
@@ -162,7 +162,9 @@ export const SlotField = ({
                   value={OPT.value}
                   checked={field.value?.includes(OPT.value)}
                   styledLabel={
-                    <RHFTextDisplay text={OPT.styledLabel ?? OPT.label} />
+                    <RHFTextDisplay
+                      text={(OPT.styledLabel || OPT.label) as string}
+                    />
                   }
                   onCheckedChange={(c) => {
                     const filtered =
@@ -207,7 +209,9 @@ export const SlotField = ({
                   />
                   {
                     <FormLabel className="font-normal mt-2" htmlFor={OPT.value}>
-                      <RHFTextDisplay text={OPT.styledLabel ?? OPT.label} />
+                      <RHFTextDisplay
+                        text={(OPT.styledLabel || OPT.label) as string}
+                      />
                     </FormLabel>
                   }
                 </div>

diff --git a/src/services/ui/src/features/package-actions/lib/modules/temporary-extension/legacy-page.tsx b/src/services/ui/src/features/package-actions/lib/modules/temporary-extension/legacy-page.tsx
@@ -21,6 +21,7 @@ import {
   SubmissionButtons,
   useLocationCrumbs,
   FormLoadingSpinner,
+  FAQFooter,
 } from "@/components";
 import { useParams } from "react-router-dom";
 import { TEPackageSection } from "@/features/package-actions/lib/modules/temporary-extension/legacy-components";
@@ -142,6 +143,7 @@ export const TemporaryExtension = () => {
         <ErrorBanner />
         <SubmissionButtons cancelNavigationLocation={navigationLocation} />
       </form>
+      <FAQFooter />
     </SimplePageContainer>
   );
 };