diff --git a/cypress/e2e/characteristics.spec.js b/cypress/e2e/characteristics.spec.js
index f3fa4cc0cb..553e969cb9 100644
--- a/cypress/e2e/characteristics.spec.js
+++ b/cypress/e2e/characteristics.spec.js
@@ -19,7 +19,7 @@ describe('The Model Plan General Characteristics Form', () => {
cy.get('[data-testid="model-plan-name"]').contains('for Empty Plan');
- cy.get('#plan-characteristics-is-new-model-no')
+ cy.get('#plan-characteristics-is-new-model-false')
.check({ force: true })
.should('be.checked');
@@ -29,12 +29,14 @@ describe('The Model Plan General Characteristics Form', () => {
.type('Plan with B{downArrow}{enter}')
.should('have.value', 'Plan with Basics');
- cy.get('#plan-characteristics-resembles-existing-model')
+ cy.get('#plan-characteristics-resembles-existing-model-true')
.check({ force: true })
.should('be.checked');
cy.get('#plan-characteristics-resembles-which-model').within(() => {
- cy.get("input[type='text']").type('advance payment{downArrow}{enter}');
+ cy.get("input[type='text']")
+ .click()
+ .type('advance payment{downArrow}{enter}');
});
cy.get('[data-testid="multiselect-tag--Advance Payment ACO Model"]')
@@ -47,7 +49,7 @@ describe('The Model Plan General Characteristics Form', () => {
.type('In every way')
.should('have.value', 'In every way');
- cy.get('#plan-characteristics-has-component-or-tracks')
+ cy.get('#plan-characteristics-has-component-or-tracks-true')
.check({ force: true })
.should('be.checked');
@@ -89,7 +91,7 @@ describe('The Model Plan General Characteristics Form', () => {
// Page - /characteristics/involvements
- cy.get('#plan-characteristics-care-coordination-involved')
+ cy.get('#plan-characteristics-care-coordination-involved-true')
.should('not.be.disabled')
.check({ force: true })
.should('be.checked');
@@ -98,7 +100,7 @@ describe('The Model Plan General Characteristics Form', () => {
.type('Yes, care coordination is involved in every way')
.should('have.value', 'Yes, care coordination is involved in every way');
- cy.get('#plan-characteristics-additional-services')
+ cy.get('#plan-characteristics-additional-services-true')
.check({ force: true })
.should('be.checked');
@@ -109,7 +111,7 @@ describe('The Model Plan General Characteristics Form', () => {
'Yes, additional services are involved in every way'
);
- cy.get('#plan-characteristics-community-partners-involved')
+ cy.get('#plan-characteristics-community-partners-involved-true')
.check({ force: true })
.should('be.checked');
@@ -124,7 +126,7 @@ describe('The Model Plan General Characteristics Form', () => {
// Page - /characteristics/targets-and-options
- cy.get('#plan-characteristics-geographies-targeted')
+ cy.get('#plan-characteristics-geographies-targeted-true')
.should('not.be.disabled')
.check({ force: true })
.should('be.checked');
@@ -137,7 +139,7 @@ describe('The Model Plan General Characteristics Form', () => {
.check({ force: true })
.should('be.checked');
- cy.get('#plan-characteristics-participation')
+ cy.get('#plan-characteristics-participation-true')
.check({ force: true })
.should('be.checked');
@@ -153,7 +155,7 @@ describe('The Model Plan General Characteristics Form', () => {
.type('Just a different agreement type')
.should('have.value', 'Just a different agreement type');
- cy.get('#plan-characteristics-multiple-participation-needed')
+ cy.get('#plan-characteristics-multiple-participation-needed-true')
.check({ force: true })
.should('be.checked');
@@ -161,7 +163,7 @@ describe('The Model Plan General Characteristics Form', () => {
// Page - /characteristics/authority
- cy.get('#plan-characteristics-rulemaking-required')
+ cy.get('#plan-characteristics-rulemaking-required-true')
.should('not.be.disabled')
.check({ force: true })
.should('be.checked');
@@ -174,7 +176,7 @@ describe('The Model Plan General Characteristics Form', () => {
.check({ force: true })
.should('be.checked');
- cy.get('#plan-characteristics-waivers-required')
+ cy.get('#plan-characteristics-waivers-required-true')
.check({ force: true })
.should('be.checked');
diff --git a/cypress/e2e/modelPlan.spec.js b/cypress/e2e/modelPlan.spec.js
index 8c4cfad823..925f0082cc 100644
--- a/cypress/e2e/modelPlan.spec.js
+++ b/cypress/e2e/modelPlan.spec.js
@@ -156,7 +156,10 @@ describe('The Model Plan Form', () => {
.type('05/23/2025')
.should('have.value', '05/23/2025');
- cy.get('#phasedIn-Yes').first().check({ force: true }).should('be.checked');
+ cy.get('#phasedIn-true')
+ .first()
+ .check({ force: true })
+ .should('be.checked');
cy.contains('button', 'Save and return to task list').click();
diff --git a/cypress/e2e/opsEvalAndLearning.spec.js b/cypress/e2e/opsEvalAndLearning.spec.js
index 2a209aa08f..62aebf6085 100644
--- a/cypress/e2e/opsEvalAndLearning.spec.js
+++ b/cypress/e2e/opsEvalAndLearning.spec.js
@@ -66,7 +66,7 @@ describe('The Model Plan Ops Eval and Learning Form', () => {
.type('They will provide wireframes of workflows')
.should('have.value', 'They will provide wireframes of workflows');
- cy.get('#ops-eval-and-learning-iddoc-support')
+ cy.get('#ops-eval-and-learning-iddoc-support-true')
.check({ force: true })
.should('be.checked');
@@ -87,7 +87,7 @@ describe('The Model Plan Ops Eval and Learning Form', () => {
cy.get('@technical-contacts').type('Bill in accounting');
cy.get('@technical-contacts').should('have.value', 'Bill in accounting');
- cy.get('#ops-eval-and-learning-capture-participant-info')
+ cy.get('#ops-eval-and-learning-capture-participant-info-true')
.check({ force: true })
.should('be.checked');
diff --git a/cypress/e2e/participantsAndProviders.spec.js b/cypress/e2e/participantsAndProviders.spec.js
index 809309cc2f..a928b7b799 100644
--- a/cypress/e2e/participantsAndProviders.spec.js
+++ b/cypress/e2e/participantsAndProviders.spec.js
@@ -57,7 +57,7 @@ describe('The Model Plan Participants and Providers Form', () => {
.type('The candy people')
.should('have.value', 'The candy people');
- cy.get('#participants-and-providers-current-participants')
+ cy.get('#participants-and-providers-current-participants-true')
.check({ force: true })
.should('be.checked');
@@ -114,7 +114,7 @@ describe('The Model Plan Participants and Providers Form', () => {
.check({ force: true });
cy.get('@communication').should('be.checked');
- cy.get('#participants-and-providers-risk')
+ cy.get('#participants-and-providers-risk-true')
.check({ force: true })
.should('be.checked');
@@ -126,7 +126,7 @@ describe('The Model Plan Participants and Providers Form', () => {
.type('Programmatic Risk')
.should('have.value', 'Programmatic Risk');
- cy.get('#participants-and-providers-risk-change')
+ cy.get('#participants-and-providers-risk-change-true')
.check({ force: true })
.should('be.checked');
@@ -134,16 +134,16 @@ describe('The Model Plan Participants and Providers Form', () => {
// Page - /participants-and-providers/coordination
- cy.get('#participants-and-providers-coordniate-work')
+ cy.get('#participants-and-providers-coordniate-work-true')
.should('not.be.disabled')
.check({ force: true })
.should('be.checked');
- cy.get('#participants-and-providers-gainshare-payment')
+ cy.get('#participants-and-providers-gainshare-payment-true')
.check({ force: true })
.should('be.checked');
- cy.get('#participants-and-providers-gainshare-track')
+ cy.get('#participants-and-providers-gainshare-track-true')
.check({ force: true })
.should('be.checked');
diff --git a/src/components/BooleanRadioForm/__snapshots__/index.test.tsx.snap b/src/components/BooleanRadioForm/__snapshots__/index.test.tsx.snap
index f1716d23f8..6801a95a43 100644
--- a/src/components/BooleanRadioForm/__snapshots__/index.test.tsx.snap
+++ b/src/components/BooleanRadioForm/__snapshots__/index.test.tsx.snap
@@ -12,14 +12,15 @@ exports[`The BooleanRadio component matches snapshot 1`] = `
>
@@ -30,14 +31,15 @@ exports[`The BooleanRadio component matches snapshot 1`] = `
>
diff --git a/src/components/BooleanRadioForm/index.tsx b/src/components/BooleanRadioForm/index.tsx
index da7c0b3f00..bed4debfea 100644
--- a/src/components/BooleanRadioForm/index.tsx
+++ b/src/components/BooleanRadioForm/index.tsx
@@ -34,7 +34,8 @@ const BooleanRadio = ({
@@ -608,6 +567,7 @@ const Performance = () => {
);
}}
+
{data && (
+
{flatErrors.contractorSupportOther}
+
{
htmlFor="ops-eval-and-learning-contractor-support-how"
className="text-normal margin-top-4"
>
- {t('whatContractorsHow')}
+ {opsEvalAndLearningT('contractorSupportHow.label')}
+
- {t('whatContractorsHowInfo')}
+ {opsEvalAndLearningT(
+ 'contractorSupportHow.sublabel'
+ )}
+
{flatErrors.contractorSupportHow}
+
{
className="margin-y-4 margin-bottom-8"
>
- {t('iddocSupport')}
+ {opsEvalAndLearningT('iddocSupport.label')}
+
{itSolutionsStarted && (
{
}
/>
)}
+
- {t('iddocSupportInfo')}
+ {opsEvalAndLearningT('iddocSupport.sublabel')}
+
- {t('iddocSupportInfo2')}
+ {opsEvalAndLearningMiscT('additionalQuestionsInfo')}
+
{flatErrors.iddocSupport}
-
- {
- setFieldValue('iddocSupport', true);
- }}
- />
- {
- setFieldValue('iddocSupport', false);
- }}
- />
-
+
+
{
+
@@ -655,6 +663,7 @@ export const OpsEvalAndLearningContent = () => {
);
}}
+
{data && (
Yes
@@ -259,14 +260,15 @@ exports[`Model Plan Communication matches snapshot 1`] = `
>
No
@@ -429,14 +431,15 @@ exports[`Model Plan Communication matches snapshot 1`] = `
>
Yes
@@ -447,14 +450,15 @@ exports[`Model Plan Communication matches snapshot 1`] = `
>
No
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
index b499159258..2bb3a40f1c 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
@@ -244,7 +244,7 @@ export const Communication = () => {
<>
@@ -304,7 +304,7 @@ export const Communication = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'communicationMethodOther.question'
+ 'communicationMethodOther.label'
)}
@@ -340,9 +340,7 @@ export const Communication = () => {
className="margin-y-4 margin-bottom-8"
>
- {participantsAndProvidersT(
- 'participantAssumeRisk.question'
- )}
+ {participantsAndProvidersT('participantAssumeRisk.label')}
@@ -363,7 +361,7 @@ export const Communication = () => {
htmlFor="participants-and-providers-risk-type"
className="text-normal"
>
- {participantsAndProvidersT('riskType.question')}
+ {participantsAndProvidersT('riskType.label')}
{flatErrors.riskType}
@@ -390,7 +388,7 @@ export const Communication = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'riskOther.question'
+ 'riskOther.label'
)}
@@ -425,7 +423,7 @@ export const Communication = () => {
className="margin-y-4 margin-bottom-8"
>
- {participantsAndProvidersT('willRiskChange.question')}
+ {participantsAndProvidersT('willRiskChange.label')}
{flatErrors.willRiskChange}
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap
index 91669d305a..cacd171a4f 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap
@@ -127,14 +127,15 @@ exports[`Model Plan Coordination matches snapshot 1`] = `
>
Yes
@@ -145,14 +146,15 @@ exports[`Model Plan Coordination matches snapshot 1`] = `
>
No
@@ -209,14 +211,15 @@ exports[`Model Plan Coordination matches snapshot 1`] = `
>
Yes
@@ -227,14 +230,15 @@ exports[`Model Plan Coordination matches snapshot 1`] = `
>
No
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx
index 7960f64449..306b4ffba2 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx
@@ -230,11 +230,11 @@ export const Coordination = () => {
className="margin-y-4 margin-bottom-8"
>
- {participantsAndProvidersT('coordinateWork.question')}
+ {participantsAndProvidersT('coordinateWork.label')}
- {participantsAndProvidersT('coordinateWork.hint')}
+ {participantsAndProvidersT('coordinateWork.sublabel')}
{flatErrors.coordinateWork}
@@ -259,7 +259,7 @@ export const Coordination = () => {
className="margin-y-4 margin-bottom-8"
>
- {participantsAndProvidersT('gainsharePayments.question')}
+ {participantsAndProvidersT('gainsharePayments.label')}
@@ -281,7 +281,7 @@ export const Coordination = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'gainsharePaymentsTrack.question'
+ 'gainsharePaymentsTrack.label'
)}
@@ -313,9 +313,7 @@ export const Coordination = () => {
render={arrayHelpers => (
<>
{itSolutionsStarted && (
@@ -330,7 +328,9 @@ export const Coordination = () => {
)}
- {participantsAndProvidersT('participantsIds.hint')}
+ {participantsAndProvidersT(
+ 'participantsIds.sublabel'
+ )}
@@ -371,7 +371,7 @@ export const Coordination = () => {
className="text-normal margin-top-1"
>
{participantsAndProvidersT(
- 'participantsIdsOther.question'
+ 'participantsIdsOther.label'
)}
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
index 7059bb4b54..6087195559 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
@@ -240,13 +240,13 @@ export const ParticipantOptions = () => {
>
{participantsAndProvidersT(
- 'expectedNumberOfParticipants.question'
+ 'expectedNumberOfParticipants.label'
)}
{participantsAndProvidersT(
- 'expectedNumberOfParticipants.hint'
+ 'expectedNumberOfParticipants.sublabel'
)}
@@ -310,7 +310,7 @@ export const ParticipantOptions = () => {
htmlFor="participants-and-providers-current-participants"
className="text-normal"
>
- {participantsAndProvidersT('estimateConfidence.question')}
+ {participantsAndProvidersT('estimateConfidence.label')}
@@ -345,7 +345,7 @@ export const ParticipantOptions = () => {
error={!!flatErrors.recruitmentMethod}
>
- {participantsAndProvidersT('recruitmentMethod.question')}
+ {participantsAndProvidersT('recruitmentMethod.label')}
{itSolutionsStarted && (
@@ -392,7 +392,7 @@ export const ParticipantOptions = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'recruitmentOther.question'
+ 'recruitmentOther.label'
)}
@@ -426,7 +426,7 @@ export const ParticipantOptions = () => {
htmlFor="participants-and-providers-selection-method"
id="label-participants-and-providers-selection-method"
>
- {participantsAndProvidersT('selectionMethod.question')}
+ {participantsAndProvidersT('selectionMethod.label')}
{itSolutionsStarted && (
@@ -470,7 +470,7 @@ export const ParticipantOptions = () => {
htmlFor="participants-and-providers-selection-other"
className="text-normal"
>
- {participantsAndProvidersT('selectionOther.question')}
+ {participantsAndProvidersT('selectionOther.label')}
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
index 8ddf46d607..7da893eaf1 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
@@ -266,7 +266,7 @@ export const ProviderOptions = () => {
>
{participantsAndProvidersT(
- 'providerAdditionFrequency.question'
+ 'providerAdditionFrequency.label'
)}
@@ -300,7 +300,7 @@ export const ProviderOptions = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'providerAdditionFrequencyOther.question'
+ 'providerAdditionFrequencyOther.label'
)}
@@ -337,11 +337,11 @@ export const ProviderOptions = () => {
htmlFor="participants-and-providers-provider-add-method"
id="label-participants-and-providers-provider-add-method"
>
- {participantsAndProvidersT('providerAddMethod.question')}
+ {participantsAndProvidersT('providerAddMethod.label')}
- {participantsAndProvidersT('providerAddMethod.hint')}
+ {participantsAndProvidersT('providerAddMethod.sublabel')}
@@ -377,7 +377,7 @@ export const ProviderOptions = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'providerAddMethodOther.question'
+ 'providerAddMethodOther.label'
)}
@@ -408,13 +408,13 @@ export const ProviderOptions = () => {
<>
{participantsAndProvidersT(
- 'providerLeaveMethod.hint'
+ 'providerLeaveMethod.sublabel'
)}
@@ -459,7 +459,7 @@ export const ProviderOptions = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'providerLeaveMethodOther.question'
+ 'providerLeaveMethodOther.label'
)}
@@ -494,7 +494,7 @@ export const ProviderOptions = () => {
className="margin-y-4 margin-bottom-8"
>
- {participantsAndProvidersT('providerOverlap.question')}
+ {participantsAndProvidersT('providerOverlap.label')}
{itSolutionsStarted && (
@@ -540,7 +540,7 @@ export const ProviderOptions = () => {
className="text-normal margin-top-4"
>
{participantsAndProvidersT(
- 'providerOverlapHierarchy.question'
+ 'providerOverlapHierarchy.label'
)}
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap
index 259e916394..7f2874d478 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap
@@ -472,14 +472,15 @@ exports[`Model Plan Participants and Providers matches snapshot 1`] = `
>
Yes
@@ -490,14 +491,15 @@ exports[`Model Plan Participants and Providers matches snapshot 1`] = `
>
No
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx
index 5493d8b2b9..46549f6651 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx
@@ -234,7 +234,7 @@ export const ParticipantsAndProvidersContent = () => {
htmlFor="participants-and-providers-participants"
id="label-participants-and-providers-participants"
>
- {participantsAndProvidersT('participants.question')}
+ {participantsAndProvidersT('participants.label')}
@@ -286,7 +286,7 @@ export const ParticipantsAndProvidersContent = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'medicareProviderType.question'
+ 'medicareProviderType.label'
)}
@@ -314,7 +314,7 @@ export const ParticipantsAndProvidersContent = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'statesEngagement.question'
+ 'statesEngagement.label'
)}
@@ -342,7 +342,7 @@ export const ParticipantsAndProvidersContent = () => {
className="text-normal"
>
{participantsAndProvidersT(
- 'participantsOther.question'
+ 'participantsOther.label'
)}
@@ -371,13 +371,13 @@ export const ParticipantsAndProvidersContent = () => {
>
{participantsAndProvidersT(
- 'participantsCurrentlyInModels.question'
+ 'participantsCurrentlyInModels.label'
)}
{participantsAndProvidersT(
- 'participantsCurrentlyInModels.hint'
+ 'participantsCurrentlyInModels.sublabel'
)}
@@ -407,13 +407,13 @@ export const ParticipantsAndProvidersContent = () => {
>
{participantsAndProvidersT(
- 'modelApplicationLevel.question'
+ 'modelApplicationLevel.label'
)}
{participantsAndProvidersT(
- 'modelApplicationLevel.hint'
+ 'modelApplicationLevel.sublabel'
)}