ru.coon 2.5.55 → 2.5.56

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.5.56, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/128444f42dc670412319a7f3bf6c53407f8ca3c7)
+* ## Features
+* <span style='color:green'>feat: HT-7788: check execute chain function result on error, add validation function in unified toolbar plugin</span> ([9af285], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af28505fd7c8761aa0cfe51d258892307a25d5d))
+
+* update: CHANGELOG.md ([cb4c2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb4c2a146ce95de7c03a07b1e3ac2c7fbc6f96d3))
+
 # Version 2.5.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/445f548a2eab2e58d40a1546de00e01a3c1e916c)
 * ## Features
 * <span style='color:green'>feat: BFL-10334: download file with blob</span> ([e42e68], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e42e682f7375feffb124b6f5179f2a1b96d7757c))

package/package.json

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

package/src/uielement/plugin/MethodChainPlugin.js

@@ -48,6 +48,10 @@ Ext.define('Coon.uielement.plugin.MethodChainPlugin', {
                     }
                     break;
                 }
+            } else {
+                if (result === false) {
+                    break;
+                }
             }
         }
     },

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -94,6 +94,26 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
         }
     },
     async callSaveHandler(closeAfterSave) {
+        if (
+            this.validateBeanHandlerName &&
+            this.controller[this.validateBeanHandlerName] &&
+            typeof this.controller[this.validateBeanHandlerName] === 'function'
+        ) {
+            const result = this.controller[this.validateBeanHandlerName].call(this.controller);
+            if (result instanceof Promise) {
+                result.then(() => {
+                    this.controller[this.validateBeanHandlerName].call(this.controller);
+                });
+                const isError = await result.catch(() => 'error');
+                if (isError === 'error') {
+                    return false;
+                }
+            } else {
+                if (result !== true) {
+                    return false;
+                }
+            }
+        }
         if (
             this.saveHandlerName &&
             this.controller[this.saveHandlerName] &&

package/src/uielement/plugin/configPanel/UnifiedButtonToolbarPluginConfigPanelFormEditor.js

@@ -6,6 +6,7 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
         data: {
             saveHandlerName: '',
             prepareBeanHandlerName: '',
+            validateBeanHandlerName: '',
             dock: 'bottom',
         },
     },
@@ -56,6 +57,23 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
                 displayField: 'id',
             },
         },
+        {
+            xtype: 'comboBtnWrapper',
+            combobox: {
+                xtype: 'BaseComboBox',
+                fieldLabel: 'Функция валидации данных',
+                labelWidth: 60,
+                flex: 1,
+                loadOnRender: false,
+                hideMode: 'offsets',
+                store: 'codeHandlers',
+                bind: {
+                    value: '{validateBeanHandlerName}',
+                },
+                valueField: 'id',
+                displayField: 'id',
+            },
+        },
         {
             xtype: 'segmentedbutton',
             allowMultiple: false,
@@ -90,7 +108,7 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
     getConfiguration: function() {
         const result = {};
         const vm = this.getViewModel();
-        ['saveHandlerName', 'prepareBeanHandlerName', 'dock'].forEach((el) => {
+        ['saveHandlerName', 'prepareBeanHandlerName', 'validateBeanHandlerName', 'dock'].forEach((el) => {
             if (vm.get(el)) {
                 result[el] = vm.get(el);
             }

package/src/version.js

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