From 795bfb6ea498efcd0ee9b7212830ee6a1b7cfa39 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 8 Sep 2024 01:06:52 +0200 Subject: [PATCH 1/4] replace static bindings for required Signed-off-by: Jens Langhammer --- .../ApplicationCheckAccessForm.ts | 6 +--- ...plication-wizard-authentication-by-ldap.ts | 2 +- ...lication-wizard-authentication-by-oauth.ts | 4 +-- .../proxy/AuthenticationByProxyPage.ts | 2 +- ...plication-wizard-authentication-for-rac.ts | 2 +- ...ication-wizard-authentication-by-radius.ts | 2 +- ...rd-authentication-by-saml-configuration.ts | 2 +- web/src/admin/blueprints/BlueprintForm.ts | 2 +- web/src/admin/brands/BrandForm.ts | 20 +++--------- .../ak-flow-search/ak-flow-search.stories.ts | 4 +-- .../admin/crypto/CertificateGenerateForm.ts | 14 ++------ .../admin/crypto/CertificateKeyPairForm.ts | 4 +-- web/src/admin/events/RuleForm.ts | 10 ++---- web/src/admin/events/TransportForm.ts | 6 ++-- web/src/admin/flows/FlowForm.ts | 24 +++++--------- web/src/admin/flows/StageBindingForm.ts | 14 +++----- web/src/admin/groups/GroupForm.ts | 8 ++--- web/src/admin/outposts/OutpostForm.ts | 4 +-- .../outposts/ServiceConnectionDockerForm.ts | 4 +-- .../ServiceConnectionKubernetesForm.ts | 2 +- web/src/admin/policies/PolicyBindingForm.ts | 4 +-- web/src/admin/policies/PolicyTestForm.ts | 2 +- .../admin/policies/dummy/DummyPolicyForm.ts | 14 ++------ .../event_matcher/EventMatcherPolicyForm.ts | 2 +- .../admin/policies/expiry/ExpiryPolicyForm.ts | 4 +-- .../expression/ExpressionPolicyForm.ts | 4 +-- .../policies/password/PasswordPolicyForm.ts | 22 ++++++------- .../reputation/ReputationPolicyForm.ts | 8 ++--- .../GoogleWorkspaceProviderForm.ts | 8 ++--- .../admin/providers/ldap/LDAPProviderForm.ts | 18 +++-------- .../MicrosoftEntraProviderForm.ts | 16 +++------- .../providers/oauth2/OAuth2ProviderForm.ts | 4 +-- .../providers/proxy/ProxyProviderForm.ts | 14 ++++---- web/src/admin/providers/rac/EndpointForm.ts | 8 ++--- .../admin/providers/rac/RACProviderForm.ts | 6 ++-- .../providers/radius/RadiusProviderForm.ts | 8 ++--- .../admin/providers/saml/SAMLProviderForm.ts | 30 +++++++---------- .../providers/saml/SAMLProviderImportForm.ts | 4 +-- .../admin/providers/scim/SCIMProviderForm.ts | 6 ++-- web/src/admin/roles/RoleForm.ts | 2 +- web/src/admin/sources/ldap/LDAPSourceForm.ts | 20 +++++------- .../admin/sources/oauth/OAuthSourceForm.ts | 12 +++---- web/src/admin/sources/plex/PlexSourceForm.ts | 16 ++++------ web/src/admin/sources/saml/SAMLSourceForm.ts | 26 +++++++-------- web/src/admin/sources/scim/SCIMSourceForm.ts | 4 +-- .../AuthenticatorDuoStageForm.ts | 12 +++---- .../authenticator_duo/DuoDeviceImportForm.ts | 12 ++----- .../AuthenticatorSMSStageForm.ts | 32 +++++-------------- .../AuthenticatorStaticStageForm.ts | 6 ++-- .../AuthenticatorTOTPStageForm.ts | 8 ++--- .../AuthenticatorValidateStageForm.ts | 10 +++--- .../AuthenticatorWebAuthnStageForm.ts | 8 ++--- .../admin/stages/captcha/CaptchaStageForm.ts | 18 +++-------- .../admin/stages/consent/ConsentStageForm.ts | 6 ++-- web/src/admin/stages/deny/DenyStageForm.ts | 2 +- web/src/admin/stages/dummy/DummyStageForm.ts | 2 +- web/src/admin/stages/email/EmailStageForm.ts | 28 +++++----------- .../identification/IdentificationStageForm.ts | 8 ++--- .../admin/stages/invitation/InvitationForm.ts | 4 +-- .../stages/invitation/InvitationStageForm.ts | 2 +- .../stages/password/PasswordStageForm.ts | 10 ++---- web/src/admin/stages/prompt/PromptForm.ts | 10 +++--- .../admin/stages/prompt/PromptStageForm.ts | 8 ++--- .../admin/stages/source/SourceStageForm.ts | 6 ++-- .../stages/user_delete/UserDeleteStageForm.ts | 2 +- .../stages/user_login/UserLoginStageForm.ts | 10 +++--- .../stages/user_logout/UserLogoutStageForm.ts | 2 +- .../stages/user_write/UserWriteStageForm.ts | 2 +- web/src/admin/tokens/TokenForm.ts | 6 ++-- web/src/admin/users/ServiceAccountForm.ts | 6 +--- web/src/admin/users/UserForm.ts | 10 ++---- web/src/admin/users/UserPasswordForm.ts | 6 +--- web/src/admin/users/UserResetEmailForm.ts | 2 +- .../user/user-settings/mfa/MFADeviceForm.ts | 2 +- .../user-settings/tokens/UserTokenForm.ts | 2 +- 75 files changed, 236 insertions(+), 404 deletions(-) diff --git a/web/src/admin/applications/ApplicationCheckAccessForm.ts b/web/src/admin/applications/ApplicationCheckAccessForm.ts index b92ed5a5e26c..a2799548d2b1 100644 --- a/web/src/admin/applications/ApplicationCheckAccessForm.ts +++ b/web/src/admin/applications/ApplicationCheckAccessForm.ts @@ -93,11 +93,7 @@ export class ApplicationCheckAccessForm extends Form<{ forUser: number }> { } renderForm(): TemplateResult { - return html` + return html` => { const args: CoreUsersListRequest = { diff --git a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts index c34f79768422..da6c0eadbfd0 100644 --- a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts +++ b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts @@ -48,7 +48,7 @@ export class ApplicationWizardApplicationDetails extends WithBrandConfig(BasePro diff --git a/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts b/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts index dd913dd3ed08..fd3f9103679d 100644 --- a/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts +++ b/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts @@ -90,7 +90,7 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel { name="authorizationFlow" label=${msg("Authorization flow")} .errorMessages=${errors?.authorizationFlow ?? []} - ?required=${true} + required > ${msg("Configure how long refresh tokens are valid for.")}

diff --git a/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts b/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts index df65e9218368..f64dca7895fe 100644 --- a/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts +++ b/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts @@ -124,7 +124,7 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel { diff --git a/web/src/admin/applications/wizard/methods/rac/ak-application-wizard-authentication-for-rac.ts b/web/src/admin/applications/wizard/methods/rac/ak-application-wizard-authentication-for-rac.ts index 27b7a2fb7ed0..cc2070daa4a4 100644 --- a/web/src/admin/applications/wizard/methods/rac/ak-application-wizard-authentication-for-rac.ts +++ b/web/src/admin/applications/wizard/methods/rac/ak-application-wizard-authentication-for-rac.ts @@ -40,7 +40,7 @@ export class ApplicationWizardAuthenticationByRAC extends BaseProviderPanel { diff --git a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts index 403398bf3712..a016206fdef4 100644 --- a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts +++ b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts @@ -108,7 +108,7 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts index dd08b6b87290..b94e0b5951be 100644 --- a/web/src/admin/blueprints/BlueprintForm.ts +++ b/web/src/admin/blueprints/BlueprintForm.ts @@ -67,7 +67,7 @@ export class BlueprintForm extends ModelForm { } renderForm(): TemplateResult { - return html` + return html` { } renderForm(): TemplateResult { - return html` + return html` { ${msg("Branding settings")}
- + - + { container( html` container( html` { return html` @@ -39,18 +39,10 @@ export class CertificateKeyPairForm extends Form { ${msg("Optional, comma-separated SubjectAlt Names.")}

- + - + + return html`

${msg("PEM-encoded Certificate data.")}

diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts index 24ec962f4d7c..468621227435 100644 --- a/web/src/admin/events/RuleForm.ts +++ b/web/src/admin/events/RuleForm.ts @@ -80,7 +80,7 @@ export class RuleForm extends ModelForm { } renderForm(): TemplateResult { - return html` + return html` { )}

- + { )}

- + { } renderForm(): TemplateResult { - return html` + return html` { required /> - + ) => { this.onModeChange(ev.detail.value); @@ -106,7 +106,7 @@ export class TransportForm extends ModelForm { ?hidden=${!this.showWebhook} label=${msg("Webhook URL")} name="webhookUrl" - ?required=${true} + required > ) { } renderForm(): TemplateResult { - return html` + return html` ) { required /> - + ) { />

${msg("Shown as the Title in Flow pages.")}

 - + ) { />

${msg("Visible in the URL.")}

 - + @@ -235,7 +231,7 @@ export class FlowForm extends WithCapabilitiesConfig(ModelForm) { ) { ) { ${msg("Appearance settings")}
- + { { { } renderForm(): TemplateResult { - return html` + return html` { )}

- + { [OutpostTypeEnum.Rac, msg("RAC")], ]; - return html` + return html` { required /> - + - + + return html` { ${msg("Negates the outcome of the binding. Messages are unaffected.")}

- + { required /> - + { } renderForm(): TemplateResult { - return html` + return html` => { const args: CoreUsersListRequest = { diff --git a/web/src/admin/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts index 8801ec3b3701..b51638152df7 100644 --- a/web/src/admin/policies/dummy/DummyPolicyForm.ts +++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts @@ -38,7 +38,7 @@ export class DummyPolicyForm extends BasePolicyForm { "A policy used for testing. Always returns the same result as specified below after waiting a random duration.", )} - + { ${msg("Pass policy?")} - + { )}

- + { "Matches an event against a set of criteria. If any of the configured values match, the policy passes.", )} - + - + { "Executes the python snippet to determine whether to allow or deny a request.", )} - + {
{
{ { { { { { {
{
{ "Checks the value from the policy request against several rules, mostly used to ensure password strength.", )} - + { - + ${msg("Check Username")} - + + return html` + return html` - + ${msg("Protocol settings")}
- + + return html` ${msg("Protocol settings")}
- + - + { { name="refreshTokenValidity" label=${msg("Refresh Token validity")} value="${first(provider?.refreshTokenValidity, "days=30")}" - ?required=${true} + required .bighelp=${html`

${msg("Configure how long refresh tokens are valid for.")}

diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts index 60ea06470876..264a1ca4e9c1 100644 --- a/web/src/admin/providers/proxy/ProxyProviderForm.ts +++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts @@ -120,7 +120,7 @@ export class ProxyProviderFormPage extends BaseProviderForm {

{ {

{
{ { } renderForm(): TemplateResult { - return html` + return html` { { renderForm(): TemplateResult { return html` - + { required /> - + { > - + { { renderForm(): TemplateResult { return html` - + { { + return html` { } renderForm(): TemplateResult { - return html` + return html` { { ${msg("Protocol settings")}
- + { required /> - + { { { { { { { { } renderForm(): TemplateResult { - return html` + return html` { } renderForm(): TemplateResult { - return html` + return html` { ${msg("Protocol settings")}
- + { { } renderForm(): TemplateResult { - return html` + return html` { } renderForm(): TemplateResult { - return html` + return html` { required /> - + {
{ > - + { { { { + return html` - + @@ -423,7 +423,7 @@ export class OAuthSourceForm extends WithCapabilitiesConfig(BaseSourceForm diff --git a/web/src/admin/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts index 347954b76a5e..afebbd64b28f 100644 --- a/web/src/admin/sources/plex/PlexSourceForm.ts +++ b/web/src/admin/sources/plex/PlexSourceForm.ts @@ -176,7 +176,7 @@ export class PlexSourceForm extends WithCapabilitiesConfig(BaseSourceForm - + @@ -363,11 +363,7 @@ export class PlexSourceForm extends WithCapabilitiesConfig(BaseSourceForm ${msg("Protocol settings")}
- + + return html` - + @@ -260,11 +260,7 @@ export class SAMLSourceForm extends WithCapabilitiesConfig(BaseSourceForm ${msg("Protocol settings")}
- + { renderForm(): TemplateResult { return html`
- + { required /> - + - + - + diff --git a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts index 42f3670b80b2..ad9409f94ca1 100644 --- a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts +++ b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts @@ -49,11 +49,7 @@ export class DuoDeviceImportForm extends ModelForm + return html` => { const args: CoreUsersListRequest = { @@ -81,11 +77,7 @@ export class DuoDeviceImportForm extends ModelForm - +

${msg("The user ID in Duo, can be found in the URL after clicking on a user.")} diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts index 6249ea18eede..83899f348173 100644 --- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts +++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts @@ -61,7 +61,7 @@ export class AuthenticatorSMSStageForm extends BaseStageForm - + - + - + ${msg("Stage used to configure an SMS-based TOTP authenticator.")} - + ${msg("Stage-specific settings")}

- + - + - + ${msg("Stage-specific settings")}
- + { "This stage checks the user's current session against the Google reCaptcha (or compatible) service.", )} - + {
{ @@ -119,11 +119,7 @@ export class CaptchaStageForm extends BaseStageForm { ${msg("Advanced settings")}
- + + - + { ${msg("Stage-specific settings")}
- + { "Statically deny the flow. To use this stage effectively, disable *Evaluate when flow is planned* on the respective binding.", )} - + { "Dummy stage used for testing. Shows a simple continue button and always passes.", )} - + { return html` ${msg("Connection settings")}
- + { required /> - + { ${msg("Use SSL")} - + { { "Verify the user's email address by sending them a one-time-link. Can also be used for recovery to verify the user's authenticity.", )} - + { { ${msg("Time in minutes the token sent is valid.")}

- + { required /> - + ${msg("Source settings")}
- + { return html` { data-ak-slug="true" /> - + { return html` ${msg("This stage can be included in enrollment flows to accept invitations.")} - + { ${msg("Stage-specific settings")}
- + { { { } renderEditForm(): TemplateResult { - return html` + return html` { ${msg("Unique name of this field, used for selecting fields in prompt stages.")}

- + { )}

- + { ${msg("Label shown next to/above the prompt.")}

- + { "Show arbitrary input fields to the user, for example during enrollment. Data is saved in the flow context under the 'prompt_data' variable.", )} - + { ${msg("Stage-specific settings")}
- + { "Inject an OAuth or SAML Source into the flow execution. This allows for additional user verification, or to dynamically access different sources for different user identifiers (username, email address, etc).", )} - + { required /> - + => { const args: SourcesAllListRequest = { @@ -82,7 +82,7 @@ export class SourceStageForm extends BaseStageForm { { "Delete the currently pending user. CAUTION, this stage does not ask for confirmation. Use a consent stage to ensure the user is aware of their actions.", )} - + { renderForm(): TemplateResult { return html` ${msg("Log the currently pending user in.")} - + {
{ { { { renderForm(): TemplateResult { return html` ${msg("Remove the user from the current session.")} - + { is pending, a new user is created, and data is written to them.`, )} - + { return html` { ${msg("Unique identifier the token is referenced by.")}

- + => { const args: CoreUsersListRequest = { @@ -98,7 +98,7 @@ export class TokenForm extends ModelForm { > - + { } renderForm(): TemplateResult { - return html` + return html`

${msg("User's primary identifier. 150 characters or fewer.")} diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts index 25f3759abb31..3b55fa79b031 100644 --- a/web/src/admin/users/UserForm.ts +++ b/web/src/admin/users/UserForm.ts @@ -80,11 +80,7 @@ export class UserForm extends ModelForm { } renderForm(): TemplateResult { - return html` + return html` { />

${msg("User's display name.")}

 - + { )}

- + { } renderForm(): TemplateResult { - return html` + return html` `; } diff --git a/web/src/admin/users/UserResetEmailForm.ts b/web/src/admin/users/UserResetEmailForm.ts index a684fdbd0589..715b4c657fe4 100644 --- a/web/src/admin/users/UserResetEmailForm.ts +++ b/web/src/admin/users/UserResetEmailForm.ts @@ -34,7 +34,7 @@ export class UserResetEmailForm extends Form { } renderForm(): TemplateResult { - return html` + return html` { return html` Date: Sun, 8 Sep 2024 01:07:30 +0200 Subject: [PATCH 2/4] replace expanded and blankable Signed-off-by: Jens Langhammer --- .../ldap/ak-application-wizard-authentication-by-ldap.ts | 2 +- .../ak-application-wizard-authentication-by-oauth.ts | 2 +- .../rac/ak-application-wizard-authentication-for-rac.ts | 2 +- ...ication-wizard-authentication-by-saml-configuration.ts | 2 +- web/src/admin/blueprints/BlueprintForm.ts | 2 +- web/src/admin/brands/BrandForm.ts | 2 +- web/src/admin/common/ak-core-group-search.ts | 2 +- web/src/admin/common/ak-crypto-certificate-search.ts | 2 +- web/src/admin/events/RuleForm.ts | 2 +- web/src/admin/events/TransportForm.ts | 2 +- web/src/admin/groups/GroupForm.ts | 2 +- web/src/admin/outposts/OutpostForm.ts | 2 +- web/src/admin/policies/PolicyBindingForm.ts | 6 +++--- web/src/admin/policies/dummy/DummyPolicyForm.ts | 2 +- .../policies/event_matcher/EventMatcherPolicyForm.ts | 8 ++++---- web/src/admin/policies/expiry/ExpiryPolicyForm.ts | 2 +- web/src/admin/policies/expression/ExpressionPolicyForm.ts | 2 +- web/src/admin/policies/geoip/GeoIPPolicyForm.ts | 2 +- web/src/admin/policies/password/PasswordPolicyForm.ts | 4 ++-- web/src/admin/policies/reputation/ReputationPolicyForm.ts | 2 +- .../property-mappings/PropertyMappingProviderRACForm.ts | 2 +- .../google_workspace/GoogleWorkspaceProviderForm.ts | 4 ++-- web/src/admin/providers/ldap/LDAPProviderForm.ts | 2 +- .../microsoft_entra/MicrosoftEntraProviderForm.ts | 4 ++-- web/src/admin/providers/oauth2/OAuth2ProviderForm.ts | 2 +- web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts | 2 +- web/src/admin/providers/rac/RACProviderForm.ts | 2 +- web/src/admin/providers/radius/RadiusProviderForm.ts | 2 +- web/src/admin/providers/saml/SAMLProviderForm.ts | 4 ++-- web/src/admin/providers/saml/SAMLProviderViewPage.ts | 2 +- web/src/admin/providers/scim/SCIMProviderForm.ts | 4 ++-- web/src/admin/sources/ldap/LDAPSourceForm.ts | 4 ++-- web/src/admin/sources/oauth/OAuthSourceForm.ts | 4 ++-- web/src/admin/sources/plex/PlexSourceForm.ts | 2 +- web/src/admin/sources/saml/SAMLSourceForm.ts | 2 +- .../stages/authenticator_duo/AuthenticatorDuoStageForm.ts | 6 +++--- .../stages/authenticator_sms/AuthenticatorSMSStageForm.ts | 6 +++--- .../authenticator_static/AuthenticatorStaticStageForm.ts | 4 ++-- .../authenticator_totp/AuthenticatorTOTPStageForm.ts | 4 ++-- .../AuthenticatorValidateStageForm.ts | 4 ++-- .../AuthenticatorWebAuthnStageForm.ts | 4 ++-- web/src/admin/stages/captcha/CaptchaStageForm.ts | 2 +- web/src/admin/stages/consent/ConsentStageForm.ts | 2 +- web/src/admin/stages/deny/DenyStageForm.ts | 2 +- web/src/admin/stages/email/EmailStageForm.ts | 2 +- .../stages/identification/IdentificationStageForm.ts | 4 ++-- web/src/admin/stages/invitation/InvitationStageForm.ts | 2 +- web/src/admin/stages/password/PasswordStageForm.ts | 4 ++-- web/src/admin/stages/prompt/PromptStageForm.ts | 2 +- web/src/admin/stages/user_login/UserLoginStageForm.ts | 2 +- web/src/admin/stages/user_write/UserWriteStageForm.ts | 4 ++-- .../forms/SearchSelect/tests/ak-search-select.test.ts | 2 +- 52 files changed, 75 insertions(+), 75 deletions(-) diff --git a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts index da6c0eadbfd0..66960931cf28 100644 --- a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts +++ b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts @@ -91,7 +91,7 @@ export class ApplicationWizardApplicationDetails extends WithBrandConfig(BasePro > - + ${msg("Protocol settings")}
- + ${msg("Protocol settings")}
- + ${msg("Protocol settings")}
- + ${msg("Protocol settings")}
{ .selected=${(item: BlueprintFile): boolean => { return this.instance?.path === item.path; }} - ?blankable=${true} + blankable > ` diff --git a/web/src/admin/brands/BrandForm.ts b/web/src/admin/brands/BrandForm.ts index e4ef0ec48063..fedb70e81fbb 100644 --- a/web/src/admin/brands/BrandForm.ts +++ b/web/src/admin/brands/BrandForm.ts @@ -83,7 +83,7 @@ export class BrandForm extends ModelForm {

- + ${msg("Branding settings")}
diff --git a/web/src/admin/common/ak-core-group-search.ts b/web/src/admin/common/ak-core-group-search.ts index 8e67d7d0c188..64be9bfa2a97 100644 --- a/web/src/admin/common/ak-core-group-search.ts +++ b/web/src/admin/common/ak-core-group-search.ts @@ -95,7 +95,7 @@ export class CoreGroupSearch extends CustomListenerElement(AKElement) { .value=${renderValue} .selected=${this.selected} @ak-change=${this.handleSearchUpdate} - ?blankable=${true} + blankable > `; diff --git a/web/src/admin/common/ak-crypto-certificate-search.ts b/web/src/admin/common/ak-crypto-certificate-search.ts index c2227168219c..9e10bcf8484c 100644 --- a/web/src/admin/common/ak-crypto-certificate-search.ts +++ b/web/src/admin/common/ak-crypto-certificate-search.ts @@ -119,7 +119,7 @@ export class AkCryptoCertificateSearch extends CustomListenerElement(AKElement) .value=${renderValue} .selected=${this.selected} @ak-change=${this.handleSearchUpdate} - ?blankable=${true} + blankable > `; diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts index 468621227435..00f6e4df86fd 100644 --- a/web/src/admin/events/RuleForm.ts +++ b/web/src/admin/events/RuleForm.ts @@ -110,7 +110,7 @@ export class RuleForm extends ModelForm { .selected=${(group: Group): boolean => { return group.pk === this.instance?.group; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts index 74cb3f1f939a..049c3215093e 100644 --- a/web/src/admin/events/TransportForm.ts +++ b/web/src/admin/events/TransportForm.ts @@ -143,7 +143,7 @@ export class TransportForm extends ModelForm { .selected=${(item: NotificationWebhookMapping): boolean => { return this.instance?.webhookMapping === item.pk; }} - ?blankable=${true} + blankable > diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts index 93fd4cc6918e..df845c3690fe 100644 --- a/web/src/admin/groups/GroupForm.ts +++ b/web/src/admin/groups/GroupForm.ts @@ -114,7 +114,7 @@ export class GroupForm extends ModelForm { .selected=${(group: Group): boolean => { return group.pk === this.instance?.parent; }} - ?blankable=${true} + blankable > diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts index ee248d8bb218..67ac0e7a7aba 100644 --- a/web/src/admin/outposts/OutpostForm.ts +++ b/web/src/admin/outposts/OutpostForm.ts @@ -203,7 +203,7 @@ export class OutpostForm extends ModelForm { } return selected; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/policies/PolicyBindingForm.ts b/web/src/admin/policies/PolicyBindingForm.ts index d271033fa2ef..5f7c720c64bc 100644 --- a/web/src/admin/policies/PolicyBindingForm.ts +++ b/web/src/admin/policies/PolicyBindingForm.ts @@ -166,7 +166,7 @@ export class PolicyBindingForm extends ModelForm { .selected=${(policy: Policy): boolean => { return policy.pk === this.instance?.policy; }} - ?blankable=${true} + blankable > @@ -198,7 +198,7 @@ export class PolicyBindingForm extends ModelForm { .selected=${(group: Group): boolean => { return group.pk === this.instance?.group; }} - ?blankable=${true} + blankable > ${this.policyOnly @@ -237,7 +237,7 @@ export class PolicyBindingForm extends ModelForm { .selected=${(user: User): boolean => { return user.pk === this.instance?.user; }} - ?blankable=${true} + blankable > ${this.policyOnly diff --git a/web/src/admin/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts index b51638152df7..1d85069f1e91 100644 --- a/web/src/admin/policies/dummy/DummyPolicyForm.ts +++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts @@ -66,7 +66,7 @@ export class DummyPolicyForm extends BasePolicyForm { )}

- + ${msg("Policy-specific settings")}
diff --git a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts index f0ef7fcfe126..351cd54cd2ff 100644 --- a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts +++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts @@ -78,7 +78,7 @@ export class EventMatcherPolicyForm extends BasePolicyForm { )}

- + ${msg("Policy-specific settings")}
@@ -100,7 +100,7 @@ export class EventMatcherPolicyForm extends BasePolicyForm { .selected=${(item: TypeCreate): boolean => { return this.instance?.action === item.component; }} - ?blankable=${true} + blankable >

@@ -138,7 +138,7 @@ export class EventMatcherPolicyForm extends BasePolicyForm { .selected=${(item: App): boolean => { return this.instance?.app === item.name; }} - ?blankable=${true} + blankable >

@@ -168,7 +168,7 @@ export class EventMatcherPolicyForm extends BasePolicyForm { .selected=${(item: App): boolean => { return this.instance?.model === item.name; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts index dfbf1d1c99ce..ba8a2e922ff3 100644 --- a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts +++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts @@ -66,7 +66,7 @@ export class PasswordExpiryPolicyForm extends BasePolicyForm - + ${msg("Policy-specific settings")}

{ )}

- + ${msg("Policy-specific settings")}
{ )}

- + ${msg("Policy-specific settings")}
diff --git a/web/src/admin/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts index 6976239ec62e..7282d1c96be6 100644 --- a/web/src/admin/policies/password/PasswordPolicyForm.ts +++ b/web/src/admin/policies/password/PasswordPolicyForm.ts @@ -144,7 +144,7 @@ export class PasswordPolicyForm extends BasePolicyForm { renderHIBP(): TemplateResult { return html` - + ${msg("HaveIBeenPwned settings")}
{ renderZxcvbn(): TemplateResult { return html` - + ${msg("zxcvbn settings")}
- + ${msg("Policy-specific settings")}
diff --git a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts index baa941c0d8b2..b885353eb0c5 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts @@ -71,7 +71,7 @@ export class PropertyMappingProviderRACForm extends ModelForm - + ${msg("General settings")}
- + ${msg("Protocol settings")}
{ return group.pk === this.instance?.filterGroup; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts index 2e7258841cc3..819106915b5f 100644 --- a/web/src/admin/providers/ldap/LDAPProviderForm.ts +++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts @@ -139,7 +139,7 @@ export class LDAPProviderFormPage extends WithBrandConfig(BaseProviderForm - + ${msg("Protocol settings")}

diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts index 44cee6425a27..1606759bbf4c 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts @@ -56,7 +56,7 @@ export class MicrosoftEntraProviderFormPage extends BaseProviderForm - + ${msg("Protocol settings")}
@@ -188,7 +188,7 @@ export class MicrosoftEntraProviderFormPage extends BaseProviderForm { return group.pk === this.instance?.filterGroup; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts index be5b4e90f650..b6dbd7acd992 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts @@ -183,7 +183,7 @@ export class OAuth2ProviderFormPage extends BaseProviderForm {

- + ${msg("Protocol settings")}
{ return user.pk === this.previewUser?.pk; }} - ?blankable=${true} + blankable @ak-change=${(ev: CustomEvent) => { this.previewUser = ev.detail.value; this.fetchPreview(); diff --git a/web/src/admin/providers/rac/RACProviderForm.ts b/web/src/admin/providers/rac/RACProviderForm.ts index 28b5ba4e9816..86be59137172 100644 --- a/web/src/admin/providers/rac/RACProviderForm.ts +++ b/web/src/admin/providers/rac/RACProviderForm.ts @@ -119,7 +119,7 @@ export class RACProviderFormPage extends ModelForm {

- + ${msg("Protocol settings")}
- + ${msg("Protocol settings")}
{

- + ${msg("Protocol settings")}
@@ -311,7 +311,7 @@ export class SAMLProviderFormPage extends BaseProviderForm { .selected=${(item: SAMLPropertyMapping): boolean => { return this.instance?.nameIdMapping === item.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts index 67e1ddad26d2..67a43ff0aeef 100644 --- a/web/src/admin/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts @@ -539,7 +539,7 @@ export class SAMLProviderViewPage extends AKElement { .selected=${(user: User): boolean => { return user.pk === this.previewUser?.pk; }} - ?blankable=${true} + blankable @ak-change=${(ev: CustomEvent) => { this.previewUser = ev.detail.value; this.fetchPreview(); diff --git a/web/src/admin/providers/scim/SCIMProviderForm.ts b/web/src/admin/providers/scim/SCIMProviderForm.ts index 28a0f0a5f0f9..0719deeae71e 100644 --- a/web/src/admin/providers/scim/SCIMProviderForm.ts +++ b/web/src/admin/providers/scim/SCIMProviderForm.ts @@ -76,7 +76,7 @@ export class SCIMProviderFormPage extends BaseProviderForm { required /> - + ${msg("Protocol settings")}

@@ -153,7 +153,7 @@ export class SCIMProviderFormPage extends BaseProviderForm { .selected=${(group: Group): boolean => { return group.pk === this.instance?.filterGroup; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts index d0e028352585..920d54a77b91 100644 --- a/web/src/admin/sources/ldap/LDAPSourceForm.ts +++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts @@ -175,7 +175,7 @@ export class LDAPSourceForm extends BaseSourceForm { ${msg("Sync groups")} - + ${msg("Connection settings")}

{ .selected=${(group: Group): boolean => { return group.pk === this.instance?.syncParentGroup; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts index b4816076e743..3dca3e8eac43 100644 --- a/web/src/admin/sources/oauth/OAuthSourceForm.ts +++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts @@ -135,7 +135,7 @@ export class OAuthSourceForm extends WithCapabilitiesConfig(BaseSourceForm + return html` ${msg("URL settings")}

${iconHelperText}

`} - + ${msg("Protocol settings")}

${iconHelperText}

`} - + ${msg("Protocol settings")}
diff --git a/web/src/admin/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts index 3cda7f60de65..8856e10f3624 100644 --- a/web/src/admin/sources/saml/SAMLSourceForm.ts +++ b/web/src/admin/sources/saml/SAMLSourceForm.ts @@ -257,7 +257,7 @@ export class SAMLSourceForm extends WithCapabilitiesConfig(BaseSourceForm${iconHelperText}

`} - + ${msg("Protocol settings")}
diff --git a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts index a611a888caef..eceab9fcf73d 100644 --- a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts +++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts @@ -79,7 +79,7 @@ export class AuthenticatorDuoStageForm extends BaseStageForm - + ${msg("Duo Auth API")}
- + ${msg("Stage-specific settings")}
{ return this.instance?.configureFlow === flow.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts index 83899f348173..d98deab97674 100644 --- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts +++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts @@ -176,7 +176,7 @@ export class AuthenticatorSMSStageForm extends BaseStageForm { return this.instance?.mapping === item.pk; }} - ?blankable=${true} + blankable >

@@ -214,7 +214,7 @@ export class AuthenticatorSMSStageForm extends BaseStageForm - + ${msg("Stage-specific settings")}

@@ -308,7 +308,7 @@ export class AuthenticatorSMSStageForm extends BaseStageForm { return this.instance?.configureFlow === flow.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts index f2b0f16d46b9..5d0b0ec9bb09 100644 --- a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts +++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts @@ -69,7 +69,7 @@ export class AuthenticatorStaticStageForm extends BaseStageForm - + ${msg("Stage-specific settings")}

{ return this.instance?.configureFlow === flow.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts index 1ec78a77ff54..6fb82a753ec7 100644 --- a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts +++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts @@ -71,7 +71,7 @@ export class AuthenticatorTOTPStageForm extends BaseStageForm - + ${msg("Stage-specific settings")}

@@ -123,7 +123,7 @@ export class AuthenticatorTOTPStageForm extends BaseStageForm { return this.instance?.configureFlow === flow.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts index a25b5681c4a4..0048028041e9 100644 --- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts +++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts @@ -128,7 +128,7 @@ export class AuthenticatorValidateStageForm extends BaseStageForm - + ${msg("Stage-specific settings")}

- + ${msg("WebAuthn-specific settings")}
- + ${msg("Stage-specific settings")}
{ return this.instance?.configureFlow === flow.pk; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts index 50a9c2cc8084..07ee58d95755 100644 --- a/web/src/admin/stages/captcha/CaptchaStageForm.ts +++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts @@ -47,7 +47,7 @@ export class CaptchaStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}

{ required /> - + ${msg("Stage-specific settings")}
diff --git a/web/src/admin/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts index 5209918a8fdf..34feef392a4e 100644 --- a/web/src/admin/stages/deny/DenyStageForm.ts +++ b/web/src/admin/stages/deny/DenyStageForm.ts @@ -45,7 +45,7 @@ export class DenyStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}
diff --git a/web/src/admin/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts index e478ffbf5a82..41933176378e 100644 --- a/web/src/admin/stages/email/EmailStageForm.ts +++ b/web/src/admin/stages/email/EmailStageForm.ts @@ -148,7 +148,7 @@ export class EmailStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}
diff --git a/web/src/admin/stages/identification/IdentificationStageForm.ts b/web/src/admin/stages/identification/IdentificationStageForm.ts index 3cb833081839..f84877993c3e 100644 --- a/web/src/admin/stages/identification/IdentificationStageForm.ts +++ b/web/src/admin/stages/identification/IdentificationStageForm.ts @@ -109,7 +109,7 @@ export class IdentificationStageForm extends BaseStageForm required /> - + ${msg("Stage-specific settings")}
@@ -152,7 +152,7 @@ export class IdentificationStageForm extends BaseStageForm .selected=${(stage: Stage): boolean => { return stage.pk === this.instance?.passwordStage; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts index 21ef4b5ab8fb..16a7d3768c16 100644 --- a/web/src/admin/stages/invitation/InvitationStageForm.ts +++ b/web/src/admin/stages/invitation/InvitationStageForm.ts @@ -43,7 +43,7 @@ export class InvitationStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}

diff --git a/web/src/admin/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts index 6c56d94ff705..6d7fc774ac3d 100644 --- a/web/src/admin/stages/password/PasswordStageForm.ts +++ b/web/src/admin/stages/password/PasswordStageForm.ts @@ -79,7 +79,7 @@ export class PasswordStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}
@@ -134,7 +134,7 @@ export class PasswordStageForm extends BaseStageForm { } return selected; }} - ?blankable=${true} + blankable >

diff --git a/web/src/admin/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts index a7ebc0e4e17b..d20c2ee20a02 100644 --- a/web/src/admin/stages/prompt/PromptStageForm.ts +++ b/web/src/admin/stages/prompt/PromptStageForm.ts @@ -100,7 +100,7 @@ export class PromptStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}

diff --git a/web/src/admin/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts index 3b04d0e68970..8cef3af4fdbe 100644 --- a/web/src/admin/stages/user_login/UserLoginStageForm.ts +++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts @@ -43,7 +43,7 @@ export class UserLoginStageForm extends BaseStageForm { required /> - + ${msg("Stage-specific settings")}
{ required /> - + ${msg("Stage-specific settings")}
@@ -183,7 +183,7 @@ export class UserWriteStageForm extends BaseStageForm { .selected=${(group: Group): boolean => { return group.pk === this.instance?.createUsersGroup; }} - ?blankable=${true} + blankable >

diff --git a/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts b/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts index c0026e8ee865..0719b2de1a72 100644 --- a/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts +++ b/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts @@ -72,7 +72,7 @@ export class MockSearch extends CustomListenerElement(AKElement) { .selected=${this.selected} managed @ak-change=${this.handleSearchUpdate} - ?blankable=${true} + blankable > `; From b997e23ba4c0aa62f04db1077541545233e0595c Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 8 Sep 2024 01:09:22 +0200 Subject: [PATCH 3/4] autoreplace Signed-off-by: Jens Langhammer --- web/src/admin/AdminInterface/AdminSidebar.ts | 4 ++-- .../admin/applications/components/ak-backchannel-input.ts | 2 +- .../scim/ak-application-wizard-authentication-by-scim.ts | 2 +- web/src/admin/flows/BoundStagesList.ts | 4 ++-- web/src/admin/outposts/OutpostHealth.ts | 6 +++--- web/src/admin/outposts/OutpostListPage.ts | 4 ++-- web/src/admin/policies/BoundPoliciesList.ts | 4 ++-- web/src/admin/policies/PolicyListPage.ts | 4 ++-- web/src/admin/property-mappings/PropertyMappingTestForm.ts | 2 +- web/src/admin/providers/ProviderViewPage.ts | 2 +- .../google_workspace/GoogleWorkspaceProviderForm.ts | 4 ++-- .../providers/microsoft_entra/MicrosoftEntraProviderForm.ts | 4 ++-- web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts | 2 +- web/src/admin/providers/saml/SAMLProviderViewPage.ts | 4 ++-- web/src/admin/providers/scim/SCIMProviderForm.ts | 4 ++-- web/src/admin/sources/SourceListPage.ts | 4 ++-- web/src/admin/sources/SourceViewPage.ts | 2 +- web/src/admin/sources/ldap/LDAPSourceForm.ts | 2 +- web/src/admin/sources/oauth/OAuthSourceForm.ts | 2 +- web/src/admin/sources/oauth/OAuthSourceViewPage.ts | 2 +- web/src/admin/sources/plex/PlexSourceForm.ts | 2 +- web/src/admin/sources/plex/PlexSourceViewPage.ts | 2 +- web/src/admin/sources/saml/SAMLSourceForm.ts | 2 +- web/src/admin/sources/saml/SAMLSourceViewPage.ts | 4 ++-- web/src/admin/sources/scim/SCIMSourceForm.ts | 2 +- .../AuthenticatorValidateStageForm.ts | 2 +- web/src/admin/stages/invitation/InvitationForm.ts | 2 +- web/src/admin/stages/user_login/UserLoginStageForm.ts | 2 +- web/src/admin/users/ServiceAccountForm.ts | 4 ++-- web/src/admin/users/UserViewPage.ts | 2 +- web/src/components/stories/ak-status-label.stories.ts | 2 +- web/src/elements/Diagram.ts | 2 +- web/src/elements/EmptyState.test.ts | 2 +- web/src/elements/SyncStatusCard.ts | 2 +- web/src/elements/TreeView.ts | 2 +- web/src/elements/forms/ModalForm.ts | 2 +- web/src/elements/forms/ModelForm.ts | 2 +- web/src/elements/router/Route.ts | 2 +- .../user/user-settings/details/UserSettingsFlowExecutor.ts | 4 ++-- 39 files changed, 54 insertions(+), 54 deletions(-) diff --git a/web/src/admin/AdminInterface/AdminSidebar.ts b/web/src/admin/AdminInterface/AdminSidebar.ts index d2ac78915250..0e301ed7073a 100644 --- a/web/src/admin/AdminInterface/AdminSidebar.ts +++ b/web/src/admin/AdminInterface/AdminSidebar.ts @@ -176,7 +176,7 @@ export class AkAdminSidebar extends WithCapabilitiesConfig(AKElement) { renderNewVersionMessage() { return this.version && this.version !== VERSION ? html` - + ${msg("A newer version of the frontend is available.")} @@ -192,7 +192,7 @@ export class AkAdminSidebar extends WithCapabilitiesConfig(AKElement) { }); return this.impersonation - ? html` + ? html` ${msg( str`You're currently impersonating ${this.impersonation}. Click to stop.`, diff --git a/web/src/admin/applications/components/ak-backchannel-input.ts b/web/src/admin/applications/components/ak-backchannel-input.ts index d0e354b081ff..4353b47e1d2b 100644 --- a/web/src/admin/applications/components/ak-backchannel-input.ts +++ b/web/src/admin/applications/components/ak-backchannel-input.ts @@ -66,7 +66,7 @@ export class AkBackchannelProvidersInput extends AKElement { return html`

- +
- + ${msg("Attribute mapping")}
{
@@ -148,7 +148,7 @@ export class BoundStagesList extends Table { return html` diff --git a/web/src/admin/outposts/OutpostHealth.ts b/web/src/admin/outposts/OutpostHealth.ts index a8c63fc2835b..be787a2a63b8 100644 --- a/web/src/admin/outposts/OutpostHealth.ts +++ b/web/src/admin/outposts/OutpostHealth.ts @@ -49,7 +49,7 @@ export class OutpostHealthElement extends AKElement {
- + ${msg( str`${getRelativeTime(this.outpostHealth.lastSeen)} (${this.outpostHealth.lastSeen?.toLocaleTimeString()})`, )} @@ -64,12 +64,12 @@ export class OutpostHealthElement extends AKElement {
${this.outpostHealth.versionOutdated - ? html`${msg( str`${this.outpostHealth.version}, should be ${this.outpostHealth.versionShould}`, )} ` - : html`${versionString} `}
diff --git a/web/src/admin/outposts/OutpostListPage.ts b/web/src/admin/outposts/OutpostListPage.ts index 7784c11574e9..02baa9bec6f4 100644 --- a/web/src/admin/outposts/OutpostListPage.ts +++ b/web/src/admin/outposts/OutpostListPage.ts @@ -112,12 +112,12 @@ export class OutpostListPage extends TablePage { return [ html`
${item.name}
${item.config.authentik_host === "" - ? html` + ? html` ${msg( "Warning: authentik Domain is not configured, authentication will not work.", )} ` - : html` + : html` ${msg(str`Logging in via ${item.config.authentik_host}.`)} `}`, html`${TypeToLabel(item.type)}`, diff --git a/web/src/admin/policies/BoundPoliciesList.ts b/web/src/admin/policies/BoundPoliciesList.ts index 53b4e07158b1..58bec19b3ede 100644 --- a/web/src/admin/policies/BoundPoliciesList.ts +++ b/web/src/admin/policies/BoundPoliciesList.ts @@ -174,7 +174,7 @@ export class BoundPoliciesList extends Table {
@@ -198,7 +198,7 @@ export class BoundPoliciesList extends Table { renderToolbar(): TemplateResult { return html` diff --git a/web/src/admin/policies/PolicyListPage.ts b/web/src/admin/policies/PolicyListPage.ts index b88270494d02..77db58fa418f 100644 --- a/web/src/admin/policies/PolicyListPage.ts +++ b/web/src/admin/policies/PolicyListPage.ts @@ -64,10 +64,10 @@ export class PolicyListPage extends TablePage { return [ html`
${item.name}
${(item.boundTo || 0) > 0 - ? html` + ? html` ${msg(str`Assigned to ${item.boundTo} object(s).`)} ` - : html` + : html` ${msg("Warning: Policy is not assigned.")} `}`, html`${item.verboseName}`, diff --git a/web/src/admin/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts index ae847ad4f3c0..2a5e9fe2f49c 100644 --- a/web/src/admin/property-mappings/PropertyMappingTestForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts @@ -55,7 +55,7 @@ export class PolicyTestForm extends Form { ${this.result?.successful ? html` ` diff --git a/web/src/admin/providers/ProviderViewPage.ts b/web/src/admin/providers/ProviderViewPage.ts index 027648a77232..98c86390d540 100644 --- a/web/src/admin/providers/ProviderViewPage.ts +++ b/web/src/admin/providers/ProviderViewPage.ts @@ -41,7 +41,7 @@ export class ProviderViewPage extends AKElement { renderProvider(): TemplateResult { if (!this.provider) { - return html``; + return html``; } switch (this.provider?.component) { case "ak-provider-saml-form": diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts index f3af792c51d4..ab80950721d7 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts @@ -163,7 +163,7 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm
- + ${msg("User filtering")}
@@ -216,7 +216,7 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm
- + ${msg("Attribute mapping")}
- + ${msg("User filtering")}
@@ -197,7 +197,7 @@ export class MicrosoftEntraProviderFormPage extends BaseProviderForm
- + ${msg("Attribute mapping")}
${this.preview ? html`
${JSON.stringify(this.preview?.preview, null, 4)}
` - : html` `} + : html` `}
`; diff --git a/web/src/admin/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts index 67a43ff0aeef..a9c2c7cd8a3b 100644 --- a/web/src/admin/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts @@ -489,7 +489,7 @@ export class SAMLProviderViewPage extends AKElement {
@@ -502,7 +502,7 @@ export class SAMLProviderViewPage extends AKElement { renderTabPreview(): TemplateResult { if (!this.preview) { - return html``; + return html``; } return html`
{
- + ${msg("User filtering")}
@@ -162,7 +162,7 @@ export class SCIMProviderFormPage extends BaseProviderForm {
- + ${msg("Attribute mapping")}
{
${item.name}
${item.enabled ? html`` - : html` + : html` ${msg("Disabled")}`} `, @@ -115,7 +115,7 @@ export class SourceListPage extends TablePage { return [ html`
${item.name}
- ${msg("Built-in")} + ${msg("Built-in")}
`, html`${msg("Built-in")}`, html``, diff --git a/web/src/admin/sources/SourceViewPage.ts b/web/src/admin/sources/SourceViewPage.ts index 4c41033a5173..883ab24d4348 100644 --- a/web/src/admin/sources/SourceViewPage.ts +++ b/web/src/admin/sources/SourceViewPage.ts @@ -33,7 +33,7 @@ export class SourceViewPage extends AKElement { renderSource(): TemplateResult { if (!this.source) { - return html``; + return html``; } switch (this.source?.component) { case "ak-source-ldap-form": diff --git a/web/src/admin/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts index 920d54a77b91..cfeaaea34e14 100644 --- a/web/src/admin/sources/ldap/LDAPSourceForm.ts +++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts @@ -283,7 +283,7 @@ export class LDAPSourceForm extends BaseSourceForm {
- + ${msg("LDAP Attribute mapping")}
${this.renderUrlOptions()} - + ${msg("OAuth Attribute mapping")}
- +
diff --git a/web/src/admin/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts index 46a8662b6e7e..90bbb096f9e2 100644 --- a/web/src/admin/sources/plex/PlexSourceForm.ts +++ b/web/src/admin/sources/plex/PlexSourceForm.ts @@ -407,7 +407,7 @@ export class PlexSourceForm extends WithCapabilitiesConfig(BaseSourceForm
- + ${msg("Plex Attribute mapping")}
- +
diff --git a/web/src/admin/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts index 8856e10f3624..edc4f57ce692 100644 --- a/web/src/admin/sources/saml/SAMLSourceForm.ts +++ b/web/src/admin/sources/saml/SAMLSourceForm.ts @@ -519,7 +519,7 @@ export class SAMLSourceForm extends WithCapabilitiesConfig(BaseSourceForm
- + ${msg("SAML Attribute mapping")}
@@ -207,7 +207,7 @@ export class SAMLSourceViewPage extends AKElement { )}
- +
diff --git a/web/src/admin/sources/scim/SCIMSourceForm.ts b/web/src/admin/sources/scim/SCIMSourceForm.ts index d9a9612b2c94..6ef8516b7229 100644 --- a/web/src/admin/sources/scim/SCIMSourceForm.ts +++ b/web/src/admin/sources/scim/SCIMSourceForm.ts @@ -95,7 +95,7 @@ export class SCIMSourceForm extends BaseSourceForm {
- + ${msg("SCIM Attribute mapping")}
- + ${ /* TODO: Remove this after 2024.6..or maybe later? */ msg( diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts index 5bb826be21d0..69293fbbad21 100644 --- a/web/src/admin/stages/invitation/InvitationForm.ts +++ b/web/src/admin/stages/invitation/InvitationForm.ts @@ -43,7 +43,7 @@ export class InvitationForm extends ModelForm { renderForm(): TemplateResult { return html` { )}

- + ${msg( "Different browsers handle session cookies differently, and might not remove them even when the browser is closed.", )} diff --git a/web/src/admin/users/ServiceAccountForm.ts b/web/src/admin/users/ServiceAccountForm.ts index 38e6286da024..87855e757e3d 100644 --- a/web/src/admin/users/ServiceAccountForm.ts +++ b/web/src/admin/users/ServiceAccountForm.ts @@ -62,7 +62,7 @@ export class ServiceAccountForm extends Form {