redux-clerk2 2.0.20 → 2.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/actions/BaseAction.js +10 -9
  2. package/package.json +1 -1
  3. package/src/actions/BaseAction.js +8 -8
package/lib/actions/BaseAction.js CHANGED
@@ -111,7 +111,7 @@ var _initialiseProps = function _initialiseProps() {
111
111
  dispatch(action);
112
112
 
113
113
  if (type === 'success' && actionData.options.normalizeResponse) {
114
- console.log('actionData.options:', actionData.options);
114
+ //console.log(`actionData.options:`, actionData.options)
115
115
  // DISPATCH RELATED ACTIONS IF WE HAVE normalizationSettings
116
116
  if (responseData) {
117
117
  if (actionData.normalizationSettings && Array.isArray(actionData.normalizationSettings)) {
@@ -120,7 +120,7 @@ var _initialiseProps = function _initialiseProps() {
120
120
  //console.log(`entity:`, entity);
121
121
  if (!(0, _is.isObject)(entity)) {
122
122
  var entityActionResponseData = _this._processResponse(entity, responseData);
123
- entityActionResponseData.length && _this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
123
+ entityActionResponseData.length && _this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
124
124
  } else {
125
125
  var _iteratorNormalCompletion = true;
126
126
  var _didIteratorError = false;
@@ -133,11 +133,11 @@ var _initialiseProps = function _initialiseProps() {
133
133
  inner_entities = _step$value[1];
134
134
 
135
135
  var entityActionResponseData = _this._processResponse(inner_entity, responseData);
136
- entityActionResponseData.length && _this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
136
+ entityActionResponseData.length && _this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
137
137
 
138
138
  inner_entities.map(async function (_entity) {
139
139
  var innerEntityActionResponseData = _this._processResponse(_entity, entityActionResponseData);
140
- innerEntityActionResponseData.length && _this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, actionData.options);
140
+ innerEntityActionResponseData.length && _this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, 'fetch', actionData.options);
141
141
  });
142
142
  };
143
143
 
@@ -172,7 +172,7 @@ var _initialiseProps = function _initialiseProps() {
172
172
  //const entityActionResponseData = this._processResponse(entity, responseData);
173
173
 
174
174
  if (updateData[entity] && updateData[entity].length) {
175
- _this._dispatchRelatedAction(entity, type, actionData.instance, updateData[entity], dispatch, actionData.options);
175
+ _this._dispatchRelatedAction(entity, type, actionData.instance, updateData[entity], dispatch, 'fetch', actionData.options);
176
176
  }
177
177
 
178
178
  //entityActionResponseData.length && this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch);
@@ -188,11 +188,11 @@ var _initialiseProps = function _initialiseProps() {
188
188
  inner_entities = _step2$value[1];
189
189
 
190
190
  var entityActionResponseData = _this._processResponse(inner_entity, responseData);
191
- entityActionResponseData.length && _this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
191
+ entityActionResponseData.length && _this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
192
192
 
193
193
  inner_entities.map(async function (_entity) {
194
194
  var innerEntityActionResponseData = _this._processResponse(_entity, entityActionResponseData);
195
- innerEntityActionResponseData.length && _this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, actionData.options);
195
+ innerEntityActionResponseData.length && _this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, 'fetch', actionData.options);
196
196
  });
197
197
  };
198
198
 
@@ -226,8 +226,9 @@ var _initialiseProps = function _initialiseProps() {
226
226
  }*/
227
227
  };
228
228
 
229
- this._dispatchRelatedAction = function (entity, type, instance, responseData, dispatch, options) {
230
- var actionType = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'fetch';
229
+ this._dispatchRelatedAction = function (entity, type, instance, responseData, dispatch) {
230
+ var actionType = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'fetch';
231
+ var options = arguments[6];
231
232
 
232
233
 
233
234
  //console.log(`this.config:`, this.config);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "redux-clerk2",
3
- "version": "2.0.20",
3
+ "version": "2.0.23",
4
4
  "description": "Redux Clerk handles the async CRUD in your Redux App.",
5
5
  "main": "lib/index.js",
6
6
  "files": [
package/src/actions/BaseAction.js CHANGED
@@ -60,7 +60,7 @@ class BaseAction {
60
60
  dispatch(action);
61
61
 
62
62
  if (type === 'success' && actionData.options.normalizeResponse) {
63
- console.log(`actionData.options:`, actionData.options)
63
+ //console.log(`actionData.options:`, actionData.options)
64
64
  // DISPATCH RELATED ACTIONS IF WE HAVE normalizationSettings
65
65
  if (responseData) {
66
66
  if(actionData.normalizationSettings && Array.isArray(actionData.normalizationSettings)){
@@ -69,16 +69,16 @@ class BaseAction {
69
69
  //console.log(`entity:`, entity);
70
70
  if(!isObject(entity)){
71
71
  const entityActionResponseData = this._processResponse(entity, responseData);
72
- entityActionResponseData.length && this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
72
+ entityActionResponseData.length && this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
73
73
  }else{
74
74
 
75
75
  for (let [inner_entity, inner_entities] of Object.entries(entity)) {
76
76
  const entityActionResponseData = this._processResponse(inner_entity, responseData);
77
- entityActionResponseData.length && this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
77
+ entityActionResponseData.length && this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
78
78
 
79
79
  inner_entities.map(async (_entity) => {
80
80
  const innerEntityActionResponseData = this._processResponse(_entity, entityActionResponseData);
81
- innerEntityActionResponseData.length && this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, actionData.options);
81
+ innerEntityActionResponseData.length && this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, 'fetch', actionData.options);
82
82
  });
83
83
  }
84
84
  }
@@ -98,7 +98,7 @@ class BaseAction {
98
98
  //const entityActionResponseData = this._processResponse(entity, responseData);
99
99
 
100
100
  if(updateData[entity] && updateData[entity].length){
101
- this._dispatchRelatedAction(entity, type, actionData.instance, updateData[entity], dispatch, actionData.options);
101
+ this._dispatchRelatedAction(entity, type, actionData.instance, updateData[entity], dispatch, 'fetch', actionData.options);
102
102
  }
103
103
 
104
104
  //entityActionResponseData.length && this._dispatchRelatedAction(entity, type, actionData.instance, entityActionResponseData, dispatch);
@@ -106,11 +106,11 @@ class BaseAction {
106
106
 
107
107
  for (let [inner_entity, inner_entities] of Object.entries(entity)) {
108
108
  const entityActionResponseData = this._processResponse(inner_entity, responseData);
109
- entityActionResponseData.length && this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, actionData.options);
109
+ entityActionResponseData.length && this._dispatchRelatedAction(inner_entity, type, actionData.instance, entityActionResponseData, dispatch, 'fetch', actionData.options);
110
110
 
111
111
  inner_entities.map(async (_entity) => {
112
112
  const innerEntityActionResponseData = this._processResponse(_entity, entityActionResponseData);
113
- innerEntityActionResponseData.length && this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, actionData.options);
113
+ innerEntityActionResponseData.length && this._dispatchRelatedAction(_entity, type, actionData.instance, innerEntityActionResponseData, dispatch, 'fetch', actionData.options);
114
114
  });
115
115
  }
116
116
  }
@@ -130,7 +130,7 @@ class BaseAction {
130
130
 
131
131
  };
132
132
 
133
- _dispatchRelatedAction = (entity, type, instance, responseData, dispatch, options, actionType = 'fetch') => {
133
+ _dispatchRelatedAction = (entity, type, instance, responseData, dispatch, actionType = 'fetch', options) => {
134
134
 
135
135
  //console.log(`this.config:`, this.config);
136
136