From b4e053c4e237e42a7d7695613007a48d0d88a587 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Tue, 22 Oct 2024 13:20:34 +0530 Subject: [PATCH 1/5] supported total distinct user count in Team page --- .../Team/TeamDetails/TeamDetailsV1.utils.tsx | 2 +- .../TeamsHeaderSection/TeamsInfo.component.tsx | 13 +++++++++++++ .../resources/ui/src/locale/languages/de-de.json | 1 + .../resources/ui/src/locale/languages/en-us.json | 1 + .../resources/ui/src/locale/languages/es-es.json | 1 + .../resources/ui/src/locale/languages/fr-fr.json | 1 + .../resources/ui/src/locale/languages/he-he.json | 1 + .../resources/ui/src/locale/languages/ja-jp.json | 1 + .../resources/ui/src/locale/languages/nl-nl.json | 1 + .../resources/ui/src/locale/languages/pr-pr.json | 1 + .../resources/ui/src/locale/languages/pt-br.json | 1 + .../resources/ui/src/locale/languages/ru-ru.json | 1 + .../resources/ui/src/locale/languages/zh-cn.json | 1 + .../resources/ui/src/pages/TeamsPage/TeamsPage.tsx | 2 ++ 14 files changed, 27 insertions(+), 1 deletion(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx index cfb8ccf31edb..ec36b07ce422 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx @@ -60,5 +60,5 @@ export const getTabs = ( return [tabs.users, tabs.assets, ...commonTabs]; } - return [tabs.teams, tabs.users, ...commonTabs]; + return [tabs.teams, ...commonTabs]; }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx index 3b770c933c78..aefe933a83fc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx @@ -314,6 +314,19 @@ const TeamsInfo = ({ updateTeamSubscription={updateTeamSubscription} /> {teamTypeElement} + + + + + + + {`${t('label.user-count')} :`} + + + + {currentTeam.userCount} + + ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 7ede75ac2c73..25a047e75142 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -1287,6 +1287,7 @@ "user": "Benutzer", "user-account": "Benutzerkonto", "user-analytics-report": "Benutzeranalysenbericht", + "user-count": "User Count", "user-lowercase": "benutzer", "user-permission-plural": "Benutzerberechtigungen", "user-plural": "Benutzer", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 7cf7279dd766..3ee73160dbb7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -1287,6 +1287,7 @@ "user": "User", "user-account": "User account", "user-analytics-report": "User Analytics Report", + "user-count": "User Count", "user-lowercase": "user", "user-permission-plural": "User Permissions", "user-plural": "Users", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index a7b6c3eb2ea1..dbf21af5b848 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -1287,6 +1287,7 @@ "user": "Usuario", "user-account": "Cuenta de usuario", "user-analytics-report": "Informe de análisis de usuario", + "user-count": "User Count", "user-lowercase": "usuario", "user-permission-plural": "Permisos de usuario", "user-plural": "Usuarios", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index f7c323534b53..2875af3a8886 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -1287,6 +1287,7 @@ "user": "Utilisateur", "user-account": "Compte d'Utilisateur", "user-analytics-report": "Rapport Analytique des Utilisateurs", + "user-count": "User Count", "user-lowercase": "utilisateur", "user-permission-plural": "Permissions Utilisateur", "user-plural": "Utilisateurs", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 7e6b4580c659..94d75b447bdb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -1287,6 +1287,7 @@ "user": "משתמש", "user-account": "חשבון משתמש", "user-analytics-report": "דוח ניתוח משתמש", + "user-count": "User Count", "user-lowercase": "משתמש", "user-permission-plural": "הרשאות משתמש", "user-plural": "משתמשים", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index b810ae443db0..96da639598e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -1287,6 +1287,7 @@ "user": "ユーザ", "user-account": "ユーザーアカウント", "user-analytics-report": "ユーザ分析レポート", + "user-count": "User Count", "user-lowercase": "ユーザ", "user-permission-plural": "ユーザの権限", "user-plural": "ユーザ", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index 9a8df974dc79..e103e06110d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -1287,6 +1287,7 @@ "user": "Gebruiker", "user-account": "Gebruikersaccount", "user-analytics-report": "Gebruikersanalyserapport", + "user-count": "User Count", "user-lowercase": "gebruiker", "user-permission-plural": "Gebruikersmachtigingen", "user-plural": "Gebruikers", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json index 219d7edd97d7..45c76919f605 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json @@ -1287,6 +1287,7 @@ "user": "کاربر", "user-account": "حساب کاربری", "user-analytics-report": "گزارش تحلیل کاربران", + "user-count": "User Count", "user-lowercase": "کاربر", "user-permission-plural": "مجوزهای کاربر", "user-plural": "کاربران", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index d10839ef589b..3752161458ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -1287,6 +1287,7 @@ "user": "Usuário", "user-account": "Conta de Usuário", "user-analytics-report": "Relatório de Análise de Usuário", + "user-count": "User Count", "user-lowercase": "usuário", "user-permission-plural": "Permissões de Usuário", "user-plural": "Usuários", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index c057687dc212..e91b880f5df1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -1287,6 +1287,7 @@ "user": "Пользователь", "user-account": "Аккаунт пользователя", "user-analytics-report": "Пользовательский аналитический отчет", + "user-count": "User Count", "user-lowercase": "пользователь", "user-permission-plural": "Разрешения пользователя", "user-plural": "Пользователи", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index b3d2e527c351..585c7d20b2b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -1287,6 +1287,7 @@ "user": "用户", "user-account": "用户帐号", "user-analytics-report": "用户分析报告", + "user-count": "User Count", "user-lowercase": "用户", "user-permission-plural": "用户权限", "user-plural": "用户", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx index 5ac5f79e0ce6..810db6799832 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx @@ -218,6 +218,7 @@ const TeamsPage = () => { const data = await getTeamByName(name, { fields: [ TabSpecificField.USERS, + TabSpecificField.USER_COUNT, TabSpecificField.PARENTS, TabSpecificField.PROFILE, TabSpecificField.OWNERS, @@ -242,6 +243,7 @@ const TeamsPage = () => { const data = await getTeamByName(name, { fields: [ TabSpecificField.USERS, + TabSpecificField.USER_COUNT, TabSpecificField.DEFAULT_ROLES, TabSpecificField.POLICIES, TabSpecificField.CHILDREN_COUNT, From c4fdaffa7d7a5fff8f01848c5b01adc973ca2abf Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Tue, 22 Oct 2024 13:28:43 +0530 Subject: [PATCH 2/5] minor improvement --- .../Settings/Team/TeamDetails/TeamDetailsV1.tsx | 8 +------- .../Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx index de4450acd767..44ec2338af5d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx @@ -1045,13 +1045,7 @@ const TeamDetailsV1 = ({ const tabs = useMemo( () => - getTabs( - currentTeam, - isGroupType, - isOrganization, - teamCount, - assetsCount - ).map((tab) => ({ + getTabs(currentTeam, isGroupType, teamCount, assetsCount).map((tab) => ({ ...tab, label: ( { @@ -52,10 +51,6 @@ export const getTabs = ( const commonTabs = [tabs.roles, tabs.policies]; - if (isOrganization) { - return [tabs.teams, ...commonTabs]; - } - if (isGroupType) { return [tabs.users, tabs.assets, ...commonTabs]; } From 4d5d81d896c8171e55b17f3086521574ea2daf39 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Tue, 22 Oct 2024 14:33:24 +0530 Subject: [PATCH 3/5] fix unit test --- .../Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx | 2 ++ .../resources/ui/src/pages/TeamsPage/TeamsPage.test.tsx | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx index cfe41383333d..93bfc192e34e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx @@ -93,8 +93,10 @@ describe('TeamsInfo', () => { render(); }); const domainLabel = screen.getByText('DomainLabel'); + const userCount = screen.getByTestId('team-user-count'); expect(domainLabel).toBeInTheDocument(); + expect(userCount).toContainHTML('1'); }); it('should handle edit team email', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.test.tsx index 8bf748ceefff..3be4d2ebe3b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.test.tsx @@ -154,13 +154,17 @@ describe('Test Teams Page', () => { expect(mockGetTeamByName.mock.calls[0]).toEqual([ 'test', - { fields: ['users', 'parents', 'profile', 'owners'], include: 'all' }, + { + fields: ['users', 'userCount', 'parents', 'profile', 'owners'], + include: 'all', + }, ]); expect(mockGetTeamByName.mock.calls[1]).toEqual([ 'test', { fields: [ 'users', + 'userCount', 'defaultRoles', 'policies', 'childrenCount', From 3da689f9d4a5461c4984e3f620df452e46c8b09b Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Tue, 22 Oct 2024 16:25:09 +0530 Subject: [PATCH 4/5] added helpertext tooltip and change the label --- .../TeamsInfo.component.tsx | 19 +++++++++++++++++-- .../ui/src/locale/languages/de-de.json | 3 ++- .../ui/src/locale/languages/en-us.json | 3 ++- .../ui/src/locale/languages/es-es.json | 3 ++- .../ui/src/locale/languages/fr-fr.json | 3 ++- .../ui/src/locale/languages/he-he.json | 3 ++- .../ui/src/locale/languages/ja-jp.json | 3 ++- .../ui/src/locale/languages/nl-nl.json | 3 ++- .../ui/src/locale/languages/pr-pr.json | 3 ++- .../ui/src/locale/languages/pt-br.json | 3 ++- .../ui/src/locale/languages/ru-ru.json | 3 ++- .../ui/src/locale/languages/zh-cn.json | 3 ++- 12 files changed, 39 insertions(+), 13 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx index aefe933a83fc..7222e7b3c948 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx @@ -10,7 +10,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; +import { + CheckOutlined, + CloseOutlined, + InfoCircleOutlined, +} from '@ant-design/icons'; import { Button, Divider, Form, Input, Space, Tooltip, Typography } from 'antd'; import { isEmpty, last } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; @@ -18,6 +22,7 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, + GRAYED_OUT_COLOR, ICON_DIMENSION, NO_DATA_PLACEHOLDER, } from '../../../../../constants/constants'; @@ -320,12 +325,22 @@ const TeamsInfo = ({ - {`${t('label.user-count')} :`} + {`${t('label.total-user')} :`} {currentTeam.userCount} + + + + ); diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 25a047e75142..72cdd6140c21 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Gesamte {{entity}}", "total-index-sent": "Gesamtindex gesendet", + "total-user": "Total User", "tour": "Tour", "tracking": "Verfolgung", "transportation-strategy": "Transportstrategie", @@ -1287,7 +1288,6 @@ "user": "Benutzer", "user-account": "Benutzerkonto", "user-analytics-report": "Benutzeranalysenbericht", - "user-count": "User Count", "user-lowercase": "benutzer", "user-permission-plural": "Benutzerberechtigungen", "user-plural": "Benutzer", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Das Löschen von systemgenerierten Tags ist nicht zulässig. Sie können versuchen, den Tag stattdessen zu deaktivieren.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Machen Sie eine Produkttour, um loszulegen!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "Team erfolgreich verschoben!", "team-no-asset": "Ihr Team hat keine Vermögenswerte.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 3ee73160dbb7..571451385e5c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Total {{entity}}", "total-index-sent": " Total index sent", + "total-user": "Total User", "tour": "Tour", "tracking": "Tracking", "transportation-strategy": "Transportation Strategy", @@ -1287,7 +1288,6 @@ "user": "User", "user-account": "User account", "user-analytics-report": "User Analytics Report", - "user-count": "User Count", "user-lowercase": "user", "user-permission-plural": "User Permissions", "user-plural": "Users", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Deleting a system generated tags is not allowed. You can try disabling the tag instead.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Take a product tour to get started!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "Team moved successfully!", "team-no-asset": "Your team does not have any assets.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index dbf21af5b848..22ccb7e491e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Total de {{entity}}", "total-index-sent": "Total de índices enviados", + "total-user": "Total User", "tour": "Recorrido", "tracking": "Seguimiento", "transportation-strategy": "Estrategia de transporte", @@ -1287,7 +1288,6 @@ "user": "Usuario", "user-account": "Cuenta de usuario", "user-analytics-report": "Informe de análisis de usuario", - "user-count": "User Count", "user-lowercase": "usuario", "user-permission-plural": "Permisos de usuario", "user-plural": "Usuarios", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "No se permite eliminar una etiqueta generada por el sistema. Puedes intentar desactivar la etiqueta en su lugar.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "¡Realiza un recorrido rápido del producto para comenzar!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "¡Equipo movido con éxito!", "team-no-asset": "Tu equipo no tiene ningún activo.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index 2875af3a8886..c835f29333fa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Total {{entity}}", "total-index-sent": "Total d'Index Envoyés", + "total-user": "Total User", "tour": "Visite", "tracking": "Suivi", "transportation-strategy": "Stratégie de Transport", @@ -1287,7 +1288,6 @@ "user": "Utilisateur", "user-account": "Compte d'Utilisateur", "user-analytics-report": "Rapport Analytique des Utilisateurs", - "user-count": "User Count", "user-lowercase": "utilisateur", "user-permission-plural": "Permissions Utilisateur", "user-plural": "Utilisateurs", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Supprimer un tag système n'est pas permis. Tentez plutôt de désactiver ce tag.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Faites une visite guidée pour vous lancer!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "L'équipe a été déplacée avec succès !", "team-no-asset": "Votre équipe n'a pas d'actifs de données", "test-case-schedule-description": "Les tests de quelité de données peuvent être planifiés pour tourner à la fréquence désirée. La timezone est en UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 94d75b447bdb..08298a97af0b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "סך הכל {{entity}}", "total-index-sent": "סך הכל שלח אינדקס", + "total-user": "Total User", "tour": "סיור", "tracking": "מעקב", "transportation-strategy": "אסטרטגיית הובלה", @@ -1287,7 +1288,6 @@ "user": "משתמש", "user-account": "חשבון משתמש", "user-analytics-report": "דוח ניתוח משתמש", - "user-count": "User Count", "user-lowercase": "משתמש", "user-permission-plural": "הרשאות משתמש", "user-plural": "משתמשים", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "מחיקת תגיות שנוצרו באופן מערכתי אינה מותרת. ניתן לנסות לנטרל את התג במקום.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "התחל סיור במוצר כדי להתחיל!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "הקבוצה הועברה בהצלחה!", "team-no-asset": "לקבוצתך אין נכסים.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index 96da639598e3..ecaa834c67b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "合計 {{entity}}", "total-index-sent": " Total index sent", + "total-user": "Total User", "tour": "ツアー", "tracking": "トラッキング", "transportation-strategy": "Transportation Strategy", @@ -1287,7 +1288,6 @@ "user": "ユーザ", "user-account": "ユーザーアカウント", "user-analytics-report": "ユーザ分析レポート", - "user-count": "User Count", "user-lowercase": "ユーザ", "user-permission-plural": "ユーザの権限", "user-plural": "ユーザ", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Deleting a system generated tags is not allowed. You can try disabling the tag instead.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Take a product tour to get started!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "チームの移動が成功しました！", "team-no-asset": "あなたのチームはアセットを持っていません。", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index e103e06110d8..7ed4cea8db3c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "{{entity}} totaal", "total-index-sent": "Index verzonden totaal", + "total-user": "Total User", "tour": "Rondleiding", "tracking": "Tracking", "transportation-strategy": "Transportstrategie", @@ -1287,7 +1288,6 @@ "user": "Gebruiker", "user-account": "Gebruikersaccount", "user-analytics-report": "Gebruikersanalyserapport", - "user-count": "User Count", "user-lowercase": "gebruiker", "user-permission-plural": "Gebruikersmachtigingen", "user-plural": "Gebruikers", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Het verwijderen van door het systeem gegenereerde tags is niet toegestaan. Je kunt proberen de tag uit te schakelen.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Maak een producttour om aan de slag te gaan!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "Team succesvol verplaatst!", "team-no-asset": "Je team heeft geen assets.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json index 45c76919f605..6210da6ae052 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json @@ -1238,6 +1238,7 @@ "total": "مجموع", "total-entity": "مجموع {{entity}}", "total-index-sent": "مجموع ایندکس ارسال‌شده", + "total-user": "Total User", "tour": "تور", "tracking": "ردیابی", "transportation-strategy": "استراتژی حمل و نقل", @@ -1287,7 +1288,6 @@ "user": "کاربر", "user-account": "حساب کاربری", "user-analytics-report": "گزارش تحلیل کاربران", - "user-count": "User Count", "user-lowercase": "کاربر", "user-permission-plural": "مجوزهای کاربر", "user-plural": "کاربران", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "حذف برچسب‌های تولید شده توسط سیستم مجاز نیست. می‌توانید برچسب را غیرفعال کنید.", "tag-update-confirmation": "آیا می‌خواهید به‌روزرسانی برچسب‌ها را ادامه دهید؟", "take-quick-product-tour": "یک تور محصولی برای شروع بگذارید!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "تیم با موفقیت منتقل شد!", "team-no-asset": "تیم شما هیچ دارایی ندارد.", "test-case-schedule-description": "آزمون‌های کیفیت داده می‌توانند به صورت دوره‌ای برنامه‌ریزی شوند. منطقه زمانی به صورت UTC است.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index 3752161458ce..9929e3a02ace 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Total de {{entity}}", "total-index-sent": " Total de índice enviado", + "total-user": "Total User", "tour": "Tour", "tracking": "Rastreamento", "transportation-strategy": "Estratégia de Transporte", @@ -1287,7 +1288,6 @@ "user": "Usuário", "user-account": "Conta de Usuário", "user-analytics-report": "Relatório de Análise de Usuário", - "user-count": "User Count", "user-lowercase": "usuário", "user-permission-plural": "Permissões de Usuário", "user-plural": "Usuários", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Não é permitido excluir tags geradas pelo sistema. Você pode tentar desativar a tag em vez disso.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Faça um tour pelo produto para começar!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "Equipe movida com sucesso!", "team-no-asset": "Sua equipe não possui ativos.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index e91b880f5df1..7db28859b3c7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "Все {{entity}}", "total-index-sent": "Все индексы отправлены", + "total-user": "Total User", "tour": "Руководство пользователя", "tracking": "Отслеживание", "transportation-strategy": "Стратегия транспортировки", @@ -1287,7 +1288,6 @@ "user": "Пользователь", "user-account": "Аккаунт пользователя", "user-analytics-report": "Пользовательский аналитический отчет", - "user-count": "User Count", "user-lowercase": "пользователь", "user-permission-plural": "Разрешения пользователя", "user-plural": "Пользователи", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "Удаление сгенерированных системой тегов не допускается. Вместо этого вы можете попробовать отключить тег.", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "Ознакомьтесь с продуктом, чтобы начать работу!", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "Команда успешно переехала!", "team-no-asset": "У вашей команды нет объектов.", "test-case-schedule-description": "The data quality tests can be scheduled to run at the desired frequency. The timezone is in UTC.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index 585c7d20b2b8..b0e9037b72fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -1238,6 +1238,7 @@ "total": "Total", "total-entity": "所有{{entity}}", "total-index-sent": "已发送的索引", + "total-user": "Total User", "tour": "导览", "tracking": "跟踪", "transportation-strategy": "传输协议", @@ -1287,7 +1288,6 @@ "user": "用户", "user-account": "用户帐号", "user-analytics-report": "用户分析报告", - "user-count": "User Count", "user-lowercase": "用户", "user-permission-plural": "用户权限", "user-plural": "用户", @@ -1822,6 +1822,7 @@ "system-tag-delete-disable-message": "无法删除系统默认的标签, 您可以尝试禁用标签", "tag-update-confirmation": "Would you like to proceed with updating the tags?", "take-quick-product-tour": "快速查看产品导览", + "team-distinct-user-description": "The total number of distinct users belongs to this team.", "team-moved-success": "团队移动成功", "team-no-asset": "您的团队没有任何资产", "test-case-schedule-description": "数据质控测试可按所需频率安排运行, 时区为 UTC", From 3d2d8d6110536b70271299f9cb655d861bb416a0 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Tue, 22 Oct 2024 16:58:57 +0530 Subject: [PATCH 5/5] minor cosmetic update --- .../TeamsInfo.component.tsx | 24 +++++++++---------- .../ui/src/locale/languages/de-de.json | 2 +- .../ui/src/locale/languages/en-us.json | 2 +- .../ui/src/locale/languages/es-es.json | 2 +- .../ui/src/locale/languages/fr-fr.json | 2 +- .../ui/src/locale/languages/he-he.json | 2 +- .../ui/src/locale/languages/ja-jp.json | 2 +- .../ui/src/locale/languages/nl-nl.json | 2 +- .../ui/src/locale/languages/pr-pr.json | 2 +- .../ui/src/locale/languages/pt-br.json | 2 +- .../ui/src/locale/languages/ru-ru.json | 2 +- .../ui/src/locale/languages/zh-cn.json | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx index 7222e7b3c948..86f6c7e199fa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx @@ -324,23 +324,23 @@ const TeamsInfo = ({ - - {`${t('label.total-user')} :`} + + {t('label.total-user-plural')} + + + + {' : '} {currentTeam.userCount} - - - - ); diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 72cdd6140c21..093cf689ee6f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Gesamte {{entity}}", "total-index-sent": "Gesamtindex gesendet", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Tour", "tracking": "Verfolgung", "transportation-strategy": "Transportstrategie", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 571451385e5c..21385e8474bd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Total {{entity}}", "total-index-sent": " Total index sent", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Tour", "tracking": "Tracking", "transportation-strategy": "Transportation Strategy", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index 22ccb7e491e3..01cd9c0a69e9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Total de {{entity}}", "total-index-sent": "Total de índices enviados", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Recorrido", "tracking": "Seguimiento", "transportation-strategy": "Estrategia de transporte", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index c835f29333fa..d05554dda413 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Total {{entity}}", "total-index-sent": "Total d'Index Envoyés", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Visite", "tracking": "Suivi", "transportation-strategy": "Stratégie de Transport", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 08298a97af0b..3aee20bbada1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "סך הכל {{entity}}", "total-index-sent": "סך הכל שלח אינדקס", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "סיור", "tracking": "מעקב", "transportation-strategy": "אסטרטגיית הובלה", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index ecaa834c67b0..161da826fb29 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "合計 {{entity}}", "total-index-sent": " Total index sent", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "ツアー", "tracking": "トラッキング", "transportation-strategy": "Transportation Strategy", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index 7ed4cea8db3c..b2771ca336a2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "{{entity}} totaal", "total-index-sent": "Index verzonden totaal", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Rondleiding", "tracking": "Tracking", "transportation-strategy": "Transportstrategie", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json index 6210da6ae052..5be70353807e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json @@ -1238,7 +1238,7 @@ "total": "مجموع", "total-entity": "مجموع {{entity}}", "total-index-sent": "مجموع ایندکس ارسال‌شده", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "تور", "tracking": "ردیابی", "transportation-strategy": "استراتژی حمل و نقل", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index 9929e3a02ace..1064f642ea9e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Total de {{entity}}", "total-index-sent": " Total de índice enviado", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Tour", "tracking": "Rastreamento", "transportation-strategy": "Estratégia de Transporte", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index 7db28859b3c7..16bae15c91d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "Все {{entity}}", "total-index-sent": "Все индексы отправлены", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "Руководство пользователя", "tracking": "Отслеживание", "transportation-strategy": "Стратегия транспортировки", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index b0e9037b72fd..48c81a510e9f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -1238,7 +1238,7 @@ "total": "Total", "total-entity": "所有{{entity}}", "total-index-sent": "已发送的索引", - "total-user": "Total User", + "total-user-plural": "Total Users", "tour": "导览", "tracking": "跟踪", "transportation-strategy": "传输协议",