@deix/rossini-identity-management 5.1.3 → 5.2.1

package/lib/components/groups/GroupUsers.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import { Group } from '../../types/groups';
 interface GroupUsersProps {
     group: Group;
 }
-declare const GroupUsers: ({ group }: GroupUsersProps) => React.JSX.Element;
+declare const GroupUsers: ({ group }: GroupUsersProps) => import("react").JSX.Element;
 export default GroupUsers;
 //# sourceMappingURL=GroupUsers.d.ts.map

package/lib/components/groups/GroupUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupUsers.d.ts","sourceRoot":"","sources":["../../../src/components/groups/GroupUsers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAgC3C,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;CACd;AAED,QAAA,MAAM,UAAU,cAAe,eAAe,sBAoD7C,CAAC;eAEa,UAAU"}
+{"version":3,"file":"GroupUsers.d.ts","sourceRoot":"","sources":["../../../src/components/groups/GroupUsers.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AA4B3C,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;CACd;AAED,QAAA,MAAM,UAAU,cAAe,eAAe,gCA2D7C,CAAC;eAEa,UAAU"}

package/lib/components/groups/GroupUsers.js

@@ -1,16 +1,16 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Button } from '@mui/material';
 import AddIcon from '@mui/icons-material/Add';
-import { useAddUserToGroup, useRemoveUserFromGroup, useUsers, } from '../../utils/hooks/users';
-import { useState } from 'react';
+import { Box, Button } from '@mui/material';
 import { useQueryClient } from '@tanstack/react-query';
-import AddItemDialog from '../AddItemDialog';
-import Table from '../tables/Table';
-import { useGroupUsers } from '../../utils/hooks/groups';
+import { useState } from 'react';
 import groupsTranslations from '../../lang/groups';
 import usersTranslations from '../../lang/users';
+import { useGroupUsers } from '../../utils/hooks/groups';
 import { useAPIClient } from '../../utils/hooks/useAPIClient';
+import { useAddUserToGroup, useRemoveUserFromGroup, useUsers, } from '../../utils/hooks/users';
 import useTranslate from '../../utils/hooks/useTranslate';
+import AddItemDialog from '../AddItemDialog';
+import Table from '../tables/Table';
 const groupUsersTableColumns = [
     {
         field: 'username',
@@ -38,9 +38,16 @@ const GroupUsers = ({ group }) => {
                     if (value) {
                         addUserToGroup({ userId: value?.value, groupId: group.id });
                     }
-                }, title: groupsTranslations.addUser, options: users?.map((user) => ({
-                    value: user.id,
-                    label: user.username || '',
-                })) })] }));
+                }, title: groupsTranslations.addUser, options: users?.map((user) => {
+                    const fullName = [user.firstName, user.lastName]
+                        .filter(Boolean)
+                        .join(' ');
+                    return {
+                        value: user.id,
+                        label: fullName
+                            ? `${fullName} (${user.username})`
+                            : user.username || '',
+                    };
+                }) })] }));
 };
 export default GroupUsers;

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { default as Users } from './components/users/Users';
 export { default as Groups } from './components/groups/Groups';
-export type { User, KeycloakQueryParams } from './types/users';
+export type { User, KeycloakQueryParams, UserByIdResult, UseUsersByIdsOptions, } from './types/users';
 export type { Group } from './types/groups';
 export { default as SearchField } from './components/SearchField';
 export { default as DeleteConfirmationDialog } from './components/DeleteConfirmationDialog';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC/D,YAAY,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC/D,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAC5F,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC/D,YAAY,EACV,IAAI,EACJ,mBAAmB,EACnB,cAAc,EACd,oBAAoB,GACrB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAC5F,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC"}

package/lib/types/users.d.ts

@@ -7,8 +7,20 @@ export interface User {
     enabled?: boolean;
     email?: string;
     emailVerified?: boolean;
+    serviceAccountClientId?: string;
 }
 export interface KeycloakQueryParams {
     briefRepresentation?: boolean;
 }
+export interface UserByIdResult {
+    data?: User;
+    isLoading: boolean;
+    isError: boolean;
+}
+export interface UseUsersByIdsOptions {
+    /** Milliseconds a cached user is considered fresh. Default: 60000. */
+    staleTime?: number;
+    /** Retries on error (true/false or a number). Default: false. */
+    retry?: boolean | number;
+}
 //# sourceMappingURL=users.d.ts.map

package/lib/types/users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/types/users.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/types/users.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AASD,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B"}

package/lib/utils/hooks/users.d.ts

@@ -1,12 +1,13 @@
 import { QueryClient, UseQueryResult } from '@tanstack/react-query';
 import { AxiosInstance } from 'axios';
-import { KeycloakQueryParams, User } from '../../types/users';
-import { Group } from '../../types/groups';
 import { UserFormFields } from '../../components/users/UserForm';
