Skip to content

Commit

Permalink
feat: allow custom form data
Browse files Browse the repository at this point in the history
  • Loading branch information
UncleDave committed Aug 2, 2017
1 parent 50021d2 commit 098febd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/image-upload/before-upload.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export interface UploadMetadata {
file: File;
url: string;
abort: boolean;
formData: { [name: string]: any };
}
16 changes: 8 additions & 8 deletions src/image-upload/image-upload.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,26 +123,26 @@ export class ImageUploadComponent implements OnInit {
const reader = new FileReader();
reader.addEventListener('load', (event: any) => {
const fileHolder: FileHolder = new FileHolder(event.target.result, beforeUploadResult.file);
this.uploadSingleFile(fileHolder, beforeUploadResult.url);
this.uploadSingleFile(fileHolder, beforeUploadResult.url, beforeUploadResult.formData);
this.files.push(fileHolder);
}, false);
reader.readAsDataURL(beforeUploadResult.file);
}
}

private uploadSingleFile(fileHolder: FileHolder, url = this.url) {
private uploadSingleFile(fileHolder: FileHolder, url = this.url, customForm?: { [name: string]: any }) {
if (url) {
this.pendingFilesCounter++;
fileHolder.pending = true;

this.imageService
.postImage(this.url, fileHolder.file, this.headers, this.partName, this.withCredentials)
.postImage(this.url, fileHolder.file, this.headers, this.partName, customForm, this.withCredentials)
.subscribe(
response => this.onResponse(response, fileHolder),
error => {
this.onResponse(error, fileHolder);
this.deleteFile(fileHolder);
});
response => this.onResponse(response, fileHolder),
error => {
this.onResponse(error, fileHolder);
this.deleteFile(fileHolder);
});
} else {
this.uploadFinished.emit(fileHolder);
}
Expand Down
11 changes: 9 additions & 2 deletions src/image-upload/image.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export class ImageService {
constructor(private http: Http) {
}

public postImage(url: string, image: File, headers?: Headers | { [name: string]: any }, partName: string = 'image', withCredentials?: boolean): Observable<Response> {
public postImage(url: string, image: File, headers?: Headers | { [name: string]: any }, partName: string = 'image', customFormData?: { [name: string]: any }, withCredentials?: boolean): Observable<Response> {
if (!url || url === '') {
throw new Error('Url is not set! Please set it before doing queries');
}
Expand All @@ -22,6 +22,13 @@ export class ImageService {
options.headers = new Headers(headers);
}

return this.http.post(url, new FormData().append(partName, image), options);

// add custom form data
let formData = new FormData();
for (let key in customFormData) {
formData.append(key, customFormData[key]);
}
formData.append(partName, image);
return this.http.post(url, formData, options);
}
}

0 comments on commit 098febd

Please sign in to comment.