FEATURE: Integrate conflict resolution with publish/discard dialog workflow

Classes/Application/PublishChangesInDocument.php → Classes/Application/PublishChangesInDocument/PublishChangesInDocumentCommand.php

@@ -12,37 +12,43 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application;
+namespace Neos\Neos\Ui\Application\PublishChangesInDocument;
 
+use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\Flow\Annotations as Flow;
 
 /**
- * The application layer level command DTO to communicate publication of all changes recorded for a given document
+ * The application layer level command DTO to communicate publication of
+ * all changes recorded for a given document
  *
  * @internal for communication within the Neos UI only
  */
 #[Flow\Proxy(false)]
-final readonly class PublishChangesInDocument
+final readonly class PublishChangesInDocumentCommand
 {
     public function __construct(
         public ContentRepositoryId $contentRepositoryId,
         public WorkspaceName $workspaceName,
         public NodeAggregateId $documentId,
+        public ?DimensionSpacePoint $preferredDimensionSpacePoint,
     ) {
     }
 
     /**
-     * @param array<string,string> $values
+     * @param array{contentRepositoryId:string,workspaceName:string,documentId:string,preferredDimensionSpacePoint?:array<string,string[]>} $values
      */
     public static function fromArray(array $values): self
     {
         return new self(
             ContentRepositoryId::fromString($values['contentRepositoryId']),
             WorkspaceName::fromString($values['workspaceName']),
             NodeAggregateId::fromString($values['documentId']),
+            isset($values['preferredDimensionSpacePoint']) && !empty($values['preferredDimensionSpacePoint'])
+                ? DimensionSpacePoint::fromLegacyDimensionArray($values['preferredDimensionSpacePoint'])
+                : null,
         );
     }
 }

Classes/Application/PublishChangesInDocument/PublishChangesInDocumentCommandHandler.php

@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Ui\Application\PublishChangesInDocument;
+
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregateCurrentlyDoesNotExist;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint;
+use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Domain\NodeLabel\NodeLabelGeneratorInterface;
+use Neos\Neos\Domain\Workspace\WorkspaceProvider;
+use Neos\Neos\Ui\Application\Shared\ConflictsOccurred;
+use Neos\Neos\Ui\Application\Shared\PublishSucceeded;
+use Neos\Neos\Ui\Controller\TranslationTrait;
+use Neos\Neos\Ui\Infrastructure\ContentRepository\ConflictsFactory;
+
+/**
+ * The application layer level command handler to perform publication of
+ * all changes recorded for a given document
+ *
+ * @internal for communication within the Neos UI only
+ */
+#[Flow\Scope("singleton")]
+final class PublishChangesInDocumentCommandHandler
+{
+    use TranslationTrait;
+
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
+    #[Flow\Inject]
+    protected WorkspaceProvider $workspaceProvider;
+
+    #[Flow\Inject]
+    protected NodeLabelGeneratorInterface $nodeLabelGenerator;
+
+    /**
+     * @throws NodeAggregateCurrentlyDoesNotExist
+     */
+    public function handle(
+        PublishChangesInDocumentCommand $command
+    ): PublishSucceeded|ConflictsOccurred {
+        try {
+            $workspace = $this->workspaceProvider->provideForWorkspaceName(
+                $command->contentRepositoryId,
+                $command->workspaceName
+            );
+            $publishingResult = $workspace->publishChangesInDocument($command->documentId);
+
+            return new PublishSucceeded(
+                numberOfAffectedChanges: $publishingResult->numberOfPublishedChanges,
+                baseWorkspaceName: $workspace->getCurrentBaseWorkspaceName()?->value
+            );
+        } catch (NodeAggregateCurrentlyDoesNotExist $e) {
+            throw new \RuntimeException(
+                $this->getLabel('NodeNotPublishedMissingParentNode'),
+                1705053430,
+                $e
+            );
+        } catch (NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint $e) {
+            throw new \RuntimeException(
+                $this->getLabel('NodeNotPublishedParentNodeNotInCurrentDimension'),
+                1705053432,
+                $e
+            );
+        } catch (WorkspaceRebaseFailed $e) {
+            $conflictsFactory = new ConflictsFactory(
+                contentRepository: $this->contentRepositoryRegistry
+                    ->get($command->contentRepositoryId),
+                nodeLabelGenerator: $this->nodeLabelGenerator,
+                workspaceName: $command->workspaceName,
+                preferredDimensionSpacePoint: $command->preferredDimensionSpacePoint
+            );
+
+            return new ConflictsOccurred(
+                conflicts: $conflictsFactory->fromWorkspaceRebaseFailed($e)
+            );
+        }
+    }
+}

Classes/Application/PublishChangesInSite.php → Classes/Application/PublishChangesInSite/PublishChangesInSiteCommand.php

@@ -12,37 +12,43 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application;
+namespace Neos\Neos\Ui\Application\PublishChangesInSite;
 
+use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\Flow\Annotations as Flow;
 
 /**
- * The application layer level command DTO to communicate publication of all changes recorded for a given site
+ * The application layer level command DTO to communicate publication of
+ * all changes recorded for a given site
  *
  * @internal for communication within the Neos UI only
  */
 #[Flow\Proxy(false)]
