From 65b68a91f245fc662da070172f7a322c4dd78e0d Mon Sep 17 00:00:00 2001
From: Darcy Ye <darcyye@silverhand.io>
Date: Wed, 27 Sep 2023 14:13:14 +0800
Subject: [PATCH] fix(console,phrases): update content of assigning new roles
 on app details page (#4588)

---
 .../components/SourceRoleItem/index.tsx          | 16 ++++++++++++----
 .../components/SourceRolesBox/index.tsx          |  1 +
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 .../admin-console/application-details.ts         |  2 +-
 17 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/console/src/components/RolesTransfer/components/SourceRoleItem/index.tsx b/packages/console/src/components/RolesTransfer/components/SourceRoleItem/index.tsx
index d89c9eeae..a1781dbf9 100644
--- a/packages/console/src/components/RolesTransfer/components/SourceRoleItem/index.tsx
+++ b/packages/console/src/components/RolesTransfer/components/SourceRoleItem/index.tsx
@@ -1,4 +1,4 @@
-import type { RoleResponse } from '@logto/schemas';
+import { type RoleResponse, RoleType } from '@logto/schemas';
 import { useTranslation } from 'react-i18next';
 
 import Checkbox from '@/ds-components/Checkbox';
@@ -8,13 +8,14 @@ import * as styles from './index.module.scss';
 
 type Props = {
   role: RoleResponse;
+  type: RoleType;
   isSelected: boolean;
   onSelect: () => void;
 };
 
-function SourceRoleItem({ role, isSelected, onSelect }: Props) {
+function SourceRoleItem({ role, type, isSelected, onSelect }: Props) {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
-  const { name, usersCount } = role;
+  const { name, usersCount, applicationsCount } = role;
 
   return (
     <div
@@ -36,7 +37,14 @@ function SourceRoleItem({ role, isSelected, onSelect }: Props) {
       />
       <div className={styles.name}>{name}</div>
       <div className={styles.count}>
-        ({t('user_details.roles.assigned_user_count', { value: usersCount })})
+        (
+        {t(
+          type === RoleType.User
+            ? 'user_details.roles.assigned_user_count'
+            : 'application_details.roles.assigned_app_count',
+          { value: type === RoleType.User ? usersCount : applicationsCount }
+        )}
+        )
       </div>
     </div>
   );
diff --git a/packages/console/src/components/RolesTransfer/components/SourceRolesBox/index.tsx b/packages/console/src/components/RolesTransfer/components/SourceRolesBox/index.tsx
index 3a7dc4a16..ea0e09b7e 100644
--- a/packages/console/src/components/RolesTransfer/components/SourceRolesBox/index.tsx
+++ b/packages/console/src/components/RolesTransfer/components/SourceRolesBox/index.tsx
@@ -95,6 +95,7 @@ function SourceRolesBox({ entityId, type, selectedRoles, onChange }: Props) {
               <SourceRoleItem
                 key={role.id}
                 role={role}
+                type={type}
                 isSelected={isSelected}
                 onSelect={() => {
                   onChange(
diff --git a/packages/phrases/src/locales/de/translation/admin-console/application-details.ts b/packages/phrases/src/locales/de/translation/admin-console/application-details.ts
index 7943eb4eb..f268ce5e4 100644
--- a/packages/phrases/src/locales/de/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/de/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/en/translation/admin-console/application-details.ts b/packages/phrases/src/locales/en/translation/admin-console/application-details.ts
index 0f60f82ac..88a6a8789 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/es/translation/admin-console/application-details.ts b/packages/phrases/src/locales/es/translation/admin-console/application-details.ts
index a1d675092..496cf7e0e 100644
--- a/packages/phrases/src/locales/es/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/es/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/fr/translation/admin-console/application-details.ts b/packages/phrases/src/locales/fr/translation/admin-console/application-details.ts
index da3cb3373..4ae429f8a 100644
--- a/packages/phrases/src/locales/fr/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/fr/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/it/translation/admin-console/application-details.ts b/packages/phrases/src/locales/it/translation/admin-console/application-details.ts
index f01c8bb15..0a4774a69 100644
--- a/packages/phrases/src/locales/it/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/it/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ja/translation/admin-console/application-details.ts b/packages/phrases/src/locales/ja/translation/admin-console/application-details.ts
index e01125af0..923c0cfae 100644
--- a/packages/phrases/src/locales/ja/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/ja/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ko/translation/admin-console/application-details.ts b/packages/phrases/src/locales/ko/translation/admin-console/application-details.ts
index b4095dd43..db52c4c26 100644
--- a/packages/phrases/src/locales/ko/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/ko/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pl-pl/translation/admin-console/application-details.ts b/packages/phrases/src/locales/pl-pl/translation/admin-console/application-details.ts
index 4c49d8459..634a9d63f 100644
--- a/packages/phrases/src/locales/pl-pl/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/pl-pl/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pt-br/translation/admin-console/application-details.ts b/packages/phrases/src/locales/pt-br/translation/admin-console/application-details.ts
index 5ff9926d6..d619bd578 100644
--- a/packages/phrases/src/locales/pt-br/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/pt-br/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/application-details.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/application-details.ts
index 987471185..d35f932ab 100644
--- a/packages/phrases/src/locales/pt-pt/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/pt-pt/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ru/translation/admin-console/application-details.ts b/packages/phrases/src/locales/ru/translation/admin-console/application-details.ts
index 025aa0027..f441faaa7 100644
--- a/packages/phrases/src/locales/ru/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/ru/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/application-details.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/application-details.ts
index 8b47539b6..a275e27b2 100644
--- a/packages/phrases/src/locales/tr-tr/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/tr-tr/translation/admin-console/application-details.ts
@@ -83,7 +83,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/application-details.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/application-details.ts
index e0816ca55..c82175cfa 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/application-details.ts
@@ -80,7 +80,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-hk/translation/admin-console/application-details.ts b/packages/phrases/src/locales/zh-hk/translation/admin-console/application-details.ts
index ee2920e96..aafcd746c 100644
--- a/packages/phrases/src/locales/zh-hk/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/zh-hk/translation/admin-console/application-details.ts
@@ -80,7 +80,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-tw/translation/admin-console/application-details.ts b/packages/phrases/src/locales/zh-tw/translation/admin-console/application-details.ts
index 5a55db079..e1fb1c8d1 100644
--- a/packages/phrases/src/locales/zh-tw/translation/admin-console/application-details.ts
+++ b/packages/phrases/src/locales/zh-tw/translation/admin-console/application-details.ts
@@ -81,7 +81,7 @@ const application_details = {
     /** UNTRANSLATED */
     added_text: '{{value, number}} added',
     /** UNTRANSLATED */
-    assigned_user_count: '{{value, number}} users',
+    assigned_app_count: '{{value, number}} applications',
     /** UNTRANSLATED */
     confirm_assign: 'Assign roles',
     /** UNTRANSLATED */