#1741: Update master with changes from mapviewer

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "geonode_mapstore_client/client/MapStore2"]
 	path = geonode_mapstore_client/client/MapStore2
 	url = https://github.com/geosolutions-it/MapStore2.git
-	branch = 2022.02.xx
+	branch = 2024.01.xx

geonode_mapstore_client/apps.py

@@ -32,11 +32,11 @@ def run_setup_hooks(*args, **kwargs):
         "default": OWNER_PERMISSIONS,
         groups_settings.REGISTERED_MEMBERS_GROUP_NAME: OWNER_PERMISSIONS,
     }
-    setattr(settings, "CLIENT_APP_LIST", ["geostory", "dashboard"])
+    setattr(settings, "CLIENT_APP_LIST", ["geostory", "dashboard", "mapviewer"])
     setattr(
         settings,
         "CLIENT_APP_ALLOWED_PERMS_LIST",
-        [{"geostory": allowed_perms}, {"dashboard": allowed_perms}],
+        [{"geostory": allowed_perms}, {"dashboard": allowed_perms}, {"mapviewer": allowed_perms}],
     )
     setattr(
         settings,
@@ -58,6 +58,14 @@ def run_setup_hooks(*args, **kwargs):
                 "manage": _("Manage"),
                 "owner": _("Owner"),
             },
+            "mapviewer": {
+                "none": _("None"),
+                "view": _("View"),
+                "download": _("Download"),
+                "edit": _("Edit"),
+                "manage": _("Manage"),
+                "owner": _("Owner"),
+            },
         },
     )
 
@@ -85,6 +93,7 @@ def run_setup_hooks(*args, **kwargs):
         **{
             "geostory": settings.DEFAULT_EXTRA_METADATA_SCHEMA,
             "dashboard": settings.DEFAULT_EXTRA_METADATA_SCHEMA,
+            "mapviewer": settings.DEFAULT_EXTRA_METADATA_SCHEMA,
         },
     }
 

geonode_mapstore_client/client/devServer.js

@@ -76,4 +76,4 @@ module.exports = (devServerDefault, projectConfig) => {
             }
         ]
     };
-};
+};

geonode_mapstore_client/client/js/actions/gnresource.js

@@ -35,7 +35,9 @@ export const DOWNLOAD_RESOURCE = 'GEONODE_DOWNLOAD_RESOURCE';
 export const DOWNLOAD_COMPLETE = 'GEONODE_DOWNLOAD_COMPLETE';
 export const UPDATE_SINGLE_RESOURCE = 'GEONODE_UPDATE_SINGLE_RESOURCE';
 export const SET_RESOURCE_EXTENT = 'GEONODE_SET_RESOURCE_EXTENT';
-
+export const SET_RESOURCE_PATH_PARAMETERS = 'GEONODE:SET_RESOURCE_PATH_PARAMETERS';
+export const SET_MAP_VIEWER_LINKED_RESOURCE = 'GEONODE:SET_MAP_VIEWER_LINKED_RESOURCE';
+export const MANAGE_LINKED_RESOURCE = 'GEONODE:MANAGE_LINKED_RESOURCE';
 
 /**
 * Actions for GeoNode resource
@@ -243,10 +245,11 @@ export function requestResourceConfig(resourceType, pk, options) {
         options
     };
 }
-export function requestNewResourceConfig(resourceType) {
+export function requestNewResourceConfig(resourceType, options) {
     return {
         type: REQUEST_NEW_RESOURCE_CONFIG,
-        resourceType
+        resourceType,
+        options
     };
 }
 
@@ -319,3 +322,30 @@ export function setResourceExtent(coords) {
         coords
     };
 }
+
+export function setResourcePathParameters(params) {
+    return {
+        type: SET_RESOURCE_PATH_PARAMETERS,
+        params
+    };
+}
+
+/**
+ * Manage linked resource by process type
+ */
+export function manageLinkedResource(payload) {
+    return {
+        type: MANAGE_LINKED_RESOURCE,
+        payload
+    };
+}
+
+/**
+ * Set map viewer linked resource
+ */
+export function setMapViewerLinkedResource(resource) {
+    return {
+        type: SET_MAP_VIEWER_LINKED_RESOURCE,
+        resource
+    };
+}

geonode_mapstore_client/client/js/api/geonode/config/index.js

@@ -7,6 +7,8 @@
  */
 
 import axios from '@mapstore/framework/libs/ajax';
+import getPluginsConfig from '@mapstore/framework/observables/config/getPluginsConfig';
+import { getGeoNodeLocalConfig } from '@js/utils/APIUtils';
 
 let cache = {};
 
@@ -45,8 +47,21 @@ export const getStyleTemplates = (styleTemplatesUrl = '/static/mapstore/configs/
         });
 };
 
