From 086c77f5e31a0bd21df6394010456f4652828665 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 19 Jan 2021 11:06:51 +0100
Subject: [PATCH] Loki: Remove showing of unique labels with the empty string
 value (#30363)

* Remove empty unique label values

* Add test

* Simplify
---
 packages/grafana-ui/src/components/Logs/LogLabels.test.tsx | 5 +++++
 packages/grafana-ui/src/components/Logs/LogLabels.tsx      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx b/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
index acbf2ef7ae8..eaee962f963 100644
--- a/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
+++ b/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
@@ -20,4 +20,9 @@ describe('<LogLabels />', () => {
     expect(wrapper.text()).not.toContain('42');
     expect(wrapper.text()).not.toContain('13');
   });
+  it('excludes labels with empty string values', () => {
+    const wrapper = shallow(<LogLabels labels={{ foo: 'bar', baz: '' }} theme={getTheme()} />);
+    expect(wrapper.text()).toContain('bar');
+    expect(wrapper.html()).not.toContain('baz');
+  });
 });
diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.tsx b/packages/grafana-ui/src/components/Logs/LogLabels.tsx
index ab21a2cfd02..1f40f0abfe7 100644
--- a/packages/grafana-ui/src/components/Logs/LogLabels.tsx
+++ b/packages/grafana-ui/src/components/Logs/LogLabels.tsx
@@ -59,6 +59,9 @@ export const UnThemedLogLabels: FunctionComponent<Props> = ({ labels, theme }) =
     <span className={cx([styles.logsLabels])}>
       {displayLabels.sort().map(label => {
         const value = labels[label];
+        if (!value) {
+          return;
+        }
         const tooltip = `${label}: ${value}`;
         return (
           <span key={label} className={cx([styles.logsLabel])}>