From 4686796543620587ae8ba794895326952a601ea1 Mon Sep 17 00:00:00 2001 From: Jens L Date: Thu, 19 Oct 2023 17:59:08 +0200 Subject: [PATCH 1/3] web/admin: decrease wizard hint padding (#7227) Signed-off-by: Jens Langhammer --- .../admin/applications/ApplicationWizardHint.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/web/src/admin/applications/ApplicationWizardHint.ts b/web/src/admin/applications/ApplicationWizardHint.ts index 288e18dbd..1bcc338cd 100644 --- a/web/src/admin/applications/ApplicationWizardHint.ts +++ b/web/src/admin/applications/ApplicationWizardHint.ts @@ -11,7 +11,7 @@ import "@goauthentik/elements/buttons/ActionButton/ak-action-button"; import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; import { msg } from "@lit/localize"; -import { html } from "lit"; +import { css, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { styleMap } from "lit/directives/style-map.js"; @@ -36,7 +36,17 @@ const closeButtonIcon = html` Date: Thu, 19 Oct 2023 23:53:04 +0200 Subject: [PATCH 2/3] web/admin: fix prompt form and codemirror mode (#7231) * web/admin: fix extra curly brace Signed-off-by: Jens Langhammer * also fix form rendering Signed-off-by: Jens Langhammer * fix codemirror alignment Signed-off-by: Jens Langhammer * use enum for codemirror mode to prevent invalid mode Signed-off-by: Jens Langhammer --------- Signed-off-by: Jens Langhammer --- web/src/admin/blueprints/BlueprintForm.ts | 5 ++- web/src/admin/groups/GroupForm.ts | 3 +- web/src/admin/outposts/OutpostForm.ts | 3 +- .../ServiceConnectionKubernetesForm.ts | 3 +- web/src/admin/policies/PolicyTestForm.ts | 3 +- .../expression/ExpressionPolicyForm.ts | 3 +- .../PropertyMappingLDAPForm.ts | 6 ++- .../PropertyMappingNotification.ts | 6 ++- .../PropertyMappingSAMLForm.ts | 6 ++- .../PropertyMappingSCIMForm.ts | 6 ++- .../PropertyMappingScopeForm.ts | 6 ++- .../PropertyMappingTestForm.ts | 5 ++- .../providers/saml/SAMLProviderViewPage.ts | 3 +- .../admin/sources/oauth/OAuthSourceForm.ts | 3 +- .../admin/sources/saml/SAMLSourceViewPage.ts | 3 +- .../admin/stages/invitation/InvitationForm.ts | 3 +- web/src/admin/stages/prompt/PromptForm.ts | 16 ++++--- web/src/admin/tenants/TenantForm.ts | 3 +- web/src/admin/users/UserForm.ts | 3 +- web/src/elements/CodeMirror.ts | 45 +++++++++++++++---- 20 files changed, 100 insertions(+), 34 deletions(-) diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts index f47b967cf..47b6c492c 100644 --- a/web/src/admin/blueprints/BlueprintForm.ts +++ b/web/src/admin/blueprints/BlueprintForm.ts @@ -3,6 +3,7 @@ import { docLink } from "@goauthentik/common/global"; import { first } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-toggle-group"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -169,7 +170,7 @@ export class BlueprintForm extends ModelForm { ${this.source === blueprintSource.internal ? html` @@ -183,7 +184,7 @@ export class BlueprintForm extends ModelForm {
diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts index 2a1cca350..1d703133e 100644 --- a/web/src/admin/groups/GroupForm.ts +++ b/web/src/admin/groups/GroupForm.ts @@ -2,6 +2,7 @@ import "@goauthentik/admin/groups/MemberSelectModal"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { first } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/chips/Chip"; import "@goauthentik/elements/chips/ChipGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; @@ -153,7 +154,7 @@ export class GroupForm extends ModelForm { name="attributes" > diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts index 70b6a3111..65fd60845 100644 --- a/web/src/admin/outposts/OutpostForm.ts +++ b/web/src/admin/outposts/OutpostForm.ts @@ -2,6 +2,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import { groupBy } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import "@goauthentik/elements/forms/SearchSelect"; @@ -209,7 +210,7 @@ export class OutpostForm extends ModelForm { diff --git a/web/src/admin/policies/PolicyTestForm.ts b/web/src/admin/policies/PolicyTestForm.ts index c32fe30d0..aa874f37e 100644 --- a/web/src/admin/policies/PolicyTestForm.ts +++ b/web/src/admin/policies/PolicyTestForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { first } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import { PFColor } from "@goauthentik/elements/Label"; import { Form } from "@goauthentik/elements/forms/Form"; import "@goauthentik/elements/forms/HorizontalFormElement"; @@ -145,7 +146,7 @@ export class PolicyTestForm extends Form { diff --git a/web/src/admin/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts index 707dc9f1c..a00c6584d 100644 --- a/web/src/admin/policies/expression/ExpressionPolicyForm.ts +++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts @@ -2,6 +2,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import { first } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -85,7 +86,7 @@ export class ExpressionPolicyForm extends ModelForm { name="expression" > diff --git a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts index 5629f07d2..6919ab079 100644 --- a/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -69,7 +70,10 @@ export class PropertyMappingLDAPForm extends ModelForm - +

${msg("Expression using Python.")} diff --git a/web/src/admin/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts index 6b9692c4f..8ab561dec 100644 --- a/web/src/admin/property-mappings/PropertyMappingNotification.ts +++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -54,7 +55,10 @@ export class PropertyMappingNotification extends ModelForm - +

${msg("Expression using Python.")} diff --git a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts index b61bc168c..77836c505 100644 --- a/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -81,7 +82,10 @@ export class PropertyMappingSAMLForm extends ModelForm - +

${msg("Expression using Python.")} diff --git a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts index 24d567d11..19bd13aab 100644 --- a/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSCIMForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -54,7 +55,10 @@ export class PropertyMappingSCIMForm extends ModelForm { ?required=${true} name="expression" > - +

${msg("Expression using Python.")} diff --git a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts index 9dc01c174..caf2dc11d 100644 --- a/web/src/admin/property-mappings/PropertyMappingScopeForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { docLink } from "@goauthentik/common/global"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; @@ -81,7 +82,10 @@ export class PropertyMappingScopeForm extends ModelForm { ?required=${true} name="expression" > - +

${msg("Expression using Python.")} diff --git a/web/src/admin/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts index 00a288d15..e81af9a0c 100644 --- a/web/src/admin/property-mappings/PropertyMappingTestForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts @@ -1,6 +1,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { first } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import { Form } from "@goauthentik/elements/forms/Form"; import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/SearchSelect"; @@ -50,7 +51,7 @@ export class PolicyTestForm extends Form { return html` ${this.result?.successful ? html` @@ -148,7 +149,7 @@ export class PolicyTestForm extends Form { diff --git a/web/src/admin/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts index 806a51b6b..de5e3505b 100644 --- a/web/src/admin/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts @@ -7,6 +7,7 @@ import { MessageLevel } from "@goauthentik/common/messages"; import "@goauthentik/components/events/ObjectChangelog"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/EmptyState"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ActionButton"; @@ -472,7 +473,7 @@ export class SAMLProviderViewPage extends AKElement {