ru.coon 3.0.62 → 3.0.67

package/CHANGELOG.md

@@ -1,7 +1,29 @@
-# Version 3.0.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/84377986f250a0a6d0428be0f0b4439bc8e4b080)
-* sync ([368524], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/368524d52dd3f4fe03818291c6418246af14d81f))
-* sync ([7896b3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7896b3427c19ff691b961deca2c28bac9e39145d))
-* sync ([aa2c61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa2c61b0e9f0d57e1f8fa1a5a47231cc70cc7813))
+# Version 3.0.67, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d850ee12048246ba85557eef4475595043fc9d00)
+* HT-14811: исправление открытия редактора для характеристик FKV ([becf94], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/becf94689878553b8c8287c6260ca986a314b08e))
+* update: CHANGELOG.md ([ef54a3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ef54a339c72c36ce13a27672dff3cf89e35ddded))
+
+# Version 3.0.66, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/75bb3540f20b528ed830505b80d99216d572121c)
+* HT-14811: доработан внешний вид и открытие на редактирование характеристик FKV ([c55804], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c558045e343890c69c03801984b203b238cae552))
+* update: CHANGELOG.md ([dd323a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dd323a40af65c90d5ac4e59b03d48f365cbf003f))
+
+# Version 3.0.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b313f77a0208579201ce66ff042e5f548b54533d)
+* ## Fixes
+* <span style='color:red'> validator.mixin</span> ([8eadf3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eadf3f0b3b2843e2ea42bc3e577ed6db9f1b62b))
+
+* update: CHANGELOG.md ([196fe2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/196fe2b32f8bacb0551b5517ce7b458548945f6a))
+
+# Version 3.0.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/977abbf84dfd6b813420431d11c1202170cd2fe8)
+* ## Fixes
+* <span style='color:red'>fix show title only with staticText</span> ([05d479], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/05d479ef92447495d4246dda085656e2042b0889))
+
+* update: CHANGELOG.md ([9b97b4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9b97b4c4ca9abfda170712cf594ffb725b9e9f03))
+
+# Version 3.0.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb48b260e66b233a4cad92d0d856d0d8da4c021b)
+# Version 3.0.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8f3faa85fc70860397b0074b43d93aa9b9ffa00)
+* ## Fixes
+* <span style='color:red'>fix csrf in ReportTreeStore</span> ([cb402a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb402a1790a7b1081a5e8a17968db947ba583df9))
+
+* HT-14775 fix: Исправление ширины системного тулбара ([bdd783], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bdd7836f8eef889ec642e486e896d3910eeb1850))
 * update: CHANGELOG.md ([0624d1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0624d16d97c878b4e695b775a6a08cb00d3f12bd))
 
 # Version 3.0.61, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a79e6af1f962bbf5062d7a242281b679c4b0f35)
@@ -16,11 +38,6 @@
 
 * HT-13993 добавлена боковая панель фильтров для репортов ([e2d5c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e2d5c7436900d232cd48c9389a685affbacf721a))
 * HT-14628 открытие компонента внутри репорта - закрытие через крестик ([fc4f4e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fc4f4e9112a3ba1a85cb4a064d65d7a7cfb8cec1))
-* prerelease urls ([da6a94], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da6a94022df090290d9ff8f7ae96adf2f486fed8))
-* sync ([4f0a82], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f0a82ba634e89ef75c8c7006d691725c5252ba1))
-* sync ([f650de], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f650de035c4135485bbe05745b372095d807c565))
-* upd ([47ade3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/47ade3ed0f9782d87c3271b98fa746cb1f4d9157))
-* upd ([7f6bc5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7f6bc58a66df2cac0f35853416c2ef3a0c9a8455))
 * update: CHANGELOG.md ([e42a2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e42a2a6fb8b511ba174ab5060fc84c683a046945))
 
 # Version 3.0.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/065a134b1f6c6211d56ef758b127778d5e104faa)

package/package.json

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

package/src/app/Application.js

