From 9d521633744738230efd859007a03b3131ecd8bd Mon Sep 17 00:00:00 2001 From: tienifr Date: Thu, 6 Apr 2023 22:57:03 +0700 Subject: [PATCH 1/3] fix: add successData into DeleteMembersFromWorkspace API --- src/libs/actions/Policy.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index f1cbb66cbdeb..7708024d9071 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -216,10 +216,15 @@ function removeMembers(members, policyID) { key: membersListKey, value: _.object(members, Array(members.length).fill({errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal('workspace.people.error.genericRemove')}})), }]; + const successData = [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: membersListKey, + value: _.object(members, Array(members.length).fill(null)), + }]; API.write('DeleteMembersFromWorkspace', { emailList: members.join(','), policyID, - }, {optimisticData, failureData}); + }, {optimisticData, failureData, successData}); } /** From 3fe2c2dc4fb535c743d0a1619d28c191a155ef7b Mon Sep 17 00:00:00 2001 From: tienifr <113963320+tienifr@users.noreply.github.com> Date: Fri, 7 Apr 2023 14:25:56 +0700 Subject: [PATCH 2/3] Update src/libs/actions/Policy.js Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com> --- src/libs/actions/Policy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 7708024d9071..327521e14406 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -224,7 +224,7 @@ function removeMembers(members, policyID) { API.write('DeleteMembersFromWorkspace', { emailList: members.join(','), policyID, - }, {optimisticData, failureData, successData}); + }, {optimisticData, successData, failureData}); } /** From 80d7bb37f5ee2bb3f7d319bfd9dfbfb74d59f9b5 Mon Sep 17 00:00:00 2001 From: tienifr Date: Fri, 7 Apr 2023 14:32:11 +0700 Subject: [PATCH 3/3] fix: move successData into between optimisticData and failureData --- src/libs/actions/Policy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 327521e14406..90b9872313fc 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -211,15 +211,15 @@ function removeMembers(members, policyID) { key: membersListKey, value: _.object(members, Array(members.length).fill({pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE})), }]; - const failureData = [{ + const successData = [{ onyxMethod: CONST.ONYX.METHOD.MERGE, key: membersListKey, - value: _.object(members, Array(members.length).fill({errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal('workspace.people.error.genericRemove')}})), + value: _.object(members, Array(members.length).fill(null)), }]; - const successData = [{ + const failureData = [{ onyxMethod: CONST.ONYX.METHOD.MERGE, key: membersListKey, - value: _.object(members, Array(members.length).fill(null)), + value: _.object(members, Array(members.length).fill({errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal('workspace.people.error.genericRemove')}})), }]; API.write('DeleteMembersFromWorkspace', { emailList: members.join(','),