Implementation of redirect system (#2038)

Author: dsuren1

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

@@ -39,8 +39,8 @@ import context from '@mapstore/framework/reducers/context';
 
 import ViewerRoute from '@js/routes/Viewer';
 import ComponentsRoute from '@js/routes/Components';
-import CatalogueRoute from '@js/routes/Catalogue';
 import MapViewerRoute from '@js/routes/MapViewer';
+import RedirectRoute from '@js/routes/Redirect';
 
 import gnresource from '@js/reducers/gnresource';
 import resourceservice from '@js/reducers/resourceservice';
@@ -84,6 +84,7 @@ import * as geoNodeMediaApi from '@js/observables/media/geonode';
 registerMediaAPI('geonode', geoNodeMediaApi);
 
 import '@js/observables/persistence';
+import { getGeoNodeLocalConfig } from '@js/utils/APIUtils';
 
 const requires = {
     ReactSwipe,
@@ -98,15 +99,19 @@ const ConnectedRouter = connect(
     })
 )(Router);
 
-const viewers = {
-    [appRouteComponentTypes.VIEWER]: ViewerRoute,
-    [appRouteComponentTypes.CATALOGUE]: CatalogueRoute,
-    [appRouteComponentTypes.DATASET_UPLOAD]: ComponentsRoute,
-    [appRouteComponentTypes.DOCUMENT_UPLOAD]: ComponentsRoute,
-    [appRouteComponentTypes.MAP_VIEWER]: MapViewerRoute
+const getViewer = (component) => {
+    const useRedirect = getGeoNodeLocalConfig('geoNodeSettings.catalogHomeRedirectsTo');
+    const viewers = {
+        [appRouteComponentTypes.VIEWER]: ViewerRoute,
+        [appRouteComponentTypes.CATALOGUE]: useRedirect ? RedirectRoute : ComponentsRoute,
+        [appRouteComponentTypes.DATASET_UPLOAD]: ComponentsRoute,
+        [appRouteComponentTypes.DOCUMENT_UPLOAD]: ComponentsRoute,
+        [appRouteComponentTypes.MAP_VIEWER]: MapViewerRoute
+    };
+    return viewers[component];
 };
 
-const routes = CATALOGUE_ROUTES.map(({ component, ...config }) => ({ ...config, component: viewers[component] }));
+const routes = CATALOGUE_ROUTES.map(({ component, ...config }) => ({ ...config, component: getViewer(component) }));
 
 initializeApp();
 

geonode_mapstore_client/client/js/epics/resourceservice.js

@@ -93,7 +93,7 @@ export const gnProcessResources = (action$, store) =>
                                 { ...process.output, func_name: process.processType }
                             ];
                             return updateResource({
-                                id: process.resource.id,
+                                id: process.resource.id ?? process.resource.pk,
                                 ['@extras']: {
                                     ...process.resource?.['@extras'],
                                     executions,

geonode_mapstore_client/client/js/plugins/Operation/components/ExecutionRequestTable.jsx

@@ -98,13 +98,13 @@ function ExecutionRequestTable({
                                                 {viewResource && <RenderActionButton
                                                     request={request}
                                                     msgId={viewResourceLabelId ?? 'gnviewer.view'}
-                                                    href={detailUrls.length === 1 ? detailUrls[0] : getCataloguePath('/catalogue/#/all')}
+                                                    href={detailUrls.length === 1 ? detailUrls[0] : getCataloguePath('/catalogue/#/')}
                                                 /> }
                                                 {editMetadata && <RenderActionButton
                                                     request={request}
                                                     msgId={editMetadataLabelId ?? 'gnviewer.fillMetadata'}
                                                     href={detailUrls.length === 1 ? detailUrls[0].replace(/\/[^/]+\/(\d+)$/, "/metadata/$1")
-                                                        : getCataloguePath('/catalogue/#/all')}
+                                                        : getCataloguePath('/catalogue/#/')}
                                                 />}
                                             </div>
                                             : null}

geonode_mapstore_client/client/js/routes/Catalogue.jsx

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import isEmpty from 'lodash/isEmpty';
+import { getGeoNodeLocalConfig } from '@js/utils/APIUtils';
+
+function RedirectRoute({
+    location
+}) {
+    const search = location?.search ?? {};
+    const catalogHomeRedirectsTo = getGeoNodeLocalConfig('geoNodeSettings.catalogHomeRedirectsTo');
+    if (!isEmpty(catalogHomeRedirectsTo)) {
+        window.location.href = `${catalogHomeRedirectsTo}#/${search ? search : ""}`;
+        return null;
+    }
+    return null;
+}
+
+RedirectRoute.propTypes = {};
+
+const ConnectedRedirectRoute = connect(
+    createSelector([], () => ({})),
+    {}
+)(RedirectRoute);
+
+ConnectedRedirectRoute.displayName = 'ConnectedRedirectRoute';
+
+export default ConnectedRedirectRoute;

geonode_mapstore_client/client/js/routes/Redirect.jsx

@@ -96,7 +96,7 @@
     border: 2px solid var(--ms-primary);
 }
 
-.gn-catalogue:has(.gn-catalogue-page) {
+.gn-catalogue:has(.ms-resources-grid) {
     .app-router {
         position: relative !important;
     }

geonode_mapstore_client/client/themes/geonode/less/_brand-navbar.less

@@ -690,7 +690,10 @@
                 }
             },
             {
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
             },
             {
                 "name": "DownloadResource",
@@ -1566,7 +1569,10 @@
             },
             {
                 "mandatory": true,
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
             },
             {
                 "mandatory": true,
@@ -2277,7 +2283,11 @@
                 "name": "FullScreen"
             },
             {
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
+                
             },
             {
                 "name": "GeoStory",
@@ -2491,7 +2501,10 @@
                 }
             },
             {
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
             },
             {
                 "name": "Save"
@@ -2618,7 +2631,10 @@
                 }
             },
             {
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
             },
             {
                 "name": "Save"
@@ -3453,7 +3469,10 @@
                 "name": "FullScreen"
             },
             {
-                "name": "DeleteResource"
+                "name": "DeleteResource",
+                "cfg": {
+                    "redirectTo": "/"
+                }
             },
             {
                 "name": "Notifications"

geonode_mapstore_client/static/mapstore/configs/localConfig.json

@@ -69,7 +69,6 @@
         let extensionsFolder = geoNodeSettings.EXTENSIONS_FOLDER_PATH;
         let supportedDatasetFileTypes = geoNodeSettings.SUPPORTED_DATASET_FILE_TYPES;
         let catalogHomeRedirectsTo = geoNodeSettings.CATALOG_HOME_REDIRECTS_TO;
-        let defaultCatalogPage = geoNodeSettings.DEFAULT_CATALOG_PAGE || "all";
         let catalogPagePath = geoNodeSettings.CATALOG_PAGE_PATH;
         let customFilters = geoNodeSettings.CUSTOM_FILTERS || {
             "my-resources": {
@@ -212,7 +211,6 @@
                     },
                     staticPath: "{% static '' %}",
                     catalogHomeRedirectsTo: catalogHomeRedirectsTo,
-                    defaultCatalogPage: defaultCatalogPage,
                     catalogPagePath: catalogPagePath
                 }
             },

geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html

@@ -7,8 +7,6 @@
     {% include './hero.html' %}
 {% endif %}
 
-{% include './topbar.html' with id='gn-topbar' %}
-
 <script>
     (function () {
         const mainHeader = document.querySelector('.gn-main-header');