Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-17 22:04:19 -05:00
Code Issues Activity

fix(console): update content of assigning new roles on app details page (#4591)

Browse source
This commit is contained in:
Darcy Ye 2023-09-27 18:11:47 +08:00 • committed by GitHub
parent 21a5b4da6c
commit 85a7461adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/console/src/components/RolesTransfer/components/SourceRoleItem/index.tsx
View file

@ -8,14 +8,13 @@ import * as styles from './index.module.scss';
type Props = {
role: RoleResponse;
type: RoleType;
isSelected: boolean;
onSelect: () => void;
};
function SourceRoleItem({ role, type, isSelected, onSelect }: Props) {
function SourceRoleItem({ role, isSelected, onSelect }: Props) {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
const { name, usersCount, applicationsCount } = role;
const { name, type, usersCount, applicationsCount } = role;
return (
<div
@ -38,12 +37,9 @@ function SourceRoleItem({ role, type, isSelected, onSelect }: Props) {
<div className={styles.name}>{name}</div>
<div className={styles.count}>
(
{t(
type === RoleType.User
? 'user_details.roles.assigned_user_count'
: 'application_details.roles.assigned_app_count',
{ value: type === RoleType.User ? usersCount : applicationsCount }
)}
{type === RoleType.User
? t('user_details.roles.assigned_user_count', { value: usersCount })
: t('application_details.roles.assigned_app_count', { value: applicationsCount })}
)
</div>
</div>

1
packages/console/src/components/RolesTransfer/components/SourceRolesBox/index.tsx
View file

@ -95,7 +95,6 @@ function SourceRolesBox({ entityId, type, selectedRoles, onChange }: Props) {
<SourceRoleItem
key={role.id}
role={role}
type={type}
isSelected={isSelected}
onSelect={() => {
onChange(

10
packages/console/src/components/RolesTransfer/components/TargetRoleItem/index.tsx
View file

@ -1,4 +1,4 @@
import type { RoleResponse } from '@logto/schemas';
import { type RoleResponse, RoleType } from '@logto/schemas';
import { useTranslation } from 'react-i18next';
import Close from '@/assets/icons/close.svg';
@ -13,14 +13,18 @@ type Props = {
function TargetRoleItem({ role, onDelete }: Props) {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
const { name, usersCount } = role;
const { name, type, usersCount, applicationsCount } = role;
return (
<div className={styles.item}>
<div className={styles.info}>
<div className={styles.name}>{name}</div>
<div className={styles.count}>
({t('user_details.roles.assigned_user_count', { value: usersCount })})
(
{type === RoleType.User
? t('user_details.roles.assigned_user_count', { value: usersCount })
: t('application_details.roles.assigned_app_count', { value: applicationsCount })}
)
</div>
</div>
<IconButton size="small" onClick={onDelete}>