Skip to content

Commit

Permalink
@uppy/transloadit: pass fields to transloadit
Browse files Browse the repository at this point in the history
Co-authored-by: Merlijn Vos <Murderlon@users.noreply.github.com>
Fixes: #3189
  • Loading branch information
aduh95 and Murderlon committed Sep 28, 2021
1 parent a298e59 commit a3e3ccf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
11 changes: 7 additions & 4 deletions packages/@uppy/transloadit/src/AssemblyOptions.js
Expand Up @@ -29,10 +29,13 @@ function validateParams (params) {
* compatible object.
*/
function normalizeAssemblyOptions (file, assemblyOptions) {
// eslint-disable-next-line no-param-reassign
assemblyOptions.fields = Array.isArray(assemblyOptions.fields)
? Object.fromEntries(assemblyOptions.fields.map((fieldName) => [fieldName, file.meta[fieldName]]))
: {}
if (Array.isArray(assemblyOptions.fields)) {
// eslint-disable-next-line no-param-reassign
assemblyOptions.fields = Object.fromEntries(assemblyOptions.fields.map((fieldName) => [fieldName, file.meta[fieldName]]))
} else if (assemblyOptions.fields == null) {
// eslint-disable-next-line no-param-reassign
assemblyOptions.fields = {}
}

return assemblyOptions
}
Expand Down
20 changes: 8 additions & 12 deletions test/endtoend/transloadit2/main.js
Expand Up @@ -33,24 +33,20 @@ function initUppyTransloadit (transloaditKey) {
auth: { key: transloaditKey },
template_id: 'uppyTransloadit',
},
fields: {
message: 'test',
},
}
},
waitForEncoding: true,
})

uppyTransloadit.on('transloadit:result', (stepName, result) => {
uppyTransloadit.on('transloadit:result', (_, __, assembly) => {
// use transloadit encoding result here.
console.log('Result here ====>', stepName, result)
console.log('Cropped image url is here ====>', result.url)

const img = new Image()
img.onload = function onload () {
const result = document.createElement('div')
result.setAttribute('id', 'uppy-result')
result.textContent = 'ok'
document.body.appendChild(result)
}
img.src = result.url
const result = document.createElement('div')
result.setAttribute('id', 'uppy-result')
result.textContent = assembly.fields.message === 'test' ? 'ok' : 'fail'
document.body.appendChild(result)
})
}

Expand Down

0 comments on commit a3e3ccf

Please sign in to comment.