From 3b027a2b0819548c8a30da32dabc256c072b3d62 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Tue, 27 Jan 2026 12:04:25 +0000 Subject: [PATCH] Prevent "Remove access" text being cut off in Share model (#30976) GitOrigin-RevId: ed577d83afd150d64c99bd6577d7543d9297f91a --- .../web/frontend/extracted-translations.json | 3 -- .../components/edit-member.tsx | 38 +++++++++---------- .../stylesheets/pages/editor/share.scss | 1 + services/web/locales/da.json | 3 -- services/web/locales/de.json | 3 -- services/web/locales/en.json | 3 -- services/web/locales/fr.json | 3 -- services/web/locales/sv.json | 3 -- services/web/locales/zh-CN.json | 3 -- .../components/share-project-modal.test.tsx | 2 +- 10 files changed, 20 insertions(+), 42 deletions(-) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 9779b7c81f..0d1a8da838 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -246,9 +246,6 @@ "change_email_address": "", "change_how_you_see_the_editor": "", "change_language": "", - "change_or_cancel-cancel": "", - "change_or_cancel-change": "", - "change_or_cancel-or": "", "change_owner": "", "change_password": "", "change_password_in_account_settings": "", diff --git a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx index 06ac5c7b4e..586e7384ad 100644 --- a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx +++ b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx @@ -202,12 +202,6 @@ export default function EditMember({ - {confirmRemoval && ( - setPrivileges(member.privileges)} - /> - )} -
{hasBeenDowngraded && !confirmRemoval && ( @@ -224,6 +218,12 @@ export default function EditMember({ canAddCollaborators={canAddCollaborators} />
+ + {confirmRemoval && ( + setPrivileges(member.privileges)} + /> + )} @@ -325,21 +325,19 @@ function ChangePrivilegesActions({ const { t } = useTranslation() return ( -
- - {t('change_or_cancel-change')} +
+ + {t('cancel')} + + + + {t('confirm')} -
- {t('change_or_cancel-or')} -   - - {t('change_or_cancel-cancel')} - -
) } diff --git a/services/web/frontend/stylesheets/pages/editor/share.scss b/services/web/frontend/stylesheets/pages/editor/share.scss index a7ce16f739..abd0fb7359 100644 --- a/services/web/frontend/stylesheets/pages/editor/share.scss +++ b/services/web/frontend/stylesheets/pages/editor/share.scss @@ -185,6 +185,7 @@ align-items: center; justify-content: flex-end; padding: 0; + flex-wrap: wrap; } .project-member-select { diff --git a/services/web/locales/da.json b/services/web/locales/da.json index 3d3b17f346..29ae69dcff 100644 --- a/services/web/locales/da.json +++ b/services/web/locales/da.json @@ -229,9 +229,6 @@ "change": "Ændr", "change_currency": "Ændr valuta", "change_language": "Skift sprog", - "change_or_cancel-cancel": "anuller", - "change_or_cancel-change": "Ændr", - "change_or_cancel-or": "eller", "change_owner": "Skift ejer", "change_password": "Skift Kodeord", "change_password_in_account_settings": "Skift kodeord i kontoindstillingerne", diff --git a/services/web/locales/de.json b/services/web/locales/de.json index b56e079dd7..2e62f3836c 100644 --- a/services/web/locales/de.json +++ b/services/web/locales/de.json @@ -168,9 +168,6 @@ "category_relations": "Beziehungen", "change": "Änderung", "change_currency": "Währung wechseln", - "change_or_cancel-cancel": "Abbrechen", - "change_or_cancel-change": "Ändern", - "change_or_cancel-or": "oder", "change_owner": "Besitzer ändern", "change_password": "Passwort ändern", "change_plan": "Abonnement ändern", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 331cf93f11..84080839e0 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -312,9 +312,6 @@ "change_email_address": "Change email address", "change_how_you_see_the_editor": "Change how you see the editor using the updated Appearance settings.", "change_language": "Change language", - "change_or_cancel-cancel": "cancel", - "change_or_cancel-change": "Change", - "change_or_cancel-or": "or", "change_owner": "Change owner", "change_password": "Change password", "change_password_in_account_settings": "Change password in Account settings", diff --git a/services/web/locales/fr.json b/services/web/locales/fr.json index 1a92fae15e..933d04e2f1 100644 --- a/services/web/locales/fr.json +++ b/services/web/locales/fr.json @@ -191,9 +191,6 @@ "category_relations": "Relations", "change": "Modifier", "change_currency": "Changer de devise", - "change_or_cancel-cancel": "annuler", - "change_or_cancel-change": "Changer", - "change_or_cancel-or": "ou", "change_owner": "Changer de propriétaire", "change_password": "Changer de mot de passe", "change_password_in_account_settings": "Changer le mot de passe dans les Paramètres du Compte", diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index 0ff559705b..49e959f888 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -111,9 +111,6 @@ "category_operators": "Operatorer", "category_relations": "Relationer", "change": "Ändra", - "change_or_cancel-cancel": "avbryt", - "change_or_cancel-change": "Ändra", - "change_or_cancel-or": "eller", "change_owner": "Ändra ägare", "change_password": "Byt lösenord", "change_plan": "Byta betalningsplan", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index db8292af26..8094998b4a 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -279,9 +279,6 @@ "change": "修改", "change_currency": "更改货币", "change_language": "更改语言", - "change_or_cancel-cancel": "取消", - "change_or_cancel-change": "修改", - "change_or_cancel-or": "或者", "change_owner": "更改所有者", "change_password": "更换密码", "change_password_in_account_settings": "在帐户设置中更改密码", diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.tsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.tsx index e9d5da2abf..54163b42fc 100644 --- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.tsx +++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.tsx @@ -529,7 +529,7 @@ describe('', function () { next: 'Remove access', }) const removeButton = screen.getByRole('button', { - name: 'Change', + name: 'Confirm', }) fireEvent.click(removeButton)