Merge pull request #431 from prescottprue/v2.0.6

v2.0.6

Author: fej-snikduj

docs/storage.md

@@ -34,7 +34,7 @@ Available on `props.firebase` if using `firebaseConnect` HOC or using `getFireba
 -   `options.name` [**String**][string-url] | [**Function**][function-url] - Name of file or function that returns the name of the file. If a function is passed the argument syntax is `(file, internalFirebase, uploadConfig)` where `file` is the file object (`file.name` is used as default if no name option is passed).
 
 ##### Returns
-[**Promise**][promise-url] Resolves with an object containing `uploadTaskSnaphot` which is the [**firebase.storage.UploadTaskSnaphot**][upload-task-snapshot-url] returned from the `storageRef.put` call which happens internally. If `databasePath` is provided `snapshot`, `key`, `File`, and `metaDataSnapshot` parameters are also included.
+[**Promise**][promise-url] Resolves with an object containing `uploadTaskSnapshot` which is the [**firebase.storage.UploadTaskSnapshot**][upload-task-snapshot-url] returned from the `storageRef.put` call which happens internally. If `databasePath` is provided `snapshot`, `key`, `File`, and `metaDataSnapshot` parameters are also included.
 
 #### Examples
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Redux integration for Firebase. Comes with a Higher Order Components for use with React.",
   "main": "lib/index.js",
   "module": "es/index.js",

package.json

@@ -35,6 +35,8 @@ export const watchEvent = (firebase, dispatch, options) => {
     isQuery,
     storeAs
   } = options
+  const { config: { enableLogging, logErrors } } = firebase._
+
   const watchPath = !storeAs ? path : `${path}@${storeAs}`
   const id = queryId || getQueryIdFromPath(path)
   const counter = getWatcherCount(firebase, type, watchPath, id)
@@ -159,7 +161,19 @@ export const watchEvent = (firebase, dispatch, options) => {
       })
     },
     err => {
-      dispatch({ type: actionTypes.ERROR, payload: err })
+      if (enableLogging || logErrors) {
+        // eslint-disable-next-line no-console
+        console.log(
+          `RRF: Error retrieving data for path: ${path}, storeAs: ${storeAs}. Firebase:`,
+          err
+        )
+      }
+      dispatch({
+        type: actionTypes.ERROR,
+        storeAs,
+        path,
+        payload: err
+      })
     }
   )
 }

src/actions/query.js

@@ -90,21 +90,27 @@ export const uploadFile = (dispatch, firebase, config) => {
           .put(file)
 
   return uploadPromise()
-    .then(uploadTaskSnaphot => {
+    .then(uploadTaskSnapshot => {
       if (!dbPath || !firebase.database) {
         dispatch({
           type: FILE_UPLOAD_COMPLETE,
           meta: { ...config, filename },
-          payload: { uploadTaskSnaphot }
+          payload: {
+            uploadTaskSnapshot,
+            uploadTaskSnaphot: uploadTaskSnapshot // Preserving legacy typo
+          }
         })
-        return { uploadTaskSnaphot }
+        return {
+          uploadTaskSnapshot,
+          uploadTaskSnaphot: uploadTaskSnapshot // Preserving legacy typo
+        }
       }
-      const { metadata: { name, fullPath, downloadURLs } } = uploadTaskSnaphot
+      const { metadata: { name, fullPath, downloadURLs } } = uploadTaskSnapshot
       const { fileMetadataFactory } = firebase._.config
 
       // Apply fileMetadataFactory if it exists in config
       const fileData = isFunction(fileMetadataFactory)
-        ? fileMetadataFactory(uploadTaskSnaphot, firebase)
+        ? fileMetadataFactory(uploadTaskSnapshot, firebase)
         : {
             name,
             fullPath,
@@ -122,7 +128,8 @@ export const uploadFile = (dispatch, firebase, config) => {
             snapshot: metaDataSnapshot,
             key: metaDataSnapshot.key,
             File: fileData,
-            uploadTaskSnaphot,
+            uploadTaskSnapshot,
+            uploadTaskSnaphot: uploadTaskSnapshot, // Preserving legacy typo
             metaDataSnapshot
           }
           dispatch({