ru.coon 2.8.39 → 2.8.40

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 2.8.40, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bc0448568232ca2c596981b5be2958423b37b25d)
+* ## Features
+* <span style='color:green'>feat: HT-11237: refactoring, fix bug on show by param</span> ([648ec9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/648ec982082f53a97615ff816bbee3b38da32efe))
+* <span style='color:green'>feat: HT-11237: refactoring, fix bug on show by param</span> ([cb3a84], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb3a84876a0d3c4b521e8ea024c0ba8dd1046d59))
+* <span style='color:green'>feat: HT-11237: refactoring, fix bug on show by param</span> ([a94d48], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a94d483235af416242a59940b5af180bd2573376))
+* <span style='color:green'>feat: HT-11237: refactoring, fix bug on show by param</span> ([defeb7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/defeb7353a40b93a6afef58eb2cf941bf855a04d))
+* <span style='color:green'>feat: HT-11237: refactoring, fix bug on show by param</span> ([e8d552], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e8d552e0094cf9e32e1c20652586ee8b8f9791ad))
+
+* ## Fixes
+* <span style='color:red'> HT-11130 FilterConditionToolbar location and width</span> ([9dddf6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9dddf6739c500bb2a1f5a2a6558a9021ff40f192))
+
+* update: CHANGELOG.md ([2191ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2191eceb941229d37de6cafd03e47132a38fe8ec))
+
 # Version 2.8.39, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4b6a41e64accf9c50f08e6404130431c4543fdb3)
 * ## Features
 * <span style='color:green'>feat: opa show user roles in roleEditPanel</span> ([78a03a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a03ac67f21b7d9053d7ec67c785f108ce65ad7))

package/package.json

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

package/src/report/component/reportpanel/FilterPanel.js

@@ -100,7 +100,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
         }
 
         if (currentLayout) {
-            height += currentLayout.height + 15;
+            height += currentLayout.height;
             this.items.push(currentLayout);
         }
         this.height = Math.max(height, 50);

package/src/report/component/reportpanel/NorthPanel.js

@@ -4,9 +4,8 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     xtype: 'NorthPanel',
     cls: 'NorthPanel',
     minimalHeight: 55,
-    alignButtons: -15,
     layout: {
-        type: 'hbox',
+        type: 'vbox',
         align: 'stretch',
     },
     tbar: {
@@ -46,13 +45,6 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             }
         ],
     },
