ru.coon 2.5.31 → 2.5.32

package/CHANGELOG.md

@@ -1,4 +1,17 @@
-# Version 2.5.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2e55a70f421f4c258fde5a21af8f2208f751ab89)
+# Version 2.5.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/de81a198b0ffcbe7ea296f9568023ab135bdb832)
+* update: CHANGELOG.md ([79085d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79085d7c621b2ebeb592dbff958a4a29d276aa90))
+
+# Version 2.5.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51eafa59b0b64087dacaafd66b754c04ada7e027)
+* ## Features
+* <span style='color:green'>feat: HT-4550 changed to Ext.ajax</span> ([3a4af5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a4af588bb24b481c427749ca8d658edc9d42a57))
+* <span style='color:green'>feat: Replace 'require' with 'import', cleanup dependencies. Related to TR-67434.</span> ([3ee407], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3ee40770a402547fa72a1cc5d1bc20e297186ebb))
+* <span style='color:green'>feat: HT-4550 add new Coon.util method, fetch instead of XMLHttpRequest</span> ([748421], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7484218eddd0e2b2e0863e88bb595aa79c8c0009))
+
+* ## Fixes
+* <span style='color:red'> HT-4550 refactor</span> ([b87c1b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b87c1b54d15ea311968f8fe5ed1c15afd41391c2))
+* <span style='color:red'> Update Coon.log.isProduction</span> ([9c7f2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9c7f2db552b265a203ca60d79205149b863760a2))
+* <span style='color:red'> Removed obsolete dependencies. Related to TR-67434.</span> ([1229d5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1229d5fc23c6c754acde1b62bed531630d7b67cf))
+
 * refactoring && testing ([48b4e4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/48b4e48d890379ea569293af8ca0badb16e5e871))
 * update: CHANGELOG.md ([6a5128], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a512898c2d35e2d34a293837b106703a0459929))
 
@@ -33,6 +46,9 @@
 * ## Features
 * <span style='color:green'>feat: TR-67310 исправление ситуации когда defaultFocus на поле в состоянии disabled приводит к возврату фокуса на предыдущий элемент</span> ([335b93], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/335b9374874e2406e6f5c80daada6ba49eef05dc))
 
+* ## Fixes
+* <span style='color:red'> HT-4550 add errorWindow</span> ([9a2fcd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9a2fcdc4320a61b8d42ba5e6593185f648d075a3))
+
 * minor changes ([b4067a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b4067ab11832201616725d3f60a48e647a30d3bd))
 * update: CHANGELOG.md ([c39291], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c3929159ea685f05c9011c520b7f476d0fe57329))
 
@@ -40,6 +56,11 @@
 * ## Features
 * <span style='color:green'>feat: HT-6865  доработка сервиса начитывания репортов</span> ([d5204c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d5204c0e6470e9f4858b800da4bfb779bd9d3d6a))
 
+* ## Fixes
+* <span style='color:red'> HT-4550 fix excel file download</span> ([b81e8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b81e8d28b762e38362624149ddaaf9d9b5daa272))
+* <span style='color:red'> HT-4550 fix excel file download</span> ([e4844c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e4844c0511d5401d1659be45539fe390bc50aa16))
+* <span style='color:red'> HT-4550 fix excel file download</span> ([a7b080], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a7b080f4a12fc6c0abd31fc06f623fc5122d4951))
+
 * CRM-7619 Доработка ReportLookupCombo дефолтными параметрами ([b9ddb1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b9ddb10c22f857d4bf33a3f66ec0ee46d8ea2add))
 * update: CHANGELOG.md ([e8d820], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e8d82018b4cb33252c4bc997473449a4bf9d94a0))
 
