From 1bde22fdd9ddf15ab141a8268bf31a4f7c734fd7 Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Tue, 15 Nov 2022 14:16:20 +0000
Subject: [PATCH] chore: reverse connect array to ensure relations are
 connected before positioning

---
 .../EditViewDataManagerProvider/utils/cleanData.js |  2 +-
 .../utils/tests/cleanData.test.js                  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
index d0d75041dd..184bf92684 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
@@ -125,7 +125,7 @@ const cleanData = ({ browserState, serverState }, currentSchema, componentsSchem
 
           cleanedData = {
             disconnect: disconnectedRelations,
-            connect: connectedRelations,
+            connect: connectedRelations.reverse(),
           };
 
           break;
diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js
index e910c7ab25..9843566b52 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js
@@ -826,8 +826,8 @@ describe('CM || components || EditViewDataManagerProvider || utils || cleanData'
       expect(result).toStrictEqual({
         relation: {
           connect: [
-            { id: 1, position: { before: 2 } },
             { id: 2, position: { end: true } },
+            { id: 1, position: { before: 2 } },
           ],
           disconnect: [],
         },
@@ -851,12 +851,12 @@ describe('CM || components || EditViewDataManagerProvider || utils || cleanData'
       expect(result).toStrictEqual({
         relation: {
           connect: [
+            { id: 2, position: { end: true } },
+            { id: 1, position: { before: 2 } },
             {
               id: 3,
               position: { before: 1 },
             },
-            { id: 1, position: { before: 2 } },
-            { id: 2, position: { end: true } },
           ],
           disconnect: [],
         },
@@ -880,14 +880,14 @@ describe('CM || components || EditViewDataManagerProvider || utils || cleanData'
       expect(result).toStrictEqual({
         relation: {
           connect: [
-            {
-              id: 3,
-              position: { before: 4 },
-            },
             {
               id: 4,
               position: { end: true },
             },
+            {
+              id: 3,
+              position: { before: 4 },
+            },
           ],
           disconnect: [],
         },