#1557: Title in the viewer page is updated (#1558)

GeoNode · Sep 13, 2023 · 99ceada · 99ceada
1 parent e82d559
commit 99ceada
Show file tree

Hide file tree

Showing 22 changed files with 61 additions and 210 deletions.
diff --git a/geonode_mapstore_client/client/js/components/ActionNavbar/ActionNavbar.jsx b/geonode_mapstore_client/client/js/components/ActionNavbar/ActionNavbar.jsx
@@ -11,7 +11,6 @@ import PropTypes from 'prop-types';
 import Menu from '@js/components/Menu';
 import BurgerMenu from '@js/components/Menu/BurgerMenu';
 import useResizeElement from '@js/hooks/useResizeElement';
-import BreadCrumb from '@js/components/BreadCrumb';
 
 const LeftContentMenu = ({ items, formatHref, query, variant, size, resourceName }) => {
     const navbarContentLeft = useRef();
@@ -79,20 +78,14 @@ const ActionNavbar = forwardRef(
             formatHref,
             variant,
             size,
-            resource,
-            titleItems,
-            disableTitle
+            resource
         },
         ref
     ) => {
         return (
             <nav ref={ref} className={`gn-menu gn-${variant}`} style={style}>
                 <div className="gn-menu-container">
                     <div className="gn-menu-content">
-                        {!disableTitle && <BreadCrumb
-                            resource={resource}
-                            titleItems={titleItems}
-                        />}
                         {leftItems.length > 0 && (
                             <LeftContentMenu
                                 items={leftItems}
@@ -125,18 +118,15 @@ ActionNavbar.propTypes = {
     rightItems: PropTypes.array,
     query: PropTypes.object,
     formatHref: PropTypes.func,
-    variant: PropTypes.string,
-    disableTitle: PropTypes.bool
+    variant: PropTypes.string
 };
 
 ActionNavbar.defaultProps = {
     leftItems: [],
     rightItems: [],
-    titleItems: [],
     query: {},
     formatHref: () => '#',
-    variant: 'primary',
-    disableTitle: false
+    variant: 'primary'
 };
 
 export default ActionNavbar;
diff --git a/geonode_mapstore_client/client/js/components/ActionNavbar/__test__/ActionNavbar-test.jsx b/geonode_mapstore_client/client/js/components/ActionNavbar/__test__/ActionNavbar-test.jsx
@@ -13,13 +13,6 @@ import ActionNavbar from '../ActionNavbar';
 
 
 const conf = {
-    titleNavbarItems: [
-        {
-            "type": "plugin",
-            "name": "DetailViewerButton",
-            "Component": 'i'
-        }
-    ],
     leftItems: [
         {
             "labelId": "gnhome.data",
@@ -201,23 +194,11 @@ describe('Test GeoNode action navbar component', () => {
         ReactDOM.render( <ActionNavbar
             leftItems={conf.leftItems.items}
             rightItems={conf.rightItems.items}
-            titleItems={conf.titleNavbarItems}
         />, document.getElementById("container"));
 
         const el = document.querySelector('.gn-menu');
         expect(el).toExist();
         const navBarContent = document.querySelector('.gn-menu-content');
         expect(navBarContent).toExist();
     });
-    it('should not render breadcrumb on new or edit resource', () => {
-        ReactDOM.render(
-            <ActionNavbar
-                disableTitle
-                titleItems={conf.titleNavbarItems}
-            />,
-            document.getElementById('container')
-        );
-        const el = document.querySelector('.gn-action-navbar-title');
-        expect(el).toNotExist();
-    });
 });
diff --git a/geonode_mapstore_client/client/js/components/BreadCrumb/BreadCrumb.jsx b/geonode_mapstore_client/client/js/components/BreadCrumb/BreadCrumb.jsx
diff --git a/geonode_mapstore_client/client/js/components/BreadCrumb/__test__/BreadCrumb-test.jsx b/geonode_mapstore_client/client/js/components/BreadCrumb/__test__/BreadCrumb-test.jsx
diff --git a/geonode_mapstore_client/client/js/components/BreadCrumb/index.js b/geonode_mapstore_client/client/js/components/BreadCrumb/index.js
diff --git a/geonode_mapstore_client/client/js/components/Menu/Menu.js b/geonode_mapstore_client/client/js/components/Menu/Menu.js
@@ -47,7 +47,7 @@ const Menu = forwardRef(({
                             <MenuItem
                                 variant={item.variant || variant}
                                 item={{ ...item, id: item.id || idx }}
-                                size={size}
+                                size={item.size || size}
                                 alignRight={alignRight}
                                 menuItemsProps={{
                                     query,

diff --git a/geonode_mapstore_client/client/js/plugins/ActionNavbar.jsx b/geonode_mapstore_client/client/js/plugins/ActionNavbar.jsx
@@ -41,9 +41,7 @@ function ActionNavbarPlugin(
         resourcePerms,
         resource,
         isDirtyState,
-        selectedLayerPermissions,
-        titleItems,
-        disableTitle
+        selectedLayerPermissions
     },
     context
 ) {
@@ -79,15 +77,6 @@ function ActionNavbarPlugin(
         }
     );
 
-    const titleItemsPlugins = reduceArrayRecursive(titleItems, (item) => {
-        configuredItems.find((plugin) => {
-            if (item.type === 'plugin' && plugin.name === item.name) {
-                item.Component = plugin?.Component;
-            }
-        });
-        return item;
-    });
-
     const leftItems = reduceArrayRecursive(leftMenuItemsPlugins, (menuItem) =>
         checkResourcePerms(menuItem, resourcePerms)
     );
@@ -96,36 +85,27 @@ function ActionNavbarPlugin(
         checkResourcePerms(menuItem, resourcePerms)
     );
 
-    const titleNavbarItems = reduceArrayRecursive(
-        titleItemsPlugins,
-        (menuItem) => checkResourcePerms(menuItem, resourcePerms)
-    );
-
     return (
         <ActionNavbar
             leftItems={leftItems}
             rightItems={rightItems}
             variant="primary"
             size="sm"
             resource={resource}
-            titleItems={titleNavbarItems}
-            disableTitle={disableTitle}
         />
     );
 }
 
 ActionNavbarPlugin.propTypes = {
     items: PropTypes.array,
     leftMenuItems: PropTypes.array,
-    rightMenuItems: PropTypes.array,
-    titleItems: PropTypes.array
+    rightMenuItems: PropTypes.array
 };
 
 ActionNavbarPlugin.defaultProps = {
     items: [],
     leftMenuItems: [],
-    rightMenuItems: [],
-    titleItems: []
+    rightMenuItems: []
 };
 
 const ConnectedActionNavbarPlugin = connect(

diff --git a/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx b/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx
@@ -91,7 +91,7 @@ const ButtonViewer = ({ onClick, hide, variant, size, showMessage }) => {
             size={size}
             onClick={handleClickButton}
         >
-            {!showMessage ? <FaIcon name="info-circle" /> : <Message msgId="gnviewer.editInfo"/>}
+            {!showMessage ? <FaIcon name="info-circle" /> : <Message msgId="gnviewer.viewInfo"/>}
         </Button>
     ) : null;
 };