ru.coon 2.7.73 → 2.7.75

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# Version 2.7.75, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/07c180f0c622d325ab34f62f832e1ee801609fdc)
+* ## Features
+* <span style='color:green'>feat: HT-10115: chain plugin return result, log unified buttons call handlers result</span> ([408dab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/408dab15c6afc49e47bd80729bf55e1a541522cc))
+* <span style='color:green'>feat: [ReportTree][CharacteristicGridCopyPlugin] Added testId generation. Related to HT-8881.</span> ([2bc5e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2bc5e899f6a5d390844fcc25fc4511b5d195fbb8))
+
+* ## Fixes
+* <span style='color:red'> TR-68748: set aceEditor value on render editor</span> ([0ec858], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ec858f3daaa04b6ae03ad6980b98e68795538f9))
+* <span style='color:red'> TR-68748: set aceEditor value on render editor</span> ([5b4020], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5b40206ef76c540beb44f030a005d074db7a5d1a))
+
+* update: CHANGELOG.md ([83565d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83565d922e173ad5755e121ba857db0b72281b9c))
+
+# Version 2.7.74, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ad505a03bce73983ba14ee55f9132c91d9c9762)
+* ## Fixes
+* <span style='color:red'>fix executeComponentDoInit parameters initialization</span> ([454f38], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/454f389375cdb2280091eb41c1ecd0f0e0150f3f))
+
+* update: CHANGELOG.md ([637d18], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/637d18bb19b23d867325ba60ad80c1e7e383c8ff))
+
 # Version 2.7.73, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/023f7c5fbe1cc722907329839a07e74212ec9153)
 * ## Fixes
 * <span style='color:red'> HT-9894 CharacteristicGridEditor getModifiedRecords</span> ([df27e0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/df27e0d0006e93994a0bf407df47d3c7e1ea0add))

package/package.json

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

package/src/Function.js

@@ -491,7 +491,8 @@ Ext.define('Coon.Function', {
         return result;
     },
 
-    executeComponentDoInit: function(component, parameters = {}) {
+    executeComponentDoInit: function(component, parameters) {
+        parameters = Ext.isObject(parameters) ? parameters : {};
         if (!component) {
             Coon.log.error('Coon.Function.executeComponentDoInit error: component cant be empty');
             return false;

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

@@ -54,6 +54,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
                     widget.on('click', me.onPasteWidget, me, {args: [widget, type]});
                     widget.on('mouseover', me.showSlaveIcon, me, {args: [type, false, me.masterWidgets]});
                     widget.on('mouseout', me.showSlaveIcon, me, {args: [type, true, me.masterWidgets]});
+                    widget.testIdToken = type;
                 }
             },
         });