+export const getDefaultPluginsConfig = () => {
+    return cache?.pluginsConfig
+        ? Promise.resolve(cache.pluginsConfig)
+        : getPluginsConfig(
+            getGeoNodeLocalConfig('geoNodeSettings.staticPath', '/static/') + 'mapstore/configs/pluginsConfig.json'
+        )
+            .then((pluginsConfig) => {
+                cache.pluginsConfig = pluginsConfig;
+                return pluginsConfig;
+            });
+};
+
 export default {
     getNewMapConfiguration,
     getNewGeoStoryConfig,
-    getStyleTemplates
+    getStyleTemplates,
+    getDefaultPluginsConfig
 };

geonode_mapstore_client/client/js/api/geonode/v2/index.js

@@ -146,7 +146,7 @@ export const getResources = ({
     };
     return axios.get(parseDevHostname(endpoints[RESOURCES]), {
         params: _params,
-        paramsSerializer
+        ...paramsSerializer()
     })
         .then(({ data }) => {
             return {
@@ -182,7 +182,7 @@ export const getMaps = ({
                     page_size: pageSize,
                     api_preset: API_PRESET.MAPS
                 },
-                paramsSerializer
+                ...paramsSerializer()
             })
         .then(({ data }) => {
             return {
@@ -218,7 +218,7 @@ export const getDatasets = ({
                     page_size: pageSize,
                     api_preset: API_PRESET.DATASETS
                 },
-                paramsSerializer
+                ...paramsSerializer()
             })
         .then(({ data }) => {
             return {
@@ -255,7 +255,7 @@ export const getDocumentsByDocType = (docType = 'image', {
                     page_size: pageSize,
                     api_preset: API_PRESET.DOCUMENTS
                 },
-                paramsSerializer
+                ...paramsSerializer()
             })
         .then(({ data }) => {
             return {
@@ -304,6 +304,24 @@ export const getLinkedResourcesByPk = (pk) => {
         .then(({ data }) => data ?? {});
 };
 
+export const setLinkedResourcesByPk = (sourcePk, targetPks) => {
+    return axios.post(parseDevHostname(`${endpoints[RESOURCES]}/${sourcePk}/linked_resources`),
+        {
+            target: castArray(targetPks)
+        }
+    )
+        .then(({ data }) => data ?? {});
+};
+
+export const removeLinkedResourcesByPk = (sourcePk, targetPks) => {
+    return axios.delete(parseDevHostname(`${endpoints[RESOURCES]}/${sourcePk}/linked_resources`), {
+        data: {
+            target: castArray(targetPks)
+        }
+    })
+        .then(({ data }) => data ?? {});
+};
+
 export const getResourceByUuid = (uuid) => {
     return axios.get(parseDevHostname(`${endpoints[RESOURCES]}`), {
         params: {
@@ -319,7 +337,7 @@ export const getDatasetByPk = (pk) => {
         params: {
             api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DATASET]
         },
-        paramsSerializer
+        ...paramsSerializer()
     })
         .then(({ data }) => data.dataset);
 };
@@ -329,7 +347,7 @@ export const getDocumentByPk = (pk) => {
         params: {
             api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
         },
-        paramsSerializer
+        ...paramsSerializer()
     })
         .then(({ data }) => data.document);
 };
@@ -342,7 +360,7 @@ export const getDocumentsByPk = (pk) => {
             page_size: pks.length,
             api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
         },
-        paramsSerializer
+        ...paramsSerializer()
     })
         .then(({ data }) => data.documents);
 };
@@ -367,6 +385,40 @@ export const getGeoAppByPk = (pk) => {
         .then(({ data }) => data.geoapp);
 };
 
+export const getGeoApps = ({
+    q,
+    pageSize = 20,
+    page = 1,
+    sort,
+    ...params
+}) => {
+    return axios
+        .get(
+            parseDevHostname(endpoints[GEOAPPS]), {
+                // axios will format query params array to `key[]=value1&key[]=value2`
+                params: {
+                    ...params,
+                    ...(q && {
+                        search: q,
+                        search_fields: ['title', 'abstract']
+                    }),
+                    ...(sort && { sort: isArray(sort) ? sort : [ sort ]}),
+                    page,
+                    page_size: pageSize
+                },
+                ...paramsSerializer()
+            })
+        .then(({ data }) => {
+            return {
+                totalCount: data.total,
+                isNextPageAvailable: !!data.links.next,
+                resources: (data.geoapps || [])
+                    .map((resource) => {
+                        return resource;
+                    })
+            };
+        });
+};
 
 export const updateGeoApp = (pk, body) => {
     return axios.patch(parseDevHostname(`${endpoints[GEOAPPS]}/${pk}`), body, {
@@ -406,7 +458,7 @@ export const getUsers = ({
                 page,
                 page_size: pageSize
             },
-            paramsSerializer
+            ...paramsSerializer()
         })
         .then(({ data }) => {
             return {
@@ -435,7 +487,7 @@ export const getGroups = ({
                 page,
                 page_size: pageSize
             },
-            paramsSerializer
+            ...paramsSerializer()
         })
         .then(({ data }) => {
             return {
@@ -599,7 +651,8 @@ export const updateMap = (id, body = {}) => {
 /**
 * Get a map configuration
 * @memberof api.geonode.adapter
-* @param {number|string} id resource id
+* @param {number|string} pk resource id
+* @param {string[]} includes property to be included in the response
 * @return {promise} it returns an object with the success map object response
 */
 export const getMapByPk = (pk) => {
@@ -608,7 +661,7 @@ export const getMapByPk = (pk) => {
             params: {
                 api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.MAP]
             },
-            paramsSerializer
+            ...paramsSerializer()
         })
         .then(({ data }) => data?.map);
 };
@@ -622,7 +675,7 @@ export const getMapsByPk = (pk) => {
                 page_size: pks.length,
                 api_preset: API_PRESET.MAPS
             },
-            paramsSerializer
+            ...paramsSerializer()
         })
         .then(({ data }) => data?.maps);
 };
@@ -786,7 +839,7 @@ export const getFacetItemsByFacetName = ({ name: facetName, style, filterKey, fi
     return axios.get(`${parseDevHostname(endpoints[FACETS])}/${facetName}`,
         { ...config,
             params: updatedParams,
-            paramsSerializer
+            ...paramsSerializer()
         }
     ).then(({data}) => {
         const {page: _page = 0, items: _items = [], total, page_size: size} = data?.topics ?? {};
@@ -837,7 +890,7 @@ export const getFacetItemsByFacetName = ({ name: facetName, style, filterKey, fi
 
 export const getFacetsByKey = (facet, filterParams) => {
     return axios
-        .get(parseDevHostname(endpoints[FACETS] + `/${facet}`), {params: {...filterParams}, paramsSerializer})
+        .get(parseDevHostname(endpoints[FACETS] + `/${facet}`), {params: {...filterParams}, ...paramsSerializer()})
         .then(({ data } = {}) => ({
             ...data?.topics,
             items: data?.topics?.items?.map(item => ({...item, facetName: facet}))
@@ -865,6 +918,8 @@ export default {
     getResources,
     getResourceByPk,
     getLinkedResourcesByPk,
+    setLinkedResourcesByPk,
+    removeLinkedResourcesByPk,
     getResourceByUuid,
     createGeoApp,
     getGeoAppByPk,

geonode_mapstore_client/client/js/apps/gn-catalogue.js

@@ -34,13 +34,14 @@ import mapPopups from '@mapstore/framework/reducers/mapPopups';
 import catalog from '@mapstore/framework/reducers/catalog';
 import searchconfig from '@mapstore/framework/reducers/searchconfig';
 import widgets from '@mapstore/framework/reducers/widgets';
-import annotations from '@mapstore/framework/reducers/annotations';
+import context from '@mapstore/framework/reducers/context';
 // end
 
 import ViewerRoute from '@js/routes/Viewer';
 import UploadDatasetRoute from '@js/routes/UploadDataset';
 import UploadDocumentRoute from '@js/routes/UploadDocument';
 import CatalogueRoute from '@js/routes/Catalogue';
+import MapViewerRoute from '@js/routes/MapViewer';
 
 import gnsearch from '@js/reducers/gnsearch';
 import gnresource from '@js/reducers/gnresource';
@@ -104,7 +105,8 @@ const viewers = {
     [appRouteComponentTypes.VIEWER]: ViewerRoute,
     [appRouteComponentTypes.CATALOGUE]: CatalogueRoute,
     [appRouteComponentTypes.DATASET_UPLOAD]: UploadDatasetRoute,
-    [appRouteComponentTypes.DOCUMENT_UPLOAD]: UploadDocumentRoute
+    [appRouteComponentTypes.DOCUMENT_UPLOAD]: UploadDocumentRoute,
+    [appRouteComponentTypes.MAP_VIEWER]: MapViewerRoute
 };
 
 const routes = CATALOGUE_ROUTES.map(({ component, ...config }) => ({ ...config, component: viewers[component] }));
@@ -163,17 +165,7 @@ getEndpoints()
                                 loaderComponent: MainLoader,
                                 initialState: {
                                     defaultState: {
-                                        ...securityState,
-                                        maptype: {
-                                            mapType
-                                        },
-                                        annotations: {
-                                            config: {
-                                                multiGeometry: true,
-                                                validationErrors: {}
-                                            },
-                                            defaultTextAnnotation: 'New'
-                                        }
+                                        ...securityState
                                     }
                                 },
                                 themeCfg: null,
@@ -209,8 +201,8 @@ getEndpoints()
                                     widgets,
                                     geostory,
                                     gnsearch,
-                                    annotations,
                                     notifications,
+                                    context,
                                     ...pluginsDefinition.reducers
                                 },
                                 appEpics,