Skip to content

Commit

Permalink
Merge pull request #595 from Enterprise-CMCS/master
Browse files Browse the repository at this point in the history
Release to val
  • Loading branch information
jdinh8124 authored Jun 18, 2024
2 parents df630a1 + b189335 commit fcdf7fe
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 11 deletions.
40 changes: 35 additions & 5 deletions src/services/api/webforms/ABP2A/v202401.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ export const v202401: FormSchema = {
{
title: "Assurances",
sectionId: "assurances",
dependency: {
conditions: [
{
name: "abp2a_benefit-align-and-require_is-state-territory-aligned",
type: "expectedValue",
expectedValue: "no",
},
],
effect: { type: "show" },
},
form: [
{
description:
Expand All @@ -97,7 +107,7 @@ export const v202401: FormSchema = {
{
styledLabel: [
{
text: "Once an individual is identified, the state/territory assures it will effectively inform the individual of the following:",
text: "Once an individual is identified, the state/territory assures it will effectively inform the individual:",
type: "default",
classname: "block py-1",
},
Expand All @@ -122,7 +132,7 @@ export const v202401: FormSchema = {
{
styledLabel: [
{
text: "The state/territory assures it will inform the individual of the following:",
text: "The state/territory assures it will inform the individual of:",
type: "default",
classname: "block py-1",
},
Expand Down Expand Up @@ -150,6 +160,16 @@ export const v202401: FormSchema = {
{
title: "Delivery of information",
sectionId: "delivery-of-info",
dependency: {
conditions: [
{
name: "abp2a_benefit-align-and-require_is-state-territory-aligned",
type: "expectedValue",
expectedValue: "no",
},
],
effect: { type: "show" },
},
form: [
{
description:
Expand All @@ -174,7 +194,7 @@ export const v202401: FormSchema = {
value: "other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "describe-other-enrollment",
label: "Describe",
labelClassName: "font-bold",
Expand Down Expand Up @@ -294,7 +314,7 @@ export const v202401: FormSchema = {
value: "other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "where-will-info-be-doc-describe-other",
label: "Describe",
labelClassName: "font-bold",
Expand Down Expand Up @@ -341,7 +361,7 @@ export const v202401: FormSchema = {
"what_documentation_will_be_maintained_in_the_eligibility_file_other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "describe-other-maintained",
label: "Describe",
labelClassName: "font-bold",
Expand Down Expand Up @@ -382,6 +402,16 @@ export const v202401: FormSchema = {
{
title: "Additional information",
sectionId: "addtnl-info",
dependency: {
conditions: [
{
name: "abp2a_benefit-align-and-require_is-state-territory-aligned",
type: "expectedValue",
expectedValue: "no",
},
],
effect: { type: "show" },
},
form: [
{
description:
Expand Down
6 changes: 3 additions & 3 deletions src/services/api/webforms/ABP2B/v202401.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const v202401: FormSchema = {
value: "other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "describe-other-enrollment",
label: "Describe",
labelClassName: "font-bold",
Expand Down Expand Up @@ -238,7 +238,7 @@ export const v202401: FormSchema = {
value: "other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "where-will-info-be-doc-describe-other",
label: "Describe",
labelClassName: "font-bold",
Expand Down Expand Up @@ -285,7 +285,7 @@ export const v202401: FormSchema = {
"what_documentation_will_be_maintained_in_the_eligibility_file_other",
slots: [
{
rhf: "Input",
rhf: "Textarea",
name: "describe-other-maintained",
label: "Describe",
labelClassName: "font-bold",
Expand Down
2 changes: 1 addition & 1 deletion src/services/ui/src/components/Inputs/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
<>
<textarea
className={cn(
"flex min-h-[60px] w-full rounded-sm border border-black bg-transparent px-3 py-2 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
"flex min-h-[76px] w-full rounded-sm border border-black bg-transparent px-3 py-2 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
ref={ref}
Expand Down
2 changes: 1 addition & 1 deletion src/services/ui/src/components/Inputs/upload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const Upload = ({ maxFiles, files, setFiles }: UploadProps) => {
<div
{...getRootProps()}
className={cn(
"w-full flex items-center justify-center border border-dashed py-6 rounded-sm",
"w-full flex items-center justify-center border border-dashed border-[#71767a] py-6 rounded-sm",
isDragActive && "border-blue-700",
)}
>
Expand Down
2 changes: 1 addition & 1 deletion src/services/ui/src/components/RHF/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const RHFSection = <TFieldValues extends FieldValues>(props: {
<FormLabel className="font-bold">{props.section.title}</FormLabel>
</div>
)}
<div className="px-8">
<div className="px-8 py-4">
{props.section.form.map((FORM, index) => (
<RHFFormGroup
key={`rhf-form-${index}-${FORM.description}`}
Expand Down

0 comments on commit fcdf7fe

Please sign in to comment.