Add new user and role selectors for pagination

src/components/resource-policy/EditPolicyForm.tsx

@@ -6,11 +6,9 @@ import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 
-import { getUserDisplayName } from "@app/lib/getUserDisplayName";
 import { orgQueries } from "@app/lib/queries";
 import { build } from "@server/build";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
-import { UserType } from "@server/types/UserTypes";
 import { useQuery } from "@tanstack/react-query";
 import { useTranslations } from "next-intl";
 
@@ -51,12 +49,6 @@ export function EditPolicyForm({
         env.server.maxmind_asn_path && env.server.maxmind_asn_path.length > 0
     );
 
-    const { data: orgRoles = [], isLoading: isLoadingOrgRoles } = useQuery(
-        orgQueries.roles({ orgId: org.org.orgId })
-    );
-    const { data: orgUsers = [], isLoading: isLoadingOrgUsers } = useQuery(
-        orgQueries.users({ orgId: org.org.orgId })
-    );
     const { data: orgIdps = [], isLoading: isLoadingOrgIdps } = useQuery(
         orgQueries.identityProviders({
             orgId: org.org.orgId,
@@ -64,26 +56,6 @@ export function EditPolicyForm({
         })
     );
 
-    const allRoles = useMemo(
-        () =>
-            orgRoles
-                .map((role) => ({
-                    id: role.roleId.toString(),
-                    text: role.name
-                }))
-                .filter((role) => role.text !== "Admin"),
-        [orgRoles]
-    );
-
-    const allUsers = useMemo(
-        () =>
-            orgUsers.map((user) => ({
-                id: user.id.toString(),
-                text: `${getUserDisplayName({ email: user.email, username: user.username })}${user.type !== UserType.Internal ? ` (${user.idpName})` : ""}`
-            })),
-        [orgUsers]
-    );
-
     const allIdps = useMemo(() => {
         if (build === "saas") {
             if (isPaidUser(tierMatrix.orgOidc)) {
@@ -98,17 +70,18 @@ export function EditPolicyForm({
         return [];
     }, [orgIdps, isPaidUser]);
 
-    if (isLoadingOrgRoles || isLoadingOrgUsers || isLoadingOrgIdps) {
+    if (isLoadingOrgIdps) {
         return <></>;
     }
 
     return (
         <SettingsContainer>
-            {!hidePolicyNameForm && <EditPolicyNameSectionForm readonly={readonly} />}
+            {!hidePolicyNameForm && (
+                <EditPolicyNameSectionForm readonly={readonly} />
+            )}
 
             <EditPolicyUsersRolesSectionForm
-                allRoles={allRoles}
-                allUsers={allUsers}
+                orgId={org.org.orgId}
                 allIdps={allIdps}
                 readonly={readonly}
             />