redux-clerk2 2.0.9 → 2.0.14

package/lib/actions/Fetch.js

@@ -76,7 +76,7 @@ var Fetch = exports.Fetch = function (_BaseAction) {
 				    normalizationSettings = _this$config.normalizationSettings;
 
 
-				var data = { instance: instance, uidField: uidField, options: options, normalizationSettings: normalizationSettings };
+				var data = { instance: instance, uidField: uidField, options: options, normalizationSettings: normalizationSettings, params: params };
 				var msguid = uuidv1();
 
 				// Call BaseAction.start with dispatch
@@ -147,11 +147,11 @@ var Fetch = exports.Fetch = function (_BaseAction) {
 						}
 
 						var parameters = _extends({
-							page: params.page || 1,
-							query: params.query || undefined,
-							order: params.order || undefined,
+							page: params && params.page || 1,
+							query: params && params.query || undefined,
+							order: params && params.order || undefined,
 							sort: sort_order || undefined,
-							limit: params.limit || 10
+							limit: params && params.limit || 10
 						}, additionalData.filters);
 						apiparams = _pickBy(parameters, _identity);
 

package/lib/reducers/fetch.js

@@ -33,6 +33,7 @@ var uniqEs6 = function uniqEs6(arrArg) {
  * @return {Immutable.Map} - updated state
  */
 var start = exports.start = function start(state, action) {
+  var params = action.params;
   return state.withMutations(function (map) {
 
     // Add additional data if provided
@@ -41,7 +42,8 @@ var start = exports.start = function start(state, action) {
     map.mergeIn(['instances', action.instance, 'additionalData'], _immutable2.default.fromJS(_extends({}, action.additionalData, {
       error: false,
       errorMessage: null,
-      isFetching: true
+      isFetching: !params || params._id === undefined ? true : false,
+      isFetchingSingle: params && params._id !== undefined ? true : false
     })));
     //}
   });
@@ -103,7 +105,8 @@ var success = exports.success = function success(state, action) {
     map.mergeIn(['instances', action.instance, 'additionalData'], _immutable2.default.fromJS(_extends({}, action.additionalData, {
       error: false,
       errorMessage: null,
-      isFetching: false
+      isFetching: false,
+      isFetchingSingle: false
       //...(action.options && action.options.recalcTotal) && { total: instanceTotal.size },
     })));
     //}
@@ -126,7 +129,8 @@ var error = exports.error = function error(state, action) {
     map.mergeIn(['instances', action.instance, 'additionalData'], _immutable2.default.fromJS(_extends({}, action.additionalData, {
       error: true,
       errorMessage: action.responseData,
-      isFetching: false
+      isFetching: false,
+      isFetchingSingle: false
     })));
     //}
   });

package/lib/reducers/perform.js

@@ -86,7 +86,13 @@ var success = exports.success = function success(state, action) {
 					map.set('raw', state.get('raw').merge(newRecord));
 
 					// Add new record to instance array using permanent uid
-					map.setIn(['instances', action.instance, 'data'], map.getIn(['instances', action.instance, 'data']).push(uid));
+					var instanceData = map.getIn(['instances', action.instance, 'data'], (0, _immutable.List)());
+					// Check if key already present in instance
+					if (!(instanceData.indexOf(uid) !== -1)) {
+						map.setIn(['instances', action.instance, 'data'], instanceData.push(uid));
+					}
+					// OLD method
+					//map.setIn(['instances', action.instance, 'data'], map.getIn(['instances', action.instance, 'data']).push(uid));
 
 					// UPDATE TOTAL COUNT FOR THIS INSTANCE
 					map.setIn(['instances', action.instance, 'additionalData', 'total'], map.getIn(['instances', action.instance, 'additionalData', 'total']) + 1);

package/package.json

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

package/src/actions/Fetch.js

@@ -55,7 +55,7 @@ export class Fetch extends BaseAction {
       // Create data object to be dispatched with actions
       const { uidField, actionSettings, api, notificationActions, normalizationSettings  } = this.config;
       
-      const data = { instance, uidField, options, normalizationSettings };
+      const data = { instance, uidField, options, normalizationSettings, params };
       const msguid = uuidv1();
 
       // Call BaseAction.start with dispatch
@@ -124,11 +124,11 @@ export class Fetch extends BaseAction {
 			}
 			
 			const parameters = {
-				page: params.page || 1
-				,query: params.query || undefined
-				,order: params.order || undefined
+				page: params && params.page || 1
+				,query: params && params.query || undefined
+				,order: params && params.order || undefined
 				,sort: sort_order || undefined
-				,limit: params.limit || 10
+				,limit: params && params.limit || 10
 				,...additionalData.filters
 			}
 			apiparams = _pickBy(parameters, _identity);

package/src/reducers/fetch.js

@@ -16,6 +16,7 @@ const uniqEs6 = (arrArg) => {
  * @return {Immutable.Map} - updated state
  */
 export const start = (state, action) => {
+    const params = action.params;
 	return state.withMutations(map => {
 
 	// Add additional data if provided
@@ -24,7 +25,8 @@ export const start = (state, action) => {
 		map.mergeIn(['instances', action.instance, 'additionalData'], Immutable.fromJS(Object.assign({}, action.additionalData, {
 			error: false,
 			errorMessage: null,
-			isFetching: true
+			isFetching: !params || params._id === undefined ? true : false,
+			isFetchingSingle: params && params._id !== undefined ? true : false,
 		})));
 	//}
 	})
@@ -85,6 +87,7 @@ export const success = (state, action) => {
                 error: false,
                 errorMessage: null,
                 isFetching: false,
+                isFetchingSingle: false,
                 //...(action.options && action.options.recalcTotal) && { total: instanceTotal.size },
             })));
         //}
@@ -107,7 +110,8 @@ export const error = (state, action) => {
 		map.mergeIn(['instances', action.instance, 'additionalData'], Immutable.fromJS(Object.assign({}, action.additionalData, {
 			error: true,
 			errorMessage: action.responseData,
-			isFetching: false
+			isFetching: false,
+            isFetchingSingle: false,
 		})));
 	//}
 	})

package/src/reducers/perform.js

@@ -73,7 +73,13 @@ export const start = (state, action) => {
 				map.set('raw', state.get('raw').merge(newRecord))
 			
 				// Add new record to instance array using permanent uid
-				map.setIn(['instances', action.instance, 'data'], map.getIn(['instances', action.instance, 'data']).push(uid));
+                const instanceData = map.getIn(['instances', action.instance, 'data'], List());
+                // Check if key already present in instance
+                if(!instanceData.includes(uid)){
+                    map.setIn(['instances', action.instance, 'data'], instanceData.push(uid));
+                }
+                // OLD method
+				//map.setIn(['instances', action.instance, 'data'], map.getIn(['instances', action.instance, 'data']).push(uid));
 				
 				// UPDATE TOTAL COUNT FOR THIS INSTANCE
 				map.setIn(['instances', action.instance, 'additionalData', 'total'], map.getIn(['instances', action.instance, 'additionalData', 'total']) + 1 );

package/CHANGELOG.md

@@ -1,79 +0,0 @@
-## 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