Skip to content

activity & category, do not embed rootContentNode #7193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmattmann merged 1 commit into from
Apr 12, 2025
Merged

activity & category, do not embed rootContentNode #7193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions api/src/Entity/HasRootContentNodeTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ trait HasRootContentNodeTrait {
* exchanged, but all the contents attached to it can.
*/
#[Assert\DisableAutoMapping]
#[ApiProperty(writable: false, readableLink: true, example: '/content_nodes/1a2b3c4d')]
#[ApiProperty(writable: false, example: '/content_nodes/1a2b3c4d')]
#[Groups(['read'])]
#[ORM\OneToOne(targetEntity: ColumnLayout::class, cascade: ['persist'])]
#[ORM\JoinColumn(nullable: false, unique: true)]
public ?ColumnLayout $rootContentNode = null;
Expand All @@ -29,8 +30,6 @@ public function setRootContentNode(?ColumnLayout $rootContentNode) {
$this->rootContentNode = $rootContentNode;
}

#[Assert\DisableAutoMapping]
#[Groups(['read'])]
public function getRootContentNode(): ?ColumnLayout {
// Getter is here to add annotations to parent class property
return $this->rootContentNode;
Expand Down
3 changes: 0 additions & 3 deletions api/tests/Api/Activities/ReadActivityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ public function testGetSingleActivityIsAllowedForMember() {
]);

$data = $result->toArray();
$this->assertEquals($this->getIriFor($activity->getRootContentNode()), $data['_embedded']['rootContentNode']['_links']['self']['href']);
$this->assertEquals($this->getIriFor($activity->getRootContentNode()), $data['_embedded']['rootContentNode']['_links']['root']['href']);
$this->assertContains(['href' => $this->getIriFor('responsiveLayout1')], $data['_embedded']['rootContentNode']['_links']['children']);
$this->assertEquals(12, count($data['_embedded']['contentNodes']));
}

Expand Down
127 changes: 0 additions & 127 deletions .../ResponseSnapshotTest__testGetCollectionMatchesStructure with data set activities__1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,6 @@
"_embedded": {
"activityResponsibles": [],
"progressLabel": "escaped_value",
"rootContentNode": {
"_links": {
"children": [
{
"href": "escaped_value"
}
],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
},
"scheduleEntries": [
{
"_links": {
Expand Down Expand Up @@ -111,34 +79,6 @@
}
],
"progressLabel": "escaped_value",
"rootContentNode": {
"_links": {
"children": [],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
},
"scheduleEntries": [
{
"_links": {
Expand Down Expand Up @@ -237,41 +177,6 @@
}
],
"progressLabel": "escaped_value",
"rootContentNode": {
"_links": {
"children": [
{
"href": "escaped_value"
},
{
"href": "escaped_value"
}
],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
},
"scheduleEntries": [
{
"_links": {
Expand Down Expand Up @@ -382,38 +287,6 @@
"position": "escaped_value",
"title": "escaped_value"
},
"rootContentNode": {
"_links": {
"children": [
{
"href": "escaped_value"
}
],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
},
"scheduleEntries": [
{
"_links": {
Expand Down
154 changes: 0 additions & 154 deletions .../ResponseSnapshotTest__testGetCollectionMatchesStructure with data set categories__1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,6 @@
"_embedded": {
"items": [
{
"_embedded": {
"rootContentNode": {
"_links": {
"children": [],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
}
},
"_links": {
"camp": {
"href": "escaped_value"
Expand All @@ -56,36 +26,6 @@
"short": "escaped_value"
},
{
"_embedded": {
"rootContentNode": {
"_links": {
"children": [],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
}
},
"_links": {
"camp": {
"href": "escaped_value"
Expand All @@ -110,36 +50,6 @@
"short": "escaped_value"
},
{
"_embedded": {
"rootContentNode": {
"_links": {
"children": [],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
}
},
"_links": {
"camp": {
"href": "escaped_value"
Expand All @@ -164,36 +74,6 @@
"short": "escaped_value"
},
{
"_embedded": {
"rootContentNode": {
"_links": {
"children": [],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
}
},
"_links": {
"camp": {
"href": "escaped_value"
Expand All @@ -218,40 +98,6 @@
"short": "escaped_value"
},
{
"_embedded": {
"rootContentNode": {
"_links": {
"children": [
{
"href": "escaped_value"
}
],
"contentType": {
"href": "escaped_value"
},
"parent": "escaped_value",
"root": {
"href": "escaped_value"
},
"self": {
"href": "escaped_value"
}
},
"contentTypeName": "escaped_value",
"data": {
"columns": [
{
"slot": "escaped_value",
"width": "escaped_value"
}
]
},
"id": "escaped_value",
"instanceName": "escaped_value",
"position": "escaped_value",
"slot": "escaped_value"
}
},
"_links": {
"camp": {
"href": "escaped_value"
Expand Down
Loading
Loading