@@ -87,6 +108,9 @@ isolate lastValue from native ComboBox logic</span> ([57078e], [link](http://git
 * update: CHANGELOG.md ([f3a0d9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f3a0d9873147e5bc99c6a04ac9fc4292166ebbcf))
 
 # Version 2.5.19, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/60dafd3ee4e54456992b474b81201242521c3991)
+* ## Features
+* <span style='color:green'>feat: HT-4550 configPanel changes</span> ([7d3ac0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7d3ac0a6a4a1124c3b1a240e26a4096635573e6a))
+
 * ## Fixes
 * <span style='color:red'>fix HT-7070
 
@@ -115,6 +139,7 @@ fix ReportPropertiesPanelController</span> ([e2b928], [link](http://gitlab-dbr.s
 * <span style='color:green'>feat: CRM-7705  add tooltip to checkboxes on DynamicCheckboxGroup</span> ([dddc4d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dddc4d3f8d8e4f6ca7d5e9c892431b1c6fba6ae5))
 * <span style='color:green'>Feat:TR-67289 Включил возможность авторизации по гит токену</span> ([b9505b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b9505baa99ee5f5785e6da287063774918f0d698))
 * <span style='color:green'>feat: TR-67140 разработка универсальной компонент-формы для обработки статуса требуемых полей</span> ([20e76d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20e76d097db4ddf9120ddc56f86b6470ab7335ca))
+* <span style='color:green'>feat: HT-4550 add localization field property</span> ([b3bd46], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3bd466dd68c893fefae86ae7e16877aedb861ba))
 * <span style='color:green'>feat BFL-7734: передача headers в ASyncBaseCommand</span> ([ed1202], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed1202d1f90cb9c73bd858598a28f63b519642c7))
 
 * ## Fixes
@@ -303,6 +328,7 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
 
 # Version 2.5.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b96e5a09990a265514d3f2c3647d032fd1a4306b)
 * ## Features
+* <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([5c70b0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5c70b008e5691e0caab7a7a56f18b6d5c0cc8818))
 * <span style='color:green'>feat: HT-6580: create paging for tag field? creeate new mixin, fix errors</span> ([a913c5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a913c5a9735da882f7619c55dc67bea7d1d5e936))
 
 * ## Fixes
@@ -320,6 +346,7 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
 
 # Version 2.4.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/95627ef5983aa5f2fd5eaf8bd4b808ba169a48fb)
 * ## Features
+* <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([1765f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1765f1c1959e585ee724021ceaa840b0fb3c2485))
 * <span style='color:green'>feat: HT-6314 Изменение отображения CharacteristicGridCopyPlugin</span> ([5fa321], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5fa3214c6e395bc66804a7acc7fe062780da1dfd))
 
 * add no-console rule to eslint rules ([aa512d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa512db0fb0165af39481718d010c9748c5cebb5))
@@ -338,6 +365,8 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
 
 # Version 2.4.39, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/552f06c65ce026090b0c7ef6716f8fa6a4cba933)
 * ## Features
+* <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([7eded0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7eded0e3efb8b28d13d51c0330fbeca82f8efd05))
+* <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([db6df1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/db6df1864086585229bf1b002e5caf59171ec1ac))
 * <span style='color:green'>feat: auto select first submenu item on change workspace</span> ([f0bad3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0bad35d4cafa86b62be334c1967401d9c276552))
 
 * upd ([24eade], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/24eade894692f4dc5f9ce6837a715dfc0d1c96b1))

package/index.js

@@ -1,47 +1,36 @@
-import * as echarts from 'echarts';
-import 'ace-diff/dist/ace-diff.min.css';
-import printJs from 'sigma-printjs/dist/print';
-import AceDiff from 'ace-diff';
-import EditorJS from '@editorjs/editorjs';
-import jss from 'jss';
-import jssNested from 'jss-plugin-nested';
-import jssGlobal from 'jss-plugin-global';
+import * as xEchartsJs from 'echarts';
+import xPrintJs from 'sigma-printjs/dist/print';
+import xAceDiff from 'ace-diff';
+import hashFromObj from 'object-hash';
+import xAceEditor from 'ace-builds/src-noconflict/ace';
+import xAceJson from 'ace-builds/src-noconflict/mode-json5';
+import xAceLangTool from 'ace-builds/src-noconflict/ext-language_tools';
+import xAceSnippets from 'ace-builds/src-noconflict/snippets/snippets';
+import JSON5 from 'json5';
 import 'extjs_iconpack';
