From 8885a9ee987e994087195413f593b55d5c119eb4 Mon Sep 17 00:00:00 2001
From: Jared Galanis <jgalani2@jhu.edu>
Date: Mon, 25 Sep 2023 17:39:59 -0400
Subject: [PATCH 1/2] refactor: make file URIs relative

Closes: https://github.com/eclipse-pass/main/issues/733
---
 app/components/workflow-files/index.hbs | 23 +++++++++++------------
 app/components/workflow-files/index.js  |  8 +-------
 app/templates/submissions/detail.hbs    |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/components/workflow-files/index.hbs b/app/components/workflow-files/index.hbs
index 421e41c0..22e50f5a 100644
--- a/app/components/workflow-files/index.hbs
+++ b/app/components/workflow-files/index.hbs
@@ -46,13 +46,13 @@
           {{#if this.manuscript}}
             <tr data-test-added-manuscript-row>
               <td class="vertical-align-middle">
-                {{!-- {{#if manuscript.uri}} --}}
-                {{!-- <a href="{{manuscript.uri}}">
-                    {{manuscript.name}}
+                {{#if this.manuscript.uri}}
+                  <a href={{concat "https://pass.local" this.manuscript.uri}}>
+                    {{this.manuscript.name}}
                   </a>
-                {{else}} --}}
-                {{this.manuscript.name}}
-                {{!-- {{/if}} --}}
+                {{else}}
+                  {{this.manuscript.name}}
+                {{/if}}
               </td>
               <td class="text-center vertical-align-middle">
                 Manuscript
@@ -79,20 +79,19 @@
           {{#each this.supplementalFiles as |file|}}
             <tr data-test-added-supplemental-row>
               <td class="vertical-align-middle">
-                {{!-- {{#if file.uri}}
-                  <a href="{{file.uri}}">
+                {{#if file.uri}}
+                  <a href="{{concat 'https://pass.local' file.uri}}">
                     {{file.name}}
                   </a>
-                {{else}} --}}
-                {{file.name}}
-                {{!-- {{/if}} --}}
+                {{else}}
+                  {{file.name}}
+                {{/if}}
               </td>
               <td class="text-center vertical-align-middle">
                 <select {{on "change" (fn this.updateFileRole file)}}>
                   <option value="supplement" selected={{eq file.fileRole "supplement"}}>
                     Supplement
                   </option>
-                  {{!-- <option value="manuscript" selected={{eq file.fileRole "manuscript"}}>Manuscript</option> --}}
                   <option value="table" selected={{eq file.fileRole "table"}}>
                     Table
                   </option>
diff --git a/app/components/workflow-files/index.js b/app/components/workflow-files/index.js
index 12a6f020..1bf74c36 100644
--- a/app/components/workflow-files/index.js
+++ b/app/components/workflow-files/index.js
@@ -105,7 +105,7 @@ export default class WorkflowFiles extends Component {
         mimeType: file.mimeType,
         description: '',
         fileRole: 'supplemental',
-        uri: `https://pass.local/file/${file.uuid}/${encodeURIComponent(file.fileName)}`,
+        uri: `/file/${file.uuid}/${encodeURIComponent(file.fileName)}`,
         submission: this.args.submission,
       });
       if (!this.hasManuscript) {
@@ -129,12 +129,6 @@ export default class WorkflowFiles extends Component {
       return;
     }
 
-    // curl -X DELETE "http://localhost:8080/file/{fileId}/{origFileName}" -H "accept: application/json"
-    // TODO: once we resolve whether we should delete file binaries and file objects
-    // either remove or uncommment this
-    // await fetch(file.uri, { method: 'DELETE' });
-    // file.deleteRecord();
-
     file.set('submission', undefined);
     await file.save();
     file.unloadRecord();
diff --git a/app/templates/submissions/detail.hbs b/app/templates/submissions/detail.hbs
index 25b4cc8b..19b124b8 100644
--- a/app/templates/submissions/detail.hbs
+++ b/app/templates/submissions/detail.hbs
@@ -288,7 +288,7 @@
                             {{/if}}
                           </td>
                           <td id="submissions-detail-file-cell" data-label="name">
-                            <a href={{file.uri}}>
+                            <a href={{concat "https://pass.local" file.uri}}>
                               {{file.name}}
                             </a>
                           </td>

From e88bd9a050ee8f0467d0634f96ac7ba8a48317f4 Mon Sep 17 00:00:00 2001
From: Jared Galanis <jgalani2@jhu.edu>
Date: Tue, 26 Sep 2023 11:48:39 -0400
Subject: [PATCH 2/2] remove concat host

- we don't need it because there is a leading slash on the file URI and default browser behavior is to use the same host if this is the case
---
 app/components/workflow-files/index.hbs | 4 ++--
 app/templates/submissions/detail.hbs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/workflow-files/index.hbs b/app/components/workflow-files/index.hbs
index 22e50f5a..80a45378 100644
--- a/app/components/workflow-files/index.hbs
+++ b/app/components/workflow-files/index.hbs
@@ -47,7 +47,7 @@
             <tr data-test-added-manuscript-row>
               <td class="vertical-align-middle">
                 {{#if this.manuscript.uri}}
-                  <a href={{concat "https://pass.local" this.manuscript.uri}}>
+                  <a href={{this.manuscript.uri}}>
                     {{this.manuscript.name}}
                   </a>
                 {{else}}
@@ -80,7 +80,7 @@
             <tr data-test-added-supplemental-row>
               <td class="vertical-align-middle">
                 {{#if file.uri}}
-                  <a href="{{concat 'https://pass.local' file.uri}}">
+                  <a href="{{file.uri}}">
                     {{file.name}}
                   </a>
                 {{else}}
diff --git a/app/templates/submissions/detail.hbs b/app/templates/submissions/detail.hbs
index 19b124b8..25b4cc8b 100644
--- a/app/templates/submissions/detail.hbs
+++ b/app/templates/submissions/detail.hbs
@@ -288,7 +288,7 @@
                             {{/if}}
                           </td>
                           <td id="submissions-detail-file-cell" data-label="name">
-                            <a href={{concat "https://pass.local" file.uri}}>
+                            <a href={{file.uri}}>
                               {{file.name}}
                             </a>
                           </td>