B 20010 int Add FF for HQ role

.circleci/config.yml

@@ -871,6 +871,7 @@ commands:
             export FEATURE_FLAG_COAST_GUARD_EMPLID=true
             export FEATURE_FLAG_MOVE_LOCK=false
             export FEATURE_FLAG_OKTA_DODID_INPUT=false
+            export FEATURE_FLAG_HEADQUARTERS_ROLE=false
             export FEATURE_FLAG_SAFETY_MOVE=false
 
             # disable for speed, playwright tests can fail otherwise
@@ -905,6 +906,7 @@ commands:
             FEATURE_FLAG_COAST_GUARD_EMPLID: 'true'
             FEATURE_FLAG_MOVE_LOCK: 'false'
             FEATURE_FLAG_OKTA_DODID_INPUT: 'false'
+            FEATURE_FLAG_HEADQUARTERS_ROLE: 'false'
             FEATURE_FLAG_SAFETY_MOVE: 'false'
           command: |
             SHARD=$((${CIRCLE_NODE_INDEX}+1))

.envrc

@@ -133,6 +133,9 @@ export FEATURE_FLAG_MOVE_LOCK=false
 export FEATURE_FLAG_OKTA_DODID_INPUT=false
 export FEATURE_FLAG_SAFETY_MOVE=true
 
+# Feature flag to disable/enable headquarters role
+export FEATURE_FLAG_HEADQUARTERS_ROLE=true
+
 # Feature flags to disable certain shipment types
 export FEATURE_FLAG_PPM=true
 export FEATURE_FLAG_NTS=true

config/env/demo.app-client-tls.env

@@ -38,4 +38,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/demo.app.env

@@ -44,4 +44,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/exp.app-client-tls.env

@@ -38,4 +38,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/exp.app.env

@@ -44,4 +44,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/loadtest.app-client-tls.env

@@ -36,4 +36,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/loadtest.app.env

@@ -42,4 +42,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/prd.app-client-tls.env

@@ -35,4 +35,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/prd.app.env

@@ -43,4 +43,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/stg.app-client-tls.env

@@ -37,4 +37,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/env/stg.app.env

@@ -44,4 +44,5 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_HEADQUARTERS_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false

config/flipt/storage/development.features.yaml

@@ -1,6 +1,14 @@
 version: "1.2"
 namespace: development
 flags:
+- key: headquarters_role
+  name: Headquarters Role feature flag
+  type: BOOLEAN_FLAG_TYPE
+  enabled: true
+  rollouts:
+  - segment:
+      key: mil-app
+      value: true
 - key: safety_move
   name: Safety Move feature flag
   type: BOOLEAN_FLAG_TYPE

pkg/handlers/authentication/devlocal.go

