From 47a5ae388ef69d5ffc46c4c5506ee83f43070771 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 19:14:49 +0200 Subject: [PATCH] [v11.0.x] Prometheus: Use correct logic for frontend package feature flag (#85298) Prometheus: Use correct logic for frontend package feature flag (#85294) use correct logic for frontend package feature flag (cherry picked from commit d4a68d66629f42aab5d26612b1eacb8e0d17bbb7) Co-authored-by: Brendan O'Handley --- public/app/plugins/datasource/prometheus/module.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/prometheus/module.ts b/public/app/plugins/datasource/prometheus/module.ts index 53891d091ea..002720ee141 100644 --- a/public/app/plugins/datasource/prometheus/module.ts +++ b/public/app/plugins/datasource/prometheus/module.ts @@ -14,10 +14,10 @@ import { PrometheusDatasource } from './datasource'; const usePackage = config.featureToggles.usePrometheusFrontendPackage; -const PrometheusDataSourceUsed = usePackage ? PrometheusDatasource : PrometheusDatasourcePackage; -const PromQueryEditorByAppUsed = usePackage ? PromQueryEditorByApp : PromQueryEditorByAppPackage; -const ConfigEditorUsed = usePackage ? ConfigEditor : ConfigEditorPackage; -const PromCheatSheetUsed = usePackage ? PromCheatSheet : PromCheatSheetPackage; +const PrometheusDataSourceUsed = usePackage ? PrometheusDatasourcePackage : PrometheusDatasource; +const PromQueryEditorByAppUsed = usePackage ? PromQueryEditorByAppPackage : PromQueryEditorByApp; +const ConfigEditorUsed = usePackage ? ConfigEditorPackage : ConfigEditor; +const PromCheatSheetUsed = usePackage ? PromCheatSheetPackage : PromCheatSheet; // @ts-ignore These type errors will be removed when we fully migrate to the @grafana/prometheus package export const plugin = new DataSourcePlugin(PrometheusDataSourceUsed)