[Grid Options] Fixes for saving grid configuration with "save filters" (#963)

* saved grid column config with "save filters":
- restore filters after loading
- store "save filters" in database
- add translation for "save filters"

* make it not requiring a migration in the core, revert part that display the clear filter button

* "critical" sonarcloud fix

---------

Co-authored-by: Ji Jia Jia <[email protected]>
(cherry picked from commit 23a65cc)

Author: BlackbitDevs

public/js/pimcore/element/helpers/gridConfigDialog.js

@@ -285,7 +285,7 @@ pimcore.element.helpers.gridConfigDialog = Class.create({
 
         this.saveFilters = new Ext.form.field.Checkbox(
             {
-                fieldLabel: "Save filters",
+                fieldLabel: t("save_filters"),
                 inputValue: true,
                 name: "saveFilters",
                 value: this.settings.saveFilters

public/js/pimcore/object/folder/search.js

@@ -283,7 +283,19 @@ pimcore.object.search = Class.create(pimcore.object.helpers.gridTabAbstract, {
                 let col = gridColumns[i];
                 if (col.filter) {
                     needGridFilter = true;
-                    break;
+
+                    if (this.filter) {
+                        const filterValue = this.filter.find(filter => filter.property === col.dataIndex)?.value || null;
+                        if (filterValue) {
+                            if (typeof col.filter !== "object") {
+                                col.filter = { type: col.filter };
+                            }
+
+                            col.filter.value = filterValue;
+                        }
+                    } else {
+                        break;
+                    }
                 }
             }
         }
@@ -340,11 +352,11 @@ pimcore.object.search = Class.create(pimcore.object.helpers.gridTabAbstract, {
 
         if (this.filter) {
             this.filter.forEach(filt => {
-                this.store.setFilters(new Ext.util.Filter(filt))
                 this.filterUpdateFunction(this.grid, this.toolbarFilterInfo, this.clearFilterButton);
             });
         }
 
+
         this.grid.on("columnmove", function () {
             this.saveColumnConfigButton.show()
         }.bind(this));

src/Model/GridConfig.php

@@ -45,7 +45,7 @@ class GridConfig extends AbstractModel
 
     protected bool $setAsFavourite = false;
 
-    protected bool $saveFilters = false;
+    protected ?bool $saveFilters = null;
 
     protected string $type = 'object';
 
@@ -199,6 +199,16 @@ public function setSetAsFavourite(bool $setAsFavourite): void
 
     public function isSaveFilters(): bool
     {
+        if ($this->saveFilters === null) {
+            $config = json_decode($this->getConfig());
+
+            if (isset($config->filter)) {
+                $this->saveFilters = (bool) $config->filter;
+            } else {
+                $this->saveFilters = false;
+            }
+        }
+
         return $this->saveFilters;
     }
 

src/Model/GridConfig/Dao.php

@@ -57,6 +57,12 @@ public function save(): int
             }
         }
 
+        if (!$gridconfigs['saveFilters']) {
+            $configData = json_decode($data['config'], true);
+            unset($configData['filter']);
+            $data['config'] = json_encode($configData);
+        }
+
         $lastInsertId = Helper::upsert($this->db, 'gridconfigs', $data, $this->getPrimaryKey('gridconfigs'));
         if ($lastInsertId !== null && !$this->model->getId()) {
             $this->model->setId((int) $lastInsertId);

translations/admin.en.yaml

@@ -581,6 +581,7 @@ restrict_to_locales: 'Restrict to locales'
 predefined: Predefined
 save_as_copy: 'Save as copy'
 set_as_favourite: 'Set as favourite'
+save_filters: Save filters
 grid_configuration: 'Grid Configuration'
 shared_users: 'Shared Users'
 shared_roles: 'Shared Roles'