From 9c765b733f593da67735ad3a7c0872bfc0a9fdb8 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:52:55 +0200
Subject: [PATCH] TASK: Remove usages to `NodeAddressFactory` TASK: Assert new
 json node address in e2e

---
 Classes/Controller/BackendServiceController.php      | 12 ++++++------
 .../Fixtures/1Dimension/discarding.e2e.js            |  2 +-
 .../Fixtures/1Dimension/treeMultiselect.e2e.js       |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
index fead2016cd..a346851e46 100644
--- a/Classes/Controller/BackendServiceController.php
+++ b/Classes/Controller/BackendServiceController.php
@@ -780,22 +780,22 @@ public function reloadNodesAction(array $query): void
         $query['ancestorsOfDocumentIds'] = array_map(
             fn (string $nodeAddress) =>
                  NodeAddress::fromJsonString(
-                    $nodeAddress
-                )->aggregateId->value,
+                     $nodeAddress
+                 )->aggregateId->value,
             $query['ancestorsOfDocumentIds']
         );
         $query['toggledNodesIds'] = array_map(
             fn (string $nodeAddress) =>
                  NodeAddress::fromJsonString(
-                    $nodeAddress
-                )->aggregateId->value,
+                     $nodeAddress
+                 )->aggregateId->value,
             $query['toggledNodesIds']
         );
         $query['clipboardNodesIds'] = array_map(
             fn (string $nodeAddress) =>
                  NodeAddress::fromJsonString(
-                    $nodeAddress
-                )->aggregateId->value,
+                     $nodeAddress
+                 )->aggregateId->value,
             $query['clipboardNodesIds']
         );
         $query = ReloadNodesQuery::fromArray($query);
diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js
index f7ed4606a3..36a7c54bd6 100644
--- a/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js
+++ b/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js
@@ -38,7 +38,7 @@ test('Discarding: create multiple nodes nested within each other and then discar
         .expect(ReactSelector('Provider').getReact(({props}) => {
             const reduxState = props.store.getState();
             return reduxState.cr.nodes.documentNode;
-        })).eql('admin-admington__eyJsYW5ndWFnZSI6ImVuX1VTIn0=__f676459d-ca77-44bc-aeea-44114814c279', 'After discarding we are back to the main page');
+        })).eql(JSON.stringify({contentRepositoryId:"onedimension",workspaceName:"admin-admington",dimensionSpacePoint:{"language":"en_US"},aggregateId:"f676459d-ca77-44bc-aeea-44114814c279"}), 'After discarding we are back to the main page');
 });
 
 test('Discarding: create a document node and then discard it', async t => {
diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/treeMultiselect.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/treeMultiselect.e2e.js
index 0bf502bb50..a06f967e2e 100644
--- a/Tests/IntegrationTests/Fixtures/1Dimension/treeMultiselect.e2e.js
+++ b/Tests/IntegrationTests/Fixtures/1Dimension/treeMultiselect.e2e.js
@@ -26,7 +26,7 @@ test('Move multiple nodes via toolbar', async t => {
         .expect(ReactSelector('Provider').getReact(({props}) => {
             const reduxState = props.store.getState();
             return reduxState.cr.nodes.documentNode;
-        })).eql('admin-admington__eyJsYW5ndWFnZSI6ImVuX1VTIn0=__5b0d6ac0-40ab-47e8-b79e-39de6c0700df', 'Node B\'s node address changed');
+        })).eql(JSON.stringify({contentRepositoryId:"onedimension",workspaceName:"admin-admington",dimensionSpacePoint:{"language":"en_US"},aggregateId:"5b0d6ac0-40ab-47e8-b79e-39de6c0700df"}), 'Node B\'s node address changed');
     await t.click(Page.getTreeNodeButton('Home'))
 });
 
@@ -43,7 +43,7 @@ test('Move multiple nodes via DND, CMD-click', async t => {
         .expect(ReactSelector('Provider').getReact(({props}) => {
             const reduxState = props.store.getState();
             return reduxState.cr.nodes.documentNode;
-        })).eql('admin-admington__eyJsYW5ndWFnZSI6ImVuX1VTIn0=__5b0d6ac0-40ab-47e8-b79e-39de6c0700df', 'Node B\'s node address changed');
+        })).eql(JSON.stringify({contentRepositoryId:"onedimension",workspaceName:"admin-admington",dimensionSpacePoint:{"language":"en_US"},aggregateId:"5b0d6ac0-40ab-47e8-b79e-39de6c0700df"}), 'Node B\'s node address changed');
     await t.click(Page.getTreeNodeButton('Home'))
 });
 
@@ -60,6 +60,6 @@ test('Move multiple nodes via DND, SHIFT-click', async t => {
         .expect(ReactSelector('Provider').getReact(({props}) => {
             const reduxState = props.store.getState();
             return reduxState.cr.nodes.documentNode;
-        })).eql('admin-admington__eyJsYW5ndWFnZSI6ImVuX1VTIn0=__84eb0340-ba34-4fdb-98b1-da503f967121', 'Node C\'s node address changed');
+        })).eql(JSON.stringify({contentRepositoryId:"onedimension",workspaceName:"admin-admington",dimensionSpacePoint:{"language":"en_US"},aggregateId:"84eb0340-ba34-4fdb-98b1-da503f967121"}), 'Node C\'s node address changed');
     await t.click(Page.getTreeNodeButton('Home'))
 });