diff --git a/frontend/src/hooks/api/admin/types.ts b/frontend/src/hooks/api/admin/types.ts index ca27c0f23..3b658cfa5 100644 --- a/frontend/src/hooks/api/admin/types.ts +++ b/frontend/src/hooks/api/admin/types.ts @@ -181,15 +181,3 @@ export type TResendOrgInviteDTO = { organizationId: string; membershipId: string; }; - -export enum AdminOrganizationsOrderBy { - Name = "name" -} - -export enum AdminIdentitiesOrderBy { - Name = "name" -} - -export enum AdminUsersOrderBy { - Username = "username" -} diff --git a/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx b/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx index 5b1110648..f50656a0e 100644 --- a/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx +++ b/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx @@ -51,7 +51,6 @@ import { useAdminGetUsers, useRemoveUserServerAdminAccess } from "@app/hooks/api"; -import { AdminUsersOrderBy } from "@app/hooks/api/admin/types"; import { User } from "@app/hooks/api/users/types"; import { UsePopUpState } from "@app/hooks/usePopUp"; import { AddServerAdminModal } from "@app/pages/admin/AccessManagementPage/components/AddServerAdminModal"; @@ -283,12 +282,9 @@ export const ServerAdminsTable = () => { const [searchUserFilter, setSearchUserFilter] = useState(""); const [debouncedSearchTerm] = useDebounce(searchUserFilter, 500); - const { offset, limit, setPage, perPage, page, setPerPage } = usePagination( - AdminUsersOrderBy.Username, - { - initPerPage: getUserTablePreference("ServerAdminUsersTable", PreferenceKey.PerPage, 20) - } - ); + const { offset, limit, setPage, perPage, page, setPerPage } = usePagination("", { + initPerPage: getUserTablePreference("ServerAdminUsersTable", PreferenceKey.PerPage, 20) + }); const handlePerPageChange = (newPerPage: number) => { setPerPage(newPerPage); diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx index 5417636ea..920c8b6c1 100644 --- a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx +++ b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx @@ -37,7 +37,6 @@ import { import { useDebounce, usePagination, usePopUp, useResetPageHelper } from "@app/hooks"; import { useAdminRemoveIdentitySuperAdminAccess } from "@app/hooks/api/admin"; import { useAdminGetIdentities } from "@app/hooks/api/admin/queries"; -import { AdminIdentitiesOrderBy } from "@app/hooks/api/admin/types"; import { UsePopUpState } from "@app/hooks/usePopUp"; const IdentityPanelTable = ({ @@ -54,14 +53,13 @@ const IdentityPanelTable = ({ const [searchIdentityFilter, setSearchIdentityFilter] = useState(""); const [debouncedSearchTerm] = useDebounce(searchIdentityFilter, 500); - const { offset, limit, setPage, perPage, page, setPerPage } = - usePagination(AdminIdentitiesOrderBy.Name, { - initPerPage: getUserTablePreference( - "ResourceOverviewIdentitiesTable", - PreferenceKey.PerPage, - 10 - ) - }); + const { offset, limit, setPage, perPage, page, setPerPage } = usePagination("", { + initPerPage: getUserTablePreference( + "ResourceOverviewIdentitiesTable", + PreferenceKey.PerPage, + 10 + ) + }); const handlePerPageChange = (newPerPage: number) => { setPerPage(newPerPage); diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx index 43ff1a48d..ba1c4500a 100644 --- a/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx +++ b/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx @@ -62,7 +62,7 @@ import { useServerAdminAccessOrg, useServerAdminResendOrgInvite } from "@app/hooks/api"; -import { AdminOrganizationsOrderBy, OrganizationWithProjects } from "@app/hooks/api/admin/types"; +import { OrganizationWithProjects } from "@app/hooks/api/admin/types"; import { OrderByDirection } from "@app/hooks/api/generic/types"; import { OrgMembershipStatus } from "@app/hooks/api/organization/types"; import { UsePopUpState } from "@app/hooks/usePopUp"; @@ -449,10 +449,9 @@ const OrganizationsPanelTable = ({ const navigate = useNavigate(); - const { offset, limit, setPage, perPage, page, setPerPage } = - usePagination(AdminOrganizationsOrderBy.Name, { - initPerPage: getUserTablePreference("ResourceOverviewOrgsTable", PreferenceKey.PerPage, 10) - }); + const { offset, limit, setPage, perPage, page, setPerPage } = usePagination("", { + initPerPage: getUserTablePreference("ResourceOverviewOrgsTable", PreferenceKey.PerPage, 10) + }); const handlePerPageChange = (newPerPage: number) => { setPerPage(newPerPage); diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx index 7ce5598ac..8c0046328 100644 --- a/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx +++ b/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx @@ -55,7 +55,6 @@ import { useAdminGrantServerAdminAccess, useRemoveUserServerAdminAccess } from "@app/hooks/api"; -import { AdminUsersOrderBy } from "@app/hooks/api/admin/types"; import { User } from "@app/hooks/api/users/types"; import { UsePopUpState } from "@app/hooks/usePopUp"; @@ -346,12 +345,9 @@ export const UserIdentitiesTable = () => { const [adminsOnly, setAdminsOnly] = useState(false); const [debouncedSearchTerm] = useDebounce(searchUserFilter, 500); - const { offset, limit, setPage, perPage, page, setPerPage } = usePagination( - AdminUsersOrderBy.Username, - { - initPerPage: getUserTablePreference("ResourceOverviewUsersTable", PreferenceKey.PerPage, 20) - } - ); + const { offset, limit, setPage, perPage, page, setPerPage } = usePagination("", { + initPerPage: getUserTablePreference("ResourceOverviewUsersTable", PreferenceKey.PerPage, 20) + }); const handlePerPageChange = (newPerPage: number) => { setPerPage(newPerPage);