8000 better user attribute query handling by edewit · Pull Request #40147 · keycloak/keycloak · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

better user attribute query handling #40147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
Merged

better user attribute query handling #40147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
8000
Diff view
Diff view
8 changes: 3 additions & 5 deletions js/apps/admin-ui/src/components/users/UserDataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function UserDataTable() {
const [searchType, setSearchType] = useState<SearchType>("default");
const [searchDropdownOpen, setSearchDropdownOpen] = useState(false);
const [activeFilters, setActiveFilters] = useState<UserFilter>({
exact: false,
exact: true,
userAttribute: [],
});
const [profile, setProfile] = useState<UserProfileConfig>({});
Expand Down Expand Up @@ -170,9 +170,7 @@ export function UserDataTable() {
params.search = searchParam;
}

if (activeFilters.exact) {
params.exact = true;
}
params.exact = activeFilters.exact;

if (!listUsers && !(params.search || params.q)) {
return [];
Expand Down Expand Up @@ -240,7 +238,7 @@ export function UserDataTable() {
const listUsers = !uiRealmInfo.userProfileProvidersEnabled;

const clearAllFilters = () => {
setActiveFilters({ exact: false, userAttribute: [] });
setActiveFilters({ exact: true, userAttribute: [] });
setSearchUser("");
setQuery("");
refresh();
Expand Down
35 changes: 16 additions & 19 deletions js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { UserProfileConfig } from "@keycloak/keycloak-admin-client/lib/defs/userProfileMetadata";
import {
KeycloakSelect,
SelectVariant,
label,
SelectVariant,
useAlerts,
} from "@keycloak/keycloak-ui-shared";
import {
Expand All @@ -22,7 +22,7 @@ import {
} from "@patternfly/react-core";
import { CheckIcon } from "@patternfly/react-icons";
import { ReactNode, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { Form } from "react-router-dom";
import { UserAttribute, UserFilter } from "./UserDataTable";
Expand Down Expand Up @@ -62,7 +62,6 @@ export function UserDataTableAttributeSearchForm({
setValue,
setError,
clearErrors,
control,
} = useForm<UserFilterForm>({
mode: "onChange",
defaultValues,
Expand Down Expand Up @@ -115,10 +114,10 @@ export function UserDataTableAttributeSearchForm({
const addToFilter = () => {
if (isAttributeValid()) {
setActiveFilters({
exact: getValues().exact,
...activeFilters,
userAttribute: [...activeFilters.userAttribute, { ...getValues() }],
});
reset({ exact: getValues().exact });
reset(defaultValues);
} else {
if (errors.name?.message) {
addAlert(errors.name.message, AlertVariant.danger);
Expand All @@ -134,7 +133,7 @@ export function UserDataTableAttributeSearchForm({
const filtered = [...activeFilters.userAttribute].filter(
(chip) => chip.name !== chip.name,
);
setActiveFilters({ exact: getValues().exact, userAttribute: filtered });
setActiveFilters({ ...activeFilters, userAttribute: filtered });
};

const createAttributeKeyInputField = () => {
Expand Down Expand Up @@ -252,19 +251,17 @@ export function UserDataTableAttributeSearchForm({
{createAttributeSearchChips()}

<div className="pf-v5-u-pt-lg">
<Controller
name="exact"
defaultValue={false}
control={control}
render={({ field }) => (
<Checkbox
id="exact"
data-testid="exact"
label={t("exactSearch")}
isChecked={field.value}
>
/>
)}
<Checkbox
id="exact"
data-testid="exact"
label={t("exactSearch")}
isChecked={activeFilters.exact}
value) => {
setActiveFilters({
...activeFilters,
exact: value,
});
}}
/>
</div>
<ActionGroup className="user-attribute-search-form-action-group">
Expand Down
Loading
0