🐛 Fix repeated create attempts adding resource item's id to list mult…

…iple times
greena13 · Aug 4, 2020 · ebe7b54 · ebe7b54
1 parent 0b51324
commit ebe7b54
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/src/action-objects/buildActions.js b/src/action-objects/buildActions.js
@@ -38,6 +38,7 @@ const STANDARD_ACTIONS = {
   newItem: 'NEW_ITEM',
   clearNewItem: 'CLEAR_NEW_ITEM',
   editNewItem: 'EDIT_NEW_ITEM',
+  editNewOrExistingItem: 'EDIT_NEW_OR_EXISTING_ITEM',
   clearItemEdit: 'CLEAR_ITEM_EDIT',
   createItem: 'CREATE_ITEM',
   editItem: 'EDIT_ITEM',

diff --git a/src/actions/RESTful/createItem.js b/src/actions/RESTful/createItem.js
@@ -18,6 +18,7 @@ import mergeStatus from '../../reducers/helpers/mergeStatus';
 import { isRequestInProgress, registerRequestStart } from '../../utils/RequestManager';
 import nop from '../../utils/function/nop';
 import EmptyKey from '../../constants/EmptyKey';
+import { isNew } from '../../index';
 
 const HTTP_REQUEST_TYPE = 'POST';
 
@@ -286,7 +287,7 @@ function reducer(resources, action) {
 
   if (status === CREATING) {
     assertInDevMode(() => {
-      if (currentItem.status.type && currentItem.status.type !== NEW) {
+      if (!isNew(currentItem)) {
         warn(
           `${type} has the same key '${temporaryKey}' as an existing item. ` +
           'Use updateItem() to update an existing item, ' +

diff --git a/src/actions/RESTful/editNewItem.js b/src/actions/RESTful/editNewItem.js
@@ -1,9 +1,10 @@
-import { EDITING, NEW } from '../../constants/Statuses';
+import { EDITING } from '../../constants/Statuses';
 import processActionCreatorOptions from '../../action-creators/helpers/processActionCreatorOptions';
 import getItemKey from '../../action-creators/helpers/getItemKey';
 import applyTransforms from '../../reducers/helpers/applyTransforms';
 import assertInDevMode from '../../utils/assertInDevMode';
 import warn from '../../utils/dev/warn';
+import { isNew } from '../../index';
 
 /** ************************************************************************************************************
  * Action creators
@@ -84,7 +85,7 @@ function reducer(resources, action) {
 
     return resources;
 
-  } else if (currentItem.status.type === NEW) {
+  } else if (isNew(currentItem)) {
 
     /**
      * We do a shallow merge of the values that already exist in the redux store for the resource item

diff --git a/src/reducers/helpers/applyListOperators.js b/src/reducers/helpers/applyListOperators.js
@@ -7,33 +7,33 @@ function applyListOperators(lists, listOperations = {}, temporaryKey) {
   listOperations.push.forEach((listKey) => {
     const existingList = lists[listKey] || LIST;
 
-    if (contains(existingList, temporaryKey)) {
-      return;
+    if (contains(existingList.positions, temporaryKey)) {
+      updatedLists[listKey] = existingList;
+    } else {
+      updatedLists[listKey] = {
+        ...existingList,
+        positions: [
+          ...existingList.positions,
+          temporaryKey
+        ]
+      };
     }
-
-    updatedLists[listKey] = {
-      ...existingList,
-      positions: [
-        ...existingList.positions,
-        temporaryKey
-      ]
-    };
   });
 
   listOperations.unshift.forEach((listKey) => {
     const existingList = lists[listKey] || LIST;
 
-    if (contains(existingList, temporaryKey)) {
-      return;
+    if (contains(existingList.positions, temporaryKey)) {
+      updatedLists[listKey] = existingList;
+    } else {
+      updatedLists[listKey] = {
+        ...existingList,
+        positions: [
+          temporaryKey,
+          ...existingList.positions
+        ]
+      };
     }
-
-    updatedLists[listKey] = {
-      ...existingList,
-      positions: [
-        temporaryKey,
-        ...existingList.positions
-      ]
-    };
   });
 
   listOperations.invalidate.forEach((listKey) => {