-
-Ext.xEchartsJs = echarts;
-
-require('json5');
-
-Ext.hashFromObj = require('object-hash');
-
-Ext.xPrintJs = printJs;
-
-
-Ext.xAceDiff = AceDiff;
-Ext.xEditorJS = EditorJS;
-
-Ext.xTable = require('@sigma/editorjs-table');
-Ext.xAceEditor = require('ace-builds/');
-const ace = window.ace;
-ace.config.set(
-    'basePath',
-    'node_modules/ace-builds/src-noconflict/'
-);
-require('ace-builds/src-noconflict/worker-json');
-require('ace-builds/src-noconflict/theme-xcode');
-require('ace-builds/src-noconflict/theme-iplastic');
-require('ace-builds/src-noconflict/ext-searchbox');
-require('ace-builds/src-noconflict/mode-javascript');
-require('ace-builds/src-noconflict/snippets/javascript');
-require('ace-builds/src-noconflict/mode-sql');
-require('ace-builds/src-noconflict/mode-pgsql');
-Ext.xAceJson = require('ace-builds/src-noconflict/mode-json5');
-Ext.xAceLangTool = require('ace-builds/src-noconflict/ext-language_tools');
-Ext.xAceSnippets = require('ace-builds/src-noconflict/snippets/snippets');
-Ext.xPdfjsViewer = require('pdfjs-dist/legacy/build/pdf');
-if (typeof window !== 'undefined' && 'Worker' in window) {
-    Ext.xPdfjsViewer.GlobalWorkerOptions.workerPort = new Worker('build/dist/pdf.worker.js');
-}
-
-Ext.jss = jss;
-Ext.jss.use(jssNested(), jssGlobal());
+import 'ace-diff/dist/ace-diff.min.css';
+import 'ace-builds/src-noconflict/worker-json';
+import 'ace-builds/src-noconflict/theme-xcode';
+import 'ace-builds/src-noconflict/theme-iplastic';
+import 'ace-builds/src-noconflict/ext-searchbox';
+import 'ace-builds/src-noconflict/mode-javascript';
+import 'ace-builds/src-noconflict/mode-sql';
+import 'ace-builds/src-noconflict/mode-pgsql';
+import 'ace-builds/src-noconflict/snippets/javascript';
+import 'ace-builds/src-noconflict/snippets/sql';
+import 'ace-builds/src-noconflict/snippets/pgsql';
+
+xAceEditor.config.set('basePath', '/node_modules/ace-builds/src-noconflict/');
+
+Object.assign(window, {JSON5, ace: xAceEditor});
+
+Object.assign(Ext || {}, {
+    xEchartsJs,
+    hashFromObj,
+    xPrintJs,
+    xAceDiff,
+    xAceEditor,
+    xAceJson,
+    xAceLangTool,
+    xAceSnippets,
+});

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.5.31",
+  "version": "2.5.32",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -26,16 +26,10 @@
     "ace-builds": "1.4.12",
     "ace-diff": "^3.0.3",
     "echarts": "^5.3.3",
+    "extjs_iconpack": "1.3.15",
     "json5": "2.2.3",
-    "jss": "^10.9.2",
-    "jss-plugin-global": "^10.9.2",
-    "jss-plugin-nested": "^10.9.2",
     "object-hash": "^3.0.0",
