Transform compat action & notes url macros automatically

Icinga · Sep 27, 2023 · 2db18fd · 2db18fd
1 parent cd41a20
commit 2db18fd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/library/Icingadb/Common/Macros.php b/library/Icingadb/Common/Macros.php
@@ -5,6 +5,8 @@
 namespace Icinga\Module\Icingadb\Common;
 
 use Icinga\Application\Logger;
+use Icinga\Module\Icingadb\Compat\CompatHost;
+use Icinga\Module\Icingadb\Compat\CompatService;
 use Icinga\Module\Icingadb\Model\Host;
 use ipl\Orm\Model;
 use ipl\Orm\Query;
@@ -18,11 +20,11 @@ trait Macros
      * Get the given string with macros being resolved
      *
      * @param string $input  The string in which to look for macros
-     * @param Model  $object The host or service used to resolve the macros
+     * @param Model|CompatService|CompatHost $object The host or service used to resolve the macros
      *
      * @return string
      */
-    public function expandMacros(string $input, Model $object): string
+    public function expandMacros(string $input, $object): string
     {
         if (preg_match_all('@\$([^\$\s]+)\$@', $input, $matches)) {
             foreach ($matches[1] as $key => $value) {
@@ -40,11 +42,11 @@ public function expandMacros(string $input, Model $object): string
      * Resolve a macro based on the given object
      *
      * @param string $macro  The macro to resolve
-     * @param Model  $object The host or service used to resolve the macros
+     * @param Model|CompatService|CompatHost  $object The host or service used to resolve the macros
      *
      * @return string
      */
-    public function resolveMacro(string $macro, Model $object): string
+    public function resolveMacro(string $macro, $object): string
     {
         if ($object instanceof Host) {
             $objectType = 'host';

diff --git a/library/Icingadb/Widget/Detail/ObjectDetail.php b/library/Icingadb/Widget/Detail/ObjectDetail.php
@@ -20,6 +20,7 @@
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Common\Macros;
 use Icinga\Module\Icingadb\Compat\CompatHost;
+use Icinga\Module\Icingadb\Compat\CompatService;
 use Icinga\Module\Icingadb\Model\CustomvarFlat;
 use Icinga\Module\Icingadb\Web\Navigation\Action;
 use Icinga\Module\Icingadb\Widget\MarkdownText;
@@ -132,8 +133,10 @@ protected function createActions()
             $item->setObject($this->object);
         }
 
+        $monitoringInstalled = Icinga::app()->getModuleManager()->hasInstalled('monitoring');
+        $obj = $monitoringInstalled ? $this->compatObject() : $this->object;
         foreach ($this->object->action_url->first()->action_url ?? [] as $url) {
-            $url = $this->expandMacros($url, $this->object);
+            $url = $this->expandMacros($url, $obj);
             $navigation->addItem(
                 Html::wantHtml([
                     // Add warning to links that open in new tabs, as recommended by WCAG20 G201
@@ -320,8 +323,10 @@ protected function createNotes()
         $navigation = new Navigation();
         $notes = trim($this->object->notes);
 
+        $monitoringInstalled = Icinga::app()->getModuleManager()->hasInstalled('monitoring');
+        $obj = $monitoringInstalled ? $this->compatObject() : $this->object;
         foreach ($this->object->notes_url->first()->notes_url ?? [] as $url) {
-            $url = $this->expandMacros($url, $this->object);
+            $url = $this->expandMacros($url, $obj);
             $navigation->addItem(
                 Html::wantHtml([
                     // Add warning to links that open in new tabs, as recommended by WCAG20 G201