ru.coon 2.8.9 → 2.8.10

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.8.10, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e5df23b8ccf59593d1960052c5f2598da9d4b7d)
+* ## Fixes
+* <span style='color:red'> HT-10125: work with AddFilterConditionPlugin</span> ([a68af5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a68af5071134224930c1c771dd93d623c29d51c3))
+* <span style='color:red'> HT-10125: add clear filter button as last item element</span> ([b0a942], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b0a942028e0a3f11dc025c0a555b93c92035ff94))
+
+* update: CHANGELOG.md ([8f445c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8f445c10774a121e821be110d86d7ade2f1dbfcc))
+
 # Version 2.8.9, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7caa6346a23d956edb83477128e8a326b3161d6)
 * ## Fixes
 * <span style='color:red'> HT-10322: add tooltip</span> ([ed47ca], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed47cab60d0baee4710dcda242139b18a37d0336))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.8.9",
+  "version": "2.8.10",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/report/component/ClearFiltersButton.js

@@ -13,7 +13,10 @@ Ext.define('Coon.report.component.ClearFiltersButton', {
     toolbar: null,
     grid: null,
     handler() {
-        this.grid && this.grid.clearFilters();
+        if (this.grid) {
+            this.grid.clearFilters();
+            this.grid.fireEvent('clearAllFilters');
+        }
     },
     initComponent() {
         this.callParent();

package/src/report/component/ReportPanel.js

@@ -493,12 +493,14 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     createTopToolbar(items) {
-        return this.gridTopToolbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [{
-            xtype: 'tbfill',
-            position: 997,
-        }, {
-            xtype: 'ClearFiltersButton',
-        }].concat(items || [])});
+        return this.gridTopToolbar = Ext.create({
+            xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || []).concat([{
+                xtype: 'tbfill',
+                position: 997,
+            }, {
+                xtype: 'ClearFiltersButton',
+            }]),
+        });
     },
     createBottomToolbar(items) {
         return this.gridBottomToolbar =Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});

package/src/report/plugin/grid/AddFilterConditionPlugin.js

@@ -11,6 +11,7 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
 
     init: function(grid) {
         this.grid = grid;
+        this.grid.on('clearAllFilters', this.clearAllFilters, this);
         grid.on('added', function(grid) {
             const contextMenu = grid.contextMenu;
             contextMenu.add(new Ext.menu.Item({

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.8.9',
+    number: '2.8.10',
 });