B 21773 main

pkg/models/order.go

@@ -342,9 +342,8 @@ func (o *Order) IsCompleteForGBL() bool {
 }
 
 func (o *Order) CanSendEmailWithOrdersType() bool {
-	if o.OrdersType != "BLUEBARK" && o.OrdersType != "SAFETY" {
-		return true
+	if o.OrdersType == internalmessages.OrdersTypeBLUEBARK || o.OrdersType == internalmessages.OrdersTypeSAFETY {
+		return false
 	}
-
-	return false
+	return true
 }

pkg/models/order_test.go

@@ -485,3 +485,44 @@ func (suite *ModelSuite) TestSaveOrderWithoutPPM() {
 	suite.Equal(location.ID, orderUpdated.NewDutyLocationID, "Wrong order new_duty_location_id")
 	suite.Equal(newPostalCode, order.NewDutyLocation.Address.PostalCode, "Wrong orig postal code")
 }
+
+func (suite *ModelSuite) TestOrderCanSendEmailWithOrdersType() {
+	suite.Run("Non safety or BB orders can send email", func() {
+		order := factory.BuildOrder(suite.DB(), []factory.Customization{
+			{
+				Model: m.Order{
+					OrdersType: internalmessages.OrdersTypePERMANENTCHANGEOFSTATION,
+				},
+			},
+		}, nil)
+
+		canSendEmail := order.CanSendEmailWithOrdersType()
+		suite.True(canSendEmail)
+	})
+
+	suite.Run(" BB orders cannot send email", func() {
+		order := factory.BuildOrder(suite.DB(), []factory.Customization{
+			{
+				Model: m.Order{
+					OrdersType: internalmessages.OrdersTypeBLUEBARK,
+				},
+			},
+		}, nil)
+
+		canSendEmail := order.CanSendEmailWithOrdersType()
+		suite.False(canSendEmail)
+	})
+
+	suite.Run("Safety orders cannot send email", func() {
+		order := factory.BuildOrder(suite.DB(), []factory.Customization{
+			{
+				Model: m.Order{
+					OrdersType: internalmessages.OrdersTypeSAFETY,
+				},
+			},
+		}, nil)
+
+		canSendEmail := order.CanSendEmailWithOrdersType()
+		suite.False(canSendEmail)
+	})
+}

src/components/Office/AddOrdersForm/AddOrdersForm.jsx

@@ -23,7 +23,14 @@ import ConnectedFlashMessage from 'containers/FlashMessage/FlashMessage';
 
 let originMeta;
 let newDutyMeta = '';
-const AddOrdersForm = ({ onSubmit, ordersTypeOptions, initialValues, onBack, isSafetyMoveSelected }) => {
+const AddOrdersForm = ({
+  onSubmit,
+  ordersTypeOptions,
+  initialValues,
+  onBack,
+  isSafetyMoveSelected,
+  isBluebarkMoveSelected,
+}) => {
   const payGradeOptions = dropdownInputOptions(ORDERS_PAY_GRADE_OPTIONS);
   const [currentDutyLocation, setCurrentDutyLocation] = useState('');
   const [newDutyLocation, setNewDutyLocation] = useState('');
@@ -122,7 +129,7 @@ const AddOrdersForm = ({ onSubmit, ordersTypeOptions, initialValues, onBack, isS
                 name="ordersType"
                 options={ordersTypeOptions}
                 required
-                isDisabled={isSafetyMoveSelected}
+                isDisabled={isSafetyMoveSelected || isBluebarkMoveSelected}
               />
               <DatePickerInput name="issueDate" label="Orders date" required />
               <DatePickerInput name="reportByDate" label="Report by date" required />

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

@@ -194,3 +194,23 @@ describe('AddOrdersForm - OCONUS and Accompanied Tour Test', () => {
     });
   });
 });
+describe('AddOrdersForm - Edge Cases and Additional Scenarios', () => {
+  it('disables orders type when safety move is selected', async () => {
+    render(
+      <Provider store={mockStore.store}>
+        <AddOrdersForm {...testProps} isSafetyMoveSelected />
+      </Provider>,
+    );
+
+    expect(screen.getByLabelText('Orders type')).toBeDisabled();
+  });
+
+  it('disables orders type when bluebark move is selected', async () => {
+    render(
+      <Provider store={mockStore.store}>
+        <AddOrdersForm {...testProps} isBluebarkMoveSelected />
+      </Provider>,
+    );
+    expect(screen.getByLabelText('Orders type')).toBeDisabled();
+  });
+});

src/components/Office/OrdersDetailForm/OrdersDetailForm.jsx

@@ -8,6 +8,7 @@ import { CheckboxField, DropdownInput, DatePickerInput, DutyLocationInput } from
 import TextField from 'components/form/fields/TextField/TextField';
 import MaskedTextField from 'components/form/fields/MaskedTextField/MaskedTextField';
 import { DropdownArrayOf } from 'types/form';
+import { SPECIAL_ORDERS_TYPES } from 'constants/orders';
 
 const OrdersDetailForm = ({
   deptIndicatorOptions,
@@ -82,12 +83,20 @@ const OrdersDetailForm = ({
       <DropdownInput
         name="ordersType"
         label="Orders type"
-        options={formOrdersType === 'SAFETY' ? dropdownInputOptions({ SAFETY: 'Safety' }) : ordersTypeOptions}
+        options={
+          formOrdersType === SPECIAL_ORDERS_TYPES.SAFETY_NON_LABEL || formOrdersType === SPECIAL_ORDERS_TYPES.BLUEBARK
+            ? dropdownInputOptions({ SAFETY: 'Safety', BLUEBARK: 'Bluebark' })
+            : ordersTypeOptions
+        }
         onChange={(e) => {
           setFormOrdersType(e.target.value);
           setFieldValue('ordersType', e.target.value);
         }}
-        isDisabled={formIsDisabled || formOrdersType === 'SAFETY'}
+        isDisabled={
+          formIsDisabled ||
+          formOrdersType === SPECIAL_ORDERS_TYPES.SAFETY_NON_LABEL ||
+          formOrdersType === SPECIAL_ORDERS_TYPES.BLUEBARK
+        }
       />
       {showOrdersTypeDetail && (
         <DropdownInput

src/components/Office/OrdersDetailForm/OrdersDetailForm.test.jsx

@@ -199,6 +199,22 @@ describe('OrdersDetailForm', () => {
       ordersType: 'SAFETY',
     });
 
+    // correct labels are visible
+    expect(await screen.findByLabelText('Orders type')).toBeDisabled();
+  });
+  it('has orders type dropdown disabled if bluebark move', async () => {
+    renderOrdersDetailForm({
+      showDepartmentIndicator: false,
+      showOrdersNumber: false,
+      showOrdersTypeDetail: false,
+      showHHGTac: false,
+      showHHGSac: false,
+      showNTSTac: false,
+      showNTSSac: false,
+      showOrdersAcknowledgement: false,
+      ordersType: 'BLUEBARK',
+    });
+
     // correct labels are visible
     expect(await screen.findByLabelText('Orders type')).toBeDisabled();
   });

src/constants/orders.js

@@ -12,6 +12,7 @@ export const SPECIAL_ORDERS_TYPES = {
   WOUNDED_WARRIOR: 'Wounded Warrior',
   BLUEBARK: 'BLUEBARK',
   SAFETY: 'Safety',
+  SAFETY_NON_LABEL: 'SAFETY',
 };
 
 export const CHECK_SPECIAL_ORDERS_TYPES = (ordersType) => {

src/pages/Office/CustomerOnboarding/CreateCustomerForm.jsx

@@ -36,6 +36,7 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
   const [showEmplid, setShowEmplid] = useState(false);
   const [isSafetyMove, setIsSafetyMove] = useState(false);
   const [showSafetyMoveHint, setShowSafetyMoveHint] = useState(false);
+  const [isBluebarkMove, setIsBluebarkMove] = useState(false);
   const navigate = useNavigate();
 
   const branchOptions = dropdownInputOptions(SERVICE_MEMBER_AGENCY_LABELS);
@@ -96,6 +97,7 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
     create_okta_account: '',
     cac_user: '',
     is_safety_move: 'false',
+    is_bluebark: 'false',
   };
 
   const handleBack = () => {
@@ -140,7 +142,7 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
           generatePath(servicesCounselingRoutes.BASE_CUSTOMERS_ORDERS_ADD_PATH, {
             customerId,
           }),
-          { state: { isSafetyMoveSelected: isSafetyMove } },
+          { state: { isSafetyMoveSelected: isSafetyMove, isBluebarkMoveSelected: isBluebarkMove } },
         );
       })
       .catch((e) => {
@@ -227,6 +229,7 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
                     create_okta_account: '',
                     cac_user: 'true',
                     is_safety_move: 'true',
+                    is_bluebark: 'false',
                   });
                 } else if (value === 'false') {
                   setIsSafetyMove(false);
@@ -275,11 +278,34 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
                   });
                 }
               };
