TileRenderer: Use the correct action urls for imported nodes

library/Businessprocess/Renderer/TileRenderer.php

@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Businessprocess\Renderer;
 
+use Icinga\Module\Businessprocess\ImportedNode;
 use Icinga\Module\Businessprocess\Renderer\TileRenderer\NodeTile;
 use Icinga\Module\Businessprocess\Web\Form\CsrfToken;
 use ipl\Html\Html;
@@ -23,12 +24,25 @@ class TileRenderer extends Renderer
                 'data-sortable-data-id-attr'    => 'id',
                 'data-sortable-filter'          => '.addnew',
                 'data-sortable-direction'       => 'horizontal', // Otherwise movement is buggy on small lists
-                'data-csrf-token'               => CsrfToken::generate(),
-                'data-action-url'               => $this->getUrl()->getAbsoluteUrl()
+                'data-csrf-token'               => CsrfToken::generate()
             ]
         );
-        if (! $this->wantsRootNodes()) {
-            $nodesDiv->getAttributes()->add('data-node-name', $this->parent->getName());
+
+        if ($this->wantsRootNodes()) {
+            $nodesDiv->getAttributes()->add('data-action-url', $this->getUrl()->getAbsoluteUrl());
+        } else {
+            $nodeName = $this->parent instanceof ImportedNode
+                ? $this->parent->getNodeName()
+                : $this->parent->getName();
+            $nodesDiv->getAttributes()
+                ->add('data-node-name', $nodeName)
+                ->add('data-action-url', $this->getUrl()
+                    ->without('path')
+                    ->overwriteParams([
+                        'config'    => $this->parent->getBpConfig()->getName(),
+                        'node'      => $nodeName
+                    ])
+                    ->getAbsoluteUrl());
         }
 
         $nodes = $this->getChildNodes();

library/Businessprocess/Renderer/TileRenderer/NodeTile.php

@@ -9,6 +9,7 @@ use Icinga\Module\Businessprocess\MonitoredNode;
 use Icinga\Module\Businessprocess\Node;
 use Icinga\Module\Businessprocess\Renderer\Renderer;
 use Icinga\Module\Businessprocess\ServiceNode;
+use Icinga\Web\Url;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 
@@ -213,13 +214,27 @@ class NodeTile extends BaseHtmlElement
 
     protected function addActionLinks()
     {
-        $node = $this->node;
-        $renderer = $this->renderer;
-        if ($node instanceof MonitoredNode) {
+        $parent = $this->renderer->getParentNode();
+        if ($parent !== null) {
+            $baseUrl = Url::fromPath('businessprocess/process/show', [
+                'config'    => $parent->getBpConfig()->getName(),
+                'node'      => $parent instanceof ImportedNode
+                    ? $parent->getNodeName()
+                    : $parent->getName(),
+                'unlocked'  => true
+            ]);
+        } else {
+            $baseUrl = Url::fromPath('businessprocess/process/show', [
+                'config'    => $this->node->getBpConfig()->getName(),
+                'unlocked'  => true
+            ]);
+        }
+
+        if ($this->node instanceof MonitoredNode) {
             $this->actions()->add(Html::tag(
                 'a',
                 [
-                    'href'  => $renderer->getUrl()
+                    'href'  => $baseUrl
                         ->with('action', 'simulation')
                         ->with('simulationnode', $this->node->getName()),
                     'title' => mt(
@@ -233,7 +248,7 @@ class NodeTile extends BaseHtmlElement
             $this->actions()->add(Html::tag(
                 'a',
                 [
-                    'href'  => $renderer->getUrl()
+                    'href'  => $baseUrl
                         ->with('action', 'editmonitored')
                         ->with('editmonitorednode', $this->node->getName()),
                     'title' => mt('businessprocess', 'Modify this monitored node')
@@ -248,11 +263,11 @@ class NodeTile extends BaseHtmlElement
             return;
         }
 
-        if ($node instanceof BpNode) {
+        if ($this->node instanceof BpNode) {
             $this->actions()->add(Html::tag(
                 'a',
                 [
-                    'href'  => $renderer->getUrl()
+                    'href'  => $baseUrl
                         ->with('action', 'edit')
                         ->with('editnode', $this->node->getName()),
                     'title' => mt('businessprocess', 'Modify this business process node')
@@ -263,10 +278,16 @@ class NodeTile extends BaseHtmlElement
             $this->actions()->add(Html::tag(
                 'a',
                 [
-                    'href'  => $renderer->getUrl()->with([
-                        'action'    => 'add',
-                        'node'      => $node->getName()
-                    ]),
+                    'href'  => $this->node instanceof ImportedNode
+                        ? $baseUrl->with([
+                            'config'    => $this->node->getConfigName(),
+                            'node'      => $this->node->getNodeName(),
+                            'action'    => 'add'
+                        ])
+                        : $baseUrl->with([
+                            'node'      => $this->node->getName(),
+                            'action'    => 'add'
+                        ]),
                     'title' => mt('businessprocess', 'Add a new sub-node to this business process')
                 ],
                 Html::tag('i', ['class' => 'icon icon-plus'])
@@ -275,13 +296,13 @@ class NodeTile extends BaseHtmlElement
 
         $params = array(
             'action'     => 'delete',
-            'deletenode' => $node->getName(),
+            'deletenode' => $this->node->getName(),
         );
 
         $this->actions()->add(Html::tag(
             'a',
             [
-                'href'  => $renderer->getUrl()->with($params),
+                'href'  => $baseUrl->with($params),
                 'title' => mt('businessprocess', 'Delete this node')
             ],
             Html::tag('i', ['class' => 'icon icon-cancel'])