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

Geomap: Update language to match documentation and remove beta (#53703)

Browse Source 
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
This commit is contained in:
Drew Slobodnjak 2022-08-12 18:33:30 -07:00 committed by GitHub
parent 0362ab131e
commit e9e5c97807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tests/api/plugins/data/expectedListResp.json
View File

@ -458,7 +458,7 @@
"hasUpdate": false, "hasUpdate": false,
"defaultNavUrl": "/plugins/geomap/", "defaultNavUrl": "/plugins/geomap/",
"category": "", "category": "",
"state": "beta", "state": "",
"signature": "internal", "signature": "internal",
"signatureType": "", "signatureType": "",
"signatureOrg": "" "signatureOrg": ""

24
public/app/plugins/panel/geomap/module.tsx
View File

@ -44,8 +44,10 @@ export const plugin = new PanelPlugin<GeomapPanelOptions>(GeomapPanel)
if (!state?.layers) { if (!state?.layers) {
// TODO? show spinner? // TODO? show spinner?
} else { } else {
const layersCategory = ['Map layers'];
const basemapCategory = ['Basemap layer'];
builder.addCustomEditor({ builder.addCustomEditor({
category: ['Data layer'], category: layersCategory,
id: 'layers', id: 'layers',
path: '', path: '',
name: '', name: '',
@ -57,7 +59,7 @@ export const plugin = new PanelPlugin<GeomapPanelOptions>(GeomapPanel)
builder.addNestedOptions( builder.addNestedOptions(
getLayerEditor({ getLayerEditor({
state: selected, state: selected,
category: ['Data layer'], category: layersCategory,
basemaps: false, basemaps: false,
}) })
); );
@ -66,18 +68,18 @@ export const plugin = new PanelPlugin<GeomapPanelOptions>(GeomapPanel)
const baselayer = state.layers[0]; const baselayer = state.layers[0];
if (config.geomapDisableCustomBaseLayer) { if (config.geomapDisableCustomBaseLayer) {
builder.addCustomEditor({ builder.addCustomEditor({
category: ['Base layer'], category: basemapCategory,
id: 'layers', id: 'layers',
path: '', path: '',
name: '', name: '',
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
editor: () => <div>The base layer is configured by the server admin.</div>, editor: () => <div>The basemap layer is configured by the server admin.</div>,
}); });
} else if (baselayer) { } else if (baselayer) {
builder.addNestedOptions( builder.addNestedOptions(
getLayerEditor({ getLayerEditor({
state: baselayer, state: baselayer,
category: ['Base layer'], category: basemapCategory,
basemaps: true, basemaps: true,
}) })
); );
@ -117,16 +119,16 @@ export const plugin = new PanelPlugin<GeomapPanelOptions>(GeomapPanel)
}) })
.addBooleanSwitch({ .addBooleanSwitch({
category, category,
path: 'controls.showDebug', path: 'controls.showMeasure',
name: 'Show debug', name: 'Show measure tools',
description: 'Show map info', description: 'Show tools for making measurements on the map',
defaultValue: false, defaultValue: false,
}) })
.addBooleanSwitch({ .addBooleanSwitch({
category, category,
path: 'controls.showMeasure', path: 'controls.showDebug',
name: 'Show measure tools', name: 'Show debug',
description: 'Show tools for making measurements on the map', description: 'Show map info',
defaultValue: false, defaultValue: false,
}) })
.addRadio({ .addRadio({

1
public/app/plugins/panel/geomap/plugin.json
View File

@ -2,7 +2,6 @@
"type": "panel", "type": "panel",
"name": "Geomap", "name": "Geomap",
"id": "geomap", "id": "geomap",
"state": "beta",
"info": { "info": {
"description": "Geomap panel", "description": "Geomap panel",