@@ -7,8 +7,6 @@ Ext.define('Coon.app.Application', {
         applicationMainView: null,
     },
 
-    links: {},
-
     init() {
         this.appRouter = Coon.app.Router;
     },
@@ -258,6 +256,7 @@ Ext.define('Coon.app.Application', {
     },
 
     launch: function() {
+        this.appRouter.onBeforeRouteEnterFn = this.isAuthenticated.bind(this);
         Ext.on('auth:logout', this.onLogout, this);
         let jwtToken;
         let beforeAuth = () => Promise.resolve();

package/src/app/Router.js

@@ -1,8 +1,6 @@
 Ext.define('Coon.app.Router', {
     mixins: ['Ext.route.Mixin'],
     singleton: true,
-
-    maxUrlLength: 2048,
     constructor() {
         this.setRoutes({
             '*': {before: 'onAny'},
@@ -10,17 +8,6 @@ Ext.define('Coon.app.Router', {
                 action: 'onRouteEnter',
                 before: 'validateMenuItem',
             },
-            'route/:{cmpId}?:{parameters}': {
-                action: 'onSpecificRoute',
-                conditions: {
-                    parameters: {
-                        re: '(.*)?',
-                        parse: function(values) {
-                            return Ext.isEmpty(values) ? {} : Ext.urlDecode(values);
-                        },
-                    },
-                },
-            },
         });
         Ext.on('router:goToLastRoute', () => {
             this.onRouteEnter(this.lastRoute);
@@ -29,27 +16,9 @@ Ext.define('Coon.app.Router', {
 
     lastRoute: null,
 
-    onSpecificRoute(route) {
-        route.urlHash = window.location.hash;
-        if (route.urlHash.length > Coon.app.Router.maxUrlLength) {
-            return;
-        }
-
-        if (this.getRouterView()) {
-            Ext.create('Coon.common.component.OpenComponent', {})
-                .loadUIElement(route.cmpId, route.parameters, {urlHash: route.urlHash});
-        } else {
-            Ext.getApplication().on('centerview:init', () => {
-                Ext.create('Coon.common.component.OpenComponent', {})
-                    .loadUIElement(route.cmpId, route.parameters, {urlHash: route.urlHash});
-            });
-        }
-    },
-
     onAny(action) {
         if (Ext.getApplication().isAuthenticated()) {
             action.resume();
-            return true;
         } else {
             Coon.log.debug('beforeAnyRoute: not authorized');
             if (action.stop) {
@@ -77,7 +46,6 @@ Ext.define('Coon.app.Router', {
                 route.stop();
                 return;
             }
-            route.urlHash = window.location.hash;
             return true;
         } catch (ex) {
             route.stop();
@@ -85,6 +53,24 @@ Ext.define('Coon.app.Router', {
         }
     },
 
+    onBeforeRouteEnterFn: null,
+
+    onBeforeRouteEnter() {
+        if (typeof this.onBeforeRouteEnterFn === 'function') {
+            return this.onBeforeRouteEnterFn();
+        }
+        return true;
+    },
+
+    onBeforeRouteEnterFailedFn: null,
+
+    onBeforeRouteEnterFailed() {
+        if (typeof this.onBeforeRouteEnterFailedFn === 'function') {
+            return this.onBeforeRouteEnterFailedFn();
+        }
+        return true;
+    },
+
     getLastRoute() {
         return this.lastRoute;
     },
@@ -99,7 +85,7 @@ Ext.define('Coon.app.Router', {
     },
 
     getRouterView() {
-        return Ext.getApplication().links && Ext.getApplication().links.centerView;
+        return Ext.ComponentQuery.query('centerview')[0];
     },
 
     getActiveComponent() {
@@ -117,12 +103,4 @@ Ext.define('Coon.app.Router', {
         return jwtToken;
     },
 
-    assign(urlHash) {
-        if (urlHash.length <= Coon.app.Router.maxUrlLength) {
-            window.location.assign(urlHash);
-        } else {
-            Coon.log.debug('urlHash too long');
-        }
-    },
-
 });

package/src/app/viewPort/CenterView.js

@@ -32,17 +32,14 @@ Ext.define('Coon.app.viewPort.CenterView', {
 
     initComponent() {
         this.callParent();
-        Ext.getApplication().links.centerView = this;
+
         Ext.on('route:change', this.setMenuComponent, this);
+
         this.on('beforeadd', function() {
             return !this.isTabLimit();
         }, this);
+
         this.on('add', function(_, component) {
-            component.on('activate', function(component) {
-                if (typeof component.urlHash === 'string' && component.urlHash.startsWith('#')) {
-                    Coon.app.Router.assign(component.urlHash);
-                }
-            }, this);
             component.on('render', function() {
                 this.setScrollButtonVisibility();
             }, this, {single: true});
@@ -50,8 +47,6 @@ Ext.define('Coon.app.viewPort.CenterView', {
         this.on('remove', function() {
             this.setScrollButtonVisibility();
         }, this);
-
-        Ext.getApplication().fireEvent('centerview:init');
     },
 
     setScrollButtonVisibility() {

package/src/common/ComponentFactory.js

@@ -161,7 +161,6 @@ Ext.define('Coon.common.ComponentFactory', {
         }
         const instanceConfig = {
             xtype: 'CVWrapperPanel',
-            urlHash: route.urlHash,
             closable: true,
             componentContext: config.componentContext,
             menuItem: config.menuItem,

package/src/common/component/characteristic/characteristicGroup/EntityGroupCharacteristicEditor.js

@@ -200,10 +200,16 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
                     if (context.field === 'mask') {
                         const editor = context.record.get('editor');
                         if (editor) {
-                            const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]].prototype;
-                            if (Ext.isObject(proto.editorOptions)) {
-                                context.column.field.triggers.info.show();
+                            const editorClass = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]];
+                            if (editorClass) {
+                                const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]].prototype;
+                                if (Ext.isObject(proto.editorOptions)) {
+                                    context.column.field.triggers.info.show();
+                                } else {
+                                    context.column.field.triggers.info.hide();
+                                }
                             } else {
+                                console.error(`Редактор ${editor} не найден.`);
                                 context.column.field.triggers.info.hide();
                             }
                         } else {

package/src/common/component/editor/CharacteristicGridEditor.js

@@ -226,6 +226,15 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
                     } else {
                         visibleValue = '';
                     }
+                } else if (record.get('entity') == 'FKV') {
+                    const mask = record.get('mask');
+                    const maskText = mask.match(/link:"(.*?)"/);
+                    if (maskText) {
+                        meta.tdCls += ' FVK-cell_link';
+                        visibleValue = maskText[1];
+                    } else {
+                        visibleValue = val;
+                    }
                 } else if (record.get(ns.$entity) === 'FLV' && !Ext.isEmpty(val)) {
                     visibleValue = val.substring(40);
                 } else {
@@ -237,6 +246,9 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
                 return Coon.format.withHint(visibleValue, visibleValue || tooltip);
             },
             getEditor: function(record) {
+                if ((record.get('entity') === 'FKV') && record.get('mask')) {
+                    return false;
+                }
                 return Ext.create('Ext.grid.CellEditor', {
                     field: Ext.create('Ext.form.field.Text', {
                         allowBlank: false,

package/src/common/component/editor/CharacteristicGridEditor.scss

@@ -59,6 +59,16 @@
       }
     }
   }
+
+  .FVK-cell_link {
+    span {
+      color: #0B57D0;
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+  }
 }
 
 .CharacteristicGridEditor {

package/src/common/component/editor/TypedCharacteristicEditor.js

@@ -92,6 +92,8 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
 
         this.on('edit', this.afterEditHandler, this);
         this.factory = this.createFactory();
+
+        this.on('cellclick', this.cellclickHandler, this);
     },
 
     createAdditionButtons: function() {
@@ -292,6 +294,14 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         }
     },
 
+    cellclickHandler(cmp, td, cellIndex, record) {
+        if (this.isEditableChar(record)) {
+            if ((record.get('entity') === 'FKV') && record.get('mask')) {
+                this.prepareType(record);
+            }
+        }
+    },
+
     // private
     calculateState: function() {
         if (this.addTypeButton) {

package/src/report/component/ReportPanel.js

@@ -1033,7 +1033,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         if (params.bar.items.length === 1) {
             return;
         }
-        params.bar.items.doSort((a, b) => {
+        params.bar.items.sortBy((a, b) => {
             if (a.position !== b.position) {
                 if (a.position < b.position) {
                     return -1;

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

@@ -16,6 +16,9 @@ Ext.define('Coon.report.component.reportpanel.ReportTreeStore', {
         getMethod: function() {
             return 'POST';
         },
+        getHeaders: function() {
+            return {'X-CSRF-Token': localStorage.getItem('CSRFToken')};
+        },
         url: 'ReportFormData/get',
         reader: {
             type: 'json',

package/src/report/plugin/configPanel/ControlColumnByParamPluginConfigPanel.js

@@ -92,21 +92,6 @@ Ext.define('Coon.report.plugin.configPanel.ControlColumnByParamPluginConfigPanel
         ];
     },
 
-    addHandler: function(btn) {
-        const grid = btn.up('panel').down('gridpanel');
-        grid.getStore().add({paramValue: ''});
-        const editor = grid.findPlugin('cellediting');
-        editor.startEditByPosition({row: this.getStore().getCount() - 1, column: 0});
-    },
-
-    deleteHandler: function(btn) {
-        const grid = btn.up('panel').down('gridpanel');
-        const record = grid.getSelectionModel().getSelection()[0];
-        if (record) {
-            grid.getStore().remove(record);
-        }
-    },
-
     doInit: function(config) {
         this.grid.doInit(config['valueConfig']);
     },

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

@@ -108,7 +108,6 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
 
     computeInteractUIState() {
         const state = {disabled: false, hidden: !!this.invisibleByDefault};
-
         if (this.isButtonAdded()) {
             if (!this.dependOnGridParameters && !this.dependOnGridRow) {
                 return state;
@@ -120,9 +119,20 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             state.disabled = this.isFilterDependedParamEmpty();
         }
 
-        if (!state.disabled && this.dependOnGridRow && this.isValidForRequiredParametersChecking()) {
-            const isRequiredParametersPassed = this.isRequiredParametersPassed();
-            state.disabled = this.skipRowValueCheck ? false : !isRequiredParametersPassed;
+        if (
+            !state.disabled &&
+            this.inputParametersConfig.haveRequiredReportParameters
+        ) {
+            state.disabled = !this.isRequiredParametersPassed('PRM');
+        }
+
+        if (
+            !state.disabled &&
+            this.dependOnGridRow &&
+            this.isValidForRequiredParametersChecking()
+        ) {
+            const isRequiredFLDParametersPassed = this.isRequiredParametersPassed('FLD');
+            state.disabled = this.skipRowValueCheck ? false : !isRequiredFLDParametersPassed;
         }
 
         state.hidden = this.isButtonHidden(state.disabled);
@@ -179,12 +189,27 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
      */
     computeRowInteractState() {
         let rowInteractEnabled= this.isRowInteractBySelection();
-        if (rowInteractEnabled && !Ext.isEmpty(this.dependOnGridParameters)) {
+        if (
+            rowInteractEnabled &&
+            !Ext.isEmpty(this.dependOnGridParameters)
+        ) {
             rowInteractEnabled = !this.isFilterDependedParamEmpty();
         }
-        if (rowInteractEnabled && this.dependOnGridRow && !this.isSelectionModelDefaultModeEnabled) {
-            rowInteractEnabled = this.skipRowValueCheck ? true : this.isRequiredParametersPassed();
+
+        if (
+            rowInteractEnabled &&
+            this.inputParametersConfig.haveRequiredReportParameters
+        ) {
+            rowInteractEnabled = this.isRequiredParametersPassed('PRM');
+        }
+
+        if (
+            rowInteractEnabled &&
+            this.dependOnGridRow
+        ) {
+            rowInteractEnabled = this.skipRowValueCheck ? true : this.isRequiredParametersPassed('FLD');
         }
+
         return {
             rowInteractEnabled,
         };
@@ -225,6 +250,10 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             }
         });
 
+        const haveRequiredReportParameters=
+            parameters.filter((param) => param.editable &&
+                param.reportNavigationOptionContextSource === 'PRM').length > 0;
+
         return {
             selectionDependencyType: multiDependencyParameters.length > 0 ? 'multi' : 'single',
             multiDependencyParameters,
@@ -232,6 +261,7 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             notRequiredMultiParameters,
             defaultParameters: reportIndependentParameters,
             onlyIndependentParameters,
+            haveRequiredReportParameters,
         };
     },
 
@@ -276,32 +306,31 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
     },
 
     /**
-     * Проверка того, что определены (заданы) значения входных параметров плагина, помеченных как обязательные.
-     * В рассмотрение берутся только параметры:
-     *  PRM - параметр отчета
-     *  FLD - поле выбранной записи.
-     * Достаточно чтобы значение было определено.
+     * Обязательные параметры плагина типа type (зависит от значения параметра репорта) настроены и заполнены.
+     * @param {string} type тип пареметра плагина (FLD, PRM)
      * @returns {boolean}
      */
-    isRequiredParametersPassed() {
-        const parameters = this.getRequiredParameters();
+    isRequiredParametersPassed(type) {
+        const parameters = this.getRequiredParameters(type);
         if (parameters.length === 0) {
             return true;
         }
-        const selected = this.component.getSelectionModel().getLastSelected();
-
         return parameters.every((param) => {
-            const paramValue = this.getParamValue(param, selected);
+            const paramValue = this.getParamValue(param);
             return !Ext.isEmpty(paramValue);
         });
     },
 
-    getRequiredParameters() {
+    getRequiredParameters(type) {
         const params = Array.isArray(this.parameters) ? this.parameters : [this.parameters];
-        return params.filter((param) => param && param.editable);
+        return params.filter((param) =>
+            param &&
+            param.editable &&
+            (!type || type === param.reportNavigationOptionContextSource)
+        );
     },
 
-    getParamValue(param, selectedRecord) {
+    getParamValue(param) {
         const {
             defaultValue,
             reportNavigationOptionContextSource: source,
@@ -314,7 +343,7 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
 
         switch (source) {
         case 'FLD':
-            return selectedRecord?.get(field);
+            return this.component.getContextManager()?.getSelectedRecord()?.get(field);
         case 'PRM':
             return this.component.contextMenu?.params?.[field];
         default: