mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
FieldOverrides: Move FieldConfigSource from fieldOptions to PanelModel.fieldConfig (#22600)
* Apply field overrides in PanelChrome * Move applyFieldOverrides to panel query runner * Review updates * Make sure overrides are applied back on souce panel when exiting the new edit mode * TS ignores in est * Make field display work in viz repeater * Review updates * Review and test updates * Change the way overrides and trransformations are retrieved in PQR * Add fieldConfig property to PanelModel * Dashboard migration v1 * Use field config when exiting new panel edit mode * Gauge - use fieldConfig from panel model * FieldDisplayOptions - don's extend FieldConfigSource * Fix fieldDisplay ts * StatPanel updated * Stat panel defaults applied * Table2 panel options update * React graph updates * BarGauge updated * PieChart, Gauge, BarGauge and Stat updates * PieChart - remove field config defaults from options * FieldDisplayEditor - remove unused methos * PanelModel - remove debugger * Remove fieldConfig from field options when migrating dashboard * Update data links migrations * Update fieldDisaplay tests to respect new fieldConfig * Update dashboard schema version in snapshots * Fix BarGaugePanel test * Rebase fixes * Add onFieldConfigChange to PanelProps type * Update shared single stat migration * Pass PanelModel instead of options only for panel type change handler [breaking] * Renames * Don't mutate panel options * Migrations update * Remove obsolete snap * Minor updates after review * Fix null checks * Temporarily (until we decide to switch to new pane edit) bring back old aditors * Temporarily rename ValueMappingEditor and MappingRow to Legacy* * Migrations update * Updae setFieldConfigDefaults API * Update the way field config defaults are applied * Use standard field config for gauge, bar gauge and stat panels * refactoring * Revert dashboard fieldOptions migrations as those are handled by single stat migrator * Fix ts in tests * Strict null fix and some minor fixes Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
This commit is contained in:
@@ -89,33 +89,25 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
|
||||
this.props.updateLocation({ query: { tab: tab.id }, partial: true });
|
||||
};
|
||||
|
||||
onFieldConfigsChange = (fieldOptions: FieldConfigSource) => {
|
||||
// NOTE: for now, assume this is from 'fieldOptions' -- TODO? put on panel model directly?
|
||||
onFieldConfigChange = (config: FieldConfigSource) => {
|
||||
const { panel } = this.props;
|
||||
const options = panel.getOptions();
|
||||
panel.updateOptions({
|
||||
...options,
|
||||
fieldOptions, // Assume it is from shared singlestat -- TODO own property?
|
||||
|
||||
panel.updateFieldConfig({
|
||||
...config,
|
||||
});
|
||||
this.forceUpdate();
|
||||
};
|
||||
|
||||
renderFieldOptions(plugin: PanelPlugin) {
|
||||
const { panel, data } = this.props;
|
||||
const { fieldConfig } = panel;
|
||||
|
||||
const fieldOptions = panel.options['fieldOptions'] as FieldConfigSource;
|
||||
|
||||
if (!fieldOptions) {
|
||||
if (!fieldConfig) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<FieldConfigEditor
|
||||
config={fieldOptions}
|
||||
plugin={plugin}
|
||||
onChange={this.onFieldConfigsChange}
|
||||
data={data.series}
|
||||
/>
|
||||
<FieldConfigEditor config={fieldConfig} plugin={plugin} onChange={this.onFieldConfigChange} data={data.series} />
|
||||
);
|
||||
}
|
||||
|
||||
@@ -130,7 +122,13 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
|
||||
if (plugin.editor && panel) {
|
||||
return (
|
||||
<div style={{ marginTop: '10px' }}>
|
||||
<plugin.editor data={data} options={panel.getOptions()} onOptionsChange={this.onPanelOptionsChanged} />
|
||||
<plugin.editor
|
||||
data={data}
|
||||
options={panel.getOptions()}
|
||||
onOptionsChange={this.onPanelOptionsChanged}
|
||||
fieldConfig={panel.getFieldConfig()}
|
||||
onFieldConfigChange={this.onFieldConfigChange}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ describe('ShareModal', () => {
|
||||
},
|
||||
};
|
||||
ctx.mount({
|
||||
panel: { id: 22, options: {} },
|
||||
panel: { id: 22, options: {}, fieldConfig: { defaults: {}, overrides: [] } },
|
||||
});
|
||||
});
|
||||
|
||||
@@ -101,7 +101,7 @@ describe('ShareModal', () => {
|
||||
it('should generate render url', () => {
|
||||
mockLocationHref('http://dashboards.grafana.com/d/abcdefghi/my-dash');
|
||||
ctx.mount({
|
||||
panel: { id: 22, options: {} },
|
||||
panel: { id: 22, options: {}, fieldConfig: { defaults: {}, overrides: [] } },
|
||||
});
|
||||
|
||||
const state = ctx.wrapper?.state();
|
||||
@@ -113,7 +113,7 @@ describe('ShareModal', () => {
|
||||
it('should generate render url for scripted dashboard', () => {
|
||||
mockLocationHref('http://dashboards.grafana.com/dashboard/script/my-dash.js');
|
||||
ctx.mount({
|
||||
panel: { id: 22, options: {} },
|
||||
panel: { id: 22, options: {}, fieldConfig: { defaults: {}, overrides: [] } },
|
||||
});
|
||||
|
||||
const state = ctx.wrapper?.state();
|
||||
@@ -142,7 +142,7 @@ describe('ShareModal', () => {
|
||||
it('should remove fullscreen from image url when is first param in querystring and modeSharePanel is true', () => {
|
||||
mockLocationHref('http://server/#!/test?fullscreen&edit');
|
||||
ctx.mount({
|
||||
panel: { id: 1, options: {} },
|
||||
panel: { id: 1, options: {}, fieldConfig: { defaults: {}, overrides: [] } },
|
||||
});
|
||||
|
||||
const state = ctx.wrapper?.state();
|
||||
@@ -153,7 +153,7 @@ describe('ShareModal', () => {
|
||||
it('should remove edit from image url when is first param in querystring and modeSharePanel is true', () => {
|
||||
mockLocationHref('http://server/#!/test?edit&fullscreen');
|
||||
ctx.mount({
|
||||
panel: { id: 1, options: {} },
|
||||
panel: { id: 1, options: {}, fieldConfig: { defaults: {}, overrides: [] } },
|
||||
});
|
||||
|
||||
const state = ctx.wrapper?.state();
|
||||
|
||||
Reference in New Issue
Block a user