libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

reset first param on client when start searching (#3267)

Browse source 
fixes: #3266
This commit is contained in:
Erik Jan de Wit 2022-09-07 14:53:35 +02:00 committed by GitHub
parent f5282fbc75
commit 57b52309f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/admin-ui/src/components/table-toolbar/KeycloakDataTable.tsx
View file

@ -4,6 +4,7 @@ import {
ReactNode, ReactNode,
useEffect, useEffect,
useMemo, useMemo,
useRef,
useState, useState,
} from "react"; } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@ -207,6 +208,7 @@ export function KeycloakDataTable<T>({
const [max, setMax] = useState(10); const [max, setMax] = useState(10);
const [first, setFirst] = useState(0); const [first, setFirst] = useState(0);
const [search, setSearch] = useState<string>(""); const [search, setSearch] = useState<string>("");
const prevSearch = useRef<string>();
const [key, setKey] = useState(0); const [key, setKey] = useState(0);
const refresh = () => setKey(new Date().getTime()); const refresh = () => setKey(new Date().getTime());
@ -297,8 +299,15 @@ export function KeycloakDataTable<T>({
useFetch( useFetch(
async () => { async () => {
setLoading(true); setLoading(true);
const newSearch = prevSearch.current === "" && search !== "";
if (newSearch) {
setFirst(0);
}
prevSearch.current = search;
return typeof loader === "function" return typeof loader === "function"
? unPaginatedData || (await loader(first, max + 1, search)) ? unPaginatedData ||
(await loader(newSearch ? 0 : first, max + 1, search))
: loader; : loader;
}, },
(data) => { (data) => {

3
keycloak-theme/src/main/java/org/keycloak/admin/ui/rest/RoleMappingResource.java
View file

@ -24,8 +24,7 @@ public abstract class RoleMappingResource {
public final List<ClientRole> mapping(Predicate<RoleModel> predicate, long first, long max, final String search) { public final List<ClientRole> mapping(Predicate<RoleModel> predicate, long first, long max, final String search) {
return mapping(predicate).filter(clientRole -> clientRole.getClient().contains(search) || clientRole.getRole().contains(search)) return mapping(predicate).filter(clientRole -> clientRole.getClient().contains(search) || clientRole.getRole().contains(search))
.skip(first).limit(max).collect(Collectors.toList());
.skip("".equals(search) ? first : 0).limit(max).collect(Collectors.toList());
} }
public RoleMappingResource(RealmModel realm, AdminPermissionEvaluator auth) { public RoleMappingResource(RealmModel realm, AdminPermissionEvaluator auth) {