fix Grid _q GET key /wo component name

atk4 · Apr 8, 2022 · 368a126 · 368a126
1 parent c45a786
commit 368a126
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/js/src/plugins/js-search.plugin.js b/js/src/plugins/js-search.plugin.js
@@ -192,8 +192,10 @@ export default class JsSearch extends atkPlugin {
    * @param options
    */
     doSearch(uri, query, options, cb = function () {}) {
+        const queryKey = this.settings.uri_query_key;
+
         if (query) {
-            options = $.extend(options, { _q: query });
+            options = $.extend(options, { [queryKey]: query });
         }
 
         if (this.settings.useAjax) {
@@ -207,7 +209,7 @@ export default class JsSearch extends atkPlugin {
                 onComplete: cb,
             });
         } else {
-            uri = $.atkRemoveParam(uri, '_q');
+            uri = $.atkRemoveParam(uri, queryKey);
             if (options.__atk_reload) {
                 delete options.__atk_reload;
             }
@@ -220,6 +222,7 @@ export default class JsSearch extends atkPlugin {
 JsSearch.DEFAULTS = {
     uri: null,
     uri_options: {},
+    uri_query_key: null,
     q: null,
     autoQuery: false,
     timeOut: 300,

diff --git a/public/atkjs-ui.min.js b/public/atkjs-ui.min.js
diff --git a/src/Grid.php b/src/Grid.php
@@ -111,7 +111,21 @@ protected function init(): void
             $this->stickyGet($this->paginator->name);
         }
 
-        $this->stickyGet('_q');
+        // TODO dirty way to set stickyGet - add addQuickSearch to find the expected search input component ID and then remove it
+        if ($this->menu !== false) {
+            $appUniqueHashesBackup = $this->getApp()->unique_hashes;
+            $menuElementNameCountsBackup = \Closure::bind(fn () => $this->_element_name_counts, $this->menu, AbstractView::class)();
+            try {
+                $menuRight = $this->menu->addMenuRight(); // @phpstan-ignore-line
+                $menuItemView = View::addTo($menuRight->addItem()->setElement('div'));
+                $quickSearch = JsSearch::addTo($menuItemView);
+                $this->stickyGet($quickSearch->name . '_q');
+                $this->menu->removeElement($menuRight->short_name);
+            } finally {
+                $this->getApp()->unique_hashes = $appUniqueHashesBackup;
+                \Closure::bind(fn () => $this->_element_name_counts = $menuElementNameCountsBackup, $this->menu, AbstractView::class)();
+            }
+        }
     }
 
     protected function initTable(): Table
@@ -314,16 +328,16 @@ public function addQuickSearch($fields = [], $hasAutoQuery = false)
         $view = View::addTo($this->menu
             ->addMenuRight()->addItem()->setElement('div'));
 
-        $q = trim($this->stickyGet('_q') ?? '');
+        $this->quickSearch = JsSearch::addTo($view, ['reload' => $this->container, 'autoQuery' => $hasAutoQuery]);
+        $q = trim($this->stickyGet($this->quickSearch->name . '_q') ?? '');
         if ($q !== '') {
             $scope = Model\Scope::createOr();
             foreach ($fields as $field) {
                 $scope->addCondition($field, 'like', '%' . $q . '%');
             }
             $this->model->addCondition($scope);
         }
-
-        $this->quickSearch = JsSearch::addTo($view, ['reload' => $this->container, 'autoQuery' => $hasAutoQuery, 'initValue' => $q]);
+        $this->quickSearch->initValue = $q;
     }
 
     /**

diff --git a/src/JsSearch.php b/src/JsSearch.php
@@ -87,6 +87,7 @@ protected function renderView(): void
         $this->js(true)->atkJsSearch([
             'uri' => $this->reload->jsUrl(),
             'uri_options' => array_merge(['__atk_reload' => $this->reload->name], $this->args),
+            'uri_query_key' => $this->name . '_q',
             'autoQuery' => $this->autoQuery,
             'q' => $this->initValue,
             'useAjax' => $this->useAjax,