trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/admin: fix inconsistent display of flows in selections (#4977) 

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens L 2023-03-16 22:39:26 +01:00 committed by GitHub
parent b9da24c952
commit 397b9845ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
@ -60,7 +61,7 @@ export class TypeOAuthCodeApplicationWizardPage extends WizardFormPage {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

6
web/src/admin/flows/utils.ts
View File

@ -1,6 +1,10 @@
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { FlowDesignationEnum, LayoutEnum } from "@goauthentik/api"; import { Flow, FlowDesignationEnum, LayoutEnum } from "@goauthentik/api";
export function RenderFlowOption(flow: Flow): string {
return `${flow.slug} (${flow.name})`;
}
export function DesignationToLabel(designation: FlowDesignationEnum): string { export function DesignationToLabel(designation: FlowDesignationEnum): string {
switch (designation) { switch (designation) {

3
web/src/admin/providers/ldap/LDAPProviderForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -93,7 +94,7 @@ export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.name; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.slug}`; return html`${flow.slug}`;

3
web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first, randomString } from "@goauthentik/common/utils"; import { first, randomString } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -96,7 +97,7 @@ export class OAuth2ProviderFormPage extends ModelForm<OAuth2Provider, number> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/providers/proxy/ProxyProviderForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -318,7 +319,7 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/providers/saml/SAMLProviderForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
@ -88,7 +89,7 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/providers/saml/SAMLProviderImportForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { SentryIgnoredError } from "@goauthentik/common/errors"; import { SentryIgnoredError } from "@goauthentik/common/errors";
import { Form } from "@goauthentik/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
@ -59,7 +60,7 @@ export class SAMLProviderImportForm extends Form<SAMLProvider> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

5
web/src/admin/sources/oauth/OAuthSourceForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils"; import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils";
import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
@ -431,7 +432,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -477,7 +478,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

5
web/src/admin/sources/plex/PlexSourceForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils"; import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils";
import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
import { PlexAPIClient, PlexResource, popupCenterScreen } from "@goauthentik/common/helpers/plex"; import { PlexAPIClient, PlexResource, popupCenterScreen } from "@goauthentik/common/helpers/plex";
@ -364,7 +365,7 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -410,7 +411,7 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

7
web/src/admin/sources/saml/SAMLSourceForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils"; import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils";
import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
@ -496,7 +497,7 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -540,7 +541,7 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -586,7 +587,7 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -146,7 +147,7 @@ export class AuthenticatorDuoStageForm extends ModelForm<AuthenticatorDuoStage,
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -292,7 +293,7 @@ export class AuthenticatorSMSStageForm extends ModelForm<AuthenticatorSMSStage,
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
@ -93,7 +94,7 @@ export class AuthenticatorStaticStageForm extends ModelForm<AuthenticatorStaticS
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
@ -98,7 +99,7 @@ export class AuthenticatorTOTPStageForm extends ModelForm<AuthenticatorTOTPStage
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
@ -162,7 +163,7 @@ export class AuthenticateWebAuthnStageForm extends ModelForm<AuthenticateWebAuth
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/identification/IdentificationStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first, groupBy } from "@goauthentik/common/utils"; import { first, groupBy } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -265,7 +266,7 @@ export class IdentificationStageForm extends ModelForm<IdentificationStage, stri
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/invitation/InvitationForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { dateTimeLocal, first } from "@goauthentik/common/utils"; import { dateTimeLocal, first } from "@goauthentik/common/utils";
import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
@ -88,7 +89,7 @@ export class InvitationForm extends ModelForm<Invitation, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

3
web/src/admin/stages/password/PasswordStageForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
@ -136,7 +137,7 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;

13
web/src/admin/tenants/TenantForm.ts
View File

@ -1,3 +1,4 @@
import { RenderFlowOption } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
@ -165,7 +166,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -202,7 +203,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -237,7 +238,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -274,7 +275,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -312,7 +313,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;
@ -347,7 +348,7 @@ export class TenantForm extends ModelForm<Tenant, string> {
return flows.results; return flows.results;
}} }}
.renderElement=${(flow: Flow): string => { .renderElement=${(flow: Flow): string => {
return flow.slug; return RenderFlowOption(flow);
}} }}
.renderDescription=${(flow: Flow): TemplateResult => { .renderDescription=${(flow: Flow): TemplateResult => {
return html`${flow.name}`; return html`${flow.name}`;