Merge pull request #382 from ONSdigital/BLAIS5-4436

Blais5 4436
ONSdigital · Oct 22, 2024 · 8e94f82 · 8e94f82
2 parents b7a2332 + 68be7be
commit 8e94f82
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 34 deletions.
diff --git a/server/role-to-serverparks-map.json b/server/role-to-serverparks-map.json
@@ -2,8 +2,9 @@
     "IPS Manager" : ["gusty", "cma"],
     "IPS Field Interviewer" : ["gusty", "cma"],
     "IPS Pilot Interviewer" : ["gusty", "cma"],
+    "IPS Researcher" : ["gusty", "cma"],
     "Field Interviewer" : ["gusty", "cma"],
     "SVT_Editor" : ["gusty", "cma"],
     "SVT_Supervisor" : ["gusty", "cma"],
     "DEFAULT" : ["gusty"]
-}
+}
diff --git a/src/Interfaces/index.ts b/src/Interfaces/index.ts
@@ -49,17 +49,3 @@ export interface BreadcrumbItem {
 export interface BreadcrumbProps {
     BreadcrumbList: BreadcrumbItem[]
 }
-
-export enum ValidUserRoles {
-    DST = "DST",
-    BDSS = "BDSS",
-    IPSManager = "IPS Manager",
-    IPSFieldInterviewer = "IPS Field Interviewer",
-    Editor = "Editor",
-    EditorManager = "Editor Manager",
-    TOAppointments = "TO Appointments",
-    TOManager = "TO Manager",
-    TOInterviewer = "TO Interviewer",
-    SEL = "SEL",
-    WelshSpeaker = "Welsh Speaker",
-}
diff --git a/src/pages/users/UserProfileEdits/ChangeRole.test.tsx b/src/pages/users/UserProfileEdits/ChangeRole.test.tsx
@@ -8,7 +8,6 @@ import "@testing-library/jest-dom";
 import ChangeRole from "./ChangeRole";
 import { MemoryRouter, useParams } from "react-router-dom";
 import { getAllRoles, patchUserRolesAndPermissions } from "../../../api/http";
-import { ValidUserRoles } from "../../../Interfaces";
 import userEvent from "@testing-library/user-event";
 
 jest.mock("react-router-dom", () => ({
@@ -27,17 +26,18 @@ jest.mock("../../../api/http", () => ({
 }));
 
 const mockRoles = [
-    { name: ValidUserRoles.DST, description: "DST User" },
-    { name: ValidUserRoles.BDSS, description: "BDSS User" },
-    { name: ValidUserRoles.IPSFieldInterviewer, description: "IPS Field Interviewer User" },
-    { name: ValidUserRoles.IPSManager, description: "IPS Manager User" },
-    { name: ValidUserRoles.Editor, description: "Editor User" },
-    { name: ValidUserRoles.EditorManager, description: "Editor Manager User" },
-    { name: ValidUserRoles.TOAppointments, description: "TO Appointments User" },
-    { name: ValidUserRoles.TOManager, description: "TO Manager User" },
-    { name: ValidUserRoles.TOInterviewer, description: "TO Interviewer User" },
-    { name: ValidUserRoles.SEL, description: "SEL User" },
-    { name: ValidUserRoles.WelshSpeaker, description: "Welsh Speaker User" }
+    { name: "DST", description: "DST User" },
+    { name: "BDSS", description: "BDSS User" },
+    { name: "IPS Manager", description: "IPS Field Interviewer User" },
+    { name: "IPS Field Interviewer", description: "IPS Manager User" },
+    { name: "IPS Researcher", description: "IPS Researcher User" },
+    { name: "Editor", description: "Editor User" },
+    { name: "Editor Manager", description: "Editor Manager User" },
+    { name: "TO Appointments", description: "TO Appointments User" },
+    { name: "TO Manager", description: "TO Manager User" },
+    { name: "TO Interviewer", description: "TO Interviewer User" },
+    { name: "SEL", description: "SEL User" },
+    { name: "Welsh Speaker", description: "Welsh Speaker User" }
 ];
 
 const mockUserDetails = {
@@ -136,4 +136,4 @@ describe("ChangeRole Component (with state management)", () => {
 
         expect(await findByText(/Failed to fetch roles list, please try again/i)).toBeVisible();
     });
-});
+});
diff --git a/src/pages/users/UserProfileEdits/ChangeRole.tsx b/src/pages/users/UserProfileEdits/ChangeRole.tsx
@@ -3,7 +3,7 @@ import { ONSButton, ONSErrorPanel, ONSLoadingPanel, ONSPanel } from "blaise-desi
 import { ChangeEvent, ReactElement, useEffect, useState } from "react";
 import { Navigate, useLocation, useParams } from "react-router-dom";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
-import { BreadcrumbItem, ValidUserRoles } from "../../../Interfaces";
+import { BreadcrumbItem } from "../../../Interfaces";
 import { RedirectWithData, UserRouteParams } from "../../../Interfaces/usersPage";
 import { getAllRoles, patchUserRolesAndPermissions } from "../../../api/http";
 import { UserRole } from "blaise-api-node-client";
@@ -47,7 +47,7 @@ export default function ChangeRole(): ReactElement {
             return;
         }
 
-        if (Object.values(ValidUserRoles).includes(role as ValidUserRoles)) {
+        if (roleList.some((userRole) => userRole.name === role)) {
             const res = await patchUserRolesAndPermissions(viewedUsername, role);
             setRedirectWithData({ redirect: true, visible: true, message: res?.message || "", statusType: res?.status === 500 ? "error" : "success" });
         } else {
@@ -117,4 +117,4 @@ export default function ChangeRole(): ReactElement {
             }
         </>
     );
-}
+}
diff --git a/src/pages/users/UserProfileEdits/__snapshots__/ChangeRole.test.tsx.snap b/src/pages/users/UserProfileEdits/__snapshots__/ChangeRole.test.tsx.snap
@@ -124,15 +124,20 @@ exports[`ChangeRole Component (with state management) matches the snapshot 1`] =
           >
             BDSS
           </option>
+          <option
+            value="IPS Manager"
+          >
+            IPS Manager
+          </option>
           <option
             value="IPS Field Interviewer"
           >
             IPS Field Interviewer
           </option>
           <option
-            value="IPS Manager"
+            value="IPS Researcher"
           >
-            IPS Manager
+            IPS Researcher
           </option>
           <option
             value="Editor"

diff --git a/src/role-to-serverparks-map.json b/src/role-to-serverparks-map.json
@@ -2,8 +2,9 @@
     "IPS Manager" : ["gusty", "cma"],
     "IPS Field Interviewer" : ["gusty", "cma"],
     "IPS Pilot Interviewer" : ["gusty", "cma"],
+    "IPS Researcher" : ["gusty", "cma"],
     "Field Interviewer" : ["gusty", "cma"],
     "SVT_Editor" : ["gusty", "cma"],
     "SVT_Supervisor" : ["gusty", "cma"],
     "DEFAULT" : ["gusty"]
-}
+}