B 21977 INT Part 2 - Fix Office User Select Counseling Office Validation

src/components/Office/AddOrdersForm/AddOrdersForm.jsx

@@ -57,6 +57,9 @@ const AddOrdersForm = ({
       .required('Required'),
     hasDependents: Yup.mixed().oneOf(['yes', 'no']).required('Required'),
     originDutyLocation: Yup.object().nullable().required('Required'),
+    counselingOfficeId: currentDutyLocation.provides_services_counseling
+      ? Yup.string().required('Required')
+      : Yup.string().notRequired(),
     newDutyLocation: Yup.object().nullable().required('Required'),
     grade: Yup.mixed().oneOf(Object.keys(ORDERS_PAY_GRADE_OPTIONS)).required('Required'),
     accompaniedTour: showAccompaniedTourField

src/components/Office/AddOrdersForm/AddOrdersForm.test.jsx

@@ -452,6 +452,38 @@ describe('AddOrdersForm - With Counseling Office', () => {
     const nextBtn = screen.getByRole('button', { name: 'Next' });
     expect(nextBtn.getAttribute('disabled')).toBeFalsy();
   });
+
+  it('disabled submit if counseling office is required and blank', async () => {
+    isBooleanFlagEnabled.mockImplementation(() => Promise.resolve(true));
+    render(
+      <Provider store={mockStore.store}>
+        <AddOrdersForm {...testProps} />
+      </Provider>,
+    );
+
+    await userEvent.selectOptions(await screen.findByLabelText(/Orders type/), 'PERMANENT_CHANGE_OF_STATION');
+    await userEvent.type(screen.getByLabelText(/Orders date/), '08 Nov 2024');
+    await userEvent.type(screen.getByLabelText(/Report by date/), '26 Nov 2024');
+
+    // Test Current Duty Location Search Box interaction
+    await userEvent.type(screen.getByLabelText(/Current duty location/), 'AFB', { delay: 100 });
+    const selectedOptionCurrent = await screen.findByText(/Scott/);
+    await userEvent.click(selectedOptionCurrent);
+
+    // Test New Duty Location Search Box interaction
+    await userEvent.type(screen.getByLabelText(/New duty location/), 'AFB', { delay: 100 });
+    const selectedOptionNew = await screen.findByText(/Luke/);
+    await userEvent.click(selectedOptionNew);
+
+    const counselingOfficeLabel = await screen.queryByText(/Counseling office/);
+    expect(counselingOfficeLabel).toBeTruthy(); // If the field is visible then it it required
+
+    await userEvent.selectOptions(screen.getByLabelText(/Pay grade/), ['E_5']);
+    await userEvent.click(screen.getByLabelText('No'));
+
+    const nextBtn = await screen.getByRole('button', { name: 'Next' }, { delay: 100 });
+    expect(nextBtn).toBeDisabled();
+  });
 });
 describe('AddOrdersForm - Edge Cases and Additional Scenarios', () => {
   it('disables orders type when safety move is selected', async () => {