FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382)

* Revert "FeatureToggles: register all enterprise feature toggles (#44336)"

This reverts commit f53b3fb007.

* Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)"

This reverts commit f94c0decbd.
This commit is contained in:
Agnès Toulet
2022-01-24 16:08:05 +01:00
committed by GitHub
parent 29268483c2
commit 65bdb3a899
66 changed files with 249 additions and 1324 deletions
@@ -40,6 +40,7 @@ export interface LicenseInfo {
licenseUrl: string;
stateInfo: string;
edition: GrafanaEdition;
enabledFeatures: { [key: string]: boolean };
}
/**
@@ -1,9 +1,3 @@
// NOTE: This file was auto generated. DO NOT EDIT DIRECTLY!
// To change feature flags, edit:
// pkg/services/featuremgmt/registry.go
// Then run tests in:
// pkg/services/featuremgmt/toggles_gen_test.go
/**
* Describes available feature toggles in Grafana. These can be configured via
* conf/custom.ini to enable features under development or not yet available in
@@ -1,12 +1,6 @@
import { FeatureToggles } from '@grafana/data';
import { config } from '../config';
export const featureEnabled = (feature: boolean | undefined | keyof FeatureToggles): boolean => {
if (feature === true || feature === false) {
return feature;
}
if (feature == null || !config?.featureToggles) {
return false;
}
return Boolean(config.featureToggles[feature]);
export const featureEnabled = (feature: string): boolean => {
const { enabledFeatures } = config.licenseInfo;
return enabledFeatures && enabledFeatures[feature];
};