Merge branch 'dblessing_fix_ldap_admin_group_display' into 'master'

Fix admin groups page LDAP group links display

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169986



Merged-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Approved-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Reviewed-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

ee/app/views/ldap_group_links/_ldap_group_link.html.haml

 %li{ class: 'gl-items-center !gl-flex' }
   %div
     %p.gl-font-bold.gl-mb-0
-      = ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name})") % {filter_name: ldap_group_link.filter}
+      = ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name}") % {filter_name: ldap_group_link.filter}
 
     - if ldap_group_link.config
       .light
@@ -14,5 +14,6 @@
     - unless ldap_group_link.active?
       = s_('LDAP|(Inactive because syncing with an LDAP user filter is not included in the current license)')
 
-  = link_button_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, variant: :danger, size: :small, icon: 'unlink', class: 'gl-ml-auto' do
-    = _('Remove')
+  - if show_remove
+    = link_button_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, variant: :danger, size: :small, icon: 'unlink', class: 'gl-ml-auto' do
+      = _('Remove')

ee/app/views/ldap_group_links/_ldap_group_links.html.haml

@@ -5,7 +5,7 @@
   - c.with_body do
     - if group.ldap_group_links.any?
       %ul.content-list
-        = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group }
+        = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group, show_remove: true }
     - else
       %p.gl-my-4
         = s_('LDAP|No LDAP synchronizations')

ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml

@@ -4,8 +4,4 @@
 = render ::Layouts::CrudComponent.new(s_('LDAP|Active synchronizations')) do |c|
   - c.with_body do
     %ul.content-list
-    - group.ldap_group_links.select(&:active?).each do |ldap_group_link|
-      %li
-        %strong= ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name})") % {filter_name: truncate(ldap_group_link.filter, length: 40)}
-        _('as')
-        %strong= group_link_role_name(ldap_group_link)
+      = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group, show_remove: false }

locale/gitlab.pot

@@ -23566,7 +23566,7 @@ msgstr ""
 msgid "Filter users"
 msgstr ""
-msgid "Filter: %{filter_name})"
+msgid "Filter: %{filter_name}"
 msgstr ""
 msgid "Finalizing"