From 9525cd10d403162c7fa14b75601f9d9b80902364 Mon Sep 17 00:00:00 2001 From: iso9000t <119494473+iso9000t@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:28:02 +0400 Subject: [PATCH] EPMRPP-91927 || Change "All users" page at instance level --- app/localization/translated/be.json | 20 ++++++++++--------- app/localization/translated/es.json | 20 ++++++++++--------- app/localization/translated/ru.json | 20 ++++++++++--------- app/localization/translated/uk.json | 20 ++++++++++--------- app/localization/translated/zh.json | 20 ++++++++++--------- .../common/users/membersListTable/messages.js | 8 ++++++++ .../allUsersListTable/allUsersListTable.jsx | 4 ++-- 7 files changed, 65 insertions(+), 47 deletions(-) diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json index ddafe23573..84ee4ef817 100644 --- a/app/localization/translated/be.json +++ b/app/localization/translated/be.json @@ -1355,9 +1355,11 @@ "MembersListTable.lastLogin": "Апошні ўваход у сістэму", "MembersListTable.managerRole": "Менеджэр", "MembersListTable.name": "Імя", + "MembersListTable.organizations": "Арганізацыі", "MembersListTable.permissions": "Дазвол", "MembersListTable.projects": "Projects", "MembersListTable.role": "Role", + "MembersListTable.type": "Тып", "MembersListTable.viewerRole": "Толькі для прагляду", "MembersListTable.youRole": "Вы", "MembersPageToolbar.membersSearchHint": "Імя карыстальніка не павінна быць пустым", @@ -1446,15 +1448,15 @@ "NestedGridRow.loadLabel": "Загрузіць наступныя 300", "NestedGridRow.loadPreviousLabel": "Загрузіць папярэднія 300", "NewsBlock.twitterTitle": "Азнаёміцца з нашымі апошнімі твітамі", - "noAssignedEmptyPage.description": "Для пачатку вам неабходна зарэгістравацца ў арганізацыі. Звяжыцеся з членамі існуючай арганізацыі, да якой вы хочаце далучыцца, і атрымаеце запрашэнні. Для атрымання дадатковай інфармацыі пра наладу арганізацыі звярніцеся да свайго адміністратара.", - "noAssignedEmptyPage.descriptionSaaS": "Каб пачаць, вам трэба ўступіць у якую-небудзь арганізацыю. Вось як:", - "noAssignedEmptyPage.contactUs": "Звяжыцеся з намі, каб стварыць сваю ўласную арганізацыю.", - "noAssignedEmptyPage.createOwnOrganization": "Стварыце сваю ўласную арганізацыю", - "noAssignedEmptyPage.existingOrganization": "Далучыцца да існуючай арганізацыі", - "noAssignedEmptyPage.invitations": "Звяжыцеся з членамі існуючай арганізацыі, да якой вы хочаце далучыцца, і атрымаеце запрашэнні ад іх.", - "noAssignedEmptyPage.or": "АБО", - "noAssignedEmptyPage.reviewPricing": "Азнаёмцеся з цэнамі", - "noAssignedEmptyPage.title": "Вітаю", + "NoAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", + "NoAssignedEmptyPage.createOwnOrganization": "Create your own organization", + "NoAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", + "NoAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", + "NoAssignedEmptyPage.existingOrganization": "Join an existing organization", + "NoAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", + "NoAssignedEmptyPage.or": "OR", + "NoAssignedEmptyPage.reviewPricing": "Review Pricing", + "NoAssignedEmptyPage.title": "Welcome", "NoCasesBlock.noItemsMessage": "Няма правилаў паведамлення па электроннай пошце", "NoCasesBlock.notificationsInfo": "Пасля завяршэння запуску сістэма паведаміць выбраным людзям па электроннай пошце", "NoDataAvailable.noDataMessage": "Няма даступных дадзеных..", diff --git a/app/localization/translated/es.json b/app/localization/translated/es.json index ab9e9dcd8e..02fff98652 100644 --- a/app/localization/translated/es.json +++ b/app/localization/translated/es.json @@ -1355,9 +1355,11 @@ "MembersListTable.lastLogin": "Last Login", "MembersListTable.managerRole": "Manager", "MembersListTable.name": "Name", + "MembersListTable.organizations": "Organizations", "MembersListTable.permissions": "Permissions", "MembersListTable.projects": "Projects", "MembersListTable.role": "Role", + "MembersListTable.type": "Type", "MembersListTable.viewerRole": "View only", "MembersListTable.youRole": "You", "MembersPageToolbar.membersSearchHint": "El nombre de usuario no debe estar vacío", @@ -1446,15 +1448,15 @@ "NestedGridRow.loadLabel": "Cargar siguientes 300", "NestedGridRow.loadPreviousLabel": "Cargar anteriores 300", "NewsBlock.twitterTitle": "Consulte nuestros últimos tweets", - "noAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", - "noAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", - "noAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", - "noAssignedEmptyPage.createOwnOrganization": "Create your own organization", - "noAssignedEmptyPage.existingOrganization": "Join an existing organization", - "noAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", - "noAssignedEmptyPage.or": "OR", - "noAssignedEmptyPage.reviewPricing": "Review Pricing", - "noAssignedEmptyPage.title": "Welcome", + "NoAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", + "NoAssignedEmptyPage.createOwnOrganization": "Create your own organization", + "NoAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", + "NoAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", + "NoAssignedEmptyPage.existingOrganization": "Join an existing organization", + "NoAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", + "NoAssignedEmptyPage.or": "OR", + "NoAssignedEmptyPage.reviewPricing": "Review Pricing", + "NoAssignedEmptyPage.title": "Welcome", "NoCasesBlock.noItemsMessage": "No hay reglas de notificación por correo electrónico", "NoCasesBlock.notificationsInfo": "Después de la finalización de la ejecución, el sistema notificará por correo electrónico a las personas seleccionadas", "NoDataAvailable.noDataMessage": "No hay datos disponibles.", diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json index 2cbc735e7e..9649d73e75 100644 --- a/app/localization/translated/ru.json +++ b/app/localization/translated/ru.json @@ -1355,9 +1355,11 @@ "MembersListTable.lastLogin": "Последний вход в систему", "MembersListTable.managerRole": "Менеджер", "MembersListTable.name": "Имя", + "MembersListTable.organizations": "Организации", "MembersListTable.permissions": "Разрешения", "MembersListTable.projects": "Projects", "MembersListTable.role": "Role", + "MembersListTable.type": "Тип", "MembersListTable.viewerRole": "Только для просмотра", "MembersListTable.youRole": "Вы", "MembersPageToolbar.membersSearchHint": "Имя пользователя не должно быть пустым", @@ -1446,15 +1448,15 @@ "NestedGridRow.loadLabel": "Загрузить следующие 300", "NestedGridRow.loadPreviousLabel": "Загрузить предыдущие 300", "NewsBlock.twitterTitle": "Ознакомьтесь с нашими последними твитами", - "noAssignedEmptyPage.description": "Для начала вам необходимо зарегистрироваться в организации. Свяжитесь с членами существующей организации, к которой вы хотите присоединиться, и получите приглашения. Для получения дополнительной информации о настройке организации обратитесь к своему администратору.", - "noAssignedEmptyPage.descriptionSaaS": "Чтобы начать, вам нужно вступить в какую-либо организацию. Вот как:", - "noAssignedEmptyPage.contactUs": "Свяжитесь с нами, чтобы создать свою собственную организацию.", - "noAssignedEmptyPage.createOwnOrganization": "Создайте свою собственную организацию", - "noAssignedEmptyPage.existingOrganization": "Присоединиться к существующей организации", - "noAssignedEmptyPage.invitations": "Свяжитесь с членами существующей организации, к которой вы хотите присоединиться, и получите приглашения от них.", - "noAssignedEmptyPage.or": "ИЛИ", - "noAssignedEmptyPage.reviewPricing": "Ознакомьтесь с ценами", - "noAssignedEmptyPage.title": "Добро пожаловать", + "NoAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", + "NoAssignedEmptyPage.createOwnOrganization": "Create your own organization", + "NoAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", + "NoAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", + "NoAssignedEmptyPage.existingOrganization": "Join an existing organization", + "NoAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", + "NoAssignedEmptyPage.or": "OR", + "NoAssignedEmptyPage.reviewPricing": "Review Pricing", + "NoAssignedEmptyPage.title": "Welcome", "NoCasesBlock.noItemsMessage": "Нет правил уведомления по электронной почте", "NoCasesBlock.notificationsInfo": "После завершения запуска система уведомит выбранных людей по электронной почте", "NoDataAvailable.noDataMessage": "Нет доступных данных.", diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json index 971bfea1b7..10dda13604 100644 --- a/app/localization/translated/uk.json +++ b/app/localization/translated/uk.json @@ -1355,9 +1355,11 @@ "MembersListTable.lastLogin": "Останній вхід в систему", "MembersListTable.managerRole": "Менеджер", "MembersListTable.name": "Ім'я", + "MembersListTable.organizations": "Організації", "MembersListTable.permissions": "Дозвіл", "MembersListTable.projects": "Projects", "MembersListTable.role": "Role", + "MembersListTable.type": "Тип", "MembersListTable.viewerRole": "Тільки для перегляду", "MembersListTable.youRole": "Ви", "MembersPageToolbar.membersSearchHint": "Ім’я користувача не повинно бути порожнім", @@ -1446,15 +1448,15 @@ "NestedGridRow.loadLabel": "Завантажити наступні 300", "NestedGridRow.loadPreviousLabel": "Завантажити попередні 300", "NewsBlock.twitterTitle": "Ознайомтеся з нашими останніми твітами", - "noAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", - "noAssignedEmptyPage.descriptionSaaS": "Щоб почати, вам потрібно вступити в якусь організацію. Ось як:", - "noAssignedEmptyPage.contactUs": "Зв'яжіться з нами, щоб створити власну організацію.", - "noAssignedEmptyPage.createOwnOrganization": "Створіть власну організацію", - "noAssignedEmptyPage.existingOrganization": "Приєднатися до існуючої організації", - "noAssignedEmptyPage.invitations": "Зв'яжіться з членами існуючої організації, до якої Ви хочете приєднатися, і отримайте запрошення від них.", - "noAssignedEmptyPage.or": "АБО", - "noAssignedEmptyPage.reviewPricing": "Ознайомтеся з цінами", - "noAssignedEmptyPage.title": "Вітати", + "NoAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", + "NoAssignedEmptyPage.createOwnOrganization": "Create your own organization", + "NoAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", + "NoAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", + "NoAssignedEmptyPage.existingOrganization": "Join an existing organization", + "NoAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", + "NoAssignedEmptyPage.or": "OR", + "NoAssignedEmptyPage.reviewPricing": "Review Pricing", + "NoAssignedEmptyPage.title": "Welcome", "NoCasesBlock.noItemsMessage": "Правил повідомлення по електронній пошті Немає", "NoCasesBlock.notificationsInfo": "Після завершення запуску система сповістить обраних людей електронною поштою", "NoDataAvailable.noDataMessage": "Доступних даних Немає.", diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json index d59e37bdd4..54b6ada7ef 100644 --- a/app/localization/translated/zh.json +++ b/app/localization/translated/zh.json @@ -1355,9 +1355,11 @@ "MembersListTable.lastLogin": "Last Login", "MembersListTable.managerRole": "Manager", "MembersListTable.name": "Name", + "MembersListTable.organizations": "Organizations", "MembersListTable.permissions": "Permissions", "MembersListTable.projects": "Projects", "MembersListTable.role": "Role", + "MembersListTable.type": "Type", "MembersListTable.viewerRole": "View only", "MembersListTable.youRole": "You", "MembersPageToolbar.membersSearchHint": "成员名不能为空", @@ -1446,15 +1448,15 @@ "NestedGridRow.loadLabel": "再加载10个", "NestedGridRow.loadPreviousLabel": "加载前300", "NewsBlock.twitterTitle": "了解我们最新的推文", - "noAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", - "noAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", - "noAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", - "noAssignedEmptyPage.createOwnOrganization": "Create your own organization", - "noAssignedEmptyPage.existingOrganization": "Join an existing organization", - "noAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", - "noAssignedEmptyPage.or": "OR", - "noAssignedEmptyPage.reviewPricing": "Review Pricing", - "noAssignedEmptyPage.title": "Welcome", + "NoAssignedEmptyPage.contactUs": "Contact us to set up your own organization.", + "NoAssignedEmptyPage.createOwnOrganization": "Create your own organization", + "NoAssignedEmptyPage.description": "To get started, you need to join an organization. Contact and receive invitations from members of an existing organization you want to join. For advanced organization configuration reach out to your administrator.", + "NoAssignedEmptyPage.descriptionSaaS": "To get started, you need to join an organization. Here's how:", + "NoAssignedEmptyPage.existingOrganization": "Join an existing organization", + "NoAssignedEmptyPage.invitations": "Contact and receive invitations from members of an existing organization you want to join.", + "NoAssignedEmptyPage.or": "OR", + "NoAssignedEmptyPage.reviewPricing": "Review Pricing", + "NoAssignedEmptyPage.title": "Welcome", "NoCasesBlock.noItemsMessage": "无电子邮件通知规则", "NoCasesBlock.notificationsInfo": "测试任务完成后系统将通过电子邮件通知选定的人", "NoDataAvailable.noDataMessage": "无可用数据。", diff --git a/app/src/pages/common/users/membersListTable/messages.js b/app/src/pages/common/users/membersListTable/messages.js index 2f4014e3fa..8cf857d2f2 100644 --- a/app/src/pages/common/users/membersListTable/messages.js +++ b/app/src/pages/common/users/membersListTable/messages.js @@ -41,6 +41,14 @@ export const messages = defineMessages({ id: 'MembersListTable.projects', defaultMessage: 'Projects', }, + type: { + id: 'MembersListTable.type', + defaultMessage: 'Type', + }, + organizations: { + id: 'MembersListTable.organizations', + defaultMessage: 'Organizations', + }, adminAccessInfo: { id: 'MembersListTable.adminAccessInfo', defaultMessage: diff --git a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx index 295c2a95a3..9bb3dd0339 100644 --- a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx +++ b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx @@ -125,13 +125,13 @@ const AllUsersListTableComponent = ({ }, { key: 'accountType', - header: formatMessage(messages.role), + header: formatMessage(messages.type), width: 114, align: 'left', }, { key: 'organizations', - header: formatMessage(messages.projects), + header: formatMessage(messages.organizations), width: 104, align: 'right', },