Replace userAuthGroup with userRole in vehicles - Part 2

frontend/src/common/authentication/OnRouteBCContext.tsx

@@ -16,7 +16,7 @@ export type IDIRUserDetailContext = {
   lastName: string;
   userName: string;
   email: string;
-  userAuthGroup: IDIRUserAuthGroupType;
+  userRole: IDIRUserAuthGroupType;
 };
 
 /**
@@ -32,7 +32,7 @@ export interface BCeIDUserDetailContext {
   phone2Extension?: string;
   email: string;
   fax?: string;
-  userAuthGroup: BCeIDUserAuthGroupType;
+  userRole: BCeIDUserAuthGroupType;
 }
 
 /**

frontend/src/common/authentication/PermissionMatrix.ts

@@ -482,7 +482,7 @@ export const usePermissionMatrix = ({
 }: PermissionConfigType & PermissionMatrixKeysType): boolean => {
   const { userDetails, idirUserDetails } = useContext(OnRouteBCContext);
   const { data: featureFlags } = useFeatureFlagsQuery();
-  const isIdir = Boolean(idirUserDetails?.userAuthGroup);
+  const isIdir = Boolean(idirUserDetails?.userRole);
 
   // If featureFlag is given, exit if it is not enabled.
   if (featureFlag) {
@@ -504,14 +504,13 @@ export const usePermissionMatrix = ({
       }
     )[permissionMatrixFunctionKey];
     if (isIdir) {
-      currentUserAuthGroup = idirUserDetails?.userAuthGroup;
+      currentUserAuthGroup = idirUserDetails?.userRole;
       isAllowed = Boolean(
         currentUserAuthGroup &&
           allowedIDIRAuthGroups?.includes(currentUserAuthGroup),
-
       );
     } else {
-      currentUserAuthGroup = userDetails?.userAuthGroup;
+      currentUserAuthGroup = userDetails?.userRole;
       isAllowed = Boolean(
         currentUserAuthGroup &&
           allowedBCeIDAuthGroups?.includes(currentUserAuthGroup),

frontend/src/common/authentication/auth-walls/IDIRAuthWall.tsx

@@ -57,7 +57,7 @@ export const IDIRAuthWall = ({
 
   if (isAuthenticated) {
     if (isIDIR(userIDP)) {
-      if (!idirUserDetails?.userAuthGroup) {
+      if (!idirUserDetails?.userRole) {
         return (
           <>
             <LoadIDIRUserContext />
@@ -84,7 +84,7 @@ export const IDIRAuthWall = ({
     }
 
     const doesUserHaveAccess = DoesUserHaveAuthGroup<IDIRUserAuthGroupType>({
-      userAuthGroup: idirUserDetails?.userAuthGroup,
+      userAuthGroup: idirUserDetails?.userRole,
       allowedAuthGroups,
     });
 

frontend/src/common/authentication/auth-walls/NewBCeIDAuthWall.tsx

@@ -35,7 +35,7 @@ export const NewBCeIDAuthWall = () => {
       if (
         !companyId &&
         isNewBCeIDUser === undefined &&
-        !userDetails?.userAuthGroup
+        !userDetails?.userRole
       ) {
         return (
           <>

frontend/src/common/authentication/types.ts

@@ -47,7 +47,7 @@ export type BCeIDUserContextType = {
   pendingCompanies: CompanyMetadata[];
   migratedClient: VerifiedClient;
   user?: {
-    userAuthGroup?: string;
+    userRole?: string;
     statusCode?: string;
     userGUID?: string;
     userName?: string;
@@ -174,7 +174,7 @@ export type UserAuthGroupType =
  */
 export type IDIRUserContextType = {
   user?: {
-    userAuthGroup?: IDIRUserAuthGroupType;
+    userRole?: IDIRUserAuthGroupType;
     statusCode?: string;
     userGUID?: string;
     userName?: string;

frontend/src/common/components/naviconsidebar/NavIconSideBar.tsx

@@ -19,7 +19,7 @@ export const NavIconSideBar = (props: NavIconSideBarProps) => {
   const { idirUserDetails } = useContext(OnRouteBCContext);
   const isIdir = user?.profile?.identity_provider === IDPS.IDIR;
   const isEofficer =
-    idirUserDetails?.userAuthGroup === USER_AUTH_GROUP.ENFORCEMENT_OFFICER;
+    idirUserDetails?.userRole === USER_AUTH_GROUP.ENFORCEMENT_OFFICER;
 
   const shouldShowSideBar =
     isAuthenticated && isIdir && idirUserDetails?.userName && !isEofficer;

frontend/src/features/idir/reporting/forms/PaymentAndRefundDetail.tsx

@@ -39,10 +39,9 @@ export const PaymentAndRefundDetail = () => {
   const { idirUserDetails } = useContext(OnRouteBCContext);
   const { user: idirUserFromAuthContext } = useAuth();
   const canSelectPermitIssuers =
-    idirUserDetails?.userAuthGroup ===
-      IDIR_USER_AUTH_GROUP.SYSTEM_ADMINISTRATOR ||
-    idirUserDetails?.userAuthGroup === IDIR_USER_AUTH_GROUP.HQ_ADMINISTRATOR ||
-    idirUserDetails?.userAuthGroup === IDIR_USER_AUTH_GROUP.FINANCE;
+    idirUserDetails?.userRole === IDIR_USER_AUTH_GROUP.SYSTEM_ADMINISTRATOR ||
+    idirUserDetails?.userRole === IDIR_USER_AUTH_GROUP.HQ_ADMINISTRATOR ||
+    idirUserDetails?.userRole === IDIR_USER_AUTH_GROUP.FINANCE;
   // GET the permit types.
   const permitTypesQuery = usePermitTypesQuery();
   const { setSnackBar } = useContext(SnackBarContext);

frontend/src/features/idir/search/components/IDIRPermitSearchResults.tsx

@@ -104,7 +104,9 @@ export const IDIRPermitSearchResults = memo(
      * @param initialData The initial data to filter by the active data toggle.
      * @returns List of permit items containing the data to be displayed in table.
      */
-    const getFilteredData = (initialData: PermitListItem[]): PermitListItem[] => {
+    const getFilteredData = (
+      initialData: PermitListItem[],
+    ): PermitListItem[] => {
       if (!initialData.length) return [];
       if (isActiveRecordsOnly) {
         // Returns unexpired permits
@@ -164,27 +166,30 @@ export const IDIRPermitSearchResults = memo(
           </Box>
         );
       },
-      renderRowActions: useCallback(({ row }: { row: MRT_Row<PermitListItem> }) => {
-        const isInactive =
-          hasPermitExpired(row.original.expiryDate) ||
-          isPermitInactive(row.original.permitStatus);
+      renderRowActions: useCallback(
+        ({ row }: { row: MRT_Row<PermitListItem> }) => {
+          const isInactive =
+            hasPermitExpired(row.original.expiryDate) ||
+            isPermitInactive(row.original.permitStatus);
 
-        if (shouldShowRowActions(idirUserDetails?.userAuthGroup)) {
-          return (
-            <Box className="idir-search-results__row-actions">
-              <IDIRPermitSearchRowActions
-                isPermitInactive={isInactive}
-                permitNumber={row.original.permitNumber}
-                permitId={row.original.permitId}
-                userAuthGroup={idirUserDetails?.userAuthGroup}
-                companyId={row.original.companyId?.toString()}
-              />
-            </Box>
-          );
-        } else {
-          return <></>;
-        }
-      }, []),
+          if (shouldShowRowActions(idirUserDetails?.userRole)) {
+            return (
+              <Box className="idir-search-results__row-actions">
+                <IDIRPermitSearchRowActions
+                  isPermitInactive={isInactive}
+                  permitNumber={row.original.permitNumber}
+                  permitId={row.original.permitId}
+                  userAuthGroup={idirUserDetails?.userRole}
+                  companyId={row.original.companyId?.toString()}
+                />
+              </Box>
+            );
+          } else {
+            return <></>;
+          }
+        },
+        [],
+      ),
       muiToolbarAlertBannerProps: isError
         ? {
             color: "error",

frontend/src/features/manageProfile/apiManager/hooks.ts

@@ -127,7 +127,7 @@ export const useUserContext = (
           lastName: user.lastName,
           userName: user.userName,
           email: user.email,
-          userAuthGroup: user.userAuthGroup,
+          userRole: user.userRole,
         } as IDIRUserDetailContext;
 
         setIDIRUserDetails?.(() => userDetails);
@@ -160,7 +160,7 @@ export const useUserContext = (
           phone2Extension: user.phone2Extension,
           email: user.email,
           fax: user.fax,
-          userAuthGroup: user.userAuthGroup as BCeIDUserAuthGroupType,
+          userRole: user.userRole as BCeIDUserAuthGroupType,
         } as BCeIDUserDetailContext;
 
         setUserDetails?.(() => userDetails);

frontend/src/features/manageProfile/components/dashboard/ManageProfilesDashboard.tsx

@@ -73,12 +73,12 @@ export const ManageProfilesDashboard = React.memo(() => {
     useGetCreditAccountMetadataQuery(companyId);
   const { data: featureFlags } = useFeatureFlagsQuery();
   const populatedUserRoles = getDefaultRequiredVal([], userRoles);
-  const isStaffActingAsCompany = Boolean(idirUserDetails?.userAuthGroup);
+  const isStaffActingAsCompany = Boolean(idirUserDetails?.userRole);
   const isBCeIDAdmin = isBCeIDOrgAdmin(populatedUserRoles);
   const shouldAllowUserManagement = isBCeIDAdmin || isStaffActingAsCompany;
   const showSpecialAuth =
     !isStaffActingAsCompany &&
-    canViewSpecialAuthorizations(userRoles, userDetails?.userAuthGroup) &&
+    canViewSpecialAuthorizations(userRoles, userDetails?.userRole) &&
     featureFlags?.["LOA"] === "ENABLED";
 
   const isCreditAccountHolder =

frontend/src/features/manageProfile/components/forms/myInfo/MyInfoForm.tsx

@@ -42,9 +42,9 @@ export const MyInfoForm = memo(
         countryCode: getDefaultRequiredVal("", myInfo?.countryCode),
         provinceCode: getDefaultRequiredVal("", myInfo?.provinceCode),
         city: getDefaultRequiredVal("", myInfo?.city),
-        userAuthGroup: getDefaultRequiredVal(
+        userRole: getDefaultRequiredVal(
           BCeID_USER_AUTH_GROUP.PERMIT_APPLICANT,
-          myInfo?.userAuthGroup as BCeIDUserAuthGroupType,
+          myInfo?.userRole as BCeIDUserAuthGroupType,
         ),
       },
     });

frontend/src/features/manageProfile/components/forms/userManagement/EditUser.tsx

@@ -48,9 +48,9 @@ export const EditUserForm = memo(
         countryCode: getDefaultRequiredVal("", userInfo?.countryCode),
         provinceCode: getDefaultRequiredVal("", userInfo?.provinceCode),
         city: getDefaultRequiredVal("", userInfo?.city),
-        userAuthGroup: getDefaultRequiredVal(
+        userRole: getDefaultRequiredVal(
           BCeID_USER_AUTH_GROUP.COMPANY_ADMINISTRATOR,
-          userInfo?.userAuthGroup,
+          userInfo?.userRole,
         ),
       },
     });
@@ -163,7 +163,7 @@ export const EditUserForm = memo(
               </Stack>
               <Stack spacing={2}>
                 <Controller
-                  name="userAuthGroup"
+                  name="userRole"
                   rules={{
                     required: { value: true, message: requiredMessage() },
                   }}

frontend/src/features/manageProfile/components/forms/userManagement/UserAuthRadioGroup.tsx

@@ -21,7 +21,7 @@ export const UserAuthRadioGroup = ({
   field,
   fieldState,
 }: {
-  field: ControllerRenderProps<FieldValues, "userAuthGroup">;
+  field: ControllerRenderProps<FieldValues, "userRole">;
   fieldState: ControllerFieldState;
 }) => {
   const { invalid } = fieldState;

frontend/src/features/manageProfile/pages/AddUserDashboard.tsx

@@ -39,7 +39,7 @@ export const AddUserDashboard = React.memo(() => {
 
   const formMethods = useForm<BCeIDAddUserRequest>({
     defaultValues: {
-      userAuthGroup: BCeID_USER_AUTH_GROUP.PERMIT_APPLICANT,
+      userRole: BCeID_USER_AUTH_GROUP.PERMIT_APPLICANT,
     },
     reValidateMode: "onBlur",
   });
@@ -185,7 +185,7 @@ export const AddUserDashboard = React.memo(() => {
             </Stack>
             <Stack spacing={2}>
               <Controller
-                name="userAuthGroup"
+                name="userRole"
                 rules={{
                   required: { value: true, message: requiredMessage() },
                 }}

frontend/src/features/manageProfile/pages/MyInfo.tsx

@@ -49,7 +49,7 @@ export const MyInfo = memo(() => {
   return (
     <div className="my-info-page">
       {isEditing ? <Header /> : null}
-      <UserInfoBanner userAuthGroup={myInfo?.userAuthGroup} />
+      <UserInfoBanner userAuthGroup={myInfo?.userRole} />
       {isEditing ? (
         <MyInfoForm myInfo={myInfo} setIsEditing={setIsEditing} />
       ) : (

frontend/src/features/manageProfile/types/manageProfile.d.ts

@@ -25,7 +25,7 @@ export type BCeIDUserStatusType =
  */
 export type BCeIDAddUserRequest = {
   userName: string;
-  userAuthGroup: BCeIDAuthGroup;
+  userRole: BCeIDAuthGroup;
 };
 
 /**
@@ -88,7 +88,7 @@ export type UpdateCompanyProfileRequest = Omit<
  * The response structure of get user info API.
  */
 export type ReadUserInformationResponse = Contact & {
-  userAuthGroup: BCeIDUserAuthGroupType;
+  userRole: BCeIDUserAuthGroupType;
   userGUID: string;
   userName: string;
   statusCode: BCeID_USER_STATUS;
@@ -100,7 +100,7 @@ export type ReadUserInformationResponse = Contact & {
  * The edit user info request body.
  */
 export type UserInfoRequest = Contact & {
-  userAuthGroup: BCeIDUserAuthGroupType;
+  userRole: BCeIDUserAuthGroupType;
 };
 
 /**

frontend/src/features/permits/components/dashboard/tests/integration/fixtures/getUserDetails.ts

@@ -12,7 +12,7 @@ export const getDefaultUserDetails = () => ({
     phone2Extension: "234",
     email: "[email protected]",
     fax: "604-123-4569",
-    userAuthGroup: USER_AUTH_GROUP.COMPANY_ADMINISTRATOR,
+    userRole: USER_AUTH_GROUP.COMPANY_ADMINISTRATOR,
   },
 });
 
@@ -28,6 +28,6 @@ export const getEmptyUserDetails = () => ({
     phone2Extension: "",
     email: "",
     fax: "",
-    userAuthGroup: USER_AUTH_GROUP.PERMIT_APPLICANT,
+    userRole: USER_AUTH_GROUP.PERMIT_APPLICANT,
   },
 });