From 8bff3cc935ed6c06302d2d9f8b02159809e220d7 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:17:57 +0100
Subject: [PATCH 01/11] TASK: Refine logic to determine content repository for
 new site beforehand

This bases on the thesis that the created site's name will use the configuration "*" which by default uses the default preset.
---
 .../Module/Administration/SitesController.php | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index e124b5cd0a1..e54ccf9b270 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -89,6 +89,14 @@ class SitesController extends AbstractModuleController
      */
     protected $session;
 
+    /**
+     * This is not 100% correct, but it is as good as we can get it to work right now
+     * It works when the created site's name will use the configuration "*" which by default uses the default preset.
+     *
+     * @Flow\InjectConfiguration("sitePresets.default.contentRepository")
+     */
+    protected $defaultContentRepositoryForNewSites;
+
     #[Flow\Inject]
     protected UserService $domainUserService;
 
@@ -236,22 +244,19 @@ public function updateSiteAction(Site $site, $newSiteNodeName)
      */
     public function newSiteAction(): void
     {
-        // This is not 100% correct, but it is as good as we can get it to work right now
         try {
-            $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())
-                ->contentRepositoryId;
-        } catch (\RuntimeException) {
-            $contentRepositoryId = ContentRepositoryId::fromString('default');
+            $contentRepositoryId = ContentRepositoryId::fromString($this->defaultContentRepositoryForNewSites ?? '');
+        } catch (\InvalidArgumentException $e) {
+            throw new \RuntimeException('The default content repository for new sites configured in "Neos.Neos.sitePresets.default.contentRepository" is not valid.', 1736946907, $e);
         }
 
         try {
             $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
             $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false);
-        } catch (ContentRepositoryNotFoundException) {
-            $documentNodeTypes = [];
+        } catch (ContentRepositoryNotFoundException $e) {
+            throw new \RuntimeException(sprintf('The default content repository for new sites "%s" could not be instantiated.', $contentRepositoryId->value), 1736946907, $e);
         }
 
