more sane file naming

1 files changed, 20 insertions, 4 deletions

diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js
index 7508885..6ecd1fe 100644
--- a/app/client/common/fileList.component.js
+++ b/app/client/common/fileList.component.js
@@ -74,15 +74,31 @@ export const FileRow = props => {
   const date = file.date || file.created_at
   const epoch = file.epoch || file.epochs || 0
 
+  let name;
+  let key;
+  if (file.name) {
+    name = file.name
+    key = name
+  } else if (file.url) {
+    if (file.opt && file.opt.type) {
+      name = file.opt.type + ': ' + file.opt.title
+      key = file.opt.token
+    }
+    else {
+      name = file.url.replace(/^https?:\/\//, '')
+      key = name
+    }
+  }
+
   return (
-    <div class={className} key={file.name}>
+    <div class={className} key={key}>
       {fields.has('name') &&
         <div className="filename" title={file.name || file.url}>
           {file.persisted === false
-            ? <span className='unpersisted'>{file.name || file.url}</span>
+            ? <span className='unpersisted'>{name}</span>
             : (linkFiles && file.url)
-            ? <a target='_blank' onClick={(e) => onClick && onClick(file, e)} href={file.url}>{file.name || file.url}</a>
-            : <span class='link' onClick={(e) => onClick && onClick(file, e)}>{file.name || file.url}</span>
+            ? <a target='_blank' onClick={(e) => onClick && onClick(file, e)} href={file.url}>{name}</a>
+            : <span class='link' onClick={(e) => onClick && onClick(file, e)}>{name}</span>
           }
         </div>
       }