Editors menus (#310)

GeoNode · Jul 14, 2021 · f104f6a · f104f6a
1 parent cb875bf
commit f104f6a
Show file tree

Hide file tree

Showing 14 changed files with 244 additions and 51 deletions.
diff --git a/geonode_mapstore_client/client/js/components/Menu/DropdownList.jsx b/geonode_mapstore_client/client/js/components/Menu/DropdownList.jsx
@@ -82,6 +82,10 @@ const DropdownList = ({
 
     const dropdownItems = items
         .map((itm, idx) => {
+
+            if (itm.type === 'plugin' && itm.Component) {
+                return (<li><itm.Component variant="default" /></li>);
+            }
             if (itm.type === 'divider') {
                 return <Dropdown.Divider key={idx} />;
             }
@@ -122,7 +126,6 @@ const DropdownList = ({
                 toogleIcon ? <FaIcon name={toogleIcon} />
                     : undefined
             }
-
             {labelId && <Message msgId={labelId} /> || label}
             {isValidBadgeValue(badgeValue) && <Badge>{badgeValue}</Badge>}
         </Dropdown.Toggle>

diff --git a/geonode_mapstore_client/client/js/components/Menu/MenuItem.js b/geonode_mapstore_client/client/js/components/Menu/MenuItem.js
@@ -44,7 +44,6 @@ const MenuItem = ({ item, menuItemsProps, containerNode, tabIndex, draggable, cl
 
     const { formatHref, query } = menuItemsProps;
     const { id, type, label, labelId = '', items = [], href, style, badge = '', image, Component, target } = item;
-
     const badgeValue = badge;
     if (type === 'dropdown') {
         return (<DropdownList
@@ -64,7 +63,7 @@ const MenuItem = ({ item, menuItemsProps, containerNode, tabIndex, draggable, cl
         />);
     }
 
-    if (type === 'custom' && Component) {
+    if ((type === 'custom' || type === 'plugin') && Component) {
         return <Component />;
     }
 

diff --git a/geonode_mapstore_client/client/js/plugins/ActionNavbar.jsx b/geonode_mapstore_client/client/js/plugins/ActionNavbar.jsx
@@ -22,51 +22,47 @@ function checkResourcePerms(menuItem, resourcePerms) {
     }
     return true;
 }
+
 function ActionNavbarPlugin({
     items,
     leftMenuItems,
-    rightMenuItems,
     resourcePerms
 }, context) {
 
+
     const { loadedPlugins } = context;
     const configuredItems = usePluginItems({ items, loadedPlugins });
-    const leftMenuConfiguredItems = configuredItems
-        .filter(({ target }) => target === 'leftMenuItem')
-        .map(({ Component }) => ({ type: 'custom', labelId: "gnviewer.edit", Component }));
 
-    const rightMenuConfiguredItems = configuredItems
-        .filter(({ target }) => target === 'rightMenuItem')
-        .map(({ Component }) => ({ type: 'custom',  Component }));
+    const leftMenuItemsPlugins = reduceArrayRecursive(leftMenuItems, (item) => {
+        configuredItems.find(plugin => {
+            if ( item.type === 'plugin' && plugin.name === item.name ) {
+                item.Component = plugin?.Component;
+            }
+        });
+        return (item);
+    });
 
     const leftItems = reduceArrayRecursive(
-        [...leftMenuConfiguredItems, ...leftMenuItems],
-        menuItem => checkResourcePerms(menuItem, resourcePerms)
-    );
-    const rightItems = reduceArrayRecursive(
-        [...rightMenuConfiguredItems, ...rightMenuItems],
+        leftMenuItemsPlugins,
         menuItem => checkResourcePerms(menuItem, resourcePerms)
     );
 
     return (
 
         <ActionNavbar
             leftItems={leftItems}
-            rightItems={rightItems}
         />
     );
 }
 
 ActionNavbarPlugin.propTypes = {
     items: PropTypes.array,
-    leftMenuItems: PropTypes.array,
-    rightMenuItems: PropTypes.array
+    leftMenuItems: PropTypes.array
 };
 
 ActionNavbarPlugin.defaultProps = {
     items: [],
-    leftMenuItems: [],
-    rightMenuItems: []
+    leftMenuItems: []
 };
 
 const ConnectedActionNavbarPlugin = connect(

diff --git a/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx b/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx
@@ -169,7 +169,6 @@ export default createPlugin('DetailViewer', {
         },
         ActionNavbar: {
             name: 'ButtonViewer',
-            target: 'leftMenuItem',
             Component: ConnectedButton,
             priority: 1
         }

diff --git a/geonode_mapstore_client/client/js/plugins/Save.jsx b/geonode_mapstore_client/client/js/plugins/Save.jsx
@@ -70,11 +70,12 @@ const SavePlugin = connect(
 
 function SaveButton({
     enabled,
-    onClick
+    onClick,
+    variant
 }) {
     return enabled
         ? <Button
-            variant="primary"
+            variant={variant || "primary"}
             onClick={() => onClick()}
         >
             <Message msgId="save"/>
@@ -123,7 +124,6 @@ export default createPlugin('Save', {
         },
         ActionNavbar: {
             name: 'Save',
-            target: 'leftMenuItem',
             Component: ConnectedSaveButton
         }
     },

diff --git a/geonode_mapstore_client/client/js/plugins/SaveAs.jsx b/geonode_mapstore_client/client/js/plugins/SaveAs.jsx
@@ -90,11 +90,12 @@ const SaveAsPlugin = connect(
 
 function SaveAsButton({
     enabled,
-    onClick
+    onClick,
+    variant
 }) {
     return enabled
         ? <Button
-            variant="primary"
+            variant={variant || "primary"}
             onClick={() => onClick()}
         >
             <Message msgId="saveAs"/>
@@ -135,7 +136,6 @@ export default createPlugin('SaveAs', {
         },
         ActionNavbar: {
             name: 'SaveAs',
-            target: 'leftMenuItem',
             Component: ConnectedSaveAsButton
         }
     },

diff --git a/geonode_mapstore_client/client/js/plugins/Share.jsx b/geonode_mapstore_client/client/js/plugins/Share.jsx
@@ -101,11 +101,12 @@ const SharePlugin = connect(
 
 function ShareButton({
     enabled,
+    variant,
     onClick
 }) {
     return enabled
         ? <Button
-            variant="primary"
+            variant={variant || "primary"}
             onClick={() => onClick()}
         >
             <Message msgId="share.title"/>
@@ -148,7 +149,6 @@ export default createPlugin('Share', {
         },
         ActionNavbar: {
             name: 'Share',
-            target: 'leftMenuItem',
             Component: ConnectedShareButton
         }
     },

diff --git a/geonode_mapstore_client/client/js/plugins/index.js b/geonode_mapstore_client/client/js/plugins/index.js
@@ -89,7 +89,6 @@ export const plugins = {
             containers: {
                 ActionNavbar: {
                     name: 'LayerDownload',
-                    target: 'leftMenuItem',
                     Component: LayerDownloadActionButton
                 }
             }
@@ -118,7 +117,6 @@ export const plugins = {
             containers: {
                 ActionNavbar: {
                     name: 'Catalog',
-                    target: 'leftMenuItem',
                     Component: CatalogActionButton,
                     priority: 1
                 },
@@ -166,7 +164,6 @@ export const plugins = {
             containers: {
                 ActionNavbar: {
                     name: 'Measure',
-                    target: 'leftMenuItem',
                     Component: MeasureActionButton
                 }
             }
@@ -275,7 +272,6 @@ export const plugins = {
             containers: {
                 ActionNavbar: {
                     name: 'Print',
-                    target: 'leftMenuItem',
                     Component: PrintActionButton,
                     priority: 5,
                     doNotHide: true