-    bbar: {
-        hidden: true,
-        reference: 'bbar',
-        items: [{
-            xtype: 'tbfill',
-        }],
-    },
     requires: [
         'Coon.Function',
         'Coon.report.component.SimplestReportCombo',
@@ -76,7 +68,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }
         this.filterContainer.setHidden(btn.pressed);
         if (!btn.pressed) {
-            this.setHeight(this.getHeight()-15);
+            this.setHeight(this.getHeight());
         }
     },
     initComponent() {
@@ -121,8 +113,28 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         });
 
         this.items = [
-            this.filterContainer,
-            this.buttonsContainer
+            {
+                xtype: 'container',
+                reference: 'topContainer',
+                layout: {
+                    type: 'hbox',
+                    align: 'stretchmax',
+                },
+                items: [
+                    this.filterContainer,
+                    this.buttonsContainer
+                ],
+            },
+            {
+                xtype: 'container',
+                reference: 'bottomContainer',
+                layout: {
+                    type: 'hbox',
+                    align: 'stretch',
+                },
+                flex: 1,
+                hidden: true,
+            }
         ];
 
         /**
@@ -179,8 +191,8 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }, this);
 
         this.filterContainer.removeAll();
-        filterPanel.on('afterlayout', (cmp) => {
-            this.setHeight(Math.max(cmp.getHeight(), this.minimalHeight) + (this.tbarsHeight || this.alignButtons));
+        filterPanel.on('afterlayout', function(cmp) {
+            this.recalculateHeight(cmp.getHeight());
         }, this, {single: true});
         this.filterContainer.add(filterPanel);
         if (this.hideFilterButtons) {
@@ -198,16 +210,20 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         this.changeTbarStates();
     },
 
+    recalculateHeight(filterPanelHeight) {
+        this.setHeight(Math.max(filterPanelHeight, this.minimalHeight) + this.tbarsHeight);
+    },
+
     changeTbarStates() {
         if (!this.items) {
             return;
         }
         const tbar = this.down('[reference="tbar"]');
-        const bbar = this.down('[reference="bbar"]');
+        const bottomContainer = this.down('[reference="bottomContainer"]');
         let tbarsHeight = 0;
         const tbarH = 20;
-        const bbarH = 30;
-        if (!tbar || !bbar || this.hideFilterPanel) {
+        const bottomContainerH = 30;
+        if (!tbar || !bottomContainer || this.hideFilterPanel) {
             return;
         }
         if (this.enableHighlightingRequiredFields || this.getEnableChipToolbar()) {
@@ -222,31 +238,32 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }
         if (!this.filterConditionToolbar) {
             this.filterConditionToolbar = Ext.widget('FilterConditionToolbar', {
+                flex: 1,
                 closableFilterCondition: false,
                 searchForm: this,
             });
-            bbar.insert(0, this.filterConditionToolbar);
+            bottomContainer.add(this.filterConditionToolbar);
             this.chipsInit();
         }
         if (this.getEnableChipToolbar()) {
             this.down('[reference="toggleBtn"]').show();
+            bottomContainer.show();
             this.filterConditionToolbar.show();
             if (!this.buttonsContainer.hidden) {
-                bbar.add(this.buttonsContainer);
+                bottomContainer.add(this.buttonsContainer);
             }
-            tbarsHeight += bbarH;
-            bbar.show();
+            tbarsHeight += bottomContainerH;
             this.filterConditionToolbar.getController().addChangeReaction();
         } else {
             this.down('[reference="toggleBtn"]').hide();
-            bbar.hide();
+            bottomContainer.hide();
             if (!this.buttonsContainer.hidden) {
-                this.add(this.buttonsContainer);
+                this.down('[reference="topContainer"]').add(this.buttonsContainer);
             }
         }
         this.tbarsHeight = tbarsHeight;
         if (this.filterPanel.getEl()) {
-            this.setHeight(Math.max(this.filterPanel.getHeight(), this.minimalHeight) + (this.tbarsHeight || this.alignButtons));
+            this.recalculateHeight(this.filterPanel.getHeight());
         }
     },
 

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

@@ -45,43 +45,33 @@ Ext.define('Coon.report.plugin.grid.ControlColumnByParamPlugin', {
         const fields = this.grid.up('ReportPanel').filterContainer.query('field')
             .filter((field) => field.getValue && field.getValue())
             .map((field) => ({name: field.name, value: field.getValue()})) || [];
-        const columnsActions = this.valueConfig.reduce((res, item) => {
-            const columnName = item['columnName'];
-            const paramName = item['paramName'];
-            if (typeof res[columnName] === 'undefined') {
-                res[columnName] = {};
-                res[columnName][paramName] = 0;
+
+        const checkFn = (val, hideAction) => {
+            return (val === 'false' || val === '0' || !val) ? (hideAction ? 1 : 0): (hideAction ? 0 : 1);
+        };
+
+        const columnsActions = this.valueConfig.reduce((acc, item) => {
+            const columnName = item.columnName;
+            const paramName = item.paramName;
+            if (!Ext.isObject(acc[columnName])) {
+                acc[columnName] = {};
+                acc[columnName][paramName] = 0;
             }
             const filter = fields.filter((f) => f.name === paramName);
-            const hideAction = item['show'] === true;
-            const itemValue = (item['paramValue'] + '').trim().toLowerCase();
-            if (!filter.length) {
-                if (itemValue === 'false' || itemValue === '0' || !itemValue) {
-                    res[columnName][paramName] += (hideAction ? 1 : 0);
-                } else {
-                    res[columnName][paramName] += (hideAction ? 0 : 1);
-                }
+            const hideAction = item.show === true;
+            const itemValue = (item.paramValue + '').trim();
+
+            if (!filter.length || !(filter[0].value + '').trim()) {
+                acc[columnName][paramName] += checkFn(itemValue, hideAction);
             } else {
-                const filterValue = (filter.pop()['value'] + '').trim().toLowerCase();
-                if (!filterValue) {
-                    if (itemValue === 'false' || itemValue === '0' || !itemValue) {
-                        res[columnName][paramName] += (hideAction ? 1 : 0);
-                    } else {
-                        res[columnName][paramName] += (hideAction ? 0 : 1);
-                    }
+                const filterValue = (filter.pop().value + '').trim();
+                if (itemValue === 'false' || itemValue === '0' || !itemValue) {
+                    acc[columnName][paramName] += checkFn(filterValue, hideAction);
                 } else {
-                    if (itemValue === 'false' || itemValue === '0' || !itemValue) {
-                        if (filterValue === 'false' || filterValue === '0' || !filterValue) {
-                            res[columnName][paramName] += (hideAction ? 1 : 0);
-                        } else {
-                            res[columnName][paramName] += (hideAction ? 0 : 1);
-                        }
-                    } else {
-                        res[columnName][paramName] += (hideAction && filterValue === itemValue ? 1 : 0);
-                    }
+                    acc[columnName][paramName] += (filterValue === itemValue) ? (hideAction ? 1 : 0) : (hideAction ? 0 : 1);
                 }
             }
-            return res;
+            return acc;
         }, {});
         const me = this;
         Object.keys(columnsActions).forEach((columnName) => {

package/src/version.js

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