From 0832bf8fd4fce23ac13892973f6c04cbdee97b6a Mon Sep 17 00:00:00 2001
From: Christopher Poile <cpoile@gmail.com>
Date: Tue, 1 Jul 2025 10:14:33 -0400
Subject: [PATCH] [MM-64696] LDAP Wizard: Add help text for slow LDAP queries
 (#32161)

---
 .../admin_console/admin_definition_ldap_wizard.tsx  | 13 ++++++++-----
 webapp/channels/src/i18n/en.json                    |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx b/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
index 0847c065714..42e70400331 100644
--- a/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
@@ -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'}),
             },
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 27ce2b49167..05447d633ee 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -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",