From 7673e5a29774b6b7e43ebdd06a08de963c5ef340 Mon Sep 17 00:00:00 2001 From: Jens L Date: Wed, 25 Oct 2023 18:25:37 +0200 Subject: [PATCH] web/admin: small fixes (#7292) * show user type better on admin interface Signed-off-by: Jens Langhammer * fix rendering for backchannel in app form Signed-off-by: Jens Langhammer * fix missing trailing slash in admin redirect Signed-off-by: Jens Langhammer --------- Signed-off-by: Jens Langhammer --- web/src/admin/AdminInterface.ts | 2 +- .../components/ak-backchannel-input.ts | 2 +- web/src/admin/users/UserListPage.ts | 7 +- web/src/admin/users/UserViewPage.ts | 11 +++ web/src/common/labels.ts | 12 ++- web/xliff/de.xlf | 25 +++++-- web/xliff/en.xlf | 26 +++++-- web/xliff/es.xlf | 25 +++++-- web/xliff/fr.xlf | 28 ++++--- web/xliff/pl.xlf | 25 +++++-- web/xliff/pseudo-LOCALE.xlf | 28 ++++--- web/xliff/tr.xlf | 25 +++++-- web/xliff/zh-Hans.xlf | 74 ++++++++++--------- web/xliff/zh-Hant.xlf | 25 +++++-- web/xliff/zh_TW.xlf | 25 +++++-- 15 files changed, 231 insertions(+), 109 deletions(-) diff --git a/web/src/admin/AdminInterface.ts b/web/src/admin/AdminInterface.ts index 984b74916..e59793706 100644 --- a/web/src/admin/AdminInterface.ts +++ b/web/src/admin/AdminInterface.ts @@ -121,7 +121,7 @@ export class AdminInterface extends Interface { // TODO: somehow add `access_admin_interface` to the API schema this.user.user.systemPermissions.includes("access_admin_interface"); if (!canAccessAdmin && this.user.user.pk > 0) { - window.location.assign("/if/user"); + window.location.assign("/if/user/"); } } diff --git a/web/src/admin/applications/components/ak-backchannel-input.ts b/web/src/admin/applications/components/ak-backchannel-input.ts index 2130ba10b..5150b16ca 100644 --- a/web/src/admin/applications/components/ak-backchannel-input.ts +++ b/web/src/admin/applications/components/ak-backchannel-input.ts @@ -65,7 +65,7 @@ export class AkBackchannelProvidersInput extends AKElement {
diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts index 17eddae14..8ca30f4aa 100644 --- a/web/src/admin/users/UserListPage.ts +++ b/web/src/admin/users/UserListPage.ts @@ -6,6 +6,7 @@ import "@goauthentik/admin/users/UserPasswordForm"; import "@goauthentik/admin/users/UserResetEmailForm"; import { me } from "@goauthentik/app/common/users"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { userTypeToLabel } from "@goauthentik/common/labels"; import { MessageLevel } from "@goauthentik/common/messages"; import { DefaultUIConfig, uiConfig } from "@goauthentik/common/ui/config"; import { first } from "@goauthentik/common/utils"; @@ -247,9 +248,9 @@ export class UserListPage extends TablePage { item.pk !== this.me?.user.pk; return [ html` -
${item.username}
- ${item.name} - `, +
${item.username}
+ ${item.name === "" ? msg("") : item.name}  ${userTypeToLabel(item.type)}`, html` ${item.isActive ? msg("Yes") : msg("No")} `, diff --git a/web/src/admin/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts index 64a917c9d..d91ea4386 100644 --- a/web/src/admin/users/UserViewPage.ts +++ b/web/src/admin/users/UserViewPage.ts @@ -13,6 +13,7 @@ import { me } from "@goauthentik/app/common/users"; import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { userTypeToLabel } from "@goauthentik/common/labels"; import "@goauthentik/components/events/ObjectChangelog"; import "@goauthentik/components/events/UserEvents"; import { AKElement, rootInterface } from "@goauthentik/elements/Base"; @@ -188,6 +189,16 @@ export class UserViewPage extends AKElement {
+
+
+ ${msg("Type")} +
+
+
+ ${userTypeToLabel(user.type)} +
+
+
${msg("Superuser")} diff --git a/web/src/common/labels.ts b/web/src/common/labels.ts index f2d9d1376..d63c4a38a 100644 --- a/web/src/common/labels.ts +++ b/web/src/common/labels.ts @@ -1,6 +1,6 @@ import { msg } from "@lit/localize"; -import { Device, EventActions, IntentEnum, SeverityEnum } from "@goauthentik/api"; +import { Device, EventActions, IntentEnum, SeverityEnum, UserTypeEnum } from "@goauthentik/api"; /* Various tables in the API for which we need to supply labels */ @@ -65,3 +65,13 @@ export const deviceTypeToLabel = new Map([ export const deviceTypeName = (device: Device) => deviceTypeToLabel.get(device.type) ?? device?.verboseName ?? ""; + +const _userTypeToLabel = new Map([ + [UserTypeEnum.Internal, msg("Internal")], + [UserTypeEnum.External, msg("External")], + [UserTypeEnum.ServiceAccount, msg("Service account")], + [UserTypeEnum.InternalServiceAccount, msg("Service account (internal)")], +]); + +export const userTypeToLabel = (type?: UserTypeEnum): string => + _userTypeToLabel.get(type) ?? type ?? ""; diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf index 00fe6b2c5..40cbe2f02 100644 --- a/web/xliff/de.xlf +++ b/web/xliff/de.xlf @@ -518,9 +518,6 @@ Manage users - - Check release notes - Outpost status Outpost Status @@ -545,10 +542,6 @@ Objects created Objekte erstellt - - User statistics - Benutzerstatistiken - Users created per day in the last month Benutzer, die im letzten Monat pro Tag erstellt wurden @@ -6020,6 +6013,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/en.xlf b/web/xliff/en.xlf index c80817208..80d8e0552 100644 --- a/web/xliff/en.xlf +++ b/web/xliff/en.xlf @@ -531,10 +531,6 @@ Manage users Manage users - - Check release notes - Check release notes - Outpost status Outpost status @@ -560,10 +556,6 @@ Objects created Objects created - - User statistics - User statistics - Users created per day in the last month Users created per day in the last month @@ -6302,6 +6294,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/es.xlf b/web/xliff/es.xlf index 9d614e262..5e17c2d87 100644 --- a/web/xliff/es.xlf +++ b/web/xliff/es.xlf @@ -511,9 +511,6 @@ Manage users - - Check release notes - Outpost status Estado de avanzada @@ -538,10 +535,6 @@ Objects created Objetos creados - - User statistics - Estadísticas de los usuarios - Users created per day in the last month Usuarios creados por día en el último mes @@ -5935,6 +5928,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/fr.xlf b/web/xliff/fr.xlf index a3cdc728d..dfb1edfd4 100644 --- a/web/xliff/fr.xlf +++ b/web/xliff/fr.xlf @@ -658,11 +658,6 @@ Il y a jour(s) Manage users Gérer les utilisateurs - - - Check release notes - Voir les notes de version - Outpost status @@ -694,11 +689,6 @@ Il y a jour(s) Objects created Objets créés - - - User statistics - Statistiques utilisateur - Users created per day in the last month @@ -7875,6 +7865,24 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/pl.xlf b/web/xliff/pl.xlf index 3f4d82371..1423bf742 100644 --- a/web/xliff/pl.xlf +++ b/web/xliff/pl.xlf @@ -520,9 +520,6 @@ Manage users - - Check release notes - Outpost status Status placówki @@ -547,10 +544,6 @@ Objects created Utworzone obiekty - - User statistics - Statystyki użytkowników - Users created per day in the last month Użytkownicy stworzeni dziennie w ciągu ostatniego miesiąca @@ -6143,6 +6136,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/pseudo-LOCALE.xlf b/web/xliff/pseudo-LOCALE.xlf index 1c2136688..d7e2e48df 100644 --- a/web/xliff/pseudo-LOCALE.xlf +++ b/web/xliff/pseudo-LOCALE.xlf @@ -646,11 +646,6 @@ Manage users Màńàĝē ũśēŕś - - - Check release notes - Ćĥēćķ ŕēĺēàśē ńōţēś - Outpost status @@ -681,11 +676,6 @@ Objects created ŌƀĴēćţś ćŕēàţēď - - - User statistics - Ũśēŕ śţàţĩśţĩćś - Users created per day in the last month @@ -7836,4 +7826,22 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> + diff --git a/web/xliff/tr.xlf b/web/xliff/tr.xlf index ba6bfb6cc..435cde44c 100644 --- a/web/xliff/tr.xlf +++ b/web/xliff/tr.xlf @@ -511,9 +511,6 @@ Manage users - - Check release notes - Outpost status Üs durumu @@ -538,10 +535,6 @@ Objects created Oluşturulan nesneler - - User statistics - Kullanıcı istatistikleri - Users created per day in the last month Son ay içinde günlük oluşturulan kullanıcılar @@ -5928,6 +5921,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/zh-Hans.xlf b/web/xliff/zh-Hans.xlf index f38a260d2..5683f3eb6 100644 --- a/web/xliff/zh-Hans.xlf +++ b/web/xliff/zh-Hans.xlf @@ -1,4 +1,4 @@ - + @@ -613,9 +613,9 @@ - The URL "" was not found. - 未找到 URL " - "。 + The URL "" was not found. + 未找到 URL " + "。 @@ -658,11 +658,6 @@ Manage users 管理用户 - - - Check release notes - 查看发行日志 - Outpost status @@ -694,11 +689,6 @@ Objects created 已创建对象 - - - User statistics - 用户统计 - Users created per day in the last month @@ -1067,8 +1057,8 @@ - To allow any redirect URI, set this value to ".*". Be aware of the possible security implications this can have. - 要允许任何重定向 URI，请将此值设置为 ".*"。请注意这可能带来的安全影响。 + To allow any redirect URI, set this value to ".*". Be aware of the possible security implications this can have. + 要允许任何重定向 URI，请将此值设置为 ".*"。请注意这可能带来的安全影响。 @@ -1809,8 +1799,8 @@ - Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon "fa-test". - 输入完整 URL、相对路径，或者使用 'fa://fa-test' 来使用 Font Awesome 图标 "fa-test"。 + Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon "fa-test". + 输入完整 URL、相对路径，或者使用 'fa://fa-test' 来使用 Font Awesome 图标 "fa-test"。 @@ -3023,8 +3013,8 @@ doesn't pass when either or both of the selected options are equal or above the - Field which contains members of a group. Note that if using the "memberUid" field, the value is assumed to contain a relative distinguished name. e.g. 'memberUid=some-user' instead of 'memberUid=cn=some-user,ou=groups,...' - 包含组成员的字段。请注意，如果使用 "memberUid" 字段，则假定该值包含相对可分辨名称。例如，'memberUid=some-user' 而不是 'memberUid=cn=some-user,ou=groups,...' + Field which contains members of a group. Note that if using the "memberUid" field, the value is assumed to contain a relative distinguished name. e.g. 'memberUid=some-user' instead of 'memberUid=cn=some-user,ou=groups,...' + 包含组成员的字段。请注意，如果使用 "memberUid" 字段，则假定该值包含相对可分辨名称。例如，'memberUid=some-user' 而不是 'memberUid=cn=some-user,ou=groups,...' @@ -3816,8 +3806,8 @@ doesn't pass when either or both of the selected options are equal or above the - When using an external logging solution for archiving, this can be set to "minutes=5". - 使用外部日志记录解决方案进行存档时，可以将其设置为 "minutes=5"。 + When using an external logging solution for archiving, this can be set to "minutes=5". + 使用外部日志记录解决方案进行存档时，可以将其设置为 "minutes=5"。 @@ -3826,8 +3816,8 @@ doesn't pass when either or both of the selected options are equal or above the - Format: "weeks=3;days=2;hours=3,seconds=2". - 格式："weeks=3;days=2;hours=3,seconds=2"。 + Format: "weeks=3;days=2;hours=3,seconds=2". + 格式："weeks=3;days=2;hours=3,seconds=2"。 @@ -4023,10 +4013,10 @@ doesn't pass when either or both of the selected options are equal or above the - Are you sure you want to update ""? + Are you sure you want to update ""? 您确定要更新 - " - " 吗？ + " + " 吗？ @@ -5112,7 +5102,7 @@ doesn't pass when either or both of the selected options are equal or above the - A "roaming" authenticator, like a YubiKey + A "roaming" authenticator, like a YubiKey 像 YubiKey 这样的“漫游”身份验证器 @@ -5447,10 +5437,10 @@ doesn't pass when either or both of the selected options are equal or above the - ("", of type ) + ("", of type ) - （" - "，类型为 + （" + "，类型为 ） @@ -5499,7 +5489,7 @@ doesn't pass when either or both of the selected options are equal or above the - If set to a duration above 0, the user will have the option to choose to "stay signed in", which will extend their session by the time specified here. + If set to a duration above 0, the user will have the option to choose to "stay signed in", which will extend their session by the time specified here. 如果设置时长大于 0，用户可以选择“保持登录”选项，这将使用户的会话延长此处设置的时间。 @@ -7919,7 +7909,25 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link 创建恢复链接 + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> - \ No newline at end of file + diff --git a/web/xliff/zh-Hant.xlf b/web/xliff/zh-Hant.xlf index 2eb231b9c..53e35e7f6 100644 --- a/web/xliff/zh-Hant.xlf +++ b/web/xliff/zh-Hant.xlf @@ -518,9 +518,6 @@ Manage users - - Check release notes - Outpost status Outpost 状态 @@ -545,10 +542,6 @@ Objects created 已创建对象 - - User statistics - 用户统计 - Users created per day in the last month 上个月每天创建的用户 @@ -5976,6 +5969,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set> diff --git a/web/xliff/zh_TW.xlf b/web/xliff/zh_TW.xlf index be270f834..9cc63cdf0 100644 --- a/web/xliff/zh_TW.xlf +++ b/web/xliff/zh_TW.xlf @@ -518,9 +518,6 @@ Manage users - - Check release notes - Outpost status Outpost 状态 @@ -545,10 +542,6 @@ Objects created 已创建对象 - - User statistics - 用户统计 - Users created per day in the last month 上个月每天创建的用户 @@ -5975,6 +5968,24 @@ Bindings to groups/users are checked against the user of the event. Create Recovery Link + + + External + + + Service account + + + Service account (internal) + + + Check the release notes + + + User Statistics + + + <No name set>