redux-clerk2 2.0.16 → 2.0.19

package/CHANGELOG.md

@@ -0,0 +1,79 @@
+## 1.0.0
+###### _August 10, 2017_
+
+- Convert responseData to Immutable data structure before adding to store ([#51](https://github.com/GetAmbassador/redux-clerk/pull/51))
+
+## 1.0.0-rc.4
+###### _May 2, 2017_
+
+- Accept responseData in handleSuccess for the update action ([#48](https://github.com/GetAmbassador/redux-clerk/pull/48))
+- Update docs to reflect optional optimism ([#47](https://github.com/GetAmbassador/redux-clerk/pull/47))
+
+## 1.0.0-rc.3
+###### _April 10, 2017_
+
+- Cast all raw ids to strings ([#44](https://github.com/GetAmbassador/redux-clerk/pull/44))
+- Update selectors to handle optional optimism ([#43](https://github.com/GetAmbassador/redux-clerk/pull/43))
+- Make optimistic updates optional ([#41](https://github.com/GetAmbassador/redux-clerk/pull/41))
+
+## 1.0.0-rc.2
+###### _March 23, 2017_
+
+- Added pre action hooks ([#38](https://github.com/GetAmbassador/redux-clerk/pull/38))
+
+## 1.0.0-rc.1
+###### _March 22, 2017_
+
+- Added post action hooks ([#36](https://github.com/GetAmbassador/redux-clerk/pull/36))
+- Rename delete action to remove to avoid reserved word conflicts ([#35](https://github.com/GetAmbassador/redux-clerk/pull/35))
+
+## 0.3.0
+###### _March 15, 2017_
+
+- Fetch response will now deep merge response data into raw data ([#33](https://github.com/GetAmbassador/redux-clerk/pull/33))
+
+## 0.2.8
+###### _February 21, 2017_
+
+- Cast uid to int in record selector ([#31](https://github.com/GetAmbassador/redux-clerk/pull/31))
+
+## 0.2.7
+###### _February 16, 2017_
+
+- Added the get selector ([#29](https://github.com/GetAmbassador/redux-clerk/pull/29))
+
+## 0.2.6
+###### _January 11, 2017_
+
+- Added the datasetProperty selector ([#27](https://github.com/GetAmbassador/redux-clerk/pull/27))
+
+## 0.2.5
+###### _January 3, 2017_
+
+- Return Map instead of List for empty dataset ([#25](https://github.com/GetAmbassador/redux-clerk/pull/25))
+- Ensure data is properly converted between actions and reducers ([#24](https://github.com/GetAmbassador/redux-clerk/pull/24))
+
+## 0.2.4
+###### _December 15, 2016_
+
+- uidField option has been removed for the reducer (it is not longer needed) ([#22](https://github.com/GetAmbassador/redux-clerk/pull/22))
+
+## 0.2.3
+###### _December 14, 2016_
+
+- Records are now added while updating if not already in state ([#20](https://github.com/GetAmbassador/redux-clerk/pull/20))
+
+## 0.2.2
+###### _December 13, 2016_
+
+- Added the ability to return fetch response as an object or array ([#18](https://github.com/GetAmbassador/redux-clerk/pull/18))
+
+## 0.2.1
+###### _December 7, 2016_
+
+- Added the ability to pass additional data with fetch, create and delete actions ([#16](https://github.com/GetAmbassador/redux-clerk/pull/16))
+
+## 0.2.0
+###### _December 5, 2016_
+
+- Initial Release

package/lib/actions/BaseAction.js

@@ -111,6 +111,7 @@ var _initialiseProps = function _initialiseProps() {
         dispatch(action);
 
         if (type === 'success' && actionData.options.normalizeResponse) {
+            console.log('actionData.options:', actionData.options);
             // DISPATCH RELATED ACTIONS IF WE HAVE normalizationSettings
             if (responseData) {
                 if (actionData.normalizationSettings && Array.isArray(actionData.normalizationSettings)) {

package/lib/actions/Perform.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-	value: true
+  value: true
 });
 exports.Perform = undefined;
 
@@ -31,205 +31,207 @@ var uuidv1 = require('uuid/v1');
  */
 
 var Perform = exports.Perform = function (_BaseAction) {
-	_inherits(Perform, _BaseAction);
-
-	/**
-  * Create an instance of the bulk action.
-  * @param {Object} config - The configuration for the action.
-  */
-	function Perform(config) {
-		_classCallCheck(this, Perform);
-
-		var _this = _possibleConstructorReturn(this, (Perform.__proto__ || Object.getPrototypeOf(Perform)).call(this, 'perform', config));
-
-		_this.do = function (instance, record) {
-			var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-			var _this$config = _this.config,
-			    uidField = _this$config.uidField,
-			    performer = _this$config.performer,
-			    actionSettings = _this$config.actionSettings,
-			    api = _this$config.api,
-			    notificationActions = _this$config.notificationActions,
-			    normalizationSettings = _this$config.normalizationSettings;
-
-			//console.log('actionSettings', actionSettings);
-			//console.log('api', api);
-			//console.log('notificationAction', notificationAction);
-
-			// Extend fetch options
-
-			options = _extends({}, _this.defaultOptions, options);
-
-			// Make sure record is an immutable map
-			record = _immutable2.default.Iterable.isIterable(record) ? record : _immutable2.default.fromJS(record);
-
-			// Validate instance key
-			_this.validateInstance(instance);
-
-			/*if(List.isList(record)){
-   	// ADD uids to new items
-   	record = record.map(item => 
-   		item.get(uidField) === undefined ? item.set("tmpid", uuidv1()) : item
-       );
-   }else{
-   	record.get(uidField) === undefined ? record.set("tmpid", uuidv1()) : record
-   }*/
-
-			return function (dispatch) {
-
-				// Create data object to be dispatched with actions
-				var isAsync = options.isAsync !== undefined ? options.isAsync : typeof performer === 'function' || actionSettings !== undefined;
-				var data = { instance: instance, record: record, uidField: uidField, isAsync: isAsync, options: options, normalizationSettings: normalizationSettings };
-				var msguid = uuidv1();
-
-				// Call BaseAction.start with dispatch and the action data
-				_this.start(dispatch, data);
-
-				//console.log('action bulk:', data);
-
-				if (actionSettings !== undefined && isAsync) {
-					var notify = notificationActions.notify,
-					    notifyDismiss = notificationActions.notifyDismiss;
-					// Extend config options
-
-					var settings = _extends({}, actionSettings.default, actionSettings.performer);
-					//console.log(settings);
-					var displayLoading = settings.loading !== undefined && settings.loading !== '' ? true : false;
-					var displayNotification = settings.notification !== undefined && settings.notification.type === 'notification' ? true : false;
-					var displayMessage = settings.notification !== undefined && !displayNotification ? true : false;
-
-					if (displayLoading) {
-						dispatch(notify({
-							id: msguid,
-							title: settings.loading !== undefined ? settings.loading : 'Please wait',
-							kind: 'loading'
-						}));
-					}
-
-					//console.log('auto performer action');
-					var successHandler = _this.success.bind(_this, dispatch, data);
-					var errorHandler = _this.error.bind(_this, dispatch, data);
-
-					var url = settings.url;
-
-					var activeProperty = localStorage.activeProperty !== undefined && localStorage.activeProperty !== 'undefined' ? JSON.parse(localStorage.activeProperty) : null;
-					var propertycode = activeProperty !== null ? activeProperty.propertycode : null;
-
-					if (options && options.property_id) {
-						var properties = localStorage.properties !== undefined && localStorage.properties !== 'undefined' ? JSON.parse(localStorage.properties) : [];
-						var overrideProperty = properties.find(function (property) {
-							return property.id === options.property_id;
-						});
-						if (overrideProperty && overrideProperty.propertycode) {
-							propertycode = overrideProperty.propertycode;
-						}
-					}
-
-					if (propertycode !== null) {
-						url = settings.url.replace(/#@propertycode@#/i, propertycode);
-					}
-
-					//console.log(`options`, options);
-
-					if (options.url) {
-						url = url + '/' + options.url;
-					}
-
-					//return api.put(url, record.toJSON())
-					return api({ method: options.method || 'get', url: url, data: record.toJSON() }).then(function (response) {
-						if (displayLoading) {
-							dispatch(notifyDismiss(msguid));
-						}
-
-						var message = '';
-
-						if (response.data.success) {
-							successHandler(response.data.data || [], null, response.data.updates || []);
-							message = response.data.message;
-
-							if (displayNotification) {
-								dispatch(notify({
-									title: settings.notification.title,
-									message: settings.notification.message !== undefined ? settings.notification.message : message,
-									type: 'notification',
-									kind: settings.notification.kind !== undefined ? settings.notification.kind : 'success'
-								}));
-							} else if (displayMessage) {
-								dispatch(notify({
-									title: settings.notification.title !== undefined ? settings.notification.title : message,
-									kind: settings.notification.kind !== undefined ? settings.notification.kind : 'success'
-								}));
-							}
-						} else {
-							errorHandler(response.data.error);
-							message = response.data.error.message !== undefined ? response.data.error.message : response.data.error;
-
-							dispatch(notify({
-								title: settings.error.title,
-								message: message || settings.error.message,
-								type: 'notification',
-								kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
-							}));
-						}
-						return response.data;
-					}).catch(function (error) {
-						if (displayLoading) {
-							dispatch(notifyDismiss(msguid));
-						}
-						errorHandler(error);
-
-						if (error && error.response && error.response.status && error.response.status !== 401) {
-
-							if (settings.error.type !== undefined && settings.error.type === 'notification') {
-								dispatch(notify({
-									title: settings.error.title,
-									message: settings.error.message !== undefined ? settings.error.message : error.response.data.message,
-									type: 'notification',
-									kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
-								}));
-							} else {
-								dispatch(notify({
-									title: settings.error.title !== undefined ? settings.error.title : error.response.data.message,
-									kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
-								}));
-							}
-						}
-					});
-				} else {
-					// If config.performer is provided, call it
-					//if(isAsync) {
-					// Prepare BaseAction.success and BaseAction.error handlers
-					// by currying with dispatch
-					var success = _this.success.bind(_this, dispatch, data);
-					var error = _this.error.bind(_this, dispatch, data);
-					return success(record || []);
-					// Call performer
-					//return performer(record, success, error);
-					//}
-				}
-			};
-		};
-
-		return _this;
-	}
-
-	/**
-  * Default options for the fetch action.
-  */
-
-
-	/**
-  * Generate an action creator with the provided data.
-  * @param {Object} record - item being updated.
-  *
-  * @returns {Function} - Returns the perform action thunk.
-  */
-
-
-	return Perform;
+  _inherits(Perform, _BaseAction);
+
+  /**
+   * Create an instance of the bulk action.
+   * @param {Object} config - The configuration for the action.
+   */
+  function Perform(config) {
+    _classCallCheck(this, Perform);
+
+    var _this = _possibleConstructorReturn(this, (Perform.__proto__ || Object.getPrototypeOf(Perform)).call(this, 'perform', config));
+
+    _this.do = function (instance, record) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var _this$config = _this.config,
+          uidField = _this$config.uidField,
+          performer = _this$config.performer,
+          actionSettings = _this$config.actionSettings,
+          api = _this$config.api,
+          notificationActions = _this$config.notificationActions,
+          normalizationSettings = _this$config.normalizationSettings;
+
+      //console.log('actionSettings', actionSettings);
+      //console.log('api', api);
+      //console.log('notificationAction', notificationAction);
+
+      // Extend fetch options
+
+      options = _extends({}, _this.defaultOptions, options);
+
+      // Make sure record is an immutable map
+      record = _immutable2.default.Iterable.isIterable(record) ? record : _immutable2.default.fromJS(record);
+
+      // Validate instance key
+      _this.validateInstance(instance);
+
+      /*if(List.isList(record)){
+      	// ADD uids to new items
+      	record = record.map(item => 
+      		item.get(uidField) === undefined ? item.set("tmpid", uuidv1()) : item
+          );
+      }else{
+      	record.get(uidField) === undefined ? record.set("tmpid", uuidv1()) : record
+      }*/
+
+      return function (dispatch) {
+
+        // Create data object to be dispatched with actions
+        var isAsync = options.isAsync !== undefined ? options.isAsync : typeof performer === 'function' || actionSettings !== undefined;
+        var data = { instance: instance, record: record, uidField: uidField, isAsync: isAsync, options: options, normalizationSettings: normalizationSettings };
+        var msguid = uuidv1();
+
+        // Call BaseAction.start with dispatch and the action data
+        _this.start(dispatch, data);
+
+        //console.log('action bulk:', data);
+
+        if (actionSettings !== undefined && isAsync) {
+          var notify = notificationActions.notify,
+              notifyDismiss = notificationActions.notifyDismiss;
+          // Extend config options
+
+          var settings = _extends({}, actionSettings.default, actionSettings.performer);
+          //console.log(settings);
+          var displayLoading = settings.loading !== undefined && settings.loading !== '' ? true : false;
+          var displayNotification = settings.notification !== undefined && settings.notification.type === 'notification' ? true : false;
+          var displayMessage = settings.notification !== undefined && !displayNotification ? true : false;
+
+          if (displayLoading) {
+            dispatch(notify({
+              id: msguid,
+              title: settings.loading !== undefined ? settings.loading : 'Please wait',
+              kind: 'loading'
+            }));
+          }
+
+          //console.log('auto performer action');
+          var successHandler = _this.success.bind(_this, dispatch, data);
+          var errorHandler = _this.error.bind(_this, dispatch, data);
+
+          var url = settings.url;
+
+          var activeProperty = localStorage.activeProperty !== undefined && localStorage.activeProperty !== 'undefined' ? JSON.parse(localStorage.activeProperty) : null;
+          var propertycode = activeProperty !== null ? activeProperty.propertycode : null;
+
+          if (options && options.property_id) {
+            var properties = localStorage.properties !== undefined && localStorage.properties !== 'undefined' ? JSON.parse(localStorage.properties) : [];
+            var overrideProperty = properties.find(function (property) {
+              return property.id === options.property_id;
+            });
+            if (overrideProperty && overrideProperty.propertycode) {
+              propertycode = overrideProperty.propertycode;
+            }
+          }
+
+          if (propertycode !== null) {
+            url = settings.url.replace(/#@propertycode@#/i, propertycode);
+          }
+
+          //console.log(`options`, options);
+
+          if (options.url) {
+            url = url + '/' + options.url;
+          }
+
+          //return api.put(url, record.toJSON())
+          return api({ method: options.method || 'get', url: url, data: record.toJSON() }).then(function (response) {
+            if (displayLoading) {
+              dispatch(notifyDismiss(msguid));
+            }
+
+            var message = '';
+
+            if (response.data.success) {
+              successHandler(response.data.data || [], null, response.data.updates || []);
+              message = response.data.message;
+
+              if (settings.notification !== undefined) {
+                if (settings.notification.type !== undefined && settings.notification.type === 'notification') {
+                  dispatch(notify({
+                    title: settings.notification.title,
+                    message: settings.notification.message !== undefined ? settings.notification.message : message,
+                    type: 'notification',
+                    kind: settings.notification.kind !== undefined ? settings.notification.kind : 'success'
+                  }));
+                } else {
+                  dispatch(notify({
+                    title: settings.notification.title !== undefined ? settings.notification.title : message, //response.data.message,
+                    kind: settings.notification.kind !== undefined ? settings.notification.kind : 'success'
+                  }));
+                }
+              }
+            } else {
+              errorHandler(response.data.error);
+              message = response.data.error.message !== undefined ? response.data.error.message : response.data.error;
+
+              dispatch(notify({
+                title: settings.error.title,
+                message: message || settings.error.message,
+                type: 'notification',
+                kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
+              }));
+            }
+            return response.data;
+          }).catch(function (error) {
+            if (displayLoading) {
+              dispatch(notifyDismiss(msguid));
+            }
+            errorHandler(error);
+
+            if (error && error.response && error.response.status && error.response.status !== 401) {
+
+              if (settings.error.type !== undefined && settings.error.type === 'notification') {
+                dispatch(notify({
+                  title: settings.error.title,
+                  message: error.response.data.message ? error.response.data.message : settings.error.message !== undefined ? settings.error.message : '',
+                  type: 'notification',
+                  kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
+                }));
+              } else {
+                dispatch(notify({
+                  title: error.response.data.message ? error.response.data.message : settings.error.title !== undefined ? settings.error.title : '',
+                  kind: settings.error.kind !== undefined ? settings.error.kind : 'error'
+                }));
+              }
+            }
+          });
+        } else {
+          // If config.performer is provided, call it
+          //if(isAsync) {
+          // Prepare BaseAction.success and BaseAction.error handlers
+          // by currying with dispatch
+          var success = _this.success.bind(_this, dispatch, data);
+          var error = _this.error.bind(_this, dispatch, data);
+          return success(record || []);
+          // Call performer
+          //return performer(record, success, error);
+          //}
+        }
+      };
+    };
+
+    return _this;
+  }
+
+  /**
+   * Default options for the fetch action.
+   */
+
+
+  /**
+   * Generate an action creator with the provided data.
+   * @param {Object} record - item being updated.
+   *
+   * @returns {Function} - Returns the perform action thunk.
+   */
+
+
+  return Perform;
 }(_BaseAction3.default);
 
 Perform.defaultOptions = {
-	appendResponse: true,
-	normalizeResponse: false,
-	property_id: null };
+  appendResponse: true,
+  normalizeResponse: false,
+  property_id: null };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-clerk2",
-  "version": "2.0.16",
+  "version": "2.0.19",
   "description": "Redux Clerk handles the async CRUD in your Redux App.",
   "main": "lib/index.js",
   "files": [

package/src/actions/BaseAction.js

@@ -60,6 +60,7 @@ class BaseAction {
     dispatch(action);
 
     if (type === 'success' && actionData.options.normalizeResponse) {
+      console.log(`actionData.options:`, actionData.options)
       // DISPATCH RELATED ACTIONS IF WE HAVE normalizationSettings
       if (responseData) {
         if(actionData.normalizationSettings && Array.isArray(actionData.normalizationSettings)){

package/src/actions/Perform.js

@@ -126,30 +126,32 @@ export class Perform extends BaseAction {
 					successHandler(response.data.data || [], null, response.data.updates || []); 
 					message = response.data.message;
 					
-					if(displayNotification){
-						dispatch(notify({
-							title: settings.notification.title,
-							message: (settings.notification.message !== undefined)?settings.notification.message:message,
-							type: 'notification',
-							kind: (settings.notification.kind !== undefined)?settings.notification.kind:'success'
-						})); 
-					}else if(displayMessage){
-						dispatch(notify({
-							title: (settings.notification.title !== undefined)?settings.notification.title:message,
-							kind: (settings.notification.kind !== undefined)?settings.notification.kind:'success'
-						}));
-					}
+					if(settings.notification !== undefined ){
+                        if(settings.notification.type !== undefined && settings.notification.type === 'notification'){
+                           dispatch(notify({
+                                title: settings.notification.title,
+                                message: (settings.notification.message !== undefined)?settings.notification.message:message,
+                                type: 'notification',
+                                kind: (settings.notification.kind !== undefined)?settings.notification.kind:'success'
+                            })); 
+                        }else{
+                            dispatch(notify({
+                                title: (settings.notification.title !== undefined)?settings.notification.title:message,//response.data.message,
+                                kind: (settings.notification.kind !== undefined)?settings.notification.kind:'success'
+                            }));
+                        }
+                    }
 				
 				}else{
 					errorHandler(response.data.error);
 					message = (response.data.error.message !== undefined)?response.data.error.message:response.data.error;
 					
 					dispatch(notify({
-						title: settings.error.title,
-						message: message || settings.error.message,
-						type: 'notification',
-						kind: (settings.error.kind !== undefined)?settings.error.kind:'error'
-					}));
+                        title: settings.error.title,
+                        message: message || settings.error.message,
+                        type: 'notification',
+                        kind: (settings.error.kind !== undefined)?settings.error.kind:'error'
+                    }));
 				}
 				return response.data;	  
 			})
@@ -164,13 +166,13 @@ export class Perform extends BaseAction {
                     if(settings.error.type !== undefined && settings.error.type === 'notification'){
                         dispatch(notify({
                             title: settings.error.title,
-                            message: (settings.error.message !== undefined)?settings.error.message:error.response.data.message,
+                            message: error.response.data.message ? error.response.data.message : (settings.error.message !== undefined)?settings.error.message:'',
                             type: 'notification',
                             kind: (settings.error.kind !== undefined)?settings.error.kind:'error'
                         })); 
                     }else{
                         dispatch(notify({
-                            title: (settings.error.title !== undefined)?settings.error.title:error.response.data.message,
+                            title: error.response.data.message ? error.response.data.message : (settings.error.title !== undefined)?settings.error.title:'',
                             kind: (settings.error.kind !== undefined)?settings.error.kind:'error'
                         }));
                     }