add create map button to dataset page (#549)

GeoNode · Oct 26, 2021 · c53f196 · c53f196
1 parent 15f3949
commit c53f196
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 11 deletions.
diff --git a/geonode_mapstore_client/client/js/epics/gnresource.js b/geonode_mapstore_client/client/js/epics/gnresource.js
@@ -147,10 +147,33 @@ const resourceTypes = {
                     );
                 }),
         newResourceObservable: (options) =>
-            Observable.defer(() => getNewMapConfiguration())
-                .switchMap((response) => {
+            Observable.defer(() => axios.all([
+                getNewMapConfiguration(),
+                ...(options?.query?.['gn-dataset']
+                    ? [ getDatasetByPk(options.query['gn-dataset']) ]
+                    : [])
+            ]))
+                .switchMap(([ response, gnLayer ]) => {
+                    const mapConfig = options.data || response;
+                    const newLayer = gnLayer ? resourceToLayerConfig(gnLayer) : null;
+                    const { minx, miny, maxx, maxy } = newLayer?.bbox?.bounds || {};
+                    const extent = newLayer?.bbox?.bounds && [ minx, miny, maxx, maxy ];
                     return Observable.of(
-                        configureMap(options.data || response),
+                        configureMap(newLayer
+                            ? {
+                                ...mapConfig,
+                                map: {
+                                    ...mapConfig?.map,
+                                    layers: [
+                                        ...(mapConfig?.map?.layers || []),
+                                        newLayer
+                                    ]
+                                }
+                            }
+                            : mapConfig),
+                        ...(extent
+                            ? [ setControlProperty('fitBounds', 'geometry', extent) ]
+                            : []),
                         setControlProperty('toolbar', 'expanded', false)
                     );
                 })
@@ -244,7 +267,8 @@ export const gnViewerRequestNewResourceConfig = (action$, store) =>
     action$.ofType(REQUEST_NEW_RESOURCE_CONFIG)
         .switchMap((action) => {
             const { newResourceObservable } = resourceTypes[action.resourceType] || {};
-            if (!canAddResource(store.getState())) {
+            const state = store.getState();
+            if (!canAddResource(state)) {
                 const formattedUrl = url.format({
                     ...window.location,
                     pathname: '/account/login/',
@@ -256,6 +280,8 @@ export const gnViewerRequestNewResourceConfig = (action$, store) =>
                 return Observable.empty();
             }
 
+            const { query = {} } = url.parse(state?.router?.location?.search, true) || {};
+
             if (!newResourceObservable) {
                 return Observable.of(
                     ...getResetActions(),
@@ -270,7 +296,7 @@ export const gnViewerRequestNewResourceConfig = (action$, store) =>
                     setNewResource(),
                     setResourceType(action.resourceType)
                 ),
-                newResourceObservable({}),
+                newResourceObservable({ query }),
                 Observable.of(
                     setControlProperty('pendingChanges', 'value', null),
                     loadingResourceConfig(false)

diff --git a/geonode_mapstore_client/client/js/hooks/useLazyPlugins.js b/geonode_mapstore_client/client/js/hooks/useLazyPlugins.js
@@ -36,7 +36,7 @@ function useLazyPlugins({
 }) {
 
     const [plugins, setPlugins] = useState({});
-    const [pending, setPending] = useState(false);
+    const [pending, setPending] = useState(true);
 
     const pluginsKeys = pluginsConfig
         .map(({ name }) => name + 'Plugin')
@@ -137,6 +137,7 @@ function useLazyPlugins({
                 });
         } else {
             setPlugins(storedPlugins);
+            setPending(false);
         }
     }, [ pluginsString ]);
 

diff --git a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json
@@ -866,6 +866,12 @@
                             "type": "plugin",
                             "name": "Share"
                         },
+                        {
+                            "type": "link",
+                            "href": "{'#/map/new?gn-dataset=' + (state('gnResourceData') || {}).pk}",
+                            "labelId": "gnviewer.createMap",
+                            "disableIf": "{!context.resourceHasPermission(state('gnResourceData'), 'change_resourcebase')}"
+                        },
                         {
                             "type": "divider",
                             "authenticated": true
@@ -2098,6 +2104,9 @@
                     "measurementAnnotationEdit": false,
                     "geodesic": false
                 }
+            },
+            {
+                "name": "FitBounds"
             }
         ],
         "geostory_viewer": [

diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json b/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json
@@ -190,7 +190,8 @@
             "warningGeoLimitsSaveTitle": "Unvollständiger Speichervorgang",
             "warningGeoLimitsSaveMessage": "Es war nicht möglich die neuen Geolimits zu aktualisieren",
             "saveMapThumbnail": "Klicken Sie hier, um die Karte als Bild festzulegen",
-            "templates": "Vorlagen"
+            "templates": "Vorlagen",
+            "createMap": "Karte Erstellen"
         }
     }
 }
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json b/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json
@@ -191,7 +191,8 @@
             "warningGeoLimitsSaveTitle": "Incomplete saving process",
             "warningGeoLimitsSaveMessage": "It was not possible to update the new geo limits",
             "saveMapThumbnail": "Click to set the map as an image",
-            "templates": "Templates"
+            "templates": "Templates",
+            "createMap": "Create Map"
         }
     }
 }
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json b/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json
@@ -190,7 +190,8 @@
             "warningGeoLimitsSaveTitle": "Proceso de guardado incompleto",
             "warningGeoLimitsSaveMessage": "No fue posible actualizar los nuevos límites geográficos",
             "saveMapThumbnail": "Haga clic para configurar el mapa como una imagen",
-            "templates": "Plantillas"
+            "templates": "Plantillas",
+            "createMap": "Crear Mapa"
         }
     }
 }
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json b/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json
@@ -190,7 +190,8 @@
             "warningGeoLimitsSaveTitle": "Processus de sauvegarde incomplet",
             "warningGeoLimitsSaveMessage": "Il n'a pas été possible de mettre à jour les nouvelles limites géographiques",
             "saveMapThumbnail": "Cliquez pour définir la carte comme une image",
-            "templates": "Modèles"
+            "templates": "Modèles",
+            "createMap": "Créer une Carte"
         }
     }
 }
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json b/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json
@@ -192,7 +192,8 @@
             "warningGeoLimitsSaveTitle": "Processo di salvataggio incompleto",
             "warningGeoLimitsSaveMessage": "Non è stato possibile aggiornare i nuovi limiti geografici",
             "saveMapThumbnail": "Clicca per impostare la mappa come immagine",
-            "templates": "Modelli"
+            "templates": "Modelli",
+            "createMap": "Crea Mappa"
         }
     }
 }