ru.coon 2.7.48 → 2.7.49

package/CHANGELOG.md

@@ -1,17 +1,24 @@
-<<<<<<< HEAD
-# Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19e7bc15c819e0dda639b962060e1993b1f29b6b)
-* upd ([b76ef9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b76ef97561c257ff2c4956cebd21a69813219c2a))
-* sync ([31dbbf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/31dbbf2431bf2bbc6aff326d50edc1fd61af841d))
-=======
+# Version 2.7.49, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1191865e9e52331596a93e7bcf3ba36c85940f6)
+* ## Fixes
+* <span style='color:red'> HT-9084 ReportColumnStatePlugin column width</span> ([b10a75], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b10a75f78f92262543be268863961fda1113d9d5))
+
+* improve custom panel plugin tracing ([ed6206], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed62065b34ebb04520b62f6fce269e4d4cbb6d21))
+* upd ([57157a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57157acdd88c0fa6702e5c5cbd321bc89d840d09))
+* update: CHANGELOG.md ([ee1e7e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee1e7e89e565e1b5514a5ee284c938b1e138e612))
+
 # Version 2.7.47, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83d7e98c91d4219f3d673decd3ebae65144e77a3)
 * update: CHANGELOG.md ([e32b02], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e32b025afe52cc55930d04bccba9fd19be5905b9))
 
 # Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/236b6e13be06add8fe0eeab8b079e086e1d8b524)
+* :feat HT-8890 update extjs_iconpack to 1.3.27 ([108b17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/108b17bbd73ed4064b884baa8633b0ceb9981048))
+* update: CHANGELOG.md ([c2d8dd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2d8dde1d050e900e2cd6fec5ded2c94c38050f0))
+
+# Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19e7bc15c819e0dda639b962060e1993b1f29b6b)
 * ## Features
 * <span style='color:green'>feat: extjs_iconpack version 1.3.26. Related to HT-8076.</span> ([4800c2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4800c23beff6959619ff467bbcb6c7fc30afb188))
 
-* :feat HT-8890 update extjs_iconpack to 1.3.27 ([108b17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/108b17bbd73ed4064b884baa8633b0ceb9981048))
->>>>>>> ee1e7e89e565e1b5514a5ee284c938b1e138e612
+* upd ([b76ef9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b76ef97561c257ff2c4956cebd21a69813219c2a))
+* sync ([31dbbf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/31dbbf2431bf2bbc6aff326d50edc1fd61af841d))
 * update: CHANGELOG.md ([c9af96], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c9af967e425b3f60570f9bf2198c105c7480f8e6))
 
 # Version 2.7.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6d09543c991b7ecfb2ea0f7e4369298dbfd2327f)

package/package.json

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

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

@@ -51,7 +51,7 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
             const currentColumnState = {
                 columnId: e.dataIndex,
                 position: e.fullColumnIndex,
-                width: e.getWidth(),
+                width: e.width,
                 hidden: e.getHidden(),
             };
             currentState.push(currentColumnState);

package/src/uielement/component/UiCustomPanel.js

@@ -21,9 +21,7 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
                 const win = Ext.create({xtype: 'UiCustomPanelTraceWindow'});
                 if (win.isTraceEnabled(scope)) {
                     const traceBuffer = scope.getTraceBuffer();
-                    win.down('grid')
-                        .getStore()
-                        .loadData(traceBuffer.getElements());
+                    win.loadLogs(traceBuffer.getElements());
                     win.show();
                 }
             },

package/src/uielement/component/UiCustomPanelTraceWindow.js

