Standalone option for Adminer. Propagate querystring to parent from A…

…dminer iframe. Shift+Click to open links in full Adminer vs panel.
adrianbj · Apr 3, 2024 · c9cb067 · c9cb067
1 parent 50e4633
commit c9cb067
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 23 deletions.
diff --git a/ProcessTracyAdminer.module.php b/ProcessTracyAdminer.module.php
@@ -22,7 +22,24 @@ public static function getModuleInfo() {
     }
 
     public function ___execute() {
-        return '<iframe src="'.str_replace('/adminer/', '/adminer-renderer/', wire('input')->url(true)).'" style="width:100%; height:calc(100vh - 25px); border: none; padding:0; margin:0;"></iframe>';
+
+        $data = wire('modules')->getModuleConfigData('TracyDebugger');
+
+        if($data['adminerStandAlone']) {
+            return $this->wire('modules')->get('ProcessTracyAdminerRenderer')->execute();
+        }
+        else {
+            // push querystring to parent window
+            return '
+            <script>
+                window.addEventListener("message", function(event) {
+                    if(event.data != "") {
+                        history.pushState(null, null, "?"+event.data);
+                    }
+                });
+            </script>
+            <iframe src="'.str_replace('/adminer/', '/adminer-renderer/', $_SERVER['REQUEST_URI']).'" style="width:100%; height:calc(100vh - 25px); border: none; padding:0; margin:0;"></iframe>';
+        }
     }
 
 }
