From 8cb9f0a36c360c08704a502cc1c1df3a476b581e Mon Sep 17 00:00:00 2001 From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com> Date: Fri, 16 May 2025 01:00:34 -0600 Subject: [PATCH] Dashboard: Use metadata.generation for dash version in v1 (#105499) --- public/app/features/dashboard/api/v1.test.ts | 8 ++++---- public/app/features/dashboard/api/v1.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/features/dashboard/api/v1.test.ts b/public/app/features/dashboard/api/v1.test.ts index c0beae229b8..9490e490168 100644 --- a/public/app/features/dashboard/api/v1.test.ts +++ b/public/app/features/dashboard/api/v1.test.ts @@ -198,7 +198,7 @@ describe('v1 dashboard API', () => { }); expect(result.uid).toBe('adh59cn'); - expect(result.version).toBe(0); + expect(result.version).toBe(1); expect(result.url).toBe('/d/adh59cn/new-dashboard-saved'); }); it('should provide dashboard URL with app sub url configured', async () => { @@ -224,7 +224,7 @@ describe('v1 dashboard API', () => { }); expect(result.uid).toBe('adh59cn'); - expect(result.version).toBe(0); + expect(result.version).toBe(1); expect(result.url).toBe('/grafana/d/adh59cn/new-dashboard-saved'); }); }); @@ -242,7 +242,7 @@ describe('v1 dashboard API', () => { }); expect(result.uid).toBe('adh59cn'); - expect(result.version).toBe(0); + expect(result.version).toBe(1); expect(result.url).toBe('/d/adh59cn/new-dashboard-saved'); }); @@ -268,7 +268,7 @@ describe('v1 dashboard API', () => { }); expect(result.uid).toBe('adh59cn'); - expect(result.version).toBe(0); + expect(result.version).toBe(1); expect(result.url).toBe('/grafana/d/adh59cn/new-dashboard-saved'); }); }); diff --git a/public/app/features/dashboard/api/v1.ts b/public/app/features/dashboard/api/v1.ts index 3235d9dbbf0..752f3e2b102 100644 --- a/public/app/features/dashboard/api/v1.ts +++ b/public/app/features/dashboard/api/v1.ts @@ -89,7 +89,7 @@ export class K8sDashboardAPI implements DashboardAPI { return { uid: v.metadata.name, - version: v.spec.version ?? 0, + version: v.metadata.generation ?? 0, id: v.spec.id ?? 0, status: 'success', url,