UPMERGE: develop -> main

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+@netlogix-internal/neos
+@netlogix-internal/ecommerce

.github/workflows/release-tag.yml

@@ -0,0 +1,30 @@
+name: Release Tag on Merge to Main
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main]
+
+jobs:
+  tag:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+
+      - name: Extract version from composer.json
+        id: version
+        run: |
+          VERSION=$(jq -r '.version' composer.json)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Create Git tag
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag -a "${{ steps.version.outputs.version }}" -m "Release ${{ steps.version.outputs.version }}"
+          git push origin "${{ steps.version.outputs.version }}"

.github/workflows/require-version-raised.yml

@@ -0,0 +1,44 @@
+name: Require Version Raise
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  require-version-bump:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+
+      - name: Read head version (PR branch)
+        id: head_version
+        run: |
+          HEAD_VERSION=$(jq -r '.version' composer.json)
+          echo "value=$HEAD_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Read base version (main branch)
+        id: base_version
+        run: |
+          git fetch origin main
+          git checkout origin/main -- composer.json
+          BASE_VERSION=$(jq -r '.version' composer.json)
+          echo "value=$BASE_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Compare versions
+        run: |
+          BASE="${{ steps.base_version.outputs.value }}"
+          HEAD="${{ steps.head_version.outputs.value }}"
+
+          echo "Base version: $BASE"
+          echo "PR version:   $HEAD"
+
+          if [ "$BASE" = "$HEAD" ]; then
+            echo "❌ ERROR: composer.json version must be updated in this PR."
+            exit 1
+          else
+            echo "✅ Version changed — OK."
+          fi

.github/workflows/upmerge.yml

@@ -0,0 +1,25 @@
+name: Create Upmerge PR
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  upmerge:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - run: |
+          OPEN_PR=$(gh pr list --head=develop --base=main --json=url)
+
+          if [ "$OPEN_PR" != "[]" ]; then
+            echo "Open PRs found, skipping..."
+            exit 0
+          fi
+
+          gh pr create --base=main --head=develop --title="UPMERGE: develop -> main" --body="Merge develop to main"

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "netlogix/neos-content",
     "description": "This plugin enables Shopware templates to be designed with an Enterprise CMS.",
-    "version": "0.1.24",
+    "version": "0.1.26",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "autoload": {

src/Core/Content/Admin/AbstractUpdatePagesRoute.php

@@ -12,5 +12,5 @@ abstract class AbstractUpdatePagesRoute
 {
     abstract public function getDecorated(): AbstractUpdatePagesRoute;
 
-    abstract public function load(): Response;
+    abstract public function load(Request $request, Context $context): Response;
 }

src/Core/Content/Admin/UpdateNeosPagesRoute.php

@@ -27,21 +27,24 @@ public function getDecorated(): AbstractUpdatePagesRoute
     }
 
     #[Route(path: '/api/_action/neos/update-neos-pages', name: 'api.neos.update-neos-pages', methods: ['POST'])]
