Dry refactor getUserThemeMode

Author: martialblog

application/controllers/IcingadbimgController.php

@@ -92,7 +92,7 @@ public function init()
             $this->defaultDashboardPanelId
         );
         $this->defaultOrgId = $this->myConfig->get('defaultorgid', $this->defaultOrgId);
-        $this->grafanaTheme = $this->getUserThemeMode();
+        $this->grafanaTheme = Util::getUserThemeMode(Auth::getInstance()->getUser());
         $this->height = $this->myConfig->get('height', $this->height);
         $this->width = $this->myConfig->get('width', $this->width);
         $this->proxyTimeout = $this->myConfig->get('proxytimeout', $this->proxyTimeout);
@@ -354,26 +354,4 @@ private function getMyimageHtml($serviceName, $hostName, &$imageHtml)
         $imageHtml = $result;
         return true;
     }
-
-    /**
-     * getUserThemeMode returns the users configured Theme Mode.
-     * Since we cannot handle the 'system' setting (it's client-side),
-     * we default to 'dark'.
-     * @return string
-     */
-    private function getUserThemeMode(): string
-    {
-        $mode = 'dark';
-
-        if ($user = Auth::getInstance()->getUser()) {
-                $mode = $user->getPreferences()->getValue('icingaweb', 'theme_mode', $mode);
-        }
-
-        // Could be system, which we cannot handle since it's browser-side
-        if (!in_array($mode, ['dark', 'light'])) {
-            $mode = 'dark';
-        }
-
-        return $mode;
-    }
 }

library/Grafana/Helpers/Util.php

@@ -2,6 +2,8 @@
 
 namespace Icinga\Module\Grafana\Helpers;
 
+use Icinga\User;
+
 class Util
 {
     public static function graphiteReplace(string $string = ''): string
@@ -10,4 +12,28 @@ public static function graphiteReplace(string $string = ''): string
 
         return $string;
     }
+
+    /**
+     * getUserThemeMode returns the users configured Theme Mode.
+     * Since we cannot handle the 'system' setting (it's client-side),
+     * we default to 'dark'.
+     *
+     * @param User $user
+     * @return string
+     */
+    public static function getUserThemeMode(User $user): string
+    {
+        $mode = 'dark';
+
+        if (isset($user)) {
+            $mode = $user->getPreferences()->getValue('icingaweb', 'theme_mode', $mode);
+        }
+
+        // Could be system, which we cannot handle since it's browser-side
+        if (!in_array($mode, ['dark', 'light'])) {
+            $mode = 'dark';
+        }
+
+        return $mode;
+    }
 }

library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php

@@ -127,7 +127,7 @@ protected function init()
         );
 
         $this->defaultOrgId = $this->config->get('defaultorgid', $this->defaultOrgId);
-        $this->grafanaTheme = $this->getUserThemeMode();
+        $this->grafanaTheme = Util::getUserThemeMode(Auth::getInstance()->getUser());
         $this->height = $this->config->get('height', $this->height);
         $this->width = $this->config->get('width', $this->width);
 
@@ -781,26 +781,4 @@ private function createDebugTable()
 
         return $grafanaTable;
     }
-
-    /**
-     * getUserThemeMode returns the users configured Theme Mode.
-     * Since we cannot handle the 'system' setting (it's client-side),
-     * we default to 'dark'.
-     * @return string
-     */
-    private function getUserThemeMode(): string
-    {
-        $mode = 'dark';
-
-        if ($user = Auth::getInstance()->getUser()) {
-                $mode = $user->getPreferences()->getValue('icingaweb', 'theme_mode', $mode);
-        }
-
-        // Could be system, which we cannot handle since it's browser-side
-        if (!in_array($mode, ['dark', 'light'])) {
-            $mode = 'dark';
-        }
-
-        return $mode;
-    }
 }