-
         $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site');
 
         $this->view->assignMultiple([

From cb7f171bf06b682793e21e38134027d1558e7727 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:38:44 +0100
Subject: [PATCH 02/11] BUGFIX: Reimplement Import site based on new
 SiteImportService

see https://github.com/neos/neos-development-collection/pull/5307
---
 .../Module/Administration/SitesController.php | 71 +++++++++++--------
 .../Private/Translations/en/Modules.xlf       |  6 --
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index e54ccf9b270..aa76ee5a02a 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -16,11 +16,11 @@
 
 use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
-use Neos\ContentRepository\Core\SharedModel\Workspace\Workspace;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeNameIsAlreadyCovered;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
+use Neos\ContentRepository\Core\SharedModel\Workspace\Workspace;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\ContentRepositoryRegistry\Exception\ContentRepositoryNotFoundException;
@@ -28,6 +28,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Package;
 use Neos\Flow\Package\PackageManager;
+use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Flow\Session\SessionInterface;
 use Neos\Media\Domain\Repository\AssetCollectionRepository;
 use Neos\Neos\Controller\Module\AbstractModuleController;
@@ -39,12 +40,10 @@
 use Neos\Neos\Domain\Repository\DomainRepository;
 use Neos\Neos\Domain\Repository\SiteRepository;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
+use Neos\Neos\Domain\Service\SiteImportService;
 use Neos\Neos\Domain\Service\SiteService;
 use Neos\Neos\Domain\Service\UserService;
-use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult;
-use Neos\SiteKickstarter\Generator\SitePackageGeneratorInterface;
-use Neos\SiteKickstarter\Service\SiteGeneratorCollectingService;
-use Neos\SiteKickstarter\Service\SitePackageGeneratorNameService;
+use Neos\Utility\Files;
 
 /**
  * The Neos Sites Management module controller
@@ -97,6 +96,18 @@ class SitesController extends AbstractModuleController
      */
     protected $defaultContentRepositoryForNewSites;
 
+    /**
+     * @Flow\Inject
+     * @var SecurityContext
+     */
+    protected $securityContext;
+
+    /**
+     * @Flow\Inject
+     * @var SiteImportService
+     */
+    protected $siteImportService;
+
     #[Flow\Inject]
     protected UserService $domainUserService;
 
@@ -272,33 +283,35 @@ public function newSiteAction(): void
      * @Flow\Validate(argumentName="$packageKey", type="\Neos\Neos\Validation\Validator\PackageKeyValidator")
      * @return void
      */
-    /*public function importSiteAction($packageKey)
+    public function importSiteAction($packageKey)
     {
         try {
-            $this->siteImportService->importFromPackage($packageKey);
-            $this->addFlashMessage(
-                $this->getModuleLabel('sites.theSiteHasBeenImported.body'),
-                '',
-                Message::SEVERITY_OK,
-                [],
-                1412372266
-            );
-        } catch (\Exception $exception) {
-            $logMessage = $this->throwableStorage->logThrowable($exception);
-            $this->logger->error($logMessage, LogEnvironment::fromMethodName(__METHOD__));
-            $this->addFlashMessage(
-                $this->getModuleLabel(
-                    'sites.importError.body',
-                    [htmlspecialchars($packageKey), htmlspecialchars($exception->getMessage())]
-                ),
-                $this->getModuleLabel('sites.importError.title'),
-                Message::SEVERITY_ERROR,
-                [],
-                1412372375
-            );
+            $contentRepositoryId = ContentRepositoryId::fromString($this->defaultContentRepositoryForNewSites ?? '');
+        } catch (\InvalidArgumentException $e) {
+            throw new \RuntimeException('The default content repository for new sites configured in "Neos.Neos.sitePresets.default.contentRepository" is not valid.', 1736946907, $e);
         }
-        $this->unsetLastVisitedNodeAndRedirect('index');
-    }*/
+
+        $package = $this->packageManager->getPackage($packageKey);
+        $path = Files::concatenatePaths([$package->getPackagePath(), 'Resources/Private/Content']);
+
+        // CreateRootWorkspace was denied: Creation of root workspaces is currently only allowed with disabled authorization checks
+        $this->securityContext->withoutAuthorizationChecks(fn () => $this->siteImportService->importFromPath(
+            $contentRepositoryId,
+            $path,
+            fn () => null,
+            fn () => null
+        ));
+
+        $this->addFlashMessage(
+            $this->getModuleLabel('sites.theSiteHasBeenImported.body'),
+            '',
+            Message::SEVERITY_OK,
+            [],
+            1412372266
+        );
+
+        $this->redirect('index');
+    }
 
     /**
      * Create a new empty site.
diff --git a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
index 1844d588155..5235978e3c0 100755
--- a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
@@ -548,12 +548,6 @@ Click on one of the nodes to only see its fallbacks and variants. Click again to
 			<trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
 				<source>The site has been imported.</source>
 			</trans-unit>
-			<trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
-			</trans-unit>
-			<trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
-			</trans-unit>
 			<trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
 				<source>Site creation error</source>
 			</trans-unit>

From 93be073781dab2852218cb73dd39e683cb0afe92 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:48:11 +0100
Subject: [PATCH 03/11] BUGFIX: Prevent site import to be run again if the
 event store contains events - also add notes for this case

---
 .../Module/Administration/SitesController.php        |  8 ++++++--
 .../Module/Administration/Sites/NewSite.html         | 12 +++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index aa76ee5a02a..fb3563dc919 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -263,14 +263,18 @@ public function newSiteAction(): void
 
         try {
             $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
-            $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false);
         } catch (ContentRepositoryNotFoundException $e) {
-            throw new \RuntimeException(sprintf('The default content repository for new sites "%s" could not be instantiated.', $contentRepositoryId->value), 1736946907, $e);
+            throw new \RuntimeException(sprintf('The default content repository for new sites "%s" could not be instantiated.', $contentRepositoryId->value), 1736946907);
         }
 
+        $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false);
+
         $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site');
 
         $this->view->assignMultiple([
+            'defaultContentRepositoryForNewSites' => $contentRepositoryId->value,
+            // The live workspace has to be empty prior to importing, that's why we disable the functionality
+            'canImportFromPackage' => $this->siteRepository->findFirst() === null,
             'sitePackages' => $sitePackages,
             'documentNodeTypes' => $documentNodeTypes
         ]);
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index fc2a4a830c0..a1384e2db8e 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -3,20 +3,26 @@
 
 <f:section name="content">
 	<h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules')}</h2>
+	All site creations will target the content repository: "{defaultContentRepositoryForNewSites}"
 
   <div class="neos-row-fluid">
     <f:form action="importSite">
       <fieldset class="neos-span3">
         <legend>{neos:backend.translate(id: 'sites.import', value: 'Import a site', source: 'Modules')}</legend>
-        <f:if condition="{sitePackages -> f:count()} > 0">
+				<f:if condition="{canImportFromPackage ? false : true}">
+					NOTE: Currently it's only possible to import once into a content repository from a site package.
+					To reimport please prune the sites first via <code>./flow site:pruneall</code>.
+					<br><br>
+				</f:if>
+				<f:if condition="{sitePackages -> f:count()} > 0">
           <f:then>
             <div class="neos-control-group">
               <label class="neos-control-label" for="site">{neos:backend.translate(id: 'sites.select', value: 'Select a site package', source: 'Modules')}</label>
               <div class="neos-controls neos-select">
-                <f:form.select name="packageKey" options="{sitePackages}" optionLabelField="packageKey" optionValueField="packageKey" id="site" class="neos-span12" />
+                <f:form.select disabled="{canImportFromPackage ? false : true}" name="packageKey" options="{sitePackages}" optionLabelField="packageKey" optionValueField="packageKey" id="site" class="neos-span12" />
               </div>
             </div>
-            <f:form.submit value="{neos:backend.translate(id: 'sites.import', value: 'Import Site', source: 'Modules')}" class="neos-button neos-button-primary" />
+            <f:form.submit disabled="{canImportFromPackage ? false : true}" value="{neos:backend.translate(id: 'sites.import', value: 'Import Site', source: 'Modules')}" class="neos-button neos-button-primary" />
           </f:then>
           <f:else>
             <p>{neos:backend.translate(id: 'sites.noPackackeInfo', value: 'No site packages are available. Make sure you have an active site package.', source: 'Modules')}

From 41f1c31cde9387f288a8f8fae7b8b3c017edc024 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:48:46 +0100
Subject: [PATCH 04/11] TASK: Add notes to UI that creating sites via site
 module is deprecated

---
 .../Templates/Module/Administration/Sites/Index.html      | 2 +-
 .../Templates/Module/Administration/Sites/NewSite.html    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
index eff259abf0a..426e4d46d39 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
@@ -100,7 +100,7 @@
 		</tbody>
 	</table>
 	<div class="neos-footer">
-		<f:link.action action="newSite" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'clickToCreate', value: 'Click to create new')}">{neos:backend.translate(id: 'sites.add', value: 'Add new site', source: 'Modules')}</f:link.action>
+		<f:link.action action="newSite" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'clickToCreate', value: 'Click to create new')}">{neos:backend.translate(id: 'sites.add', value: 'Add new site', source: 'Modules')} <i>(Deprecated)</i></f:link.action>
 	</div>
 
 	<script>
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index a1384e2db8e..c9246be0ed0 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -2,7 +2,13 @@
 <f:layout name="BackendSubModule" />
 
 <f:section name="content">
-	<h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules')}</h2>
+	<h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules')} <i>(Deprecated)</i></h2>
+
+	<br>
+	Using the sites management module for creation sites is deprecated please consider using the command line instead.
+	<br>
+	For example <code>./flow site:importall</code> for importing from a package or <code>./flow site:create</code> to create a new site.
+	<br>
 	All site creations will target the content repository: "{defaultContentRepositoryForNewSites}"
 
   <div class="neos-row-fluid">

From 0ab76adbd3b4640f0d061df25ea96e35986d0a3b Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:05:07 +0100
Subject: [PATCH 05/11] BUGFIX: Fix that createSiteNode creates workspace

---
 .../Controller/Module/Administration/SitesController.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index fb3563dc919..a7ceaef0533 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -329,7 +329,11 @@ public function importSiteAction($packageKey)
     public function createSiteNodeAction($packageKey, $siteName, $nodeType)
     {
         try {
-            $site = $this->siteService->createSite($packageKey, $siteName, $nodeType);
+            // CreateRootWorkspace was denied: Creation of root workspaces is currently only allowed with disabled authorization checks
+            $site = null;
+            $this->securityContext->withoutAuthorizationChecks(function () use (&$site, $packageKey, $siteName, $nodeType) {
+                $site = $this->siteService->createSite($packageKey, $siteName, $nodeType);
+            });
         } catch (NodeTypeNotFound $exception) {
             $this->addFlashMessage(
                 $this->getModuleLabel('sites.siteCreationError.givenNodeTypeNotFound.body', [$nodeType]),

From 08a7af0d7c343c1d67b1d9a45a0d4a38013cf38e Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:08:18 +0100
Subject: [PATCH 06/11] BUGFIX: Disable importing of site after site was
 deleted

because a site deletion does not prune the content repository we cannot reimport the nodes
---
 .../Controller/Module/Administration/SitesController.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index a7ceaef0533..d0f7955d078 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -268,13 +268,14 @@ public function newSiteAction(): void
         }
 
         $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false);
+        $liveWorkspace = $contentRepository->findWorkspaceByName(WorkspaceName::forLive());
 
         $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site');
 
         $this->view->assignMultiple([
             'defaultContentRepositoryForNewSites' => $contentRepositoryId->value,
             // The live workspace has to be empty prior to importing, that's why we disable the functionality
-            'canImportFromPackage' => $this->siteRepository->findFirst() === null,
+            'canImportFromPackage' => $liveWorkspace === null,
             'sitePackages' => $sitePackages,
             'documentNodeTypes' => $documentNodeTypes
         ]);

From 93b7dc22351e14febb5f4909b70dd1804882eb37 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:30:05 +0100
Subject: [PATCH 07/11] TASK: Add help tip to removed 'Create a new
 site-package'

Removed via https://github.com/neos/neos-development-collection/pull/5139
---
 .../Module/Administration/Sites/NewSite.html        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index c9246be0ed0..22af438648d 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -71,6 +71,19 @@ <h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules
         </f:if>
       </fieldset>
     </f:form>
+
+		<div class="neos neos-row-fluid neos-span3">
+			<legend>Create a new site-package</legend>
+			NOTE: The functionality to create site packages via this module was removed as being too fragile.
+			To get started with neos head over to the setup:
+			<br>
+			<br>
+			<a href="/setup" class="neos-button neos-button-primary">/setup</a>
+			<br>
+			<br>
+			To kickstart a new package use: <code>./flow kickstart:site</code>
+		</div>
+
   </div>
   <div class="neos-footer">
     <f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'cancel', value: 'Cancel')}</f:link.action>

From d55bb1d2812b1f989288b966e4b52c7745dc3fa3 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 17 Jan 2025 13:39:32 +0100
Subject: [PATCH 08/11] TASK: Revert notes in the sites module and only allow
 create blank site

see https://github.com/neos/neos-development-collection/issues/4719#issuecomment-2598274287
---
 .../Module/Administration/SitesController.php | 43 ++--------------
 .../Module/Administration/Sites/Index.html    |  2 +-
 .../Module/Administration/Sites/NewSite.html  | 51 ++-----------------
 .../Private/Translations/en/Modules.xlf       |  6 ---
 4 files changed, 8 insertions(+), 94 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index d0f7955d078..891e3cf49e9 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -92,6 +92,9 @@ class SitesController extends AbstractModuleController
      * This is not 100% correct, but it is as good as we can get it to work right now
      * It works when the created site's name will use the configuration "*" which by default uses the default preset.
      *
+     * As proposed here https://github.com/neos/neos-development-collection/issues/4470#issuecomment-2432140074
+     * the site must have a field to define the contentRepositoryId to correctly create sites dynamically.
+     *
      * @Flow\InjectConfiguration("sitePresets.default.contentRepository")
      */
     protected $defaultContentRepositoryForNewSites;
@@ -268,56 +271,16 @@ public function newSiteAction(): void
         }
 
         $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false);
