-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/files-synchronization-5x
- Loading branch information
Showing
12 changed files
with
404 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,67 @@ | ||
| import { setXhrHeaders } from './xhr'; | ||
| const dropbox = (formio) => ({ | ||
| uploadFile(file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, abortCallback) { | ||
| return new Promise(((resolve, reject) => { | ||
| // Send the file with data. | ||
| const xhr = new XMLHttpRequest(); | ||
| function dropbox(formio) { | ||
| return { | ||
| uploadFile(file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, abortCallback) { | ||
| return new Promise(((resolve, reject) => { | ||
| // Send the file with data. | ||
| const xhr = new XMLHttpRequest(); | ||
|
|
||
| if (typeof progressCallback === 'function') { | ||
| xhr.upload.onprogress = progressCallback; | ||
| } | ||
| if (typeof progressCallback === 'function') { | ||
| xhr.upload.onprogress = progressCallback; | ||
| } | ||
|
|
||
| if (typeof abortCallback === 'function') { | ||
| abortCallback(() => xhr.abort()); | ||
| } | ||
| if (typeof abortCallback === 'function') { | ||
| abortCallback(() => xhr.abort()); | ||
| } | ||
|
|
||
| const fd = new FormData(); | ||
| fd.append('name', fileName); | ||
| fd.append('dir', dir); | ||
| fd.append('file', file); | ||
| const fd = new FormData(); | ||
| fd.append('name', fileName); | ||
| fd.append('dir', dir); | ||
| fd.append('file', file); | ||
|
|
||
| // Fire on network error. | ||
| xhr.onerror = (err) => { | ||
| err.networkError = true; | ||
| reject(err); | ||
| }; | ||
| // Fire on network error. | ||
| xhr.onerror = (err) => { | ||
| err.networkError = true; | ||
| reject(err); | ||
| }; | ||
|
|
||
| xhr.onload = () => { | ||
| if (xhr.status >= 200 && xhr.status < 300) { | ||
| const response = JSON.parse(xhr.response); | ||
| response.storage = 'dropbox'; | ||
| response.size = file.size; | ||
| response.type = file.type; | ||
| response.groupId = groupId; | ||
| response.groupPermissions = groupPermissions; | ||
| response.url = response.path_lower; | ||
| resolve(response); | ||
| } | ||
| else { | ||
| reject(xhr.response || 'Unable to upload file'); | ||
| } | ||
| }; | ||
| xhr.onload = () => { | ||
| if (xhr.status >= 200 && xhr.status < 300) { | ||
| const response = JSON.parse(xhr.response); | ||
| response.storage = 'dropbox'; | ||
| response.size = file.size; | ||
| response.type = file.type; | ||
| response.groupId = groupId; | ||
| response.groupPermissions = groupPermissions; | ||
| response.url = response.path_lower; | ||
| resolve(response); | ||
| } | ||
| else { | ||
| reject(xhr.response || 'Unable to upload file'); | ||
| } | ||
| }; | ||
|
|
||
| xhr.onabort = reject; | ||
| xhr.onabort = reject; | ||
|
|
||
| xhr.open('POST', `${formio.formUrl}/storage/dropbox`); | ||
| xhr.open('POST', `${formio.formUrl}/storage/dropbox`); | ||
|
|
||
| setXhrHeaders(formio, xhr); | ||
| setXhrHeaders(formio, xhr); | ||
|
|
||
| const token = formio.getToken(); | ||
| if (token) { | ||
| xhr.setRequestHeader('x-jwt-token', token); | ||
| } | ||
| xhr.send(fd); | ||
| })); | ||
| }, | ||
| downloadFile(file) { | ||
| const token = formio.getToken(); | ||
| if (token) { | ||
| xhr.setRequestHeader('x-jwt-token', token); | ||
| } | ||
| xhr.send(fd); | ||
| })); | ||
| }, | ||
| downloadFile(file) { | ||
| const token = formio.getToken(); | ||
| file.url = | ||
| `${formio.formUrl}/storage/dropbox?path_lower=${file.path_lower}${token ? `&x-jwt-token=${token}` : ''}`; | ||
| return Promise.resolve(file); | ||
| } | ||
| }); | ||
| file.url = | ||
| `${formio.formUrl}/storage/dropbox?path_lower=${file.path_lower}${token ? `&x-jwt-token=${token}` : ''}`; | ||
| return Promise.resolve(file); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| dropbox.title = 'Dropbox'; | ||
| export default dropbox; |
Oops, something went wrong.