From 7619cf69c2ba4244a608034a2f174e43dcde0b3a Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 14:32:21 +0100
Subject: [PATCH] [v10.4.x] Azure Monitor: Add validation for namespace field
 in AdvancedResourcePicker when entering a forward slash (#89313)

Azure Monitor: Add validation for namespace field in AdvancedResourcePicker when entering a forward slash (#89288)

* Add validation for namespace field in AdvancedResourcePicker when entering a forward slash

* Add test

* Fix formatting

* Remove unused import

(cherry picked from commit 0bdd613f3b33a67d3df2554a788b54dc2d85962f)

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>
---
 .../AdvancedResourcePicker.test.tsx                 | 13 +++++++++++++
 .../MetricsQueryEditor/AdvancedResourcePicker.tsx   |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.test.tsx
index 57ff4eaa53a..8ff8908e1aa 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.test.tsx
@@ -101,4 +101,17 @@ describe('AdvancedResourcePicker', () => {
     expect(screen.getByDisplayValue('rg2')).toBeInTheDocument();
     expect(screen.getByDisplayValue('res2')).toBeInTheDocument();
   });
+
+  it('should display an error when the namespace field ends in a /', async () => {
+    const onChange = jest.fn();
+
+    render(
+      <AdvancedResourcePicker
+        onChange={onChange}
+        resources={[{ metricNamespace: 'Microsoft.OperationalInsights/workspaces/' }]}
+      />
+    );
+
+    expect(screen.getByText('Namespace cannot end with a "/"')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.tsx
index ab755ca6454..dcbc0bf216e 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.tsx
@@ -81,6 +81,8 @@ const AdvancedResourcePicker = ({ resources, onChange }: ResourcePickerProps<Azu
         htmlFor={`input-advanced-resource-picker-metricNamespace`}
         labelWidth={15}
         data-testid={selectors.components.queryEditor.resourcePicker.advanced.namespace.input}
+        invalid={resources[0]?.metricNamespace?.endsWith('/')}
+        error={'Namespace cannot end with a "/"'}
       >
         <Input
           id={`input-advanced-resource-picker-metricNamespace`}