-        $liveWorkspace = $contentRepository->findWorkspaceByName(WorkspaceName::forLive());
 
         $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site');
 
         $this->view->assignMultiple([
             'defaultContentRepositoryForNewSites' => $contentRepositoryId->value,
-            // The live workspace has to be empty prior to importing, that's why we disable the functionality
-            'canImportFromPackage' => $liveWorkspace === null,
             'sitePackages' => $sitePackages,
             'documentNodeTypes' => $documentNodeTypes
         ]);
     }
 
-    /**
-     * Import a site from site package.
-     *
-     * @param string $packageKey Package from where the import will come
-     * @Flow\Validate(argumentName="$packageKey", type="\Neos\Neos\Validation\Validator\PackageKeyValidator")
-     * @return void
-     */
-    public function importSiteAction($packageKey)
-    {
-        try {
-            $contentRepositoryId = ContentRepositoryId::fromString($this->defaultContentRepositoryForNewSites ?? '');
-        } catch (\InvalidArgumentException $e) {
-            throw new \RuntimeException('The default content repository for new sites configured in "Neos.Neos.sitePresets.default.contentRepository" is not valid.', 1736946907, $e);
-        }
-
-        $package = $this->packageManager->getPackage($packageKey);
-        $path = Files::concatenatePaths([$package->getPackagePath(), 'Resources/Private/Content']);
-
-        // CreateRootWorkspace was denied: Creation of root workspaces is currently only allowed with disabled authorization checks
-        $this->securityContext->withoutAuthorizationChecks(fn () => $this->siteImportService->importFromPath(
-            $contentRepositoryId,
-            $path,
-            fn () => null,
-            fn () => null
-        ));
-
-        $this->addFlashMessage(
-            $this->getModuleLabel('sites.theSiteHasBeenImported.body'),
-            '',
-            Message::SEVERITY_OK,
-            [],
-            1412372266
-        );
-
-        $this->redirect('index');
-    }
-
     /**
      * Create a new empty site.
      *
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
index 426e4d46d39..eff259abf0a 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/Index.html
@@ -100,7 +100,7 @@
 		</tbody>
 	</table>
 	<div class="neos-footer">
-		<f:link.action action="newSite" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'clickToCreate', value: 'Click to create new')}">{neos:backend.translate(id: 'sites.add', value: 'Add new site', source: 'Modules')} <i>(Deprecated)</i></f:link.action>
+		<f:link.action action="newSite" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'clickToCreate', value: 'Click to create new')}">{neos:backend.translate(id: 'sites.add', value: 'Add new site', source: 'Modules')}</f:link.action>
 	</div>
 
 	<script>
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index 22af438648d..b4cd0e3decf 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -2,45 +2,14 @@
 <f:layout name="BackendSubModule" />
 
 <f:section name="content">
-	<h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules')} <i>(Deprecated)</i></h2>
-
-	<br>
-	Using the sites management module for creation sites is deprecated please consider using the command line instead.
-	<br>
-	For example <code>./flow site:importall</code> for importing from a package or <code>./flow site:create</code> to create a new site.
-	<br>
-	All site creations will target the content repository: "{defaultContentRepositoryForNewSites}"
+	<h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules')}</h2>
 
   <div class="neos-row-fluid">
-    <f:form action="importSite">
-      <fieldset class="neos-span3">
-        <legend>{neos:backend.translate(id: 'sites.import', value: 'Import a site', source: 'Modules')}</legend>
-				<f:if condition="{canImportFromPackage ? false : true}">
-					NOTE: Currently it's only possible to import once into a content repository from a site package.
-					To reimport please prune the sites first via <code>./flow site:pruneall</code>.
-					<br><br>
-				</f:if>
-				<f:if condition="{sitePackages -> f:count()} > 0">
-          <f:then>
-            <div class="neos-control-group">
-              <label class="neos-control-label" for="site">{neos:backend.translate(id: 'sites.select', value: 'Select a site package', source: 'Modules')}</label>
-              <div class="neos-controls neos-select">
-                <f:form.select disabled="{canImportFromPackage ? false : true}" name="packageKey" options="{sitePackages}" optionLabelField="packageKey" optionValueField="packageKey" id="site" class="neos-span12" />
-              </div>
-            </div>
-            <f:form.submit disabled="{canImportFromPackage ? false : true}" value="{neos:backend.translate(id: 'sites.import', value: 'Import Site', source: 'Modules')}" class="neos-button neos-button-primary" />
-          </f:then>
-          <f:else>
-            <p>{neos:backend.translate(id: 'sites.noPackackeInfo', value: 'No site packages are available. Make sure you have an active site package.', source: 'Modules')}
-            </p>
-          </f:else>
-        </f:if>
-      </fieldset>
-    </f:form>
-
     <f:form action="createSiteNode">
-      <fieldset class="neos-span3 neos-offset1">
+      <fieldset class="neos-span3">
         <legend>{neos:backend.translate(id: 'sites.createBlank', value: 'Create a blank site', source: 'Modules')}</legend>
+				In the content repository: "{defaultContentRepositoryForNewSites}"
+
         <f:if condition="{sitePackages -> f:count()} > 0">
           <f:then>
             <div class="neos-control-group">
@@ -72,18 +41,6 @@ <h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules
       </fieldset>
     </f:form>
 
-		<div class="neos neos-row-fluid neos-span3">
-			<legend>Create a new site-package</legend>
-			NOTE: The functionality to create site packages via this module was removed as being too fragile.
-			To get started with neos head over to the setup:
-			<br>
-			<br>
-			<a href="/setup" class="neos-button neos-button-primary">/setup</a>
-			<br>
-			<br>
-			To kickstart a new package use: <code>./flow kickstart:site</code>
-		</div>
-
   </div>
   <div class="neos-footer">
     <f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'cancel', value: 'Cancel')}</f:link.action>
diff --git a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
index 5235978e3c0..f5975addd7a 100755
--- a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
@@ -359,9 +359,6 @@
 			<trans-unit id="sites.confirmDelete" xml:space="preserve">
 				<source>Yes, delete the site</source>
 			</trans-unit>
-			<trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
-			</trans-unit>
 			<trans-unit id="sites.select" xml:space="preserve">
 				<source>Select a site package</source>
 			</trans-unit>
@@ -545,9 +542,6 @@ Click on one of the nodes to only see its fallbacks and variants. Click again to
 			<trans-unit id="sites.update.body" xml:space="preserve">
 				<source>The site "{0}" has been updated.</source>
 			</trans-unit>
-			<trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
-			</trans-unit>
 			<trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
 				<source>Site creation error</source>
 			</trans-unit>

From a816c4c5e29ae5493b4832563fbe43a72552cc1b Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Mon, 20 Jan 2025 10:17:16 +0100
Subject: [PATCH 09/11] TASK: Move withoutAuthorizationChecks into
 `createSiteNodeIfNotExists`

---
 .../Module/Administration/SitesController.php | 22 ++-----------------
 .../Classes/Domain/Service/SiteService.php    | 13 +++++++++--
 .../Domain/Service/SiteServiceInternals.php   | 17 +++++++++-----
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index 891e3cf49e9..d94f1ecef01 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -28,7 +28,6 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Package;
 use Neos\Flow\Package\PackageManager;
-use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Flow\Session\SessionInterface;
 use Neos\Media\Domain\Repository\AssetCollectionRepository;
 use Neos\Neos\Controller\Module\AbstractModuleController;
@@ -40,10 +39,8 @@
 use Neos\Neos\Domain\Repository\DomainRepository;
 use Neos\Neos\Domain\Repository\SiteRepository;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
-use Neos\Neos\Domain\Service\SiteImportService;
 use Neos\Neos\Domain\Service\SiteService;
 use Neos\Neos\Domain\Service\UserService;
-use Neos\Utility\Files;
 
 /**
  * The Neos Sites Management module controller
@@ -96,21 +93,10 @@ class SitesController extends AbstractModuleController
      * the site must have a field to define the contentRepositoryId to correctly create sites dynamically.
      *
      * @Flow\InjectConfiguration("sitePresets.default.contentRepository")
+     * @var string|null
      */
     protected $defaultContentRepositoryForNewSites;
 
