Geonode homepage (#2042)

* replace resources catalog components

* Add missing translations (#2011)

* Remove duplicated fullscreen button (#2014)

* Fix - Metadata side panel list style (#2012)

* Add space to avoid overlapping of resource and pagination (#2013)

* Accordion style update (#2033)

* Fix - ActionNavbar style (#2015)

* Fix - Resource cards are not highlighted when the details are open (#2018)

* Move Permissions to Resource details panel (#2017)

* Update geonode-home to latest MS master (#2041)

* add existing changes

* code refactor

* update unit tests

---------

Co-authored-by: allyoucanmap <[email protected]>

Author: dsuren1

geonode_mapstore_client/apps.py

@@ -85,6 +85,7 @@ def run_setup_hooks(*args, **kwargs):
         ),
         re_path(r"^metadata/(?P<pk>[^/]*)$", views.metadata, name='metadata'),
         re_path(r"^metadata/(?P<pk>[^/]*)/embed$", views.metadata_embed, name='metadata'),
+        re_path(r"^(?P<resource_type>[^/]*)$", views.resource_type_catalog, name='resource_type_catalog'),
         # required, otherwise will raise no-lookup errors to be analysed
         re_path(r"^api/v2/", include(router.urls)),
     ]
@@ -120,7 +121,9 @@ def run_setup_hooks(*args, **kwargs):
             "subtype",
             "title",
             "executions",
-            "thumbnail_url"
+            "thumbnail_url",
+            "created",
+            "favorite"
         ],
     }
     settings.REST_API_PRESETS["dataset_list"] = {
@@ -230,6 +233,11 @@ def run_setup_hooks(*args, **kwargs):
             "featured"
         ],
     }
+    settings.REST_API_PRESETS["map_details"] = {
+        "include[]": [
+            "maplayers"
+        ]
+    }
     settings.REST_API_PRESETS["map_viewer"] = {
         "include[]": [
             "data",

geonode_mapstore_client/client/MapStore2

@@ -42,6 +42,7 @@ export const SET_DEFAULT_VIEWER_PLUGINS = 'GEONODE:SET_DEFAULT_VIEWER_PLUGINS';
 export const SET_SELECTED_LAYER = 'GEONODE:SET_SELECTED_LAYER';
 export const UPDATE_LAYER_DATASET = 'GEONODE:UPDATE_LAYER_DATASET';
 export const SET_SELECTED_LAYER_DATASET = 'GEONODE:SET_SELECTED_LAYER_DATASET';
+export const REQUEST_RESOURCE = 'GEONODE:REQUEST_RESOURCE';
 
 /**
 * Actions for GeoNode resource
@@ -394,3 +395,10 @@ export function setLayerDataset(layerId) {
         layerId
     };
 }
+
+export function requestResource(resource) {
+    return {
+        type: REQUEST_RESOURCE,
+        resource
+    };
+}

geonode_mapstore_client/client/js/actions/gnresource.js

@@ -11,6 +11,11 @@ import {
     getApiToken,
     getGeoNodeLocalConfig
 } from '@js/utils/APIUtils';
+import mergeWith from 'lodash/mergeWith';
+import isArray from 'lodash/isArray';
+import isString from 'lodash/isString';
+import castArray from 'lodash/castArray';
+import omit from 'lodash/omit';
 
 let endpoints = {
     // default values
@@ -69,3 +74,37 @@ export const getEndpoints = () => {
             return data;
         });
 };
+
+function mergeCustomQuery(params, customQuery) {
+    if (customQuery) {
+        return mergeWith(
+            { ...params },
+            { ...customQuery },
+            (objValue, srcValue) => {
+                if (isArray(objValue) && isArray(srcValue)) {
+                    return [...objValue, ...srcValue];
+                }
+                if (isString(objValue) && isArray(srcValue)) {
+                    return [objValue, ...srcValue];
+                }
+                if (isArray(objValue) && isString(srcValue)) {
+                    return [...objValue, srcValue];
+                }
+                if (isString(objValue) && isString(srcValue)) {
+                    return [ objValue, srcValue ];
+                }
+                return undefined; // eslint-disable-line consistent-return
+            }
+        );
+    }
+    return params;
+}
+export const getQueryParams = (params, customFilters) => {
+    const customQuery = customFilters
+        .filter(({ id }) => castArray(params?.f ?? []).indexOf(id) !== -1)
+        .reduce((acc, filter) => mergeCustomQuery(acc, filter.query || {}), {}) || {};
+    return {
+        ...mergeCustomQuery(omit(params, "f"), customQuery)
+    };
+};
+