Merge pull request #1260 from BlueBrain/3937/show-better-names-in-my-data

3937 // Display name or label of resource in my-data if present other…

Author: Dinika

src/shared/molecules/MyDataTable/MyDataTable.tsx

@@ -21,6 +21,7 @@ import {
   removeLocalStorageRows,
   toLocalStorageResources,
 } from '../../../shared/utils/datapanel';
+import { getResourceLabel } from '../../../shared/utils';
 
 export const MAX_DATA_SELECTED_SIZE__IN_BYTES = 1_073_741_824;
 export const MAX_LOCAL_STORAGE_ALLOWED_SIZE = 4.5;
@@ -188,22 +189,22 @@ const MyDataTable: React.FC<TProps> = ({
         width: 250,
         ellipsis: true,
         render: (text, record) => {
-          const showedText = isValidUrl(text) ? text.split('/').pop() : text;
+          const resourceId = record['@id'] ?? record._self;
           if (text && record._project) {
             const { org, project } = makeOrgProjectTuple(record._project);
             return (
-              <Tooltip title={text}>
+              <Tooltip title={resourceId}>
                 <Button
                   style={{ padding: 0 }}
                   type="link"
-                  onClick={() => goToResource(org, project, text)}
+                  onClick={() => goToResource(org, project, resourceId)}
                 >
-                  {showedText}
+                  {text}
                 </Button>
               </Tooltip>
             );
           }
-          return <Tooltip title={text}>{showedText}</Tooltip>;
+          return <Tooltip title={resourceId}>{text}</Tooltip>;
         },
       },
       {
@@ -281,7 +282,7 @@ const MyDataTable: React.FC<TProps> = ({
     resources?._results?.map(resource => {
       return {
         ...resource,
-        name: resource['@id'] ?? resource._self,
+        name: getResourceLabel(resource),
         description: resource.discription ?? '',
       };
     }) || [];