support view archive online (#252)

SAP · Jan 18, 2019 · 9d30645 · 9d30645
1 parent 073f277
commit 9d30645
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/api/handlers/projects/jobs.py b/src/api/handlers/projects/jobs.py
@@ -381,7 +381,7 @@ class ArchiveDownload(Resource):
 
     def get(self, project_id, job_id):
         filename = request.args.get('filename', None)
-
+        force_download = request.args.get('view', "false") == "false"
         if not filename:
             abort(404)
 
@@ -422,7 +422,7 @@ def get(self, project_id, job_id):
             logger.error(key)
             abort(404)
 
-        return send_file(f, as_attachment=True, attachment_filename=os.path.basename(filename))
+        return send_file(f, as_attachment=force_download, attachment_filename=os.path.basename(filename))
 
 @ns.route('/<job_id>/archive')
 @api.response(403, 'Not Authorized')

diff --git a/src/dashboard-client/src/components/job/Archive.vue b/src/dashboard-client/src/components/job/Archive.vue
@@ -6,13 +6,15 @@
                     <md-table-row>
                         <md-table-head md-sort-by="filename">Filename</md-table-head>
                         <md-table-head md-sort-by="size">Size</md-table-head>
+                        <md-table-head >View</md-table-head>
                     </md-table-row>
                 </md-table-header>
 
                 <md-table-body>
                     <md-table-row v-for="a in files" :key="a.filename">
                         <md-table-cell><a @click="job.downloadArchive(a.filename)">{{ a.filename }}</a></md-table-cell>
                         <md-table-cell>{{ Math.round(a.size / 1024) }} kb</md-table-cell>
+                        <md-table-cell><a @click="job.downloadArchive(a.filename, 'true')">View Online</a></md-table-cell>
                     </md-table-row>
                 </md-table-body>
             </md-table>

diff --git a/src/dashboard-client/src/models/Job.js b/src/dashboard-client/src/models/Job.js
@@ -317,8 +317,8 @@ export default class Job {
         NewAPIService.openAPIUrl(url)
     }
 
-    downloadArchive (filename) {
-        const url = `projects/${this.project.id}/jobs/${this.id}/archive/download?filename=${filename}`
+    downloadArchive (filename, view = false) {
+        const url = `projects/${this.project.id}/jobs/${this.id}/archive/download?filename=${filename}&view=${view}`
         NewAPIService.openAPIUrl(url)
             .catch((err) => {
                 NotificationService.$emit('NOTIFICATION', new Notification('It seems the archived file was deleted from the server'))