From d01cfcc2edd2cfcd675f658e85ad580ac995eb47 Mon Sep 17 00:00:00 2001
From: Ying WANG <ying.wang@grafana.com>
Date: Thu, 20 May 2021 14:22:57 +0200
Subject: [PATCH] remove feature toggle + add libraryPaneldefinition

---
 cue/data/gen.cue                                         | 4 ----
 pkg/api/dashboard.go                                     | 8 +++-----
 pkg/api/plugins.go                                       | 2 +-
 pkg/services/schemaloader/schemaloader.go                | 6 ------
 pkg/setting/setting.go                                   | 5 -----
 .../dashboard/components/ShareModal/ShareExport.tsx      | 9 +++------
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/cue/data/gen.cue b/cue/data/gen.cue
index d793254ae2d..e8dadab0ffa 100644
--- a/cue/data/gen.cue
+++ b/cue/data/gen.cue
@@ -133,10 +133,6 @@ Family: scuemata.#Family & {
 
                     // The values depend on panel type
                     options: {...}
-                    libraryPanel?: {
-                        name: string,
-                        uid: string
-                    }
                     fieldConfig: {
                         defaults: {
                             ...
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 8438a13c397..692ce5a2558 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -52,11 +52,9 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa
 	meta := cmd.Meta
 
 	trimedResult := *dash
-	if !hs.LoadSchemaService.IsDisabled() {
-		trimedResult, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash)
-		if err != nil {
-			return response.Error(500, "Error while trim default value from dashboard json", err)
-		}
+	trimedResult, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash)
+	if err != nil {
+		return response.Error(500, "Error while trim default value from dashboard json", err)
 	}
 
 	dto := dtos.TrimDashboardFullWithMeta{
diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index 761163c2d9d..07bee001dc6 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -213,7 +213,7 @@ func (hs *HTTPServer) ImportDashboard(c *models.ReqContext, apiCmd dtos.ImportDa
 	}
 
 	trimDefaults := c.QueryBoolWithDefault("trimdefaults", true)
-	if trimDefaults && !hs.LoadSchemaService.IsDisabled() {
+	if trimDefaults {
 		apiCmd.Dashboard, err = hs.LoadSchemaService.DashboardApplyDefaults(apiCmd.Dashboard)
 		if err != nil {
 			return response.Error(500, "Error while applying default value to the dashboard json", err)
diff --git a/pkg/services/schemaloader/schemaloader.go b/pkg/services/schemaloader/schemaloader.go
index 647c6b206eb..b922eb40dd9 100644
--- a/pkg/services/schemaloader/schemaloader.go
+++ b/pkg/services/schemaloader/schemaloader.go
@@ -50,12 +50,6 @@ func (rs *SchemaLoaderService) Init() error {
 	}
 	return nil
 }
-func (rs *SchemaLoaderService) IsDisabled() bool {
-	if rs.Cfg == nil {
-		return true
-	}
-	return !rs.Cfg.IsTrimDefaultsEnabled()
-}
 
 func (rs *SchemaLoaderService) DashboardApplyDefaults(input *simplejson.Json) (*simplejson.Json, error) {
 	val, _ := input.Map()
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index a2ecbb42f40..8447481bdb3 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -390,11 +390,6 @@ func (cfg Cfg) IsNgAlertEnabled() bool {
 	return cfg.FeatureToggles["ngalert"]
 }
 
-// IsTrimDefaultsEnabled returns whether the standalone trim dashboard default feature is enabled.
-func (cfg Cfg) IsTrimDefaultsEnabled() bool {
-	return cfg.FeatureToggles["trimDefaults"]
-}
-
 // IsDatabaseMetricsEnabled returns whether the database instrumentation feature is enabled.
 func (cfg Cfg) IsDatabaseMetricsEnabled() bool {
 	return cfg.FeatureToggles["database_metrics"]
diff --git a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
index 4feeec45b6c..7850e24f966 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
@@ -7,7 +7,6 @@ import { DashboardExporter } from 'app/features/dashboard/components/DashExportM
 import { appEvents } from 'app/core/core';
 import { ShowModalReactEvent } from 'app/types/events';
 import { ViewJsonModal } from './ViewJsonModal';
-import { config } from '@grafana/runtime';
 
 interface Props {
   dashboard: DashboardModel;
@@ -138,11 +137,9 @@ export class ShareExport extends PureComponent<Props, State> {
         <Field label="Export for sharing externally">
           <Switch value={shareExternally} onChange={this.onShareExternallyChange} />
         </Field>
-        {config.featureToggles.trimDefaults && (
-          <Field label="Export with trimed dashboard json">
-            <Switch value={trimDefaults} onChange={this.onTrimDefaultsChange} />
-          </Field>
-        )}
+        <Field label="Export with trimed dashboard json">
+          <Switch value={trimDefaults} onChange={this.onTrimDefaultsChange} />
+        </Field>
         <Modal.ButtonRow>
           <Button variant="secondary" onClick={onDismiss} fill="outline">
             Cancel