From 7da43f0e0e7f8ecb24662e9d921744242615d7f3 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 26 Mar 2025 10:11:34 +0000
Subject: [PATCH] [release-11.6.1] LDAP test: Fix page crash (#102684)

* LDAP test: Fix page crash (#102587)

* fix translation code on ldap page causing crash

* move tooltip outside of trans

(cherry picked from commit 4f01c1aa885b9ca8cf0f098db692cfe0f7bcb182)

* pseudo translations
---
 .../app/features/admin/ldap/LdapUserGroups.tsx   | 16 +++++++---------
 public/locales/en-US/grafana.json                |  2 +-
 public/locales/pseudo-LOCALE/grafana.json        |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/public/app/features/admin/ldap/LdapUserGroups.tsx b/public/app/features/admin/ldap/LdapUserGroups.tsx
index 890ec4aee56..565048f1059 100644
--- a/public/app/features/admin/ldap/LdapUserGroups.tsx
+++ b/public/app/features/admin/ldap/LdapUserGroups.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import { Tooltip, Icon, InteractiveTable, type CellProps, Column } from '@grafana/ui';
+import { Tooltip, Icon, InteractiveTable, type CellProps, Column, Stack } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 import { LdapRole } from 'app/types';
 
@@ -28,14 +28,12 @@ export const LdapUserGroups = ({ groups }: Props) => {
         header: 'Role',
         cell: (props: CellProps<LdapRole, string | undefined>) =>
           props.value || (
-            <>
-              <Trans i18nKey="admin.ldap-user-groups.no-org-found">
-                No match{' '}
-                <Tooltip content="No matching organizations found">
-                  <Icon name="info-circle" />
-                </Tooltip>
-              </Trans>
-            </>
+            <Stack alignItems="center" wrap>
+              <Trans i18nKey="admin.ldap-user-groups.no-org-found">No match</Trans>
+              <Tooltip content="No matching organizations found">
+                <Icon name="info-circle" />
+              </Tooltip>
+            </Stack>
           ),
       },
     ],
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index cef94684d01..f98caba3808 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -82,7 +82,7 @@
       "title": "LDAP Synchronization"
     },
     "ldap-user-groups": {
-      "no-org-found": "No match <2><0></0></2>"
+      "no-org-found": "No match"
     },
     "ldap-user-info": {
       "no-team": "No teams found via LDAP"
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index a2f227ebf67..ae84044d4e6 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -82,7 +82,7 @@
       "title": "ĿĐÅP Ŝyʼnčĥřőʼnįžäŧįőʼn"
     },
     "ldap-user-groups": {
-      "no-org-found": "Ńő mäŧčĥ <2><0></0></2>"
+      "no-org-found": "Ńő mäŧčĥ"
     },
     "ldap-user-info": {
       "no-team": "Ńő ŧęämş ƒőūʼnđ vįä ĿĐÅP"