-final readonly class PublishChangesInSite
+final readonly class PublishChangesInSiteCommand
 {
     public function __construct(
         public ContentRepositoryId $contentRepositoryId,
         public WorkspaceName $workspaceName,
         public NodeAggregateId $siteId,
+        public ?DimensionSpacePoint $preferredDimensionSpacePoint,
     ) {
     }
 
     /**
-     * @param array<string,string> $values
+     * @param array{contentRepositoryId:string,workspaceName:string,siteId:string,preferredDimensionSpacePoint?:array<string,string[]>} $values
      */
     public static function fromArray(array $values): self
     {
         return new self(
             ContentRepositoryId::fromString($values['contentRepositoryId']),
             WorkspaceName::fromString($values['workspaceName']),
             NodeAggregateId::fromString($values['siteId']),
+            isset($values['preferredDimensionSpacePoint']) && !empty($values['preferredDimensionSpacePoint'])
+                ? DimensionSpacePoint::fromLegacyDimensionArray($values['preferredDimensionSpacePoint'])
+                : null,
         );
     }
 }

Classes/Application/PublishChangesInSite/PublishChangesInSiteCommandHandler.php

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos.Ui package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Ui\Application\PublishChangesInSite;
+
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
+use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Domain\NodeLabel\NodeLabelGeneratorInterface;
+use Neos\Neos\Domain\Workspace\WorkspaceProvider;
+use Neos\Neos\Ui\Application\Shared\ConflictsOccurred;
+use Neos\Neos\Ui\Application\Shared\PublishSucceeded;
+use Neos\Neos\Ui\Infrastructure\ContentRepository\ConflictsFactory;
+
+/**
+ * The application layer level command handler to perform publication of
+ * all changes recorded for a given site
+ *
+ * @internal for communication within the Neos UI only
+ */
+#[Flow\Scope("singleton")]
+final class PublishChangesInSiteCommandHandler
+{
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
+    #[Flow\Inject]
+    protected WorkspaceProvider $workspaceProvider;
+
+    #[Flow\Inject]
+    protected NodeLabelGeneratorInterface $nodeLabelGenerator;
+
+    public function handle(
+        PublishChangesInSiteCommand $command
+    ): PublishSucceeded|ConflictsOccurred {
+        try {
+            $workspace = $this->workspaceProvider->provideForWorkspaceName(
+                $command->contentRepositoryId,
+                $command->workspaceName
+            );
+            $publishingResult = $workspace->publishChangesInSite($command->siteId);
+
+            return new PublishSucceeded(
+                numberOfAffectedChanges: $publishingResult->numberOfPublishedChanges,
+                baseWorkspaceName: $workspace->getCurrentBaseWorkspaceName()?->value
+            );
+        } catch (WorkspaceRebaseFailed $e) {
+            $conflictsFactory = new ConflictsFactory(
+                contentRepository: $this->contentRepositoryRegistry
+                    ->get($command->contentRepositoryId),
+                nodeLabelGenerator: $this->nodeLabelGenerator,
+                workspaceName: $command->workspaceName,
+                preferredDimensionSpacePoint: $command->preferredDimensionSpacePoint
+            );
+
+            return new ConflictsOccurred(
+                conflicts: $conflictsFactory->fromWorkspaceRebaseFailed($e)
+            );
+        }
+    }
+}

Classes/Application/SyncWorkspace/Conflict.php → Classes/Application/Shared/Conflict.php

@@ -12,8 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -25,6 +26,7 @@
 final readonly class Conflict implements \JsonSerializable
 {
     public function __construct(
+        public string $key,
         public ?IconLabel $affectedSite,
         public ?IconLabel $affectedDocument,
         public ?IconLabel $affectedNode,

Classes/Application/SyncWorkspace/Conflicts.php → Classes/Application/Shared/Conflicts.php

@@ -12,13 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
-use Neos\ContentRepository\Core\ContentRepository;
-use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
-use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\Flow\Annotations as Flow;
-use Neos\Neos\Domain\NodeLabel\NodeLabelGeneratorInterface;
 
 /**
  * @internal for communication within the Neos UI only
@@ -34,18 +30,9 @@ public function __construct(Conflict ...$items)
         $this->items = $items;
     }
 
-    public static function builder(
-        ContentRepository $contentRepository,
-        NodeLabelGeneratorInterface $nodeLabelGenerator,
-        WorkspaceName $workspaceName,
-        ?DimensionSpacePoint $preferredDimensionSpacePoint,
-    ): ConflictsBuilder {
-        return new ConflictsBuilder(
-            contentRepository: $contentRepository,
-            nodeLabelGenerator: $nodeLabelGenerator,
-            workspaceName: $workspaceName,
-            preferredDimensionSpacePoint: $preferredDimensionSpacePoint
-        );
+    public static function builder(): ConflictsBuilder
+    {
+        return new ConflictsBuilder();
     }
 
     public function jsonSerialize(): mixed

Classes/Application/Shared/ConflictsBuilder.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos.Ui package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Ui\Application\Shared;
+
+use Neos\Flow\Annotations as Flow;
+
+/**
+ * @internal
+ */
+#[Flow\Proxy(false)]
+final class ConflictsBuilder
+{
+    /**
+     * @var Conflict[]
+     */
+    private array $items = [];
+
+    /**
+     * @var array<string,Conflict>
+     */
+    private array $itemsByKey = [];
+
+    public function addConflict(Conflict $conflict): self
+    {
+        if (!isset($this->itemsByKey[$conflict->key])) {
+            $this->itemsByKey[$conflict->key] = $conflict;
+            $this->items[] = $conflict;
+        }
+
+        return $this;
+    }
+
+    public function build(): Conflicts
+    {
+        return new Conflicts(...$this->items);
+    }
+}