Skip to content

Commit

Permalink
Merge pull request #603 from Enterprise-CMCS/master
Browse files Browse the repository at this point in the history 
Release to val
  • Loading branch information
@mdial89f
mdial89f authored Jun 26, 2024
2 parents 3b5ed2f + e129441 commit 189fc76
Show file tree
Hide file tree
Showing 10 changed files with 123 additions and 35 deletions.
98 changes: 75 additions & 23 deletions src/services/api/webforms/ABP1/v202402.ts
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/services/api/webforms/ABP10/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const v202401: FormSchema = {
rhf: "Textarea",
label: "Describe the approach",
labelClassName: "font-bold",
name: "describe-approach",
name: "approach-description",
formItemClassName:
"ml-[0.6rem] px-4 my-2 border-l-4 border-l-primary",
rules: {
Expand Down
2 changes: 1 addition & 1 deletion src/services/api/webforms/ABP2B/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export const v202401: FormSchema = {
{
text: "The state/territory assures it will document in the exempt individual's eligibility file that the individual:",
type: "default",
classname: "block py-1 font-bold",
classname: "block py-1",
},
{
text: "A. Was informed in accordance with this section prior to enrollment",
Expand Down
2 changes: 0 additions & 2 deletions src/services/api/webforms/ABP2C/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ export const v202401: FormSchema = {
props: {
options: [
{
label:
"The state/territory assures it will appropriately identify any individuals in the eligibility groups who:",
value: "assure_individuals_in_egroup_exempt_section_1937",
styledLabel: [
{
Expand Down
7 changes: 7 additions & 0 deletions src/services/api/webforms/ABP3/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export const v202401: FormSchema = {
{
rhf: "Input",
label: "Plan name",
labelClassName: "font-bold",
name: "state-employee-coverage-plan-name",
rules: {
required: "* Required",
Expand All @@ -112,6 +113,7 @@ export const v202401: FormSchema = {
{
rhf: "Input",
label: "Plan name",
labelClassName: "font-bold",
name: "commercial-hmo",
rules: {
required: "* Required",
Expand Down Expand Up @@ -262,6 +264,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "state-employee-coverage-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand All @@ -286,6 +289,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "commercial-hmo-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand Down Expand Up @@ -324,11 +328,13 @@ export const v202401: FormSchema = {
{
description:
"The state/territory must select a base benchmark plan as the basis for providing essential health benefits in its benchmark or benchmark-equivalent package.",
descriptionClassName: "font-normal",
slots: [
{
rhf: "Select",
label:
"Is the base benchmark plan the same as the Section 1937 coverage option?",
labelClassName: "font-bold",
name: "same-as-sect-1937",
rules: { required: "* Required" },
props: {
Expand Down Expand Up @@ -373,6 +379,7 @@ export const v202401: FormSchema = {
{
rhf: "Input",
label: "Plan name",
labelClassName: "font-bold",
name: "name",
rules: {
required: "* Required",
Expand Down
27 changes: 26 additions & 1 deletion src/services/api/webforms/ABP3_1/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "state-territory-bench-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand All @@ -116,6 +117,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "bench-hmo-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand Down Expand Up @@ -258,6 +260,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "bench-equivalent-state-coverage-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand All @@ -278,6 +281,7 @@ export const v202401: FormSchema = {
rhf: "Input",
name: "bench-equivalent-hmo-plan-name",
label: "Plan name",
labelClassName: "font-bold",
rules: {
required: "* Required",
pattern: {
Expand Down Expand Up @@ -316,6 +320,7 @@ export const v202401: FormSchema = {
{
description:
"The state or territory must select an EHB-benchmark plan as the basis for providing essential health benefits in its benchmark or benchmark-equivalent package.",
descriptionClassName: "text-base",
slots: [
{
name: "plan-name",
Expand Down Expand Up @@ -360,6 +365,16 @@ export const v202401: FormSchema = {
rules: {
required: "* Required",
},
dependency: {
conditions: [
{
name: "abp3-1_select-of-ehb-bench-plan_is-ehb-bench-plan-same-section-1937",
type: "expectedValue",
expectedValue: "no",
},
],
effect: { type: "show" },
},
props: {
options: [
{
Expand All @@ -376,7 +391,7 @@ export const v202401: FormSchema = {
rhf: "Select",
name: "is-geo-area",
label: "State/territory",
labelClassName: "p-3",
labelClassName: "mt-3 pr-4 font-bold",
formItemClassName: "flex-row",
props: {
className: "w-[150px]",
Expand Down Expand Up @@ -1752,6 +1767,16 @@ export const v202401: FormSchema = {
{
title: "Assurances",
sectionId: "assurances",
dependency: {
conditions: [
{
name: "abp3-1_select-of-ehb-bench-plan_is-ehb-bench-plan-same-section-1937",
type: "expectedValue",
expectedValue: "no",
},
],
effect: { type: "show" },
},
form: [
{
slots: [
Expand Down
4 changes: 2 additions & 2 deletions src/services/api/webforms/ABP9/v202401.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const v202401: FormSchema = {

{
rhf: "Select",
name: "abp9_employee-sponsored-insurance-or-pay_does-provide-pay-of-premiums",
name: "does-provide-pay-of-premiums",
label:
"Does the state/territory otherwise provide for payment of premiums?",
labelClassName: "font-bold",
Expand Down Expand Up @@ -85,7 +85,7 @@ export const v202401: FormSchema = {
dependency: {
conditions: [
{
name: "abp9_employee-sponsored-insurance-or-pay_does-provide-pay-of-premiums",
name: "abp9_employee-sponsored-insur-or-pay_does-provide-pay-of-premiums",
type: "expectedValue",
expectedValue: "yes",
},
Expand Down
6 changes: 5 additions & 1 deletion src/services/ui/src/components/BreadCrumb/BreadCrumb.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ export const BreadCrumb = ({
{children}
</Link>
)}
{!active && <span aria-disabled>{children}</span>}
{!active && (
<span className="whitespace-nowrap" aria-disabled>
{children}
</span>
)}
</li>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/services/ui/src/components/Inputs/checkbox.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Checkbox = React.forwardRef<
<label
htmlFor={(props.label || props.styledLabel) as string}
className={cn(
"mt-1 text-md font-normal leading-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
"mt-2.5 text-md font-normal leading-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
props.optionlabelClassName,
)}
>
Expand Down
8 changes: 5 additions & 3 deletions src/services/ui/src/features/package/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ export const Details = () => {
const id = query.get("id") as string;

return (
<div className="max-w-screen-xl mx-auto flex px-4 lg:px-8">
<div className="hidden lg:block">
<div className="max-w-screen-xl mx-auto flex flex-col lg:flex-row px-4 lg:px-8">
<div>
<BreadCrumbs options={detailsAndActionsCrumbs({ id })} />
<DetailsSidebar id={id} />
<div className="hidden lg:block">
<DetailsSidebar id={id} />
</div>
</div>
<DetailsContent id={id} />
</div>
Expand Down

0 comments on commit 189fc76

Please sign in to comment.