upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-64696] LDAP Wizard: Add help text for slow LDAP queries (#32161)

Browse source
This commit is contained in:
Christopher Poile 2025-07-01 10:14:33 -04:00 committed by GitHub
parent 1b7d27707d
commit 0832bf8fd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
View file

@ -366,7 +366,8 @@ export const ldapWizardAdminDefinition: LDAPAdminDefinitionConfigSchemaSettings
),
),
label: defineMessage({id: 'admin.ldap.testFiltersTitle', defaultMessage: 'Test Filters'}),
help_text_markdown: false,
help_text: defineMessage({id: 'admin.ldap.testFiltersHelpText', defaultMessage: '**Note**: This test is similar in scope to an LDAP sync and may take time depending on the size of the LDAP Server, hardware, or network conditions.'}),
help_text_markdown: true,
error_message: defineMessage({id: 'admin.ldap.testFiltersFailure', defaultMessage: 'We failed to apply some filters: {error}'}),
success_message: defineMessage({id: 'admin.ldap.testFiltersSuccess', defaultMessage: 'Test Successful'}),
},
@ -526,7 +527,9 @@ export const ldapWizardAdminDefinition: LDAPAdminDefinitionConfigSchemaSettings
type: 'button',
action: ldapTestAttributes,
key: 'LdapSettings.TestAttributes',
help_text_markdown: false,
label: defineMessage({id: 'admin.ldap.testAttributesTitle', defaultMessage: 'Test Attributes'}),
help_text: defineMessage({id: 'admin.ldap.testFiltersHelpText', defaultMessage: '**Note**: This test is similar in scope to an LDAP sync and may take time depending on the size of the LDAP Server, hardware, or network conditions.'}),
help_text_markdown: true,
isDisabled: it.any(
it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.LDAP)),
it.all(
@ -534,7 +537,6 @@ export const ldapWizardAdminDefinition: LDAPAdminDefinitionConfigSchemaSettings
it.stateIsFalse('LdapSettings.EnableSync'),
),
),
label: defineMessage({id: 'admin.ldap.testAttributesTitle', defaultMessage: 'Test Attributes'}),
error_message: defineMessage({id: 'admin.ldap.testAttributesFailure', defaultMessage: 'We failed to find some attributes: {error}'}),
success_message: defineMessage({id: 'admin.ldap.testAttributesSuccess', defaultMessage: 'Test Successful'}),
},
@ -583,7 +585,9 @@ export const ldapWizardAdminDefinition: LDAPAdminDefinitionConfigSchemaSettings
type: 'button',
action: ldapTestGroupAttributes,
key: 'LdapSettings.TestGroupAttributes',
help_text_markdown: false,
label: defineMessage({id: 'admin.ldap.testGroupAttributesTitle', defaultMessage: 'Test Group Attributes'}),
help_text: defineMessage({id: 'admin.ldap.testFiltersHelpText', defaultMessage: '**Note**: This test is similar in scope to an LDAP sync and may take time depending on the size of the LDAP Server, hardware, or network conditions.'}),
help_text_markdown: true,
isDisabled: it.any(
it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.LDAP)),
it.all(
@ -591,7 +595,6 @@ export const ldapWizardAdminDefinition: LDAPAdminDefinitionConfigSchemaSettings
it.stateIsFalse('LdapSettings.EnableSync'),
),
),
label: defineMessage({id: 'admin.ldap.testGroupAttributesTitle', defaultMessage: 'Test Group Attributes'}),
error_message: defineMessage({id: 'admin.ldap.testGroupAttributesFailure', defaultMessage: 'We failed to find some attributes: {error}'}),
success_message: defineMessage({id: 'admin.ldap.testGroupAttributesSuccess', defaultMessage: 'Test Successful'}),
},

1
webapp/channels/src/i18n/en.json
View file

@ -1542,6 +1542,7 @@
"admin.ldap.testConnectionSuccess": "Test Connection Successful",
"admin.ldap.testConnectionTitle": "Test Connection",
"admin.ldap.testFiltersFailure": "We failed to apply some filters: {error}",
"admin.ldap.testFiltersHelpText": "**Note**: This test is similar in scope to an LDAP sync and may take time depending on the size of the LDAP Server, hardware, or network conditions.",
"admin.ldap.testFiltersPartialFailure": "{failedCount, number} of {totalCount, number} filter test{totalCount, plural, one {} other {s}} failed. Check the highlighted fields for details.",
"admin.ldap.testFiltersSuccess": "Test Successful",
"admin.ldap.testFiltersTitle": "Test Filters",