+import { Group } from '../../types/groups';
+import { KeycloakQueryParams, User, UserByIdResult, UseUsersByIdsOptions } from '../../types/users';
 export declare const getUsers: (apiClient: AxiosInstance, username?: string, group?: string, offset?: number, limit?: number, params?: KeycloakQueryParams) => Promise<User[]>;
 export declare const useUsers: (apiClient: AxiosInstance, group?: string, offset?: number, limit?: number, params?: KeycloakQueryParams) => UseQueryResult<User[] | undefined, Error>;
 export declare const getUser: (id: string, apiClient: AxiosInstance) => Promise<User>;
 export declare const useUser: (id: string, apiClient: AxiosInstance) => UseQueryResult<User | undefined, Error>;
+export declare const useUsersByIds: (apiClient: AxiosInstance, ids: (string | undefined)[], options?: UseUsersByIdsOptions) => UserByIdResult[];
 export declare const addUser: ({ newUser, sendEmailOnCreation, apiClient, groups, }: {
     newUser: User;
     sendEmailOnCreation: boolean;

package/lib/utils/hooks/users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/users.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,cAAc,EAGf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjE,eAAO,MAAM,QAAQ,cACR,aAAa,aACb,MAAM,UACT,MAAM,WACN,MAAM,UACP,MAAM,WACJ,mBAAmB,oBA8B7B,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,aAAa,UAChB,MAAM,WACN,MAAM,UACP,MAAM,WACJ,mBAAmB,KAC3B,cAAc,CAAC,IAAI,EAAE,GAAG,SAAS,EAAE,KAAK,CAc1C,CAAC;AAGF,eAAO,MAAM,OAAO,OAAc,MAAM,aAAa,aAAa,kBAGjE,CAAC;AAEF,eAAO,MAAM,OAAO,OACd,MAAM,aACC,aAAa,KACvB,cAAc,CAAC,IAAI,GAAG,SAAS,EAAE,KAAK,CAMxC,CAAC;AAGF,eAAO,MAAM,OAAO,yDAKjB;IACD,OAAO,EAAE,IAAI,CAAC;IACd,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,kBAWA,CAAC;AAEF,eAAO,MAAM,UAAU,gBACR,WAAW,aACb,aAAa;UAQd,cAAc;YACZ,MAAM,EAAE,GAAG,SAAS;WA6BjC,CAAC;AAiBF,eAAO,MAAM,aAAa,gBACX,WAAW,aACb,aAAa,kFA6BzB,CAAC;AAgBF,eAAO,MAAM,aAAa,gBACX,WAAW,aACb,aAAa,4GA6BzB,CAAC;AAcF,eAAO,MAAM,aAAa,OACpB,MAAM,GAAG,SAAS,aACX,aAAa,KACvB,cAAc,CAAC,KAAK,EAAE,GAAG,SAAS,EAAE,KAAK,CAM3C,CAAC;AAmBF,eAAO,MAAM,iBAAiB,gBACf,WAAW,aACb,aAAa;;;;YAIsB,MAAM;aAAW,MAAM;WA8BtE,CAAC;AAmBF,eAAO,MAAM,sBAAsB,gBACpB,WAAW,aACb,aAAa;;;;YAIsB,MAAM;aAAW,MAAM;WA8BtE,CAAC;AAkBF,eAAO,MAAM,0BAA0B,gBACxB,WAAW,aACb,aAAa;;0BAoBzB,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,aAAa,aACb,MAAM,UACT,MAAM,oBAmBf,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,aAAa,UAChB,MAAM,KACb,cAAc,CAAC,MAAM,GAAG,SAAS,EAAE,KAAK,CAM1C,CAAC"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/users.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAKX,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,mBAAmB,EACnB,IAAI,EACJ,cAAc,EACd,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;AAO3B,eAAO,MAAM,QAAQ,cACR,aAAa,aACb,MAAM,UACT,MAAM,WACN,MAAM,UACP,MAAM,WACJ,mBAAmB,oBA2B7B,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,aAAa,UAChB,MAAM,WACN,MAAM,UACP,MAAM,WACJ,mBAAmB,KAC3B,cAAc,CAAC,IAAI,EAAE,GAAG,SAAS,EAAE,KAAK,CAc1C,CAAC;AAGF,eAAO,MAAM,OAAO,OAAc,MAAM,aAAa,aAAa,kBAGjE,CAAC;AAEF,eAAO,MAAM,OAAO,OACd,MAAM,aACC,aAAa,KACvB,cAAc,CAAC,IAAI,GAAG,SAAS,EAAE,KAAK,CAMxC,CAAC;AAoBF,eAAO,MAAM,aAAa,cACb,aAAa,OACnB,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,YACjB,oBAAoB,KAC7B,cAAc,EAUb,CAAC;AAGL,eAAO,MAAM,OAAO,yDAKjB;IACD,OAAO,EAAE,IAAI,CAAC;IACd,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,kBAWA,CAAC;AAEF,eAAO,MAAM,UAAU,gBACR,WAAW,aACb,aAAa;UAQd,cAAc;YACZ,MAAM,EAAE,GAAG,SAAS;WA6BjC,CAAC;AAiBF,eAAO,MAAM,aAAa,gBACX,WAAW,aACb,aAAa,kFA6BzB,CAAC;AAgBF,eAAO,MAAM,aAAa,gBACX,WAAW,aACb,aAAa,4GA6BzB,CAAC;AAcF,eAAO,MAAM,aAAa,OACpB,MAAM,GAAG,SAAS,aACX,aAAa,KACvB,cAAc,CAAC,KAAK,EAAE,GAAG,SAAS,EAAE,KAAK,CAM3C,CAAC;AAmBF,eAAO,MAAM,iBAAiB,gBACf,WAAW,aACb,aAAa;;;;YAIsB,MAAM;aAAW,MAAM;WA8BtE,CAAC;AAmBF,eAAO,MAAM,sBAAsB,gBACpB,WAAW,aACb,aAAa;;;;YAIsB,MAAM;aAAW,MAAM;WA8BtE,CAAC;AAkBF,eAAO,MAAM,0BAA0B,gBACxB,WAAW,aACb,aAAa;;0BAoBzB,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,aAAa,aACb,MAAM,UACT,MAAM,oBAmBf,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,aAAa,UAChB,MAAM,KACb,cAAc,CAAC,MAAM,GAAG,SAAS,EAAE,KAAK,CAM1C,CAAC"}

package/lib/utils/hooks/users.js

@@ -1,7 +1,8 @@
-import { useMutation, useQuery, } from '@tanstack/react-query';
+import { useMutation, useQueries, useQuery, } from '@tanstack/react-query';
 import { enqueueSnackbar } from 'notistack';
 import usersTranslations from '../../lang/users';
 import useTranslate from './useTranslate';
+const isServiceAccount = (u) => !!u.serviceAccountClientId || !!u.username?.startsWith('service-account-');
 // Get list of users
 export const getUsers = async (apiClient, username, group, offset = 0, limit = 1000, params) => {
     const { briefRepresentation } = params ?? {};
@@ -10,26 +11,20 @@ export const getUsers = async (apiClient, username, group, offset = 0, limit = 1
         const { data: groupData } = await apiClient.get(`/groups`, {
             params: { max: 1, search: group, exact: 'true' },
         });
-        if (groupData.length === 1) {
-            const { data } = await apiClient.get(`/groups/${groupData[0].id}/members`, { params: { max: limit, first: offset, ...extraParams } });
-            return data;
-        }
-        else {
+        if (groupData.length !== 1)
             return [];
-        }
-    }
-    else {
-        const { data } = await apiClient.get(`/users`, {
-            params: {
-                max: limit,
-                first: offset,
-                username,
-                exact: 'true',
-                ...extraParams,
-            },
-        });
-        return data;
+        const { data } = await apiClient.get(`/groups/${groupData[0].id}/members`, { params: { max: limit, first: offset, ...extraParams } });
+        return data.filter((u) => !isServiceAccount(u));
     }
+    const { data } = await apiClient.get(`/users`, {
+        params: {
+            max: limit,
+            first: offset,
+            ...(username ? { username, exact: 'true' } : {}),
+            ...extraParams,
+        },
+    });
+    return data;
 };
 export const useUsers = (apiClient, group, offset = 0, limit = 1000, params) => {
     return useQuery({
@@ -58,6 +53,30 @@ export const useUser = (id, apiClient) => {
         staleTime: 0,
     });
 };
+// Get multiple users by id
+// Defined OUTSIDE the hook: its identity must be stable, otherwise React Query
+// recomputes the combined result on every render and loses structural sharing.
+// Without combine, useQueries returns a new array on every render.
+const combineUsers = (results) => results.map((r) => ({
+    data: r.data,
+    isLoading: r.isLoading,
+    isError: r.isError,
+}));
+// Loads several Keycloak users with one GET /users/{id} each.
+// useUser cannot be used here because hooks cannot be called in a loop.
+// It uses the SAME queryKey as useUser (['user', id]), so the cache is shared with useUser.
+// Results are in the same order as ids; an undefined id triggers no request.
+// Each result is a reduced state (see UserByIdResult), not the full UseQueryResult.
+export const useUsersByIds = (apiClient, ids, options) => useQueries({
+    queries: ids.map((id) => ({
+        queryKey: ['user', id],
+        queryFn: () => getUser(id, apiClient),
+        enabled: !!id,
+        staleTime: options?.staleTime ?? 60 * 1000,
+        retry: options?.retry ?? false,
+    })),
+    combine: combineUsers,
+});
 // Add user
 export const addUser = async ({ newUser, sendEmailOnCreation, apiClient, groups, }) => {
     await apiClient.post(`/users`, { ...newUser, groups });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deix/rossini-identity-management",
-  "version": "5.1.3",
+  "version": "5.2.1",
   "main": "lib/index.js",
   "repository": {
     "type": "git",
@@ -62,7 +62,7 @@
     "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-storybook": "^10.6.0",
     "json-server": "^1.0.0-beta.15",
-    "next": "~16.3.8",
+    "next": "~16.4.3",
     "react": "^19.3.0",
     "react-dom": "19.3.0",
     "remark-mdx": "^3.0.0",