From 3b61c6f9b920ce2b02924be725205ed4b754af58 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 21 Dec 2022 19:16:00 +0100 Subject: [PATCH] web/admin: improve UI for removing users from groups and groups from users no longer deletes users/groups when they are removed from the opposite closes #4251 closes #3964 Signed-off-by: Jens Langhammer --- locale/en/LC_MESSAGES/django.po | 6 +-- web/src/admin/groups/GroupViewPage.ts | 2 +- web/src/admin/groups/RelatedGroupList.ts | 27 +++++++------ web/src/admin/users/RelatedUserList.ts | 50 ++++++++---------------- web/src/admin/users/UserViewPage.ts | 2 +- web/src/elements/forms/DeleteBulkForm.ts | 14 ++++++- web/src/locales/de.po | 24 ++++++++++-- web/src/locales/en.po | 24 ++++++++++-- web/src/locales/es.po | 24 ++++++++++-- web/src/locales/fr_FR.po | 24 ++++++++++-- web/src/locales/pl.po | 24 ++++++++++-- web/src/locales/pseudo-LOCALE.po | 24 ++++++++++-- web/src/locales/tr.po | 24 ++++++++++-- web/src/locales/zh-Hans.po | 24 ++++++++++-- web/src/locales/zh-Hant.po | 24 ++++++++++-- web/src/locales/zh_TW.po | 24 ++++++++++-- 16 files changed, 258 insertions(+), 83 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a09808f34..6f00b9ffc 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-20 23:41+0000\n" +"POT-Creation-Date: 2022-12-21 18:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -988,11 +988,11 @@ msgstr "" msgid "Proxy Providers" msgstr "" -#: authentik/providers/saml/api.py:227 +#: authentik/providers/saml/api/providers.py:219 msgid "Invalid XML Syntax" msgstr "" -#: authentik/providers/saml/api.py:237 +#: authentik/providers/saml/api/providers.py:229 #, python-format msgid "Failed to import Metadata: %(message)s" msgstr "" diff --git a/web/src/admin/groups/GroupViewPage.ts b/web/src/admin/groups/GroupViewPage.ts index 9238ba410..ae9142985 100644 --- a/web/src/admin/groups/GroupViewPage.ts +++ b/web/src/admin/groups/GroupViewPage.ts @@ -160,7 +160,7 @@ export class GroupViewPage extends AKElement { >
- +
diff --git a/web/src/admin/groups/RelatedGroupList.ts b/web/src/admin/groups/RelatedGroupList.ts index ee48b84bc..a7e188a9d 100644 --- a/web/src/admin/groups/RelatedGroupList.ts +++ b/web/src/admin/groups/RelatedGroupList.ts @@ -13,7 +13,7 @@ import { t } from "@lingui/macro"; import { TemplateResult, html } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { CoreApi, Group } from "@goauthentik/api"; +import { CoreApi, Group, User } from "@goauthentik/api"; @customElement("ak-group-related-list") export class RelatedGroupList extends Table { @@ -25,8 +25,8 @@ export class RelatedGroupList extends Table { @property() order = "name"; - @property({ type: Number }) - targetUser?: number; + @property({ attribute: false }) + targetUser?: User; async apiEndpoint(page: number): Promise> { return new CoreApi(DEFAULT_CONFIG).coreGroupsList({ @@ -34,7 +34,7 @@ export class RelatedGroupList extends Table { page: page, pageSize: (await uiConfig()).pagination.perPage, search: this.search || "", - membersByPk: this.targetUser ? [this.targetUser] : [], + membersByPk: this.targetUser ? [this.targetUser.pk] : [], }); } @@ -51,20 +51,23 @@ export class RelatedGroupList extends Table { const disabled = this.selectedElements.length < 1; return html` { - return new CoreApi(DEFAULT_CONFIG).coreGroupsUsedByList({ - groupUuid: item.pk, - }); - }} .delete=${(item: Group) => { - return new CoreApi(DEFAULT_CONFIG).coreGroupsDestroy({ - groupUuid: item.pk, + const newGroups = this.targetUser?.groups.filter((group) => { + return group != item.pk; + }); + return new CoreApi(DEFAULT_CONFIG).coreUsersPartialUpdate({ + id: this.targetUser?.pk || 0, + patchedUserRequest: { + groups: newGroups, + }, }); }} > `; } diff --git a/web/src/admin/users/RelatedUserList.ts b/web/src/admin/users/RelatedUserList.ts index b15511f24..9079ba844 100644 --- a/web/src/admin/users/RelatedUserList.ts +++ b/web/src/admin/users/RelatedUserList.ts @@ -6,7 +6,6 @@ import "@goauthentik/admin/users/UserResetEmailForm"; import { DEFAULT_CONFIG, config, tenant } from "@goauthentik/common/api/config"; import { MessageLevel } from "@goauthentik/common/messages"; import { uiConfig } from "@goauthentik/common/ui/config"; -import { me } from "@goauthentik/common/users"; import { first } from "@goauthentik/common/utils"; import { PFColor } from "@goauthentik/elements/Label"; import "@goauthentik/elements/buttons/ActionButton"; @@ -26,7 +25,7 @@ import { until } from "lit/directives/until.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { CapabilitiesEnum, CoreApi, ResponseError, User } from "@goauthentik/api"; +import { CapabilitiesEnum, CoreApi, Group, ResponseError, User } from "@goauthentik/api"; @customElement("ak-user-related-list") export class RelatedUserList extends Table { @@ -38,7 +37,7 @@ export class RelatedUserList extends Table { } @property() - groupUuid?: string; + targetGroup?: Group; @property() order = "last_login"; @@ -56,7 +55,7 @@ export class RelatedUserList extends Table { page: page, pageSize: (await uiConfig()).pagination.perPage, search: this.search || "", - groupsByPk: this.groupUuid ? [this.groupUuid] : [], + groupsByPk: this.targetGroup ? [this.targetGroup.pk] : [], attributes: this.hideServiceAccounts ? JSON.stringify({ "goauthentik.io/user/service-account__isnull": true, @@ -78,6 +77,8 @@ export class RelatedUserList extends Table { const disabled = this.selectedElements.length < 1; return html` { return [ @@ -86,41 +87,22 @@ export class RelatedUserList extends Table { { key: t`UID`, value: item.uid }, ]; }} - .usedBy=${(item: User) => { - return new CoreApi(DEFAULT_CONFIG).coreUsersUsedByList({ - id: item.pk, - }); - }} .delete=${(item: User) => { - return new CoreApi(DEFAULT_CONFIG).coreUsersDestroy({ - id: item.pk, + const newUsers = this.targetGroup?.usersObj + .filter((user) => { + return user.pk != item.pk; + }) + .map((user) => user.pk); + return new CoreApi(DEFAULT_CONFIG).coreGroupsPartialUpdate({ + groupUuid: this.targetGroup?.pk || "", + patchedGroupRequest: { + users: newUsers, + }, }); }} > - ${until( - me().then((user) => { - const shouldShowWarning = this.selectedElements.find((el) => { - return el.pk === user.user.pk || el.pk == user.original?.pk; - }); - if (shouldShowWarning) { - return html` -
-
-
- -
-

- ${t`Warning: You're about to delete the user you're logged in as (${shouldShowWarning.username}). Proceed at your own risk.`} -

-
-
- `; - } - return html``; - }), - )} `; } diff --git a/web/src/admin/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts index eebbcda54..9929f8e28 100644 --- a/web/src/admin/users/UserViewPage.ts +++ b/web/src/admin/users/UserViewPage.ts @@ -315,7 +315,7 @@ export class UserViewPage extends AKElement { >
- +
diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts index 39ec03305..17e23bec1 100644 --- a/web/src/elements/forms/DeleteBulkForm.ts +++ b/web/src/elements/forms/DeleteBulkForm.ts @@ -122,6 +122,12 @@ export class DeleteBulkForm extends ModalButton { @property() objectLabel?: string; + @property() + actionLabel?: string; + + @property() + actionSubtext?: string; + @property({ attribute: false }) // eslint-disable-next-line @typescript-eslint/no-explicit-any metadata: (item: any) => BulkDeleteMetadata = (item: any) => { @@ -183,13 +189,17 @@ export class DeleteBulkForm extends ModalButton { renderModalInner(): TemplateResult { return html`
-

${t`Delete ${this.objectLabel}`}

+

+ ${this.actionLabel ? this.actionLabel : t`Delete ${this.objectLabel}`} +

- ${t`Are you sure you want to delete ${this.objects.length} ${this.objectLabel}?`} + ${this.actionSubtext + ? this.actionSubtext + : t`Are you sure you want to delete ${this.objects.length} ${this.objectLabel}?`}}

diff --git a/web/src/locales/de.po b/web/src/locales/de.po index bcc8ba322..586cd6ee3 100644 --- a/web/src/locales/de.po +++ b/web/src/locales/de.po @@ -541,6 +541,14 @@ msgstr "Sind Sie sicher, dass Sie {0} {1} löschen wollen?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "Sind Sie sicher, dass Sie {0} {objName} löschen wollen?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "Sind Sie sicher, dass Sie {0} \"{1}\" aktualisieren wollen?" @@ -1670,7 +1678,6 @@ msgstr "Definieren Sie, wie Benachrichtigungen an Benutzer gesendet werden, z. B #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1684,7 +1691,6 @@ msgstr "Definieren Sie, wie Benachrichtigungen an Benutzer gesendet werden, z. B #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4689,6 +4695,19 @@ msgstr "" msgid "Related objects" msgstr "Verwandte Objekte" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Entfernen Sie den Benutzer aus der aktuellen Sitzung." @@ -7010,7 +7029,6 @@ msgstr "Warnung: Der Anbieter wird von keinem Outpost verwendet." msgid "Warning: Provider not assigned to any application." msgstr "Warnung: Provider ist keiner Applikation zugewiesen" -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "Warnung: Sie sind im Begriff, den Benutzer zu löschen, als den Sie angemeldet sind ({0}). Fahren Sie auf eigene Gefahr fort." diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 207ab1446..58942353c 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -524,6 +524,14 @@ msgstr "Are you sure you want to delete {0} {1}?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "Are you sure you want to delete {0} {objName} ?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "Are you sure you want to remove the selected users from the group {0}?" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "Are you sure you want to remove users {0} from the following groups?" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "Are you sure you want to update {0} \"{1}\"?" @@ -1676,7 +1684,6 @@ msgstr "Define how notifications are sent to users, like Email or Webhook." #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1690,7 +1697,6 @@ msgstr "Define how notifications are sent to users, like Email or Webhook." #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4782,6 +4788,19 @@ msgstr "Related actions" msgid "Related objects" msgstr "Related objects" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "Remove" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "Remove Users(s)" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "Remove from Group(s)" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Remove the user from the current session." @@ -7166,7 +7185,6 @@ msgstr "Warning: Provider is not used by any Outpost." msgid "Warning: Provider not assigned to any application." msgstr "Warning: Provider not assigned to any application." -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." diff --git a/web/src/locales/es.po b/web/src/locales/es.po index 225ab3d5e..c74a68ae1 100644 --- a/web/src/locales/es.po +++ b/web/src/locales/es.po @@ -519,6 +519,14 @@ msgstr "¿Estás seguro de que quieres eliminar {0} {1}?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "¿Estás seguro de que quieres eliminar {0} {objName}?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "¿Estás seguro de que quieres actualizar {0} «{1}»?" @@ -1646,7 +1654,6 @@ msgstr "Define cómo se envían las notificaciones a los usuarios, por ejemplo, #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1660,7 +1667,6 @@ msgstr "Define cómo se envían las notificaciones a los usuarios, por ejemplo, #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4665,6 +4671,19 @@ msgstr "" msgid "Related objects" msgstr "Objetos relacionados" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Elimina al usuario de la sesión actual." @@ -6986,7 +7005,6 @@ msgstr "Advertencia: ningún puesto avanzado utiliza el proveedor." msgid "Warning: Provider not assigned to any application." msgstr "Advertencia: el proveedor no está asignado a ninguna aplicación." -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "Advertencia: Vas a eliminar el usuario con el que iniciaste sesión ({0}). Proceda bajo su propio riesgo." diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po index d5bcb5f9d..a58798de5 100644 --- a/web/src/locales/fr_FR.po +++ b/web/src/locales/fr_FR.po @@ -524,6 +524,14 @@ msgstr "Êtes-vous sûr de vouloir supprimer {0} {1} ?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "Êtes-vous sûr de vouloir supprimer {0} {objName} ?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "Êtes-vous sûr de vouloir modifier {0} {1} ?" @@ -1651,7 +1659,6 @@ msgstr "Définit les méthodes d'envoi des notifications aux utilisateurs, telle #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1665,7 +1672,6 @@ msgstr "Définit les méthodes d'envoi des notifications aux utilisateurs, telle #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4666,6 +4672,19 @@ msgstr "" msgid "Related objects" msgstr "" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Supprimer l'utilisateur de la session actuelle." @@ -6977,7 +6996,6 @@ msgstr "Attention : ce fournisseur n’est utilisé par aucun avant-poste." msgid "Warning: Provider not assigned to any application." msgstr "Avertissement : le fournisseur n'est assigné à aucune application." -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "" diff --git a/web/src/locales/pl.po b/web/src/locales/pl.po index aef9b3701..d143d1689 100644 --- a/web/src/locales/pl.po +++ b/web/src/locales/pl.po @@ -523,6 +523,14 @@ msgstr "Czy na pewno chcesz usunąć {0} {1}?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "Czy na pewno chcesz usunąć {0} {objName}?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "Czy na pewno chcesz zaktualizować {0} \"{1}”?" @@ -1652,7 +1660,6 @@ msgstr "Określ sposób wysyłania powiadomień do użytkowników, takich jak e- #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1666,7 +1673,6 @@ msgstr "Określ sposób wysyłania powiadomień do użytkowników, takich jak e- #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4675,6 +4681,19 @@ msgstr "" msgid "Related objects" msgstr "Powiązane obiekty" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Usuń użytkownika z bieżącej sesji." @@ -6996,7 +7015,6 @@ msgstr "Ostrzeżenie: Dostawca nie jest używany przez żadną placówkę." msgid "Warning: Provider not assigned to any application." msgstr "Ostrzeżenie: dostawca nie jest przypisany do żadnej aplikacji." -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "Ostrzeżenie: masz zamiar usunąć użytkownika, na którym jesteś zalogowany jako ({0}). Kontynuuj na własne ryzyko." diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 938a737bc..0bfb41f08 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -516,6 +516,14 @@ msgstr "" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "" @@ -1664,7 +1672,6 @@ msgstr "" #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1678,7 +1685,6 @@ msgstr "" #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4762,6 +4768,19 @@ msgstr "" msgid "Related objects" msgstr "" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "" @@ -7136,7 +7155,6 @@ msgstr "" msgid "Warning: Provider not assigned to any application." msgstr "" -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "" diff --git a/web/src/locales/tr.po b/web/src/locales/tr.po index 5cc1c20e0..87b87db35 100644 --- a/web/src/locales/tr.po +++ b/web/src/locales/tr.po @@ -519,6 +519,14 @@ msgstr "{0} {1} silmek istediğinizden emin misiniz?" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "Silmek istediğinizden emin misiniz {0} {objName}?" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "{0} “{1}” güncellemesini istediğinizden emin misiniz?" @@ -1646,7 +1654,6 @@ msgstr "E-posta veya Webhook gibi kullanıcılara bildirimlerin nasıl gönderil #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1660,7 +1667,6 @@ msgstr "E-posta veya Webhook gibi kullanıcılara bildirimlerin nasıl gönderil #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4665,6 +4671,19 @@ msgstr "" msgid "Related objects" msgstr "İlgili nesneler" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "Kullanıcıyı geçerli oturumdan kaldırın." @@ -6986,7 +7005,6 @@ msgstr "Uyarı: Sağlayıcı herhangi bir Üs tarafından kullanılmaz." msgid "Warning: Provider not assigned to any application." msgstr "Uyarı: Sağlayıcı herhangi bir uygulamaya atanmamış." -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "Uyarı: Oturum açtığınız kullanıcıyı ({0}) silmek üzeresiniz. Kendi sorumluluğunuzdadır." diff --git a/web/src/locales/zh-Hans.po b/web/src/locales/zh-Hans.po index 102857100..0270c6f28 100644 --- a/web/src/locales/zh-Hans.po +++ b/web/src/locales/zh-Hans.po @@ -525,6 +525,14 @@ msgstr "您确定要删除 {0} {1} 吗？" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "您确定要删除 {0} {objName} 吗？" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "您确定要更新 {0} \"{1}\" 吗？" @@ -1654,7 +1662,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1668,7 +1675,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4673,6 +4679,19 @@ msgstr "" msgid "Related objects" msgstr "相关对象" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "从当前会话中移除用户。" @@ -6994,7 +7013,6 @@ msgstr "警告：提供程序未被任何前哨使用。" msgid "Warning: Provider not assigned to any application." msgstr "警告：提供程序未分配给任何应用程序。" -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "警告：您即将删除当前登录的用户（{0}）。如果继续，请自担风险。" diff --git a/web/src/locales/zh-Hant.po b/web/src/locales/zh-Hant.po index 9fb453634..207fc7a78 100644 --- a/web/src/locales/zh-Hant.po +++ b/web/src/locales/zh-Hant.po @@ -525,6 +525,14 @@ msgstr "你确定要删除 {0} {1} 吗？" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "你确定要删除 {0} {objName} 吗？" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "你确定要更新 {0} \"{1}\" 吗？" @@ -1654,7 +1662,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1668,7 +1675,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4673,6 +4679,19 @@ msgstr "" msgid "Related objects" msgstr "相关对象" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "从当前会话中移除用户。" @@ -6994,7 +7013,6 @@ msgstr "警告：提供者未被任何 Outpos 使用。" msgid "Warning: Provider not assigned to any application." msgstr "警告：提供程序未分配给任何应用程序。" -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "警告：你即将删除登录的用户 ({0})。继续，风险自负。" diff --git a/web/src/locales/zh_TW.po b/web/src/locales/zh_TW.po index 9c2dc292b..42df9e737 100644 --- a/web/src/locales/zh_TW.po +++ b/web/src/locales/zh_TW.po @@ -525,6 +525,14 @@ msgstr "你确定要删除 {0} {1} 吗？" msgid "Are you sure you want to delete {0} {objName} ?" msgstr "你确定要删除 {0} {objName} 吗？" +#: src/admin/users/RelatedUserList.ts +msgid "Are you sure you want to remove the selected users from the group {0}?" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Are you sure you want to remove users {0} from the following groups?" +msgstr "" + #: src/admin/users/UserActiveForm.ts msgid "Are you sure you want to update {0} \"{1}\"?" msgstr "你确定要更新 {0} \"{1}\" 吗？" @@ -1654,7 +1662,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/flows/BoundStagesList.ts #: src/admin/flows/FlowListPage.ts #: src/admin/groups/GroupListPage.ts -#: src/admin/groups/RelatedGroupList.ts #: src/admin/outposts/OutpostListPage.ts #: src/admin/outposts/ServiceConnectionListPage.ts #: src/admin/policies/BoundPoliciesList.ts @@ -1668,7 +1675,6 @@ msgstr "定义如何向用户发送通知，例如电子邮件或 Webhook。" #: src/admin/stages/prompt/PromptListPage.ts #: src/admin/tenants/TenantListPage.ts #: src/admin/tokens/TokenListPage.ts -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts #: src/elements/forms/DeleteBulkForm.ts #: src/elements/forms/DeleteForm.ts @@ -4673,6 +4679,19 @@ msgstr "" msgid "Related objects" msgstr "相关对象" +#: src/admin/groups/RelatedGroupList.ts +#: src/admin/users/RelatedUserList.ts +msgid "Remove" +msgstr "" + +#: src/admin/users/RelatedUserList.ts +msgid "Remove Users(s)" +msgstr "" + +#: src/admin/groups/RelatedGroupList.ts +msgid "Remove from Group(s)" +msgstr "" + #: src/admin/stages/user_logout/UserLogoutStageForm.ts msgid "Remove the user from the current session." msgstr "从当前会话中移除用户。" @@ -6994,7 +7013,6 @@ msgstr "警告：提供者未被任何 Outpos 使用。" msgid "Warning: Provider not assigned to any application." msgstr "警告：提供程序未分配给任何应用程序。" -#: src/admin/users/RelatedUserList.ts #: src/admin/users/UserListPage.ts msgid "Warning: You're about to delete the user you're logged in as ({0}). Proceed at your own risk." msgstr "警告：你即将删除登录的用户 ({0})。继续，风险自负。"