From df5b683c68c81dcadb9d25a542c89d5892d32a6b Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Thu, 3 Apr 2025 14:25:29 +0200 Subject: [PATCH 1/2] BUGFIX: Allow back navigation in workspace ui Before this change pressing back in the browser would lead to the previous Neos module instead of the previous view in the workspace ui itself, even though the url was correctly updated in the navigation bar. --- .../Fusion/Features/Review/Components/ReviewActions.fusion | 2 +- .../Features/Workspace/Components/WorkspaceTableRow.fusion | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Review/Components/ReviewActions.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Review/Components/ReviewActions.fusion index c13cf4929e..8c83f8476e 100644 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Review/Components/ReviewActions.fusion +++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Review/Components/ReviewActions.fusion @@ -57,6 +57,7 @@ prototype(Neos.Workspace.Ui:Component.ReviewActions) < prototype(Neos.Fusion:Com label={props.i18n.id('back')} attributes.hx-get={private.indexWorkspaceUri} attributes.hx-replace-url={private.indexWorkspaceUri} + attributes.hx-push-url={private.indexWorkspaceUri} attributes.hx-select="#workspace-module-content" attributes.hx-target="#workspace-module-content" attributes.hx-swap="outerHTML" @@ -107,7 +108,6 @@ prototype(Neos.Workspace.Ui:Component.ReviewActions) < prototype(Neos.Fusion:Com attributes.hx-on--after-request={'document.getElementById("' + private.publishSelectedChangesPopoverId + '").showPopover()'} /> - ` diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion index 158120cd87..d24ff878c1 100644 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion +++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion @@ -117,6 +117,7 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion disabled={props.workspaceListItem.pendingChanges.total == 0} attributes.hx-get={private.reviewWorkspaceUri} attributes.hx-replace-url={private.reviewWorkspaceUri} + attributes.hx-push-url={private.reviewWorkspaceUri} attributes.hx-target="#workspace-module-content" attributes.hx-select="#workspace-module-content" attributes.hx-swap="outerHTML" From 6bc599efef7bcd4b39008b69af64cdbf9b3f1e98 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Thu, 3 Apr 2025 14:25:34 +0200 Subject: [PATCH 2/2] TASK: Remove unused import --- Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php index d4eeb5dad6..70fe40b4ad 100644 --- a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php +++ b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php @@ -16,7 +16,6 @@ use Neos\ContentRepository\Core\ContentRepository; use Neos\ContentRepository\Core\Dimension\ContentDimensionId; -use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; use Neos\ContentRepository\Core\Feature\WorkspaceRebase\ConflictingEvent; use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Dto\RebaseErrorHandlingStrategy;