diff --git a/src/IsaacApiTypes.tsx b/src/IsaacApiTypes.tsx index 0403c60c6b..a4469fcda9 100644 --- a/src/IsaacApiTypes.tsx +++ b/src/IsaacApiTypes.tsx @@ -775,8 +775,6 @@ export interface AdminSearchEndpointParams { familyName?: string; role?: UserRole; schoolOther?: string; - postcode?: string; - postcodeRadius?: string; schoolURN?: string; emailVerificationStatus?: EmailVerificationStatus; subjectOfInterest?: string; diff --git a/src/app/components/pages/AdminUserManager.tsx b/src/app/components/pages/AdminUserManager.tsx index 9e6fd223ed..2158cb0e1f 100644 --- a/src/app/components/pages/AdminUserManager.tsx +++ b/src/app/components/pages/AdminUserManager.tsx @@ -27,9 +27,7 @@ export const AdminUserManager = () => { const [searchUsers, {isUninitialized: searchNotRequested, isLoading: searchLoading}] = useAdminSearchUsersMutation(); const searchResults = useAppSelector(selectors.admin.userSearch); - const [searchQuery, setSearchQuery] = useState({ - postcodeRadius: "FIVE_MILES", - }); + const [searchQuery, setSearchQuery] = useState({}); const [selectedUserIds, setSelectedUserIds] = useState([]); const adminSearchResultsRef = useRef(null); @@ -111,16 +109,13 @@ export const AdminUserManager = () => { event.preventDefault(); let hasFilterSet = false; for (const filter in searchQuery) { - if (filter && filter !== "postcodeRadius") { + if (filter) { hasFilterSet = true; } } if (!hasFilterSet) { alert("At least one search filter must be set."); } - else if (searchQuery.postcode && !/^[A-Z]{1,2}[0-9][A-Z0-9]? ?([0-9][A-Z]{2})?$/i.test(searchQuery.postcode)) { - alert("Postcode input invalid"); - } else { adminSearchResultsRef.current?.scrollIntoView({behavior: "smooth"}); searchUsers(searchQuery); @@ -173,13 +168,6 @@ export const AdminUserManager = () => { onChange={e => setParamIfNotDefault("email", e.target.value, "")} /> - - - setParamIfNotDefault("schoolOther", e.target.value, "")} - /> - { - - - - - setParamIfNotDefault("postcode", e.target.value, "")} - /> - - - setParamIfNotDefault("postcodeRadius", e.target.value, "")} - > - - - - - - - - - - { onChange={e => setParamIfNotDefault("schoolURN", e.target.value, "")} /> + + + setParamIfNotDefault("schoolOther", e.target.value, "")} + /> + diff --git a/src/test/pages/AdminUserManager.test.tsx b/src/test/pages/AdminUserManager.test.tsx index 87585e4db9..823d7d6fc7 100644 --- a/src/test/pages/AdminUserManager.test.tsx +++ b/src/test/pages/AdminUserManager.test.tsx @@ -15,7 +15,7 @@ describe("AdminUserManager", () => { * * Will return the usersToReturn if provided, otherwise will return [mockUser].map(buildMockUserSummary). */ - const buildSearchHandler = (adminSearchParams: AdminSearchEndpointParams, {usersToReturn, defaultUsersToReturn}: {usersToReturn?: any[], defaultUsersToReturn?: any[]}) => jest.fn(({request, params, cookies}) => { + const buildSearchHandler = (adminSearchParams: AdminSearchEndpointParams, {usersToReturn, defaultUsersToReturn}: {usersToReturn?: any[], defaultUsersToReturn?: any[]}) => jest.fn(({request, params}) => { if (Object.entries(adminSearchParams).length === 0) return HttpResponse.json(usersToReturn ? usersToReturn.map(u => buildMockUserSummary(u, true)) : [buildMockUserSummary(mockUser, true)], @@ -23,7 +23,7 @@ describe("AdminUserManager", () => { const url = new URL(request.url); const searchParams = paramsToObject(url.searchParams); // If default params, return an empty array or defaultUsersToReturn - if (!isDefined(params.postcodeRadius) && (Object.entries(searchParams).length === 1 && searchParams["postcodeRadius"] === "FIVE_MILES")) { + if (Object.entries(searchParams).length === 0) { return HttpResponse.json(defaultUsersToReturn ? defaultUsersToReturn.map(u => buildMockUserSummary(u, true)) : [] @@ -72,14 +72,6 @@ describe("AdminUserManager", () => { const schoolInput = await screen.findByLabelText("Find by manually entered school:"); await userEvent.type(schoolInput, params.schoolOther); } - if (isDefined(params["postcode"])) { - const postcodeInput = await screen.findByLabelText("Find users with school within a given distance of postcode:"); - await userEvent.type(postcodeInput, params.postcode); - } - if (isDefined(params["postcodeRadius"])) { - const radiusInput = await screen.findByTestId("postcode-radius-search"); - await userEvent.selectOptions(radiusInput, params.postcodeRadius); - } if (isDefined(params["schoolURN"])) { const urnInput = await screen.findByLabelText("Find a user with school URN:"); await userEvent.type(urnInput, params.schoolURN); @@ -155,7 +147,7 @@ describe("AdminUserManager", () => { it("shows no list of users after searching, leaving, and coming back.", async () => { const searchHandler = buildSearchHandler( - {postcodeRadius: 'FIVE_MILES'}, + {}, { usersToReturn: [mockUser], }