Skip to content

Commit 2031e82

Browse files
dsuren1dsuren1
committed
#2020 - Update edit menu of the dataset and layer settings
1 parent b1e5659 commit 2031e82

15 files changed

+55
-46
lines changed

‎geonode_mapstore_client/client/js/epics/gnresource.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,15 @@ import { ProcessTypes } from '@js/utils/ResourceServiceUtils';
110110
import { catalogClose } from '@mapstore/framework/actions/catalog';
111111
import { VisualizationModes } from '@mapstore/framework/utils/MapTypeUtils';
112112
import { forceUpdateMapLayout } from '@mapstore/framework/actions/maplayout';
113+
import { searchSelector } from '@mapstore/framework/selectors/router';
113114

114115
const FIT_BOUNDS_CONTROL = 'fitBounds';
115116

116117
const resourceTypes = {
117118
[ResourceTypes.DATASET]: {
118119
resourceObservable: (pk, options) => {
119120
const { page, selectedLayer, map: currentMap } = options || {};
120-
const { subtype } = options?.params || {};
121+
const { subtype, searchParams } = options?.params || {};
121122
return Observable.defer(() =>
122123
axios.all([
123124
getNewMapConfiguration(),
@@ -182,6 +183,7 @@ const resourceTypes = {
182183
...(page === 'dataset_edit_layer_settings'
183184
? [
184185
showSettings(newLayer.id, "layers", {opacity: newLayer.opacity ?? 1}),
186+
setControlProperty("layersettings", "activeTab", searchParams.get('tab') ?? "general"),
185187
updateAdditionalLayer(newLayer.id, STYLE_OWNER_NAME, 'override', {}),
186188
resizeMap()
187189
]
@@ -485,6 +487,7 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
485487
loadingResourceConfig(false)
486488
);
487489
}
490+
const params = new URLSearchParams(searchSelector(state));
488491
const resourceData = getResourceData(state);
489492
const isSamePreviousResource = !resourceData?.['@ms-detail'] && resourceData?.pk === action.pk;
490493
return Observable.concat(
@@ -511,7 +514,7 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
511514
resourceData,
512515
selectedLayer: isSamePreviousResource && getSelectedLayer(state),
513516
map: isSamePreviousResource && mapSelector(state),
514-
params: action?.options?.params
517+
params: {...action?.options?.params, searchParams: params}
515518
}),
516519
Observable.of(
517520
loadingResourceConfig(false)

‎geonode_mapstore_client/static/mapstore/configs/localConfig.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,17 @@
596596
"labelId": "gnviewer.editData",
597597
"disableIf": "{!context.resourceHasPermission(state('gnResourceData'), 'change_dataset_data')}"
598598
},
599+
{
600+
"type": "link",
601+
"href": "{'#/dataset/' + (state('gnResourceData') || {}).pk + '/edit/settings?tab=style'}",
602+
"labelId": "gnviewer.editStyle",
603+
"disableIf": "{!context.resourceHasPermission(state('gnResourceData'), 'change_dataset_style')}"
604+
},
605+
{
606+
"type": "plugin",
607+
"name": "OperationUploadStyle",
608+
"disableIf": "{!context.resourceHasPermission(state('gnResourceData'), 'change_dataset_style')}"
609+
},
599610
{
600611
"type": "link",
601612
"href": "{'#/dataset/' + (state('gnResourceData') || {}).pk + '/edit/settings'}",
@@ -607,11 +618,6 @@
607618
"href": "{context.getMetadataUrl(state('gnResourceData'))}",
608619
"labelId": "gnviewer.editMetadata"
609620
},
610-
{
611-
"type": "plugin",
612-
"name": "OperationUploadStyle",
613-
"disableIf": "{!context.resourceHasPermission(state('gnResourceData'), 'change_dataset_style')}"
614-
},
615621
{
616622
"type": "plugin",
617623
"name": "OperationUploadMetadata",

‎geonode_mapstore_client/static/mapstore/gn-translations/data.de-DE.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@
463463
"metadataGroupTitle": "Allgemein",
464464
"noGridData": "Keine Daten zum Anzeigen",
465465
"layerSettings": {
466-
"title": "Layer-Einstellungen",
467-
"updateSuccess": "Layer-Einstellungen aktualisiert",
468-
"updateError": "Fehler beim Speichern der Layer-Einstellungen"
466+
"title": "Kartenschichteinstellungen",
467+
"updateSuccess": "Kartenschichteinstellungen aktualisiert",
468+
"updateError": "Fehler beim Aktualisieren der Kartenschichteinstellungen"
469469
},
470470
"apply": "Anwenden"
471471
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.en-US.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@
463463
"metadataGroupTitle": "General",
464464
"noGridData": "No data to display",
465465
"layerSettings": {
466-
"title": "Layer settings",
467-
"updateSuccess": "Layer settings updated",
468-
"updateError": "Error updating layer settings"
466+
"title": "Map layer settings",
467+
"updateSuccess": "Map layer settings updated",
468+
"updateError": "Error updating map layer settings"
469469
},
470470
"apply": "Apply"
471471

‎geonode_mapstore_client/static/mapstore/gn-translations/data.es-ES.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@
462462
"metadataGroupTitle": "General",
463463
"noGridData": "No hay datos para mostrar",
464464
"layerSettings": {
465-
"title": "Configuración de capa",
466-
"updateSuccess": "Configuración de capa actualizada",
467-
"updateError": "Error al guardar la configuración de capa"
465+
"title": "Configuración de capas del mapa",
466+
"updateSuccess": "Configuración de capas del mapa actualizada",
467+
"updateError": "Error al actualizar la configuración de capas del mapa"
468468
},
469469
"apply": "Aplicar"
470470
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.fi-FI.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.fr-FR.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@
463463
"metadataGroupTitle": "Général",
464464
"noGridData": "Aucune donnée à afficher",
465465
"layerSettings": {
466-
"title": "Paramètres de la couche",
467-
"updateSuccess": "Paramètres de la couche mis à jour",
468-
"updateError": "Erreur lors de la sauvegarde des paramètres de la couche"
466+
"title": "Paramètres des couches de la carte",
467+
"updateSuccess": "Paramètres des couches de la carte mis à jour",
468+
"updateError": "Erreur lors de la mise à jour des paramètres des couches de la carte"
469469
},
470470
"apply": "Appliquer"
471471
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.hr-HR.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.it-IT.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,9 @@
465465
"metadataGroupTitle": "Generale",
466466
"noGridData": "Nessun dato da visualizzare",
467467
"layerSettings": {
468-
"title": "Impostazioni del layer",
469-
"updateSuccess": "Impostazioni del layer aggiornate",
470-
"updateError": "Errore nel salvataggio delle impostazioni del layer"
468+
"title": "Impostazioni del layer della mappa",
469+
"updateSuccess": "Impostazioni del layer della mappa aggiornate",
470+
"updateError": "Errore durante l'aggiornamento delle impostazioni del layer della mappa"
471471
},
472472
"apply": "Applica"
473473
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.nl-NL.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.pt-PT.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.sk-SK.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.sv-SE.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@
434434
"metadataGroupTitle": "General",
435435
"noGridData": "No data to display",
436436
"layerSettings": {
437-
"title": "Layer settings",
438-
"updateSuccess": "Layer settings updated",
439-
"updateError": "Error saving layer settings"
437+
"title": "Map layer settings",
438+
"updateSuccess": "Map layer settings updated",
439+
"updateError": "Error updating map layer settings"
440440
},
441441
"apply": "Apply"
442442
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.vi-VN.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

‎geonode_mapstore_client/static/mapstore/gn-translations/data.zh-ZH.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@
433433
"metadataGroupTitle": "General",
434434
"noGridData": "No data to display",
435435
"layerSettings": {
436-
"title": "Layer settings",
437-
"updateSuccess": "Layer settings updated",
438-
"updateError": "Error saving layer settings"
436+
"title": "Map layer settings",
437+
"updateSuccess": "Map layer settings updated",
438+
"updateError": "Error updating map layer settings"
439439
},
440440
"apply": "Apply"
441441
}

0 commit comments

Comments
 (0)