Merge 355fc9b into 5f23988

cerebral · Jun 29, 2017 · 854a238 · 854a238
2 parents 5f23988 + 355fc9b
commit 854a238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/node_modules/@cerebral/http/README.md b/packages/node_modules/@cerebral/http/README.md
@@ -136,7 +136,7 @@ export default [
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```
@@ -184,7 +184,7 @@ export default [
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```
@@ -229,7 +229,7 @@ export default [
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```
@@ -271,7 +271,7 @@ export default [
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```
@@ -313,7 +313,7 @@ export default [
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```
@@ -338,7 +338,7 @@ function someDeleteAction ({http, props}) {
     name: 'filename.png', // Default to "files"
     data: {}, // Additional form data
     headers: {},
-    onProgress(progress) {} // Upload progress
+    onProgress: 'some.signal.path' // Upload progress
   })
 }
 ```
@@ -355,12 +355,13 @@ export default [
 
   // Alternatively with explicit paths
   httpUploadFile('/uploads', props`file`, {
-    name: state`currentFileName`
+    name: state`currentFileName`,
+    onProgress: 'some.signal.path'
   }), {
     success: [],
     error: [],
     abort: [], // Optional
-    '${STATUS_CODE}': [] // Optionally any status code, ex. 404: []
+    [STATUS_CODE]: [] // Optionally any status code, ex. 404: []
   }
 ]
 ```

diff --git a/packages/node_modules/@cerebral/http/src/index.js b/packages/node_modules/@cerebral/http/src/index.js
@@ -114,6 +114,9 @@ export default function HttpProviderFactory(passedOptions) {
         },
         uploadFile(url, files, options = {}) {
           options.url = moduleOptions.baseUrl + url
+          options.onProgress = typeof options.onProgress === 'string'
+            ? context.controller.getSignal(options.onProgress)
+            : options.onProgress
 
           return new FileUpload(options).send(files)
         },