IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

FieldConfig: Set field config defaults based on config registry (#23376)

Browse Source 
* Set field config defaults based on config registry

* Rename FIeldPropertyEditorItem to FieldConfigPopertyItem

* Remove console.log

* Simplify overrides persistence model and add support for nested properties in overrides

* Review updates
This commit is contained in:
Dominik Prokop
2020-04-07 15:02:08 +02:00
committed by GitHub
parent 3c61627ab7
commit 92231cc42e
10 changed files with 184 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx
View File

@@ -3,7 +3,7 @@ import cloneDeep from 'lodash/cloneDeep';
import {
FieldConfigSource,
DataFrame,
FieldPropertyEditorItem,
FieldConfigPropertyItem,
VariableSuggestionsScope,
PanelPlugin,
SelectableValue,
@@ -142,7 +142,7 @@ export const DefaultFieldConfigEditor: React.FC<Props> = ({ data, onChange, conf
);
const renderEditor = useCallback(
(item: FieldPropertyEditorItem) => {
(item: FieldConfigPropertyItem) => {
const defaults = config.defaults;
const value = item.isCustom
? defaults.custom

6
public/app/features/dashboard/components/PanelEditor/OverrideEditor.tsx
View File

@@ -49,10 +49,9 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({ data, override,
);
const onDynamicConfigValueAdd = useCallback(
(id: string, custom?: boolean) => {
(id: string) => {
const propertyConfig: DynamicConfigValue = {
id,
isCustom: custom,
};
if (override.properties) {
override.properties.push(propertyConfig);
@@ -69,7 +68,6 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({ data, override,
label: item.name,
value: item.id,
description: item.description,
custom: item.isCustom,
};
});
@@ -117,7 +115,7 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({ data, override,
options={configPropertiesOptions}
variant={'link'}
onChange={o => {
onDynamicConfigValueAdd(o.value, o.custom);
onDynamicConfigValueAdd(o.value);
}}
/>
</div>