public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v8.5.x] Geomap: Revert temporary fix for markers coloring (#53611) (#53630)

Browse Source 
(cherry picked from commit 1f93216f1d)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2022-08-11 17:57:01 -04:00
committed by GitHub
co-authored by Adela Almasan
parent b48e5fcc53
commit d8583237ea
1 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/panel/geomap/GeomapPanel.tsx
-47
View File
@@ -95,28 +95,6 @@ export class GeomapPanel extends Component<Props, State> {
componentDidMount() {
this.panelContext = this.context as PanelContext;
// TODO: Clean this approach up / potentially support multiple marker layers?
// See https://github.com/grafana/grafana/issues/51185 for more details.
setTimeout(() => {
for (const layer of this.layers) {
if (layer.options.type === MARKERS_LAYER_ID) {
const colorField = layer.options.config.style.color.field;
const colorFieldData = this.props.data.series[0].fields.find((field) => field.name === colorField);
// initialize (not override) Standard Options min/max value with color field calc min/max
if (colorFieldData) {
this.props.onFieldConfigChange({
...this.props.fieldConfig,
defaults: {
min: colorFieldData.state?.calcs?.min,
max: colorFieldData.state?.calcs?.max,
...this.props.fieldConfig.defaults,
},
});
break;
}
}
}
}, 50);
}
shouldComponentUpdate(nextProps: Props) {
@@ -265,31 +243,6 @@ export class GeomapPanel extends Component<Props, State> {
console.log('Controls changed');
this.initControls(options.controls ?? { showZoom: true, showAttribution: true });
}
// TODO: Clean this approach up / potentially support multiple marker layers?
// See https://github.com/grafana/grafana/issues/51185 for more details.
for (const layer of options.layers) {
if (layer.type === MARKERS_LAYER_ID) {
const oldLayer = this.props.options.layers.find((lyr) => lyr.name === layer.name);
const newLayerColorField = layer.config.style.color.field;
const oldLayerColorField = oldLayer?.config.style.color.field;
if (layer.config.style.color.field && newLayerColorField !== oldLayerColorField) {
const colorFieldData = this.props.data.series[0].fields.find((field) => field.name === newLayerColorField);
if (colorFieldData) {
// override Standard Options min/max value with color field calc min/max
this.props.onFieldConfigChange({
...this.props.fieldConfig,
defaults: {
...this.props.fieldConfig.defaults,
min: colorFieldData.state?.calcs?.min,
max: colorFieldData.state?.calcs?.max,
},
});
break;
}
}
}
}
}
/**