diff --git a/TracyDebugger.module.php b/TracyDebugger.module.php
@@ -27,7 +27,7 @@ public static function getModuleInfo() {
             'summary' => __('Tracy debugger from Nette with many PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/forum/58-tracy-debugger/',
-            'version' => '4.26.9',
+            'version' => '4.26.10',
             'autoload' => 100000, // in PW 3.0.114+ higher numbers are loaded first - we want Tracy first
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',
@@ -254,8 +254,9 @@ static public function getDefaultData() {
             "linksNewTab" => null,
             "pWInfoPanelLinksNewTab" => null,
             "customPWInfoPanelLinks" => array(11, 16, 22, 21, 29, 30, 31, 304),
-            "adminerThemeColor" => 'blue',
             "adminerEditFieldLink" => 1,
+            "adminerStandAlone" => null,
+            "adminerThemeColor" => 'blue',
             "adminerJsonMaxLevel" => 3,
             "adminerJsonInTable" => 1,
             "adminerJsonInEdit" => 1,
@@ -1148,10 +1149,12 @@ public function init() {
                         $event->page->addHookAfter('render', function($event) {
                             if(!$event->return) return;
 
-                            $adminerModuleId = $this->wire('modules')->getModuleID("ProcessTracyAdminerRenderer");
+                            $adminerRendererModuleId = $this->wire('modules')->getModuleID("ProcessTracyAdminerRenderer");
+                            $adminerRendererUrl = $this->wire('pages')->get("process=$adminerRendererModuleId")->url;
+                            $adminerModuleId = $this->wire('modules')->getModuleID("ProcessTracyAdminer");
                             $adminerUrl = $this->wire('pages')->get("process=$adminerModuleId")->url;
 
-                            $event->return = str_replace("</body>", "<script>window.AdminerUrl = '".$adminerUrl."'; window.TracyMaxAjaxRows = ".$this->data['maxAjaxRows']."; window.TracyPanelZIndex = " . ($this->data['panelZindex'] + 1) . ";</script></body>", $event->return);
+                            $event->return = str_replace("</body>", "<script>window.AdminerUrl = '".$adminerUrl."'; window.AdminerRendererUrl = '".$adminerRendererUrl."'; window.TracyMaxAjaxRows = ".$this->data['maxAjaxRows']."; window.TracyPanelZIndex = " . ($this->data['panelZindex'] + 1) . ";</script></body>", $event->return);
 
                             $tracyErrors = Debugger::getBar()->getPanel('Tracy:errors');
                             if(!is_array($tracyErrors->data) || count($tracyErrors->data) === 0) {
@@ -4033,26 +4036,35 @@ public function getModuleConfigInputfields(array $data) {
             $fieldset->label = __('Adminer panel', __FILE__);
             $wrapper->add($fieldset);
 
-            $f = $this->wire('modules')->get("InputfieldSelect");
-            $f->attr('name', 'adminerThemeColor');
-            $f->label = __('Theme color', __FILE__);
-            $f->addOption('blue', 'Blue');
-            $f->addOption('green', 'Green');
-            $f->addOption('orange', 'Orange');
-            $f->required = true;
-            $f->columnWidth = 50;
-            if($this->data['adminerThemeColor']) $f->attr('value', $this->data['adminerThemeColor']);
+            $f = $this->wire('modules')->get("InputfieldCheckbox");
+            $f->attr('name', 'adminerStandAlone');
+            $f->label = __('Standalone mode', __FILE__);
+            $f->description = __('Load Setup > Adminer in standalone mode.', __FILE__);
+            $f->notes = __('Adminer won\'t be embedded in PW admin via iframe.', __FILE__);
+            $f->columnWidth = 33;
+            $f->attr('checked', $this->data['adminerStandAlone'] == '1' ? 'checked' : '');
             $fieldset->add($f);
 
             $f = $this->wire('modules')->get("InputfieldCheckbox");
             $f->attr('name', 'adminerEditFieldLink');
             $f->label = __('Field edit links', __FILE__);
             $f->description = __('Add adminer links to each field in the page edit interface.', __FILE__);
             $f->notes = __('Will only appear when Adminer panel is enabled', __FILE__);
-            $f->columnWidth = 50;
+            $f->columnWidth = 34;
             $f->attr('checked', $this->data['adminerEditFieldLink'] == '1' ? 'checked' : '');
             $fieldset->add($f);
 
+            $f = $this->wire('modules')->get("InputfieldSelect");
+            $f->attr('name', 'adminerThemeColor');
+            $f->label = __('Theme color', __FILE__);
+            $f->addOption('blue', 'Blue');
+            $f->addOption('green', 'Green');
+            $f->addOption('orange', 'Orange');
+            $f->required = true;
+            $f->columnWidth = 33;
+            if($this->data['adminerThemeColor']) $f->attr('value', $this->data['adminerThemeColor']);
+            $fieldset->add($f);
+
             $f = $this->wire('modules')->get("InputfieldText");
             $f->attr('name', 'adminerJsonMaxLevel');
             $f->label = __('JSON max level', __FILE__);

diff --git a/panels/Adminer/plugins/AdminerProcessWireLogin.php b/panels/Adminer/plugins/AdminerProcessWireLogin.php
@@ -18,7 +18,7 @@ public function __construct($pwAdminUrl, $server = false, $db = false, $name = f
     public function head() {
     ?>
         <link rel="stylesheet" type="text/css" href="../../../site/modules/TracyDebugger/panels/Adminer/css/tweaks.css?v=1">
-        <script nonce="<?=get_nonce()?>" src="../../../site/modules/TracyDebugger/panels/Adminer/scripts/framed-check.js"></script>
+        <script nonce="<?=get_nonce()?>" src="../../../site/modules/TracyDebugger/panels/Adminer/scripts/main.js"></script>
     <?php
     }
 

diff --git a/panels/Adminer/scripts/framed-check.js b/panels/Adminer/scripts/framed-check.js
diff --git a/panels/Adminer/scripts/main.js b/panels/Adminer/scripts/main.js
@@ -0,0 +1,4 @@
+document.documentElement.className += (window.self == window.top ? " top" : " framed");
+
+const queryStr = new URLSearchParams(window.location.search).toString();
+window.parent.postMessage(queryStr, "*");
diff --git a/panels/AdminerPanel.php b/panels/AdminerPanel.php
@@ -23,8 +23,8 @@ public function getTab() {
 
     public function getPanel() {
 
-        $adminerModuleId = $this->wire('modules')->getModuleID("ProcessTracyAdminerRenderer");
-        $adminerUrl = $this->wire('pages')->get("process=$adminerModuleId")->url;
+        $adminerRendererModuleId = $this->wire('modules')->getModuleID("ProcessTracyAdminerRenderer");
+        $adminerRendererUrl = $this->wire('pages')->get("process=$adminerRendererModuleId")->url;
         $contextLink = '';
 
         if(\TracyDebugger::getDataValue('referencePageEdited') && $this->wire('input')->get('id') &&
@@ -128,7 +128,7 @@ public function getPanel() {
         if($this->wire('modules')->isInstalled("ProcessTracyAdminer")) {
             $out .= '
             <div class="tracy-inner" style="padding: 0 !important">
-                <iframe id="adminer-iframe" src="'.$adminerUrl.'?iframe=1'.$contextLink.'" style="width:100%; height:calc(100% - 5px); border: none; padding:0; margin:0;"></iframe>';
+                <iframe id="adminer-iframe" src="'.$adminerRendererUrl.'?iframe=1'.$contextLink.'" style="width:100%; height:calc(100% - 5px); border: none; padding:0; margin:0;"></iframe>';
         }
         else {
             $out .= '

diff --git a/scripts/adminer.js b/scripts/adminer.js
@@ -1,5 +1,5 @@
 function openAdminer(queryStr) {
-    var url = window.AdminerUrl + "?" + queryStr;
+    var url = window.AdminerRendererUrl + "?" + queryStr;
     if(document.getElementById("tracy-debug-panel-AdminerPanel").classList.contains("tracy-mode-window")) {
         document.getElementById('adminer-iframe').src = url;
     }
@@ -18,7 +18,6 @@ function openAdminer(queryStr) {
         }
     }
 }
-
 document.body.addEventListener("click", function(e) {
     if(e.target) {
         var curEl = e.target;
@@ -28,7 +27,11 @@ document.body.addEventListener("click", function(e) {
         if(curEl && curEl.href && curEl.href.indexOf("adminer://") !== -1) {
             e.preventDefault();
             var queryStr = curEl.href.split('?')[1];
-            openAdminer(queryStr);
+            if (e.shiftKey) {
+                window.location = curEl.href.replace("adminer://", window.AdminerUrl);
+            } else {
+                openAdminer(queryStr);
+            }
         }
     }
 });