Client - Detail panel / viewer improvement (#264)

GeoNode · Jun 24, 2021 · e47d605 · e47d605
1 parent 1bb0fce
commit e47d605
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/geonode_mapstore_client/client/js/components/home/DetailsPanel.jsx b/geonode_mapstore_client/client/js/components/home/DetailsPanel.jsx
@@ -178,7 +178,7 @@ function DetailsPanel({
                         }}>
                         <FaIcon name={icon}/>
                     </div>
-                    {embedUrl
+                    {embedUrl && !editThumbnail
                         ? <iframe
                             key={embedUrl}
                             src={embedUrl}
@@ -256,7 +256,6 @@ function DetailsPanel({
                                 {detailUrl && <Button
                                     variant="default"
                                     href={detailUrl}
-                                    target="_blank"
                                     rel="noopener noreferrer">
                                     <Message msgId={`gnhome.view${name || ''}`}/>
                                 </Button>}

diff --git a/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx b/geonode_mapstore_client/client/js/plugins/DetailViewer.jsx
@@ -20,7 +20,7 @@ import controls from '@mapstore/framework/reducers/controls';
 import {toggleControl} from '@mapstore/framework/actions/controls';
 import gnresource from '@js/reducers/gnresource';
 import Message from '@mapstore/framework/components/I18N/Message';
-import { userSelector } from '@mapstore/framework/selectors/security';
+import { canEditResource } from '@js/selectors/gnresource';
 import Button from '@js/components/Button';
 
 const ConnectedDetailsPanel = connect(
@@ -37,24 +37,22 @@ const ConnectedDetailsPanel = connect(
     }
 )(DetailsPanel);
 
-const ButtonViewer = ({user,  onClick}) => {
+const ButtonViewer = ({onClick}) => {
 
     const handleClickButton = () => {
         onClick();
     };
 
-    return (user && <Button
+    return (<Button
         variant="primary"
         onClick={handleClickButton}
     > <Message msgId="gnviewer.details"/>
     </Button>);
 };
 
 const ConnectedButton = connect(
-    createSelector([userSelector],
-        (user) => ({
-            user
-        })),
+    createSelector([],
+        () => ({})),
     {
         onClick: toggleControl.bind(null, 'DetailViewer', null)
     }
@@ -65,7 +63,9 @@ function DetailViewer({
     enabled,
     onEditResource,
     onEditAbstractResource,
-    onEditThumbnail}) {
+    onEditThumbnail,
+    canEdit
+}) {
 
     const handleTitleValue = (val) => {
         onEditResource(val);
@@ -87,11 +87,11 @@ function DetailViewer({
                 height: '100%'
 
             }}>
-            { enabled && <ConnectedDetailsPanel
+            { !enabled && <ConnectedDetailsPanel
                 editTitle={handleTitleValue}
                 editAbstract={handleAbstractValue}
                 editThumbnail={handleEditThumbnail}
-                activeEditMode={enabled}
+                activeEditMode={!enabled && canEdit}
                 sectionStyle={{
                     width: '600px',
                     position: 'fixed'
@@ -103,9 +103,11 @@ function DetailViewer({
 
 const DetailViewerPlugin = connect(
     createSelector([
-        state => state?.controls?.DetailViewer?.enabled || false
-    ], (enabled) => ({
-        enabled
+        state => state?.controls?.DetailViewer?.enabled || false,
+        canEditResource
+    ], (enabled, canEdit) => ({
+        enabled,
+        canEdit
     })),
     {
         onEditResource: editTitleResource,

diff --git a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json
@@ -3042,6 +3042,7 @@
         "map_viewer": [
             { "name": "ViewerLayout" },
             { "name": "ActionNavbar" },
+            { "name": "DetailViewer"},
             { "name": "BrandNavbar" },
             {
                 "name": "Map",
@@ -3407,6 +3408,7 @@
             { "name": "ViewerLayout" },
             { "name": "ActionNavbar" },
             { "name": "BrandNavbar" },
+            { "name": "DetailViewer"},
             {
                 "name": "GeoStory",
                 "cfg": {