@@ -1141,7 +1141,8 @@ func loginUser(h devlocalAuthHandler, user *models.User, userType string, w http
 }
 
 func isOfficeUser(userType string) bool {
-	if userType == TOOOfficeUserType || userType == TIOOfficeUserType || userType == ServicesCounselorOfficeUserType || userType == QaeCsrOfficeUserType || userType == CustomerServiceRepresentativeOfficeUserType || userType == HQOfficeUserType {
+	if userType == TOOOfficeUserType || userType == TIOOfficeUserType || userType == ServicesCounselorOfficeUserType ||
+		userType == QaeCsrOfficeUserType || userType == CustomerServiceRepresentativeOfficeUserType || userType == HQOfficeUserType {
 		return true
 	}
 	return false

pkg/handlers/authentication/permissions.go

@@ -124,7 +124,7 @@ var CustomerServiceRepresentative = RolePermissions{
 	},
 }
 
-var AllRolesPermissions = []RolePermissions{TOO, TIO, ServicesCounselor, QAECSR, HQ, CustomerServiceRepresentative}
+var AllRolesPermissions = []RolePermissions{TOO, TIO, ServicesCounselor, QAECSR, CustomerServiceRepresentative, HQ}
 
 // check if a [user.role] has permissions on a given object
 func checkUserPermission(appCtx appcontext.AppContext, session *auth.Session, permission string) (bool, error) {

src/components/Office/RequestAccountForm/RequestAccountForm.test.jsx

@@ -90,10 +90,6 @@ describe('RequestAccountForm component', () => {
     const qsaCheckbox = screen.getByTestId('qualityAssuranceAndCustomerSupportCheckBox');
     expect(qsaCheckbox).toBeInstanceOf(HTMLInputElement);
     expect(qsaCheckbox).not.toBeChecked(false);
-
-    const hqCheckbox = screen.getByTestId('headquartersCheckBox');
-    expect(hqCheckbox).toBeInstanceOf(HTMLInputElement);
-    expect(hqCheckbox).not.toBeChecked(false);
   });
 
   it('cancels requesting office account when cancel button is clicked', async () => {
@@ -149,51 +145,6 @@ describe('RequestAccountForm component', () => {
     expect(testProps.onSubmit).toHaveBeenCalled();
   });
 
-  it('submits Headquarters office account form when submit button is clicked', async () => {
-    const mockOfficeId = '3210a533-19b8-4805-a564-7eb452afce10';
-    const mockHeadquartersOffice = {
-      address: {
-        city: 'Test City',
-        country: 'United States',
-        id: 'a13806fc-0e7d-4dc3-91ca-b802d9da50f1',
-        postalCode: '85309',
-        state: 'AZ',
-        streetAddress1: '7383 N Litchfield Rd',
-        streetAddress2: 'Rm 1122',
-      },
-      created_at: '2018-05-28T14:27:39.198Z',
-      gbloc: 'KKFA',
-      id: mockOfficeId,
-      name: 'Tester',
-      phone_lines: [],
-      updated_at: '2018-05-28T14:27:39.198Z',
-    };
-
-    const mockSearchHeadquartersOfficesOpen = () => Promise.resolve([mockHeadquartersOffice]);
-    searchTransportationOfficesOpen.mockImplementation(mockSearchHeadquartersOfficesOpen);
-
-    renderWithRouter(<RequestAccountForm {...testProps} />);
-
-    await userEvent.type(screen.getByLabelText('First Name'), 'Bob');
-    await userEvent.type(screen.getByLabelText('Last Name'), 'Banks');
-    await userEvent.type(screen.getByLabelText('Email'), '[email protected]');
-    await userEvent.type(screen.getByLabelText('Telephone'), '333-333-3333');
-    await userEvent.type(screen.getByTestId('officeAccountRequestEdipi'), '1111111111');
-    await userEvent.type(screen.getByTestId('officeAccountRequestOtherUniqueId'), '1111111111');
-
-    const transportationOfficeInput = screen.getByLabelText('Transportation Office');
-    fireEvent.change(transportationOfficeInput, { target: { value: 'Tester' } });
-    await act(() => selectEvent.select(transportationOfficeInput, /Tester/));
-
-    const tooCheckbox = screen.getByTestId('headquartersCheckBox');
-    await userEvent.click(tooCheckbox);
-
-    const submitButton = await screen.getByTestId('requestOfficeAccountSubmitButton');
-    await userEvent.click(submitButton);
-
-    expect(testProps.onSubmit).toHaveBeenCalled();
-  });
-
   it('shows policy error when both TOO and TIO checkboxes are both selected, and goes away after unselecting one of them', async () => {
     renderWithRouter(<RequestAccountForm {...testProps} />);
 

src/components/form/OfficeAccountRequestFields/OfficeAccountRequestFields.jsx

@@ -96,12 +96,6 @@ export const OfficeAccountRequestFields = ({ render }) => {
             name="customerSupportRepresentativeCheckBox"
             label="Customer Support Representative"
           />
-          <CheckboxField
-            id="headquartersCheckBox"
-            data-testid="headquartersCheckBox"
-            name="headquartersCheckBox"
-            label="Headquarters"
-          />
         </>,
       )}
     </Fieldset>

src/pages/Office/RequestAccount/RequestAccount.jsx

@@ -62,10 +62,10 @@ export const RequestAccount = ({ setFlashMessage }) => {
         roleType: 'qae_csr',
       });
     }
-    if (values.headquartersCheckBox) {
+    if (values.customerSupportRepresentativeCheckBox) {
       requestedRoles.push({
-        name: 'Headquarters',
-        roleType: 'headquarters',
+        name: 'Customer Service Representative',
+        roleType: 'customer_service_representative',
       });
     }
     if (values.customerSupportRepresentativeCheckBox) {

src/scenes/SystemAdmin/shared/RolesPrivilegesCheckboxes.jsx

@@ -1,21 +1,32 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { CheckboxGroupInput } from 'react-admin';
 
 import { adminOfficeRoles } from 'constants/userRoles';
 import { officeUserPrivileges } from 'constants/userPrivileges';
+import { isBooleanFlagEnabled } from 'utils/featureFlags';
 
 const RolesPrivilegesCheckboxInput = (props) => {
   let rolesSelected = [];
   let privilegesSelected = [];
 
+  const [isHeadquartersRoleFF, setHeadquartersRoleFF] = useState(false);
+
+  useEffect(() => {
+    isBooleanFlagEnabled('headquarters_role')?.then((enabled) => {
+      setHeadquartersRoleFF(enabled);
+    });
+  }, []);
+
   const makeRoleTypeArray = (roles) => {
     if (!roles || roles.length === 0) {
       rolesSelected = [];
       return undefined;
     }
     return roles.reduce((rolesArray, role) => {
       if (role.roleType) {
-        rolesArray.push(role.roleType);
+        if (isHeadquartersRoleFF || (!isHeadquartersRoleFF && role.roleType !== 'headquarters')) {
+          rolesArray.push(role.roleType);
+        }
       }
 
       rolesSelected = rolesArray;
@@ -40,6 +51,22 @@ const RolesPrivilegesCheckboxInput = (props) => {
       }
     }
 
+    if (!isHeadquartersRoleFF && input.includes('headquarters')) {
+      if (input.includes('headquarters')) {
+        index = input.indexOf('headquarters');
+        if (index !== -1) {
+          input.splice(index, 1);
+        }
+      }
+    } else if (isHeadquartersRoleFF && privilegesSelected.includes('safety')) {
+      if (input.includes('headquarters')) {
+        index = input.indexOf('headquarters');
+        if (index !== -1) {
+          input.splice(index, 1);
+        }
+      }
+    }
+
     return input.reduce((rolesArray, role) => {
       rolesArray.push(adminOfficeRoles.find((adminOfficeRole) => adminOfficeRole.roleType === role));
       return rolesArray;
@@ -79,6 +106,15 @@ const RolesPrivilegesCheckboxInput = (props) => {
       }
     }
 
+    if (isHeadquartersRoleFF && rolesSelected.includes('headquarters')) {
+      if (input.includes('safety')) {
+        index = input.indexOf('safety');
+        if (index !== -1) {
+          input.splice(index, 1);
+        }
+      }
+    }
+
     return input.reduce((privilegesArray, privilege) => {
       privilegesArray.push(
         officeUserPrivileges.find((officeUserPrivilege) => officeUserPrivilege.privilegeType === privilege),