From 4678c5d16cb709a9cc5a03717063a3281e50e853 Mon Sep 17 00:00:00 2001
From: Sebastian Helzle <sebastian@helzle.it>
Date: Thu, 19 Dec 2024 13:43:52 +0100
Subject: [PATCH] TASK: Only match htmx pattern for workspace module

---
 Neos.Workspace.Ui/Classes/Mvc/HtmxRequestPattern.php | 2 +-
 Neos.Workspace.Ui/Configuration/Settings.Flow.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Neos.Workspace.Ui/Classes/Mvc/HtmxRequestPattern.php b/Neos.Workspace.Ui/Classes/Mvc/HtmxRequestPattern.php
index 04b190f90e6..356c6b994e7 100644
--- a/Neos.Workspace.Ui/Classes/Mvc/HtmxRequestPattern.php
+++ b/Neos.Workspace.Ui/Classes/Mvc/HtmxRequestPattern.php
@@ -21,6 +21,6 @@ final class HtmxRequestPattern implements RequestPatternInterface
 {
     public function matchRequest(ActionRequest $request): bool
     {
-        return $request->getFormat() === 'htmx';
+        return $request->getFormat() === 'htmx' && $request->getControllerPackageKey() === 'Neos.Workspace.Ui';
     }
 }
diff --git a/Neos.Workspace.Ui/Configuration/Settings.Flow.yaml b/Neos.Workspace.Ui/Configuration/Settings.Flow.yaml
index 91a652d7d24..c13ff742363 100644
--- a/Neos.Workspace.Ui/Configuration/Settings.Flow.yaml
+++ b/Neos.Workspace.Ui/Configuration/Settings.Flow.yaml
@@ -3,7 +3,7 @@ Neos:
     mvc:
       flashMessages:
         containers:
-          'httpHeaderFlashMessages':
+          'Neos.Workspace.Ui:httpHeaderFlashMessages':
             storage: 'Neos\Workspace\Ui\Mvc\HttpHeaderFlashMessageStorage'
             requestPatterns:
               'htmx':