From f77853f91ef8406bf54c8f3ea7337485a6013a4f Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 31 Jan 2023 12:36:21 +0000
Subject: [PATCH] AzureMonitor: Fix dimension migration (#62485)

Remove unneeded properties post migration
---
 .../utils/migrateQuery.test.ts                | 21 +++++++++++++++++++
 .../utils/migrateQuery.ts                     |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
index 7d46fc905c9..aec26492fec 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
@@ -155,6 +155,27 @@ describe('AzureMonitor: migrateQuery', () => {
         })
       );
     });
+    it('correctly removes outdated fields', () => {
+      const result = migrateQuery({
+        ...azureMonitorQueryV8,
+        azureMonitor: { dimension: 'testDimension', dimensionFilter: 'testFilter' },
+      });
+      expect(result).toMatchObject(
+        expect.objectContaining({
+          azureMonitor: expect.objectContaining({
+            dimensionFilters: [
+              {
+                dimension: 'testDimension',
+                operator: 'eq',
+                filters: ['testFilter'],
+              },
+            ],
+          }),
+        })
+      );
+      expect(result.azureMonitor).not.toHaveProperty('dimension');
+      expect(result.azureMonitor).not.toHaveProperty('dimensionFilter');
+    });
 
     it('correctly migrates a metric definition', () => {
       const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { metricDefinition: 'ms.ns/mn' } });
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
index 69149cc24fe..c1e9ad03edc 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
@@ -103,6 +103,9 @@ function migrateDimensionToDimensionFilter(query: AzureMonitorQuery): AzureMonit
     ]);
   }
 
+  delete workingQuery.azureMonitor?.dimension;
+  delete workingQuery.azureMonitor?.dimensionFilter;
+
   return workingQuery;
 }