-    public function load(): Response
+    public function load(Request $request, Context $context): Response
     {
-        $context = Context::createDefaultContext();
+        $content = json_decode(json: $request->getContent(), associative: true) ?? [];
+        // If nodes are provided in the request, only process those
+        if (!empty($content['updatedNodes'])) {
+            $this->neosLayoutPageService->processProvidedNodes($content['updatedNodes'], $context);
+            return new JsonResponse(['status' => 'Provided Neos layout pages processed successfully.'], Response::HTTP_OK);
+        }
+
         try {
-            $neosPages = $this->neosLayoutPageService->getNeosLayoutPages(
-                explode('|', NeosLayoutPageService::AVAILABLE_FILTER_PAGE_TYPES)
-            );
+            $neosPages = $this->neosLayoutPageService->getNeosCmsPageTemplates();
         } catch (GuzzleException $e) {
             $this->neosLayoutPageService->createNotification($context);
-            throw new Exception('Failed to retrieve Neos layout pages: ' . $e->getMessage(), 1751381726, $e);
+            throw new Exception('Failed to retrieve Neos templates: ' . $e->getMessage(), 1751381726, $e);
         }
 
-        $this->neosLayoutPageService->createMissingNeosCmsPages($neosPages, $context);
         $this->neosLayoutPageService->updateNeosCmsPages($neosPages, $context);
-        $this->neosLayoutPageService->removeCmsPagesWithInvalidNodeIdentifiers($neosPages, $context);
+        $this->neosLayoutPageService->removeObsoleteCmsPages($neosPages, $context);
 
 
         return new JsonResponse(['status' => 'Neos layout pages updated successfully.'], Response::HTTP_OK);

src/Core/Content/Cms/Aggregate/CmsBlock/NeosCmsBlockCollection.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsBlock;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsBlock\CmsBlockCollection;
+
+class NeosCmsBlockCollection extends CmsBlockCollection
+{
+
+}

src/Core/Content/Cms/Aggregate/CmsBlock/NeosCmsBlockEntity.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsBlock;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsBlock\CmsBlockEntity;
+
+class NeosCmsBlockEntity extends CmsBlockEntity
+{
+
+}

src/Core/Content/Cms/Aggregate/CmsSection/NeosCmsSectionCollection.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsSection;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsSection\CmsSectionCollection;
+
+class NeosCmsSectionCollection extends CmsSectionCollection
+{
+
+}

src/Core/Content/Cms/Aggregate/CmsSection/NeosCmsSectionEntity.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsSection;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsSection\CmsSectionEntity;
+
+class NeosCmsSectionEntity extends CmsSectionEntity
+{
+
+}

src/Core/Content/Cms/Aggregate/CmsSlot/NeosCmsSlotCollection.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsSlot;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotCollection;
+
+class NeosCmsSlotCollection extends CmsSlotCollection
+{
+
+}

src/Core/Content/Cms/Aggregate/CmsSlot/NeosCmsSlotEntity.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\CmsSlot;
+
+use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity;
+
+class NeosCmsSlotEntity extends CmsSlotEntity
+{
+
+}

src/Core/Content/Cms/Aggregate/FieldConfig/NeosFieldConfig.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\FieldConfig;
+
+use Shopware\Core\Content\Cms\DataResolver\FieldConfig;
+
+class NeosFieldConfig extends FieldConfig
+{
+
+}

src/Core/Content/Cms/Aggregate/FieldConfig/NeosFieldConfigCollection.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Core\Content\Cms\Aggregate\FieldConfig;
+
+use Shopware\Core\Content\Cms\DataResolver\FieldConfigCollection;
+
+class NeosFieldConfigCollection extends FieldConfigCollection
+{
+
+}

src/Core/Content/NeosNode/NeosNodeDefinition.php

@@ -6,6 +6,7 @@
 
 use Shopware\Core\Content\Cms\CmsPageDefinition;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\BoolField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\DateField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\FkField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\PrimaryKey;
@@ -38,7 +39,7 @@ protected function defineFields(): FieldCollection
             ((new IdField('id', 'id'))->addFlags(new Required(), new PrimaryKey())),
             (new DateField('created_at', 'createdAt')),
             (new DateField('updated_at', 'updatedAt')),
-            (new StringField('node_identifier', 'nodeIdentifier')),
+            (new BoolField('neos_connection', 'neosConnection')),
             (new FkField('cms_page_id', 'cmsPageId', CmsPageDefinition::class))->addFlags(new Required()),
             (new ReferenceVersionField(CmsPageDefinition::class, 'cms_page_version_id')),
             (new OneToOneAssociationField('cmsPage', 'cms_page_id', 'id', CmsPageDefinition::class, false)),

src/Core/Content/NeosNode/NeosNodeEntity.php

@@ -19,16 +19,16 @@ class NeosNodeEntity extends Entity
 
     protected string $cmsPageVersionId;
 
-    protected ?string $nodeIdentifier;
+    protected bool $neosConnection = false;
 
-    public function getNodeIdentifier(): ?string
+    public function getNeosConnection(): bool
     {
-        return $this->nodeIdentifier;
+        return $this->neosConnection;
     }
 
-    public function nodeIdentifier(?string $nodeIdentifier): void
+    public function neosConnection(bool $neosConnection): void
     {
-        $this->nodeIdentifier = $nodeIdentifier;
+        $this->neosConnection = $neosConnection;
     }
 
     public function getCmsPage(): CmsPageEntity

src/Error/CanNotDeleteDefaultLayoutPageException.php

@@ -6,7 +6,7 @@
 
 use Shopware\Core\Content\Cms\CmsPageEntity;
 
-class CanNotDeleteDefaultLayoutPageException extends \Exception
+class CanNotDeleteDefaultLayoutPageException extends \Exception implements NeosExceptionInterface
 {
     public function __construct(CmsPageEntity $cmsPageEntity, int $code = 1753085155, ?\Throwable $previous = null)
     {

src/Error/FaultyNeosSectionDataException.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Error;
+
+use Exception;
+use Throwable;
+
+class FaultyNeosSectionDataException extends Exception implements NeosExceptionInterface
+{
+    public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, mixed $sectionData = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}

src/Error/MissingCmsPageEntityException.php

@@ -4,7 +4,7 @@
 
 namespace nlxNeosContent\Error;
 
-class MissingCmsPageEntityException extends \Exception
+class MissingCmsPageEntityException extends \Exception implements NeosExceptionInterface
 {
     public function __construct(string $message = 'No cmsPage entity was found in CmsPageLoadedEvent.', int $code = 1752652152, ?\Throwable $previous = null)
     {

src/Error/NeosContentFetchException.php

@@ -4,7 +4,7 @@
 
 namespace nlxNeosContent\Error;
 
-class NeosContentFetchException extends \Exception
+class NeosContentFetchException extends \Exception implements NeosExceptionInterface
 {
     public function __construct(string $message = 'Neos Content could not be fetched.', int $code = 1752651981, ?\Throwable $previous = null)
     {

src/Error/NeosExceptionInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace nlxNeosContent\Error;
+
+interface NeosExceptionInterface extends \Throwable
+{
+
+}

src/Error/NeosUrlNotConfiguredException.php

@@ -4,7 +4,7 @@
 
 namespace nlxNeosContent\Error;
 
-class NeosUrlNotConfiguredException extends \Exception
+class NeosUrlNotConfiguredException extends \Exception implements NeosExceptionInterface
 {
     public function __construct(string $message = 'Neos URL is not configured.', int $code = 1752646642, ?\Throwable $previous = null)
     {