From 6a8a457cce0b75f774a688f210519f3b0d10ba7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Woimb=C3=A9e?= Date: Fri, 26 Jan 2024 18:10:43 +0100 Subject: [PATCH 1/3] fallback on name is displayName is emtpy --- src/components/elements/organizations/item.tsx | 5 ++++- src/pages/invitation/new.tsx | 2 +- src/pages/organizations/detail.tsx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/elements/organizations/item.tsx b/src/components/elements/organizations/item.tsx index 51d0064..940e3f4 100644 --- a/src/components/elements/organizations/item.tsx +++ b/src/components/elements/organizations/item.tsx @@ -78,7 +78,10 @@ const InnerItem = ({ const OrganizationItem: FC = ({ children, org, viewType }) => { const { t } = useTranslation(); - const { displayName: title, name: subTitle } = org; + let { displayName: title, name: subTitle } = org; + if (!title) { + title = subTitle; + } const link = `/organizations/${org.id}/details`; const { hasViewOrganizationRole: hasViewOrganizationRoleCheck } = useUser(); const hasViewOrganizationRole = hasViewOrganizationRoleCheck(org.id); diff --git a/src/pages/invitation/new.tsx b/src/pages/invitation/new.tsx index 8187638..8c604b1 100644 --- a/src/pages/invitation/new.tsx +++ b/src/pages/invitation/new.tsx @@ -98,7 +98,7 @@ const NewInvitation = () => { return (
Date: Tue, 13 Feb 2024 21:49:13 -0700 Subject: [PATCH 2/3] abstract to function, use translation, update calls --- src/components/utils/org-display-name.tsx | 11 +++++++++++ src/pages/invitation/new.tsx | 9 +++++---- src/pages/organizations/detail.tsx | 5 ++++- src/pages/organizations/settings/index.tsx | 7 ++++--- 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/components/utils/org-display-name.tsx diff --git a/src/components/utils/org-display-name.tsx b/src/components/utils/org-display-name.tsx new file mode 100644 index 0000000..254e8ea --- /dev/null +++ b/src/components/utils/org-display-name.tsx @@ -0,0 +1,11 @@ +import { useTranslation } from "react-i18next"; +import { OrganizationRepresentation } from "store/apis/orgs"; + +function useOrgDisplayName(org?: OrganizationRepresentation) { + const { t } = useTranslation(); + const orgName = org?.displayName || org?.name || t("organization"); + + return { orgName }; +} + +export default useOrgDisplayName; diff --git a/src/pages/invitation/new.tsx b/src/pages/invitation/new.tsx index 8c604b1..c364632 100644 --- a/src/pages/invitation/new.tsx +++ b/src/pages/invitation/new.tsx @@ -17,6 +17,7 @@ import useUser from "components/utils/useUser"; import Alert from "components/elements/alerts/alert"; import { useTranslation } from "react-i18next"; import { DecoratedRole, RolesList } from "pages/member/components"; +import useOrgDisplayName from "components/utils/org-display-name"; const { realm } = config.env; @@ -44,6 +45,8 @@ const NewInvitation = () => { realm: config.env.realm, }); + const { orgName } = useOrgDisplayName(org); + const { register, handleSubmit, @@ -83,9 +86,7 @@ const NewInvitation = () => { return P2Toast({ error: true, title: - e.status === 401 - ? t("insufficient-permissions") - : e.data.error, + e.status === 401 ? t("insufficient-permissions") : e.data.error, }); }); } @@ -98,7 +99,7 @@ const NewInvitation = () => { return (
Date: Tue, 13 Feb 2024 21:49:22 -0700 Subject: [PATCH 3/3] update some translation keys --- public/locales/en/translation.json | 2 +- public/locales/fr/translation.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 654a794..c434fd5 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -109,7 +109,7 @@ "internalApp": "Internal", "inUse": "In use", "insufficient-permissions": "Insufficient permissions to perform action.", - "invitation-email-placeholder": "for example, Thomas, thomas@domain.com", + "invitation-email-placeholder": "thomas@domain.com", "invitation-instructions-description": "Add a new member to the organization by entering their email and assigning them a role within the organization. An email will be sent to them with instructions on how to join.", "invitation-missing-permission-title": "You lack the 'manage-invitations' role.", "invitation-missing-permission-body": "Speak to an admin in order to be granted this role.", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index c6779c3..0168d26 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -108,7 +108,7 @@ "internalApp": "Interne", "inUse": "En cours d'utilisation", "insufficient-permissions": "Permissions insuffisante pour réaliser cette action.", - "invitation-email-placeholder": "par exemple, Thomas, thomas@domaine.com", + "invitation-email-placeholder": "thomas@domaine.com", "invitation-instructions-description": "Ajoutez un nouveau membre à l'organisation en entrant son email et en lui attribuant un rôle au sein de l'organisation. Un email leur sera envoyé avec des instructions pour rejoindre.", "invitation-missing-permission-title": "Vous ne pouvez pas gérer les invitations.", "invitation-missing-permission-body": "Contactez un administrateur pour obtenir les droits nécessaires.",