-    /**
-     * @Flow\Inject
-     * @var SecurityContext
-     */
-    protected $securityContext;
-
-    /**
-     * @Flow\Inject
-     * @var SiteImportService
-     */
-    protected $siteImportService;
-
     #[Flow\Inject]
     protected UserService $domainUserService;
 
@@ -293,11 +279,7 @@ public function newSiteAction(): void
     public function createSiteNodeAction($packageKey, $siteName, $nodeType)
     {
         try {
-            // CreateRootWorkspace was denied: Creation of root workspaces is currently only allowed with disabled authorization checks
-            $site = null;
-            $this->securityContext->withoutAuthorizationChecks(function () use (&$site, $packageKey, $siteName, $nodeType) {
-                $site = $this->siteService->createSite($packageKey, $siteName, $nodeType);
-            });
+            $site = $this->siteService->createSite($packageKey, $siteName, $nodeType);
         } catch (NodeTypeNotFound $exception) {
             $this->addFlashMessage(
                 $this->getModuleLabel('sites.siteCreationError.givenNodeTypeNotFound.body', [$nodeType]),
diff --git a/Neos.Neos/Classes/Domain/Service/SiteService.php b/Neos.Neos/Classes/Domain/Service/SiteService.php
index 42f7bea37e6..a43df73c453 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteService.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteService.php
@@ -20,6 +20,7 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Media\Domain\Model\Asset;
 use Neos\Media\Domain\Repository\AssetCollectionRepository;
 use Neos\Neos\Domain\Exception\SiteNodeNameIsAlreadyInUseByAnotherSite;
@@ -70,6 +71,12 @@ class SiteService
      */
     protected $workspaceService;
 
+    /**
+     * @Flow\Inject
+     * @var SecurityContext
+     */
+    protected $securityContext;
+
     /**
      * Remove given site all nodes for that site and all domains associated.
      */
@@ -77,7 +84,8 @@ public function pruneSite(Site $site): void
     {
         $siteServiceInternals = new SiteServiceInternals(
             $this->contentRepositoryRegistry->get($site->getConfiguration()->contentRepositoryId),
-            $this->workspaceService
+            $this->workspaceService,
+            $this->securityContext
         );
 
         try {
@@ -181,7 +189,8 @@ public function createSite(
 
         $siteServiceInternals = new SiteServiceInternals(
             $this->contentRepositoryRegistry->get($site->getConfiguration()->contentRepositoryId),
-            $this->workspaceService
+            $this->workspaceService,
+            $this->securityContext
         );
         $siteServiceInternals->createSiteNodeIfNotExists($site, $nodeTypeName);
 
diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
index 09d64fefd46..f4cbef02fe4 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
@@ -30,6 +30,7 @@
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeVariantSelectionStrategy;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Neos\Domain\Exception\SiteNodeTypeIsInvalid;
 use Neos\Neos\Domain\Model\Site;
 use Neos\Neos\Domain\Model\SiteNodeName;
@@ -49,6 +50,7 @@
     public function __construct(
         private ContentRepository $contentRepository,
         private WorkspaceService $workspaceService,
+        private SecurityContext $securityContext
     ) {
         $this->nodeTypeManager = $this->contentRepository->getNodeTypeManager();
         $this->interDimensionalVariationGraph = $this->contentRepository->getVariationGraph();
@@ -94,12 +96,15 @@ public function createSiteNodeIfNotExists(Site $site, string $nodeTypeName): voi
     {
         $liveWorkspace = $this->contentRepository->findWorkspaceByName(WorkspaceName::forLive());
         if ($liveWorkspace === null) {
-            $this->workspaceService->createRootWorkspace(
-                $this->contentRepository->id,
-                WorkspaceName::forLive(),
-                WorkspaceTitle::fromString('Public live workspace'),
-                WorkspaceDescription::empty(),
-                WorkspaceRoleAssignments::createForLiveWorkspace()
+            // CreateRootWorkspace was denied: Creation of root workspaces is currently only allowed with disabled authorization checks
+            $this->securityContext->withoutAuthorizationChecks(
+                fn () => $this->workspaceService->createRootWorkspace(
+                    $this->contentRepository->id,
+                    WorkspaceName::forLive(),
+                    WorkspaceTitle::fromString('Public live workspace'),
+                    WorkspaceDescription::empty(),
+                    WorkspaceRoleAssignments::createForLiveWorkspace()
+                )
             );
         }
 

From 2ade42251adcf92b226288318d8ae2b8cb3f8123 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Mon, 20 Jan 2025 10:29:05 +0100
Subject: [PATCH 10/11] BUGFIX: Use withoutAuthorizationChecks to remove site
 via user interface

The CR security was introduced with

https://github.com/neos/neos-development-collection/pull/5298

And now fails when fetching the content graph or deleting nodes:

> Read access denied for workspace "user-editor": User is a Neos Administrator without explicit role for workspace "user-editor"

The herby proposed fix is not perfect but so is the whole site deletion, instead only the base workspace should need to be deleted and the others need to be rebased.
---
 .../Domain/Service/SiteServiceInternals.php   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
index f4cbef02fe4..ceb708e20de 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
@@ -68,9 +68,13 @@ public function removeSiteNode(SiteNodeName $siteNodeName): void
             );
         }
 
+        // todo only remove site node in base workspace and rebase dependant workspaces to avoid also the security hacks here.
         foreach ($this->contentRepository->findWorkspaces() as $workspace) {
-            $contentGraph = $this->contentRepository->getContentGraph($workspace->workspaceName);
-            $sitesNodeAggregate = $contentGraph->findRootNodeAggregateByType(
+            $contentGraph = null;
+            $this->securityContext->withoutAuthorizationChecks(function () use (&$contentGraph, $workspace) {
+                $contentGraph = $this->contentRepository->getContentGraph($workspace->workspaceName);
+            });
+            $sitesNodeAggregate = $contentGraph?->findRootNodeAggregateByType(
                 NodeTypeNameFactory::forSites()
             );
             if (!$sitesNodeAggregate) {
@@ -82,12 +86,14 @@ public function removeSiteNode(SiteNodeName $siteNodeName): void
                 $siteNodeName->toNodeName()
             );
             if ($siteNodeAggregate instanceof NodeAggregate) {
-                $this->contentRepository->handle(RemoveNodeAggregate::create(
-                    $workspace->workspaceName,
-                    $siteNodeAggregate->nodeAggregateId,
-                    $arbitraryDimensionSpacePoint,
-                    NodeVariantSelectionStrategy::STRATEGY_ALL_VARIANTS,
-                ));
+                $this->securityContext->withoutAuthorizationChecks(
+                    fn () => $this->contentRepository->handle(RemoveNodeAggregate::create(
+                        $workspace->workspaceName,
+                        $siteNodeAggregate->nodeAggregateId,
+                        $arbitraryDimensionSpacePoint,
+                        NodeVariantSelectionStrategy::STRATEGY_ALL_VARIANTS,
+                    ))
+                );
             }
         }
     }

From 0df849a1c6a09604d4b51cd3e84aff43b483fd11 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:32:38 +0100
Subject: [PATCH 11/11] TASK: Introduce translation key for site module

---
 .../Private/Templates/Module/Administration/Sites/NewSite.html | 2 +-
 Neos.Neos/Resources/Private/Translations/en/Modules.xlf        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index b4cd0e3decf..4c9016a9e79 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -8,7 +8,7 @@ <h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules
     <f:form action="createSiteNode">
       <fieldset class="neos-span3">
         <legend>{neos:backend.translate(id: 'sites.createBlank', value: 'Create a blank site', source: 'Modules')}</legend>
-				In the content repository: "{defaultContentRepositoryForNewSites}"
+				{neos:backend.translate(id: 'sites.creationContentRepository', value: 'In the content repository: "{defaultContentRepositoryForNewSites}"', source: 'Modules', arguments: {0: defaultContentRepositoryForNewSites})}
 
         <f:if condition="{sitePackages -> f:count()} > 0">
           <f:then>
diff --git a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
index f5975addd7a..813f55a3c66 100755
--- a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
@@ -368,6 +368,9 @@
 			<trans-unit id="sites.createBlank" xml:space="preserve">
 				<source>Create a blank site</source>
 			</trans-unit>
+      <trans-unit id="sites.creationContentRepository" xml:space="preserve">
+				<source>In the content repository: "{0}"</source>
+			</trans-unit>
 			<trans-unit id="sites.documentType" xml:space="preserve">
 				<source>Select a document nodeType</source>
 			</trans-unit>