@@ -19,6 +19,7 @@ Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
     items: [
         {
             xtype: 'gridpanel',
+            itemId: 'logs',
             flex: 1,
             split: true,
             width: 500,
@@ -26,15 +27,61 @@ Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
                 type: 'json',
             },
             columns: [
-                {xtype: 'datecolumn', dataIndex: 'time', text: 'время', flex: 1, format: 'h:m:s.u'},
+                {
+                    dataIndex: 'time',
+                    text: 'метка времени, ms',
+                    flex: 1,
+                    renderer(v) {
+                        return v ? `${v / 1000} sec` : '-';
+                    },
+                },
                 {dataIndex: 'ptype', text: 'плагин', flex: 1},
-                {dataIndex: 'handlerName', text: 'название обработчика', flex: 1}
+                {
+                    dataIndex: 'handlerName',
+                    text: 'название обработчика',
+                    flex: 1,
+                    renderer(v, meta, record) {
+                        if (record.get('entryCount') > 1) {
+                            meta.tdStyle = 'color: orange';
+                        }
+                        return v;
+                    },
+                }
             ],
         },
         {
-            xtype: 'UiAceEditor',
-            readOnly: true,
+            xtype: 'panel',
             flex: 1,
+            title: 'входные параметры плагина',
+            layout: 'fit',
+            bodyPadding: 8,
+            items: [
+                {
+                    xtype: 'UiAceEditor',
+                    readOnly: true,
+                    flex: 1,
+                }
+            ],
+        },
+        {
+            xtype: 'gridpanel',
+            disabled: true,
+            title: 'все вхождения плагина',
+            width: 220,
+            itemId: 'repeatedOccurrences',
+            columns: [
+                {
+                    dataIndex: 'time',
+                    text: 'метка времени, ms',
+                    flex: 1,
+                    renderer(v) {
+                        return v ? `${v / 1000} sec` : '-';
+                    },
+                }
+            ],
+            store: {
+                type: 'array',
+            },
         }
     ],
 
@@ -70,11 +117,44 @@ Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
         return unpack(args);
     },
 
+    getLogKey(record) {
+        const {ptype, handlerName} = record.getData ? record.getData() : record;
+        return `${ptype}:${handlerName}`;
+    },
+
+    loadLogs(logs) {
+        const startTime = logs[0] && logs[0].time;
+        logs = logs.map((log) => {
+            log.time = log.time - startTime;
+            return log;
+        });
+        this.logMap = logs.reduce((acc, el, idx) => {
+            el.index = idx;
+            const logs = acc.get(this.getLogKey(el)) || [];
+            logs.push(el);
+            acc.set(this.getLogKey(el), logs);
+            return acc;
+        }, new Map());
+        logs = logs.map((el) => {
+            el.entryCount = (this.logMap.get(this.getLogKey(el)) || []).length;
+            return el;
+        });
+        this.logGrid.getStore().loadData(logs);
+    },
+
     initComponent() {
         this.callParent();
         const viewer = this.down('UiAceEditor');
-        const grid = this.down('gridpanel');
-        grid.on('select', function(_, record) {
+        this.logGrid = this.down('gridpanel#logs');
+        const repeatedOccurrenceGrid = this.down('gridpanel#repeatedOccurrences');
+        repeatedOccurrenceGrid.on('select', function(_, record) {
+            const selected = this.logGrid.getStore().getRange().find((el) => record.get('index') === el.get('index'));
+            selected && this.logGrid.getSelectionModel().select(selected);
+        }, this);
+        this.logGrid.on('select', function(_, record) {
+            const occurrences = this.logMap.get(this.getLogKey(record)) || [];
+            repeatedOccurrenceGrid.getStore().loadData(occurrences);
+            repeatedOccurrenceGrid.setDisabled(occurrences.length < 2);
             viewer.setValue(this.convertArgs(record.data.args));
         }, this);
     },

package/src/uielement/plugin/CustomPanelPlugin.js

@@ -44,6 +44,11 @@ Ext.define('Coon.uielement.plugin.CustomPanelPlugin', {
             handlerName: this.handlerName && this.handlerName.toString() || '-/-',
             args,
         });
+        Coon.log.debug('trace:', {
+            ptype: this.getPtype(),
+            handlerName: this.handlerName && this.handlerName.toString() || '-/-',
+            args,
+        });
     },
 
     logTraceMessages(msg) {

package/src/version.js

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