From c3336e6ecfa4edd83a536f96314b9ea784711815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20Toulet?= <35176601+AgnesToulet@users.noreply.github.com> Date: Wed, 14 Oct 2020 19:08:52 +0200 Subject: [PATCH] Chore: clean up Enterprise feature toggles (#28264) --- packages/grafana-data/src/types/config.ts | 2 -- packages/grafana-runtime/src/config.ts | 2 -- .../app/features/datasources/state/navModel.ts | 16 +++++++--------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts index a283f702386..7c0c449c9d4 100644 --- a/packages/grafana-data/src/types/config.ts +++ b/packages/grafana-data/src/types/config.ts @@ -41,8 +41,6 @@ export interface FeatureToggles { * Available only in Grafana Enterprise */ meta: boolean; - datasourceInsights: boolean; - reportGrid: boolean; } /** diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts index 3f5660ff8b3..0930ec44371 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -55,8 +55,6 @@ export class GrafanaBootConfig implements GrafanaConfig { live: false, expressions: false, meta: false, - datasourceInsights: false, - reportGrid: false, ngalert: false, }; licenseInfo: LicenseInfo = {} as LicenseInfo; diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts index 72b8ca1cf57..71b84f011dd 100644 --- a/public/app/features/datasources/state/navModel.ts +++ b/public/app/features/datasources/state/navModel.ts @@ -54,15 +54,13 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat url: `datasources/edit/${dataSource.id}/permissions`, }); - if (config.featureToggles.datasourceInsights) { - navModel.children!.push({ - active: false, - icon: 'info-circle', - id: `datasource-insights-${dataSource.id}`, - text: 'Insights', - url: `datasources/edit/${dataSource.id}/insights`, - }); - } + navModel.children!.push({ + active: false, + icon: 'info-circle', + id: `datasource-insights-${dataSource.id}`, + text: 'Insights', + url: `datasources/edit/${dataSource.id}/insights`, + }); } return navModel;