@@ -72,11 +73,13 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
     },
 
     showSlaveIcon(type, hideMasterIcon, masterWidgets) {
-        masterWidgets.find((widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]).setHidden(hideMasterIcon);
+        masterWidgets.find((widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]).
+            setHidden(hideMasterIcon);
     },
 
     onPasteWidget(widget, type) {
-        const masterWidget = this.masterWidgets.find((widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]);
+        const masterWidget = this.masterWidgets.find(
+            (widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]);
         const masterRecord = masterWidget && masterWidget.getWidgetRecord();
         const slaveRecord = widget.getWidgetRecord();
 

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

@@ -58,7 +58,8 @@ Ext.define('Coon.report.component.reportpanel.ReportTree', {
                                     if (!mapElement) {
                                         mapElement = {};
                                         mapElement[me.getIdIndex()] = parentId;
-                                        mapElement[me.getTreeColumnIndex()] = 'Неверный родительский объект:' + parentId;
+                                        mapElement[me.getTreeColumnIndex()] = 'Неверный родительский объект:' +
+                                            parentId;
                                     }
 
                                     mapElement.list = mapElement.list || [];
@@ -107,6 +108,15 @@ Ext.define('Coon.report.component.reportpanel.ReportTree', {
         }
         this.callParent();
         this.relayEvents(this.getStore(), ['datachanged', 'load']);
+
+        // testId generation on tree nodes
+        this.getStore().on('load', (store) => {
+            for (const [index, domElement] of this.getView().getNodes().entries()) {
+                if (typeof Ext.Component.generateTestId === 'function') {
+                    Ext.Component.generateTestId(store.getAt(index).get(this.idIndex), domElement);
+                }
+            }
+        }, this);
     },
 
     clear: function() {

package/src/uielement/plugin/MethodChainPlugin.js

@@ -31,61 +31,55 @@ Ext.define('Coon.uielement.plugin.MethodChainPlugin', {
         if (this.isTraceEnabled()) {
             this.tracePlugin();
         }
+        let result;
         for (const methodName of this.methodNames) {
-            let result;
-            if (typeof this.controller[methodName] === 'function') {
-                try {
-                    result = this.controller[methodName].call();
-                } catch (error) {
-                    this.showError(methodName);
-                    if (this.breakChainOnFalse) {
-                        break;
-                    }
-                }
-                const errorHandler = this.getErrorHandler(methodName);
+            if (typeof this.controller[methodName] !== 'function') {
+                this.showError(false, `Ошибка в обработчике ${methodName}, не найден метод ${this.handlerName}`);
+                return false;
+            }
+            try {
+                result = this.controller[methodName].call(this.controller, result);
+            } catch (error) {
+                this.showError(methodName);
+                throw error;
+            }
+            const errorHandler = this.getErrorHandler(methodName);
 
-                if (result instanceof Promise) {
-                    const promiseResult = await result
-                        .then((result) => {
-                            return this.breakChainOnFalse && result === false ? '__error' : result;
-                        })
-                        .catch((error) => {
-                            return this.logError(methodName, error);
-                        });
+            if (result instanceof Promise) {
+                const promiseResult = await result
+                    .then((result) => {
+                        return this.breakChainOnFalse && result === false ? '__error' : result;
+                    })
+                    .catch((error) => {
+                        return this.logError(methodName, error);
+                    });
 
-                    if (promiseResult === '__error') {
-                        if (!errorHandler) {
-                            this.showError(methodName);
-                        } else {
-                            try {
-                                errorHandler.call();
-                            } catch (error) {
-                                this.showError(false, `Ошибка в обработчике ${this.errorHandlers[methodName]} в ${this.handlerName}`);
-                            }
+                if (promiseResult === '__error') {
+                    if (!errorHandler) {
+                        this.showError(methodName);
+                    } else {
+                        try {
+                            errorHandler.call();
+                        } catch (error) {
+                            this.showError(false, `Ошибка в обработчике ${this.errorHandlers[methodName]} в ${this.handlerName}`);
+                            throw error;
                         }
-                        if (this.breakChainOnFalse) {
-                            break;
-                        }
-                    }
-                } else {
-                    if (this.breakChainOnFalse && result === false) {
-                        if (errorHandler) {
-                            try {
-                                errorHandler.call();
-                            } catch (error) {
-                                this.showError(false, `Ошибка в обработчике ${this.errorHandlers[methodName]} в ${this.handlerName}`);
-                            }
-                        }
-                        break;
                     }
+                    return false;
                 }
-            } else {
-                this.showError(false, `Ошибка в обработчике ${methodName}, не найден метод ${this.handlerName}`);
-                if (this.breakChainOnFalse) {
-                    break;
+            } else if (this.breakChainOnFalse && result === false) {
+                if (errorHandler) {
+                    try {
+                        errorHandler.call();
+                    } catch (error) {
+                        this.showError(false, `Ошибка в обработчике ${this.errorHandlers[methodName]} в ${this.handlerName}`);
+                        throw error;
+                    }
                 }
+                return false;
             }
         }
+        return result;
     },
 
     showError(methodName, msg) {

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -104,8 +104,7 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
 
     confirmHandler(btn) {
         if (btn === 'yes') {
-            return this.callValidate()
-                .then((valid) => valid && this.callSaveHandler(true));
+            return this.callValidate().then((valid) => valid && this.callSaveHandler(true));
         }
         if (btn === 'no') {
             this.suspendBeforeCloseEvent = true;
@@ -120,14 +119,20 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
     save(isWindowClose) {
         this.isWindowClose = isWindowClose;
         this.compareCash = true;
-        this.callMethod(this.prepareBeanHandlerName);
+        this.callMethod(this.prepareBeanHandlerName).then((res) => {
+            Coon.log.debug(`Результат выполнения функции подготовки данных для сохранения ${this.prepareBeanHandlerName}: ${res}`);
+            return res;
+        });
     },
 
     callValidate() {
         return this.callMethod(
             this.validateBeanHandlerName,
             Promise.resolve(true)
-        ).catch((error) => {
+        ).then((res) => {
+            Coon.log.debug(`Результат выполнения функции валидации данных ${this.validateBeanHandlerName}: ${res}`);
+            return res;
+        }).catch((error) => {
             Coon.log.error(error);
             Ext.Msg.alert('ошибка функции валидации');
             throw error;
@@ -155,6 +160,9 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
             }
         }
         const currentHash = Coon.util.generateHashFromObj(params);
+        if (this.controller.savedDataHash === currentHash) {
+            Coon.log.debug(`Данные не были измененны`);
+        }
         if (this.controller.savedDataHash !== currentHash) {
             if (this.isWindowClose) {
                 this.callDialog();
@@ -167,16 +175,15 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
         }
     },
 
-
     callSaveHandler(closeAfterSave) {
-        return this.callMethod(this.saveHandlerName)
-            .then(() => {
-                if (closeAfterSave) {
-                    this.suspendBeforeCloseEvent = true;
-                    this.closeWindow();
-                } else {
-                    this.callMethod(this.prepareBeanHandlerName);
-                }
-            });
+        return this.callMethod(this.saveHandlerName).then((res) => {
+            Coon.log.debug(`Результат выполнения функции сохранения данных ${this.saveHandlerName}: ${res}`);
+            if (closeAfterSave) {
+                this.suspendBeforeCloseEvent = true;
+                this.closeWindow();
+            } else {
+                this.callMethod(this.prepareBeanHandlerName);
+            }
+        });
     },
 });

package/src/version.js

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