From b4c274718589995a37d2b7b0390414c50cdb7a25 Mon Sep 17 00:00:00 2001
From: Luca Orlandini <luca.orlandini@gmail.com>
Date: Thu, 16 Sep 2021 12:44:23 +0200
Subject: [PATCH] Add owner in permissions list (#504)

* add owner first last name or unsername

* rm debug

* link for poc / link for profile
---
 .../js/components/DetailsPanel/DetailsPanel.jsx    |  4 ++--
 .../js/components/Permissions/Permissions.jsx      | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx b/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx
index 7ca843e114..2968b82528 100644
--- a/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx
+++ b/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx
@@ -184,7 +184,7 @@ function DetailsPanel({
         },
         {
             "label": "Owner",
-            "value": <a href={`/people/profile/${resource?.owner?.username}/`}> {resource?.owner?.username} </a>
+            "value": <a href={`/people/profile/${resource?.owner?.username}/`}> {(resource?.owner?.first_name !== "" && resource?.owner?.last_name !== "" ) ? (resource?.owner?.first_name + " " + resource?.owner?.last_name) : resource?.owner?.username} </a>
         },
         {
             "label": "Created",
@@ -243,7 +243,7 @@ function DetailsPanel({
     const extraItemsList = [
         {
             "label": "Point of Contact",
-            "value": <a href={`/messages/create/${resource?.owner?.pk}/`}> {(resource?.poc?.first_name + resource?.poc?.last_name || resource?.poc?.username)} </a>
+            "value": <a href={`/messages/create/${resource?.poc?.pk}/`}> {(resource?.poc?.first_name !== "" && resource?.poc?.last_name !== "" ) ? (resource?.poc?.first_name + " " + resource?.poc?.last_name) : resource?.poc?.username} </a>
         },
         {
             "label": "License",
diff --git a/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx b/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
index 7feb7b4b13..d2fa9c5fcd 100644
--- a/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
+++ b/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
@@ -167,9 +167,21 @@ function Permissions({
 
     return (
         <div className="gn-share-permissions-container">
-
             <ul className="gn-share-permissions-list">
                 <li className="gn-share-permissions-pinned">
+                    {filteredEntries
+                        .filter((item) => item.permissions === 'owner'  )
+                        .map((item) => {
+                            return (<p className="gn-share-permissions-name" >
+                                <Message msgId="gnviewer.permissionOwner" />: {' '}
+                                <a href={`/people/profile/${item?.username}/`}>
+                                    {(item?.first_name !== "" && item?.last_name !== "") ?
+                                        (item?.first_name + ' ' + item?.last_name) :
+                                        item?.username
+                                    }
+                                </a>
+                            </p>);
+                        })}
                     {permissionsGroups
                         .map((group) => {
                             return (