Add basic workspace support

medienreaktor · Mar 28, 2023 · 68c9ca9 · 68c9ca9
1 parent f1232cb
commit 68c9ca9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/Classes/Controller/ImportController.php b/Classes/Controller/ImportController.php
@@ -71,6 +71,7 @@ public function uploadAction()
             $this->import->setDataFromCSV($file, $args['delimiter']);
             $this->import->setParentNodeIdentifier($args['parentNodeIdentifier']);
             $this->import->setTargetNodeType($args['targetNodeType']);
+            $this->import->setTargetWorkspace($args['targetWorkspace']);
 
             $this->redirect('mapping');
         }
@@ -116,8 +117,14 @@ public function importAction() {
         $parentNodeIdentifier = $this->import->getParentNodeIdentifier();
         $targetNodeType = $this->nodeTypeManager->getNodeType($this->import->getTargetNodeType());
 
-        $context = $this->contextFactory->create();
-        $q = new FlowQuery([$context->getCurrentSiteNode()]);
+        $workspace = $this->import->getTargetWorkspace();
+
+        /** @var ContentContext $contentContext */
+        $contentContext = $this->contextFactory->create([
+            'workspaceName' => $workspace,
+        ]);
+
+        $q = new FlowQuery([$contentContext->getCurrentSiteNode()]);
         $parentNode = $q->find($parentNodeIdentifier)->get(0);
 
         $nodeTemplate = new NodeTemplate();

diff --git a/Classes/Domain/Model/Import.php b/Classes/Domain/Model/Import.php
@@ -24,6 +24,11 @@ class Import
      */
     protected $targetNodeType = '';
 
+    /**
+     * @var string
+     */
+    protected $targetWorkspace = '';
+
     /**
      * Get data
      *
@@ -111,6 +116,29 @@ public function setTargetNodeType($targetNodeType)
         $this->targetNodeType = $targetNodeType;
     }
 
+    /**
+     * Get targetWorkspace
+     *
+     * @return string
+     * @Flow\Session(autoStart = TRUE)
+     */
+    public function getTargetWorkspace()
+    {
+        return $this->targetWorkspace;
+    }
+
+    /**
+     * Set targetWorkspace
+     *
+     * @param string $targetWorkspace
+     * @return void
+     * @Flow\Session(autoStart = TRUE)
+     */
+    public function setTargetWorkspace($targetWorkspace)
+    {
+        $this->targetWorkspace = $targetWorkspace;
+    }
+
     /**
      * Remove all import data
      *
@@ -121,5 +149,6 @@ public function flush()
         unset($this->data);
         unset($this->parentNodeIdentifier);
         unset($this->targetNodeType);
+        unset($this->targetWorkspace);
     }
 }
diff --git a/Resources/Private/Templates/Import/Index.html b/Resources/Private/Templates/Import/Index.html
@@ -34,6 +34,12 @@
                         <f:form.select class="neos-span12 form-control" name="targetNodeType" additionalAttributes="{required: 'required'}" options="{nodeTypes}"></f:form.select>
                     </div>
                 </div>
+                <div class="neos-control-group">
+                    <label class="neos-control-label">Target Workspace</label>
+                    <div class="neos-controls">
+                        <f:form.textfield class="neos-span12 form-control" name="targetWorkspace" additionalAttributes="{required: 'required'}" value="" placeholder="Workspace name"></f:form.textfield>
+                    </div>
+                </div>
             </fieldset>
         </div>
         <div class="neos-footer">