[MM-63772] Add LDAP setting to re-add removed members (#30787)

webapp/channels/src/components/admin_console/admin_definition.tsx

@@ -4177,6 +4177,19 @@ const AdminDefinition: AdminDefinitionType = {
                                         ),
                                     ),
                                 },
+                                {
+                                    type: 'bool',
+                                    key: 'LdapSettings.ReAddRemovedMembers',
+                                    label: defineMessage({id: 'admin.ldap.reAddRemovedMembersTitle', defaultMessage: 'Re-add removed members on sync:'}),
+                                    help_text: defineMessage({id: 'admin.ldap.reAddRemovedMembersDesc', defaultMessage: 'When enabled, members who were previously removed from group-synced teams or channels will be re-added during LDAP synchronization if they are still a member of the LDAP group.'}),
+                                    isDisabled: it.any(
+                                        it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.LDAP)),
+                                        it.all(
+                                            it.stateIsFalse('LdapSettings.Enable'),
+                                            it.stateIsFalse('LdapSettings.EnableSync'),
+                                        ),
+                                    ),
+                                },
                                 {
                                     type: 'number',
                                     key: 'LdapSettings.MaxPageSize',

webapp/channels/src/i18n/en.json

@@ -1471,6 +1471,8 @@
   "admin.ldap.queryDesc": "The timeout value for queries to the AD/LDAP server. Increase if you are getting timeout errors caused by a slow AD/LDAP server.",
   "admin.ldap.queryEx": "E.g.: \"60\"",
   "admin.ldap.queryTitle": "Query Timeout (seconds):",
+  "admin.ldap.reAddRemovedMembersDesc": "When enabled, members who were previously removed from group-synced teams or channels will be re-added during LDAP synchronization if they are still a member of the LDAP group.",
+  "admin.ldap.reAddRemovedMembersTitle": "Re-add removed members on sync:",
   "admin.ldap.remove.privKey": "Remove TLS Certificate Private Key",
   "admin.ldap.remove.sp_certificate": "Remove Service Provider Certificate",
   "admin.ldap.removing.certificate": "Removing Certificate...",