pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1005 from dod-ccpo/cloud-pdf-downloads

Browse Source 
Cloud pdf downloads
This commit is contained in:
richard-dds
2019-08-30 16:11:27 -04:00
committed by GitHub
parent 26864a76eb 7d3bda9496
commit c5284fd8f9
12 changed files with 159 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/components/__tests__/upload_input.test.js
View File

@@ -8,7 +8,8 @@ const UploadWrapper = makeTestWrapper({
components: { uploadinput },
templatePath: 'upload_input_template.html',
data: function() {
return { initialvalue: this.initialData.initialvalue, token: this.token }
const { filename, objectName } = this.initialData
return { filename, objectName }
},
})
@@ -16,7 +17,7 @@ const UploadErrorWrapper = makeTestWrapper({
components: { uploadinput },
templatePath: 'upload_input_error_template.html',
data: function() {
return { initialvalue: null, token: null }
return { filename: null, objectName: null }
},
})
@@ -24,7 +25,7 @@ describe('UploadInput Test', () => {
it('should show input and button when no attachment present', () => {
const wrapper = mount(UploadWrapper, {
propsData: {
initialData: { initialvalue: null, token: 'token' },
initialData: {},
},
})
@@ -35,21 +36,24 @@ describe('UploadInput Test', () => {
it('should show file name and hide input', () => {
const wrapper = mount(UploadWrapper, {
propsData: {
initialData: { initialvalue: 'somepdf.pdf', token: 'token' },
initialData: {
filename: 'somepdf.pdf',
objectName: 'abcd',
},
},
})
const fileInput = wrapper.find('input[type=file]').element
const fileNameSpan = wrapper.find('.uploaded-file__name')
const fileNameLink = wrapper.find('.uploaded-file__name')
expect(fileInput).toBe(undefined)
expect(fileNameSpan.html()).toContain('somepdf.pdf')
expect(fileNameLink.html()).toContain('somepdf.pdf')
})
it('should correctly display error treatment', () => {
const wrapper = mount(UploadErrorWrapper, {
propsData: {
initialData: { initialvalue: 'somepdf.pdf', token: 'token' },
initialData: { initialvalue: 'somepdf.pdf', objectName: 'abcd' },
},
})

32
js/components/upload_input.js
View File

@@ -17,7 +17,10 @@ export default {
props: {
name: String,
initialData: {
filename: {
type: String,
},
objectName: {
type: String,
},
initialErrors: {
@@ -38,11 +41,12 @@ export default {
data: function() {
return {
hasInitialData: !!this.initialData,
attachment: this.initialData || null,
hasInitialData: !!this.filename,
attachment: this.filename || null,
changed: false,
uploadError: false,
sizeError: false,
downloadLink: '',
}
},
@@ -52,6 +56,13 @@ export default {
name: this.name,
valid: this.hasAttachment,
})
if (this.hasInitialData) {
this.downloadLink = await this.getDownloadLink(
this.filename,
this.objectName
)
}
},
methods: {
@@ -70,6 +81,10 @@ export default {
this.attachment = e.target.value
this.$refs.attachmentFilename.value = file.name
this.$refs.attachmentObjectName.value = response.objectName
this.downloadLink = await this.getDownloadLink(
file.name,
response.objectName
)
} else {
this.uploadError = true
}
@@ -104,12 +119,21 @@ export default {
this.sizeError = false
},
getUploader: async function() {
return fetch(`/task_orders/${this.portfolioId}/upload-token`, {
return fetch(`/task_orders/${this.portfolioId}/upload_token`, {
credentials: 'include',
})
.then(response => response.json())
.then(({ token, objectName }) => buildUploader(token, objectName))
},
getDownloadLink: async function(filename, objectName) {
const { downloadLink } = await fetch(
`/task_orders/${
this.portfolioId
}/download_link?filename=${filename}&objectName=${objectName}`,
{ credentials: 'include' }
).then(r => r.json())
return downloadLink
},
},
computed: {

9
js/lib/upload.js
View File

@@ -43,6 +43,14 @@ class AzureUploader {
fileReader.readAsText(file)
})
}
downloadUrl(objectName) {
const blobService = Azure.createBlobServiceWithSas(
`https://${this.accountName}.blob.core.windows.net`,
this.sasToken
)
return blobService.getUrl(this.containerName, objectName, this.sasToken)
}
}
class AwsUploader {
@@ -58,6 +66,7 @@ class AwsUploader {
})
form.append('file', file)
form.set('x-amz-meta-filename', file.name)
form.set('Content-Type', 'application/pdf')
const response = await fetch(this.presignedPost.url, {
method: 'POST',

2
js/test_templates/upload_input_error_template.html
View File

@@ -13,7 +13,7 @@
<span class="icon icon--check-circle-solid " aria-hidden="true"><svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="check-circle" class="svg-inline--fa fa-check-circle fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"></path></svg></span>
<span class="uploaded-file__name" v-html="baseName"></span>
<a class="uploaded-file__name" v-html="baseName" v-bind:href="downloadLink"></a>
<a href="#" class="uploaded-file__remove" v-on:click="removeAttachment">Remove</a>
</div>
<div v-show="hasAttachment === false" v-bind:class='{ "usa-input": true, "usa-input--error": showErrors }'>

5
js/test_templates/upload_input_template.html
View File

@@ -1,7 +1,8 @@
<uploadinput
inline-template
v-bind:initial-data='initialvalue'
v-bind:filename='filename'
v-bind:object-name='objectName'
v-bind:watch='false'
v-bind:portfolio-id="''"
@@ -13,7 +14,7 @@
<span class="icon icon--check-circle-solid " aria-hidden="true"><svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="check-circle" class="svg-inline--fa fa-check-circle fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"></path></svg></span>
<span class="uploaded-file__name" v-html="baseName"></span>
<a class="uploaded-file__name" v-html="baseName" v-bind:href="downloadLink"></a>
<a href="#" class="uploaded-file__remove" v-on:click="removeAttachment">Remove</a>
</div>
<div v-show="hasAttachment === false" v-bind:class='{ "usa-input": true, "usa-input--error": showErrors }'>