From 19cd446f05c70310420c93e98402093d2d4be76b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 23 May 2022 13:18:00 -0400 Subject: [PATCH] Plugins: Fix Azure Devops plugin link and plugins list order (#49394) (#49432) * Plugins: Fix Azure Devops plugin link and plugins list order * tests added for plugins sorting (cherry picked from commit f9d1d8370f651f621a12d82fec44bc5818ffee0d) Co-authored-by: Sriram --- .../app/features/datasources/state/buildCategories.test.ts | 7 +++++-- public/app/features/datasources/state/buildCategories.ts | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/app/features/datasources/state/buildCategories.test.ts b/public/app/features/datasources/state/buildCategories.test.ts index d161de8c620..70a615aae89 100644 --- a/public/app/features/datasources/state/buildCategories.test.ts +++ b/public/app/features/datasources/state/buildCategories.test.ts @@ -52,7 +52,10 @@ describe('buildCategories', () => { }); it('should add enterprise phantom plugins', () => { - expect(categories[3].title).toBe('Enterprise plugins'); - expect(categories[3].plugins.length).toBe(17); + const enterprisePluginsCategory = categories[3]; + expect(enterprisePluginsCategory.title).toBe('Enterprise plugins'); + expect(enterprisePluginsCategory.plugins.length).toBe(17); + expect(enterprisePluginsCategory.plugins[0].name).toBe('AppDynamics'); + expect(enterprisePluginsCategory.plugins[enterprisePluginsCategory.plugins.length - 1].name).toBe('Wavefront'); }); }); diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts index d74fd4fe7f2..5ca1021d960 100644 --- a/public/app/features/datasources/state/buildCategories.ts +++ b/public/app/features/datasources/state/buildCategories.ts @@ -88,7 +88,7 @@ function sortPlugins(plugins: DataSourcePluginMeta[]) { return 1; } - return a.name > b.name ? -1 : 1; + return a.name > b.name ? 1 : -1; }); } @@ -191,7 +191,7 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] { imgUrl: 'public/img/plugins/signalfx-logo.svg', }), getPhantomPlugin({ - id: 'grafana-azure-devops-datasource', + id: 'grafana-azuredevops-datasource', description: 'Azure Devops datasource', name: 'Azure Devops', imgUrl: 'public/img/plugins/azure-devops.png',