+              const handleBluebarkChange = (e) => {
+                if (e.target.value === 'true') {
+                  setIsBluebarkMove(true);
+                  setIsSafetyMove(false);
+                  setShowEmplid(false);
+                  setValues({
+                    ...values,
+                    affiliation: e.target.value,
+                    create_okta_account: 'false',
+                    cac_user: 'false',
+                    is_bluebark: 'true',
+                    is_safety_move: 'false',
+                  });
+                } else {
+                  setIsBluebarkMove(false);
+                  setShowEmplid(false);
+                  setValues({
+                    ...values,
+                    affiliation: e.target.value,
+                    is_bluebark: 'false',
+                  });
+                }
+              };
               return (
                 <Form className={classnames(formStyles.form, styles.form)}>
                   <h1 className={styles.header}>Create Customer Profile</h1>
                   <SectionWrapper className={sectionStyles}>
-                    <h3>Customer Affiliation</h3>
+                    <h3>Special Moves</h3>
                     {isSafetyPrivileged && (
                       <Fieldset className={styles.trailerOwnershipFieldset}>
                         <legend className="usa-label">Is this a Safety move?</legend>
@@ -307,10 +333,39 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
                         </div>
                       </Fieldset>
                     )}
+                    <Fieldset className={styles.trailerOwnershipFieldset}>
+                      <legend className="usa-label">Is this a Bluebark move?</legend>
+                      <div className="grid-row grid-gap">
+                        <Field
+                          as={Radio}
+                          id="isBluebarkYes"
+                          label="Yes"
+                          name="is_bluebark"
+                          value="true"
+                          data-testid="is-bluebark-yes"
+                          onChange={handleBluebarkChange}
+                          checked={values.is_bluebark === 'true'}
+                        />
+                        <Field
+                          as={Radio}
+                          id="isBluebarkNo"
+                          label="No"
+                          name="is_bluebark"
+                          value="false"
+                          data-testid="is-bluebark-no"
+                          onChange={handleBluebarkChange}
+                          checked={values.is_bluebark === 'false'}
+                        />
+                      </div>
+                    </Fieldset>
+                  </SectionWrapper>
+                  <SectionWrapper className={sectionStyles}>
+                    <h3>Customer Affiliation</h3>
                     <DropdownInput
                       label="Branch of service"
                       name="affiliation"
                       id="affiliation"
+                      data-testid="affiliationInput"
                       required
                       onChange={(e) => {
                         handleChange(e);
@@ -410,8 +465,8 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
                       required
                     />
                   </SectionWrapper>
-                  {values.is_safety_move !== 'true' && (
-                    <SectionWrapper className={sectionStyles}>
+                  {values.is_safety_move !== 'true' && values.is_bluebark !== 'true' && (
+                    <SectionWrapper className={formStyles.formSection}>
                       <h3>Okta Account</h3>
                       <Fieldset className={styles.trailerOwnershipFieldset}>
                         <legend className="usa-label">Do you want to create an Okta account for this customer?</legend>
@@ -436,8 +491,8 @@ export const CreateCustomerForm = ({ userPrivileges, setFlashMessage, setCanAddO
                       </Fieldset>
                     </SectionWrapper>
                   )}
-                  {values.is_safety_move !== 'true' && (
-                    <SectionWrapper className={sectionStyles}>
+                  {values.is_safety_move !== 'true' && values.is_bluebark !== 'true' && (
+                    <SectionWrapper className={formStyles.formSection}>
                       <h3>Non-CAC Users</h3>
                       <Fieldset className={styles.trailerOwnershipFieldset}>
                         <legend className="usa-label">Does the customer have a CAC?</legend>