opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 11:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-4230 pass case insensitive key to users resource (#2162)

Browse Source 
Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>
This commit is contained in:
alex
2023-11-27 10:38:42 +03:00
committed by GitHub
co-authored by Evgenia Bezborodova
parent 6075fe0003
commit e68269efc1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-authentication/src/UsersResource.ts
+2 -1
View File
@@ -72,7 +72,8 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
this.entries
.filter(
([userId, user]) =>
userId.includes(key.options.userId ?? '') && (key.options.enabledState === undefined || user.enabled === key.options.enabledState),
userId.toLowerCase().includes((key.options.userId ?? '').toLowerCase()) &&
(key.options.enabledState === undefined || user.enabled === key.options.enabledState),
)
.map(([userId]) => userId),
),
webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
+1 -1
View File
@@ -32,7 +32,7 @@ export function useUsersTable(filters: IUserFilters) {
const translate = useTranslate();
const usersResource = useService(UsersResource);
const pagination = useOffsetPagination(UsersResource, {
key: UsersResourceFilterKey(filters.search, filters.status === 'true' ? true : filters.status === 'false' ? false : undefined),
key: UsersResourceFilterKey(filters.search.toLowerCase(), filters.status === 'true' ? true : filters.status === 'false' ? false : undefined),
});
const usersLoader = useResource(useUsersTable, usersResource, pagination.key);
const notificationService = useService(NotificationService);