-    "pdfjs-dist": "^2.12.313",
-    "sigma-printjs": "^1.0.1",
-    "@sigma/editorjs-table": "0.2.5",
-    "extjs_iconpack": "1.3.15",
-    "@editorjs/editorjs": "2.27.0"
+    "sigma-printjs": "^1.0.1"
   },
   "devDependencies": {
     "eslint": "^8.15.0",

package/src/log.js

@@ -50,8 +50,7 @@ Ext.define('Coon.log', {
     },
 
     isProduction() {
-        // TODO does not work without sencha cmd
-        return Ext.Microloader && !Ext.Microloader.manifest.loadOrder;
+        return Ext.isProduction === true || Ext.Microloader && !Ext.Microloader.manifest.loadOrder;
     },
 
     searchXtype(cmp, idx = 0) {
@@ -97,11 +96,13 @@ Ext.define('Coon.log', {
             return this;
         }
         if (trace) {
+            // eslint-disable-next-line no-console
             console.trace(...args);
         } else {
             if (this.isProduction && level === 'error') {
                 this.getConsoleError()(` [${level}]: `, ...args);
             } else {
+                // eslint-disable-next-line no-console
                 console[level](` [${level}]: `, ...args);
             }
         }

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

@@ -128,8 +128,18 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                 {
                     xtype: 'container',
                     html: `<div style="font-size:12px;color:gray">
-                        Разрешить пользователю указать собственный набор колонок при экспорте.<br>
-                        <b>В таблице необходимо выбрать доступные пользователю колонки!</b>
+                        Укажите поля, которые будут доступны пользователю для выбора при экспорте.<br>
+                        <b>Если не выбрано ни одной колонки, то пользователю будут для выбора все поля репорта!</b>
+                        </div>`,
+                },
+                {
+                    xtype: 'container',
+                    reference: 'warning',
+                    hidden: true,
+                    html: `<div style="font-size:12px;color:brown">
+                        <b>Отчет содержит поля с типом BOOLEAN!</b><br>
+                        Чтобы преобразовать BOOLEAN в нужную строку, укажите localization в свойствах BOOLEAN поля.<br>
+                        По умолчанию значения будут преобразованы в Y/N!<br>
                         </div>`,
                 },
                 this.grid
@@ -151,14 +161,23 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
     },
 
     setFieldsData(fields) {
+        this.booleanFields = [];
         const ns = Coon.report.model.ReportFieldMaintenanceBeanFields;
+        const fieldsNS = Coon.report.model.ReportFieldBeanFields;
+        const warningMessage = this.lookup('warning');
+
         const fieldsData = fields.length && fields.map((field) => {
+            if (field[fieldsNS.$reportFieldTypeLookup] === 'BOOLEAN') {
+                this.booleanFields.push(field[fieldsNS.$reportFieldCd]);
+            }
             return {
                 reportField: field[ns.$reportField],
                 description: field[ns.$description],
                 checkbox: (this.columnList && this.columnList.includes(field[ns.$reportField])),
             };
         });
+
+        warningMessage.setHidden(!this.booleanFields.length);
         fieldsData && this.grid.getStore().loadData(fieldsData);
     },
 
@@ -166,7 +185,8 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
         return this.callParent().then((config) => {
             const allowUserColumns = Coon.Function.getFieldByName(this, 'allowUserColumns').getValue();
             if (allowUserColumns) {
-                config['columnList'] = JSON5.stringify(this.grid.getStore().queryRecords('checkbox', true));
+                const checkedRecords = this.grid.getStore().queryRecords('checkbox', true);
+                config['columnList'] = JSON5.stringify(checkedRecords.length ? checkedRecords : this.grid.getStore().queryRecords());
                 config['allowUserSelectColumnsToUpload'] = allowUserColumns;
             }
             return config;

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

@@ -409,13 +409,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             const blob = new Blob(this.collectGridDataAsArray(this.getSelected()), {
                 type: 'text/xls;charset=UTF-8',
             });
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = filename;
-            link.click();
-            if (blob) {
-                window.URL.revokeObjectURL(blob);
-            }
+            Coon.util.downloadFileFromBlob(blob, filename);
         }
         reportPanel && reportPanel.unmask();
     },

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

@@ -17,6 +17,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         config.invisibleByDefault = config.addToSearchButton === true;
         this.callParent(arguments);
     },
+
     init(grid) {
         this.callParent([grid]);
         const format = this.config.exportFileFormat;
@@ -32,14 +33,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             }
             this.grid = grid;
         }, this);
-        this.getDataCommand = Ext.create(
-            `command.${
-                format === 'pdf' ?
-                    'GetPdfReportDataCommand' :
-                    'GetExcelFromRowsOrReportData'
-            }`,
-            {useRawFilterParams: this.getConfig('addToSearchButton')}
-        );
+        this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
     },
 
     handler: function() {
@@ -47,8 +41,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             this.showPanel();
         } else {
             this.config.columns = this.config.columnList.map((record) => record.reportField);
-            this.getSelections();
-            this.getDataCommand.execute(this.report, this.config);
+            this.getRecordsToPrint();
+            this.config.exportFileFormat === 'pdf' ?
+                this.printPdfCommand.execute(this.report, this.config) :
+                this.printExcelFile();
         }
     },
 
@@ -114,8 +110,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             title: 'Выводить колонки',
         });
         this.win.on('setColumns', function() {
-            this.getSelections();
-            this.getDataCommand.execute(this.report, this.config);
+            this.getRecordsToPrint();
+            this.config.exportFileFormat === 'pdf' ?
+                this.printPdfCommand.execute(this.report, this.config) :
+                this.printExcelFile();
             this.win.close();
         }, this);
         this.win.show();
