appeals: swap css variable imports

src/applications/appeals/10182/sass/10182-nod.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/995/sass/995-supplemental-claim.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/996/components/InformalConference.jsx

@@ -93,11 +93,6 @@ export const InformalConference = ({
         goForward(data);
       }
     },
-    onUpdatePage: event => {
-      if (!checkErrors(data) && conference !== '') {
-        updatePage(event);
-      }
-    },
     onSelectionOriginal: event => {
       const { value } = event?.detail || {};
       if (value) {
@@ -111,11 +106,9 @@ export const InformalConference = ({
     onSelectionNew: event => {
       const { value } = event?.detail || {};
       if (value) {
-        const conf = data.informalConference;
         const formData = {
           ...data,
           informalConferenceChoice: value,
-          informalConference: value !== 'no' && conf === 'no' ? '' : conf,
         };
         update(formData, value, newInformalConferenceLabels[value]);
       }
@@ -125,7 +118,7 @@ export const InformalConference = ({
   const navButtons = onReviewPage ? (
     <va-button
       text={updateButtonText}
-      onClick={handlers.onUpdatePage}
+      onClick={updatePage}
       class="vads-u-margin-bottom--4"
     />
   ) : (

src/applications/appeals/996/components/InformalConferenceContact.jsx

@@ -58,11 +58,6 @@ export const InformalConferenceContact = ({
         goForward(data);
       }
     },
-    onUpdatePage: event => {
-      if (!checkErrors() && conference !== '') {
-        updatePage(event);
-      }
-    },
     onSelection: event => {
       const { value } = event?.detail || {};
       if (value) {
@@ -84,7 +79,7 @@ export const InformalConferenceContact = ({
   const navButtons = onReviewPage ? (
     <va-button
       text={updateButtonText}
-      onClick={handlers.onUpdatePage}
+      onClick={updatePage}
       class="vads-u-margin-bottom--4"
     />
   ) : (

src/applications/appeals/996/components/InformalConferenceReview.jsx

@@ -20,9 +20,10 @@ const InformalConferenceReview = ({ data, editPage }) => {
 
   // show 'me', 'rep' or 'no' for original content
   // show 'yes' or 'no' for new content
-  const value = showNewContent
-    ? data.informalConferenceChoice
-    : data.informalConference;
+  const value =
+    showNewContent && ['me', 'rep'].includes(data.informalConference)
+      ? data.informalConferenceChoice
+      : data.informalConference;
   const title = showNewContent
     ? newInformalConferenceTitle
     : informalConferenceTitle;

src/applications/appeals/996/pages/informalConference.js

@@ -12,24 +12,20 @@ import {
   informalConferenceLabels,
   informalConferenceDescriptions,
 } from '../content/InformalConference';
-import { validateConferenceChoice } from '../validations';
 
 const informalConference = {
   uiSchema: {
     'ui:description': InformalConferenceDescription,
-    informalConference: {
-      ...radioUI({
-        title: informalConferenceTitle,
-        hint: informalConferenceHint,
-        labels: informalConferenceLabels,
-        descriptions: informalConferenceDescriptions,
-        enableAnalytics: true,
-        errorMessages: {
-          required: errorMessages.informalConferenceContactChoice,
-        },
-      }),
-      'ui:validations': [validateConferenceChoice],
-    },
+    informalConference: radioUI({
+      title: informalConferenceTitle,
+      hint: informalConferenceHint,
+      labels: informalConferenceLabels,
+      descriptions: informalConferenceDescriptions,
+      enableAnalytics: true,
+      errorMessages: {
+        required: errorMessages.informalConferenceContactChoice,
+      },
+    }),
   },
   schema: {
     type: 'object',

src/applications/appeals/996/pages/informalConferenceRep.js

@@ -75,7 +75,7 @@ export default {
   // https://github.com/department-of-veterans-affairs/vets-api/blob/master/modules/appeals_api/config/schemas/v2/200996.json#L79-L92
   schema: {
     type: 'object',
-    required: ['informalConferenceRep'],
+    required: ['informalConference'],
     properties: {
       informalConferenceRep: {
         type: 'object',

src/applications/appeals/996/sass/0996-higher-level-review.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/996/tests/components/InformalConference.unit.spec.jsx

@@ -164,45 +164,20 @@ describe('<InformalConference>', () => {
         setSpy.calledWith({
           hlrUpdatedContent: true,
           informalConferenceChoice: 'yes',
-          informalConference: undefined,
         }),
       ).to.be.true;
     });
 
     it('should set form data with "no"', () => {
       const setSpy = sinon.spy();
-      const { container } = setup({
-        toggle: true,
-        setFormData: setSpy,
-        data: { informalConference: 'me' },
-      });
+      const { container } = setup({ toggle: true, setFormData: setSpy });
       $('va-radio', container).__events.vaValueChange({
         detail: { value: 'no' },
       });
       expect(
         setSpy.calledWith({
           hlrUpdatedContent: true,
           informalConferenceChoice: 'no',
-          informalConference: 'me',
-        }),
-      ).to.be.true;
-    });
-
-    it('should set form data with "no"', () => {
-      const setSpy = sinon.spy();
-      const { container } = setup({
-        toggle: true,
-        setFormData: setSpy,
-        data: { informalConference: 'no' },
-      });
-      $('va-radio', container).__events.vaValueChange({
-        detail: { value: 'yes' },
-      });
-      expect(
-        setSpy.calledWith({
-          hlrUpdatedContent: true,
-          informalConferenceChoice: 'yes',
-          informalConference: '', // will clear informalConference if set to "no"
         }),
       ).to.be.true;
     });

src/applications/appeals/shared/content/reviewErrors.js

@@ -20,7 +20,8 @@ const reviewErrors = {
     ) {
       return {
         chapterKey: 'conditions',
-        pageKey: 'areaOfDisagreementFollowUp',
+        // include page index to match fullPageKey in ReviewCollapsibleChapter
+        pageKey: `areaOfDisagreementFollowUp${err}`,
       };
     }
     // overrides for contact info page

src/applications/appeals/shared/tests/content/reviewErrors.unit.spec.js

@@ -21,11 +21,11 @@ describe('reviewErrors override', () => {
     const error = { __errors: [errorMessages.missingDisagreement] };
     expect(override('0', error)).to.be.deep.equal({
       chapterKey: 'conditions',
-      pageKey: 'areaOfDisagreementFollowUp',
+      pageKey: 'areaOfDisagreementFollowUp0',
     });
     expect(override('11', error)).to.be.deep.equal({
       chapterKey: 'conditions',
-      pageKey: 'areaOfDisagreementFollowUp',
+      pageKey: 'areaOfDisagreementFollowUp11',
     });
   });
 });

src/applications/appeals/testing/download/sass/submitted-appeal.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/testing/hlr/sass/hlr.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/testing/nod-new/sass/nod-new.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../../platform/forms/sass/m-schemaform";

src/applications/appeals/testing/sc/sass/sc.scss

@@ -1,4 +1,4 @@
-@import "~@department-of-veterans-affairs/formation/sass/shared-variables";
+@import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list";
 @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process";
 @import "../../../../../platform/forms/sass/m-schemaform";