@@ -126,24 +124,51 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
 
     setColumns: function() {
-        const selectedColumns = this.columnsGrid.getStore().queryRecords('checkbox', true);
-        if (!selectedColumns.length) {
+        const checkedRecords = this.columnsGrid.getStore().queryRecords('checkbox', true);
+        if (!checkedRecords.length) {
             return;
         }
-        this.config.columns = selectedColumns.map((record) => record.get('reportField'));
+        this.config.columns = checkedRecords.map((record) => record.get('reportField'));
         this.win.fireEvent('setColumns');
     },
 
-    getSelections: function() {
-        const rows = this.grid.getSelectionModel().getSelection();
-        if (rows.length > 0) {
-            this.config.toExcel = [];
-            for (let i = 0; i < rows.length; i++) {
-                const rowData = rows[i].getData();
-                delete rowData['id'];
-                this.config.toExcel.push(rowData);
+    getRecordsToPrint: function() {
+        this.config.toExcel = [];
+        const selectedRecords = this.grid.getSelectionModel().getSelection();
+        const records = selectedRecords.length ? selectedRecords : this.grid.getStore().getRange();
+
+        records.forEach((rec) => {
+            const recData = rec.getData();
+            delete recData['id'];
+            this.config.toExcel.push(recData);
+        });
+    },
+
+    printExcelFile: async function() {
+        const fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';
+        const currentParamList = this.report.currentParamList;
+        const parameterList = [];
+
+        for (const key in currentParamList) {
+            if (currentParamList.hasOwnProperty(key) && !Ext.isEmpty(currentParamList[key])) {
+                parameterList.push({type: key, value: currentParamList[key]});
             }
         }
+
+        Ext.Ajax.request({
+            url: 'ReportFormData/getExcelFromRowsOrReport',
+            method: 'POST',
+            binary: true,
+            params: {
+                reportId: this.report.reportId,
+                fileName: fileName,
+                appendDateToFileName: Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true,
+                parameterList: JSON.stringify(parameterList),
+                columnList: JSON.stringify(this.config.columns),
+                toExcel: JSON.stringify(this.config.toExcel),
+            },
+            success: (responce) => Coon.util.downloadFileFromBlob(new Blob([responce.responseBytes]), `${fileName}.xlsx`),
+        });
     },
 
 });

package/src/security/component/navmenu/RoleNavMenuEditorController.js

@@ -138,11 +138,7 @@ Ext.define('Coon.security.component.navmenu.RoleNavMenuEditorController', {
                     [data],
                     {type: 'text/xls;charset=UTF-8'}
                 );
-                const link = document.createElement('a');
-                link.href = window.URL.createObjectURL(blob);
-                link.download = filename;
-                link.click();
-                window.URL.revokeObjectURL(blob);
+                Coon.util.downloadFileFromBlob(blob, filename);
             })
                 .catch(console.error);
         } catch (ex) {

package/src/security/component/role/RoleEditorController.js

@@ -85,11 +85,7 @@ Ext.define('Coon.security.component.role.RoleEditorController', {
                 {
                     type: 'text/xls;charset=UTF-8',
                 });
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = 'roles.json';
-            link.click();
-            window.URL.revokeObjectURL(blob);
+            Coon.util.downloadFileFromBlob(blob, 'roles.json');
         });
     },
 });

package/src/security/component/ui/UiCPRestrictionEditorController.js

@@ -156,11 +156,7 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
                 {
                     type: 'text/xls;charset=UTF-8',
                 });
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = 'restrictionUICPConfig.json';
-            link.click();
-            window.URL.revokeObjectURL(blob);
+            Coon.util.downloadFileFromBlob(blob, 'restrictionUICPConfig.json');
         });
     },
 });

package/src/security/component/user/UserRoleEditorController.js

@@ -105,11 +105,7 @@ Ext.define('Coon.security.component.user.UserRoleEditorController', {
                 {
                     type: 'text/xls;charset=UTF-8',
                 });
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = 'user_roles.json';
-            link.click();
-            window.URL.revokeObjectURL(blob);
+            Coon.util.downloadFileFromBlob(blob, 'user_roles.json');
         });
     },
 });

package/src/util.js

@@ -568,4 +568,12 @@ Ext.define('Coon.util', {
         return txt.documentElement.textContent;
     },
 
+    downloadFileFromBlob(blob, fileName) {
+        const link = document.createElement('a');
+        link.href = window.URL.createObjectURL(blob);
+        link.download = fileName;
+        link.click();
+        window.URL.revokeObjectURL(blob);
+    },
+
 });

package/src/version.js

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