ru.coon 2.5.51 → 2.5.53

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Version 2.5.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71f06d3a65bdf8040963d24a7ff0e6ac59946c7a)
+* ## Features
+* <span style='color:green'>feat: HT-7346: remove callback prepare data function</span> ([968a10], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/968a10cd85fb68fb13f4f3887d1785c73934e4cd))
+* <span style='color:green'>feat: BFL-10334: add export csv button</span> ([5c067e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5c067e688795ac9b4341be80ab0909572d899f90))
+* <span style='color:green'>feat: BFL-10334: add export csv button</span> ([afe199], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/afe199fc47b3587dc076debbc9b8e824c4421ed8))
+* <span style='color:green'>feat: HT-7346: get save function return value for call close window functiion</span> ([f0bea7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0bea74091a045b2477d8518d5d07c4ee2ae3fa1))
+* <span style='color:green'>feat: HT-7346: get save function return value for call close window functiion</span> ([86806d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/86806d51d6a38fce1a4754d3c8497a6957841e1d))
+
+* ## Fixes
+* <span style='color:red'> HT-7346: fix add docked and throw promise error</span> ([46b17e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/46b17e452222787468ef0e65e49cd8e40cc9797e))
+
+* upd ([3b137b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b137bc6ff518b9769e55674484c1d3e14469e23))
+* update: CHANGELOG.md ([d9c853], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9c8532cdef4cf46572967c94895486657a5bba1))
+
 # Version 2.5.51, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/86e7f44d186c08b70ff00747e70cbb182686afd7)
 * ## Features
 * <span style='color:green'>feat: Добавлен вывод информации о количестве отчетов, в которых используются настройки экземпляра плагина. Closes HT-7432.</span> ([ccd4b9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ccd4b9d8f5be9a7e9fb9edb4f7cc9c642a26c3a7))

package/package.json

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

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

@@ -101,7 +101,8 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                 allowBlank: false,
                 store: [
                     {name: 'Excel', id: 'excel'},
-                    {name: 'PDF', id: 'pdf'}
+                    {name: 'PDF', id: 'pdf'},
+                    {name: 'CSV', id: 'csv'}
                 ],
                 displayField: 'name',
                 valueField: 'id',

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

@@ -37,16 +37,29 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         }, this);
         this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
     },
-
+    callExportByType() {
+        switch (this.config.exportFileFormat) {
+        case 'pdf':
+            this.printPdfCommand.execute(this.report, this.config);
+            break;
+        case 'excel':
+            this.printExcelFile();
+            break;
+        case 'csv':
+            this.printCsvFile();
+            break;
+        }
+    },
     handler: function() {
         if (this.config.allowUserSelectColumnsToUpload) {
             this.showPanel();
         } else {
             this.config.columns = this.config.columnList.map((record) => record.reportField);
             this.getRecordsToPrint();
-            this.config.exportFileFormat === 'pdf' ?
+            this.callExportByType();
+            /* this.config.exportFileFormat === 'pdf' ?
                 this.printPdfCommand.execute(this.report, this.config) :
-                this.printExcelFile();
+                this.printExcelFile();*/
         }
     },
 
@@ -113,9 +126,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         });
         this.win.on('setColumns', function() {
             this.getRecordsToPrint();
-            this.config.exportFileFormat === 'pdf' ?
+            /* this.config.exportFileFormat === 'pdf' ?
                 this.printPdfCommand.execute(this.report, this.config) :
-                this.printExcelFile();
+                this.printExcelFile();*/
+            this.callExportByType();
             this.win.close();
         }, this);
         this.win.show();
@@ -155,7 +169,55 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             this.config.cmp.timeout :
             this.defaultTimeout;
     },
+    printCsvFile: async function() {
+        this.grid.mask('подождите пожалуйста...');
+        const fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';
+        const currentParamList = this.getConfig('addToSearchButton') ? this.report.northPanel.collectParams() : 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]});
+            }
+        }
+
+        /* const hasSelected = !!(this.getSelectedRecords() || []).length;
+         const url = hasSelected && !this.getConfig('addToSearchButton') ?
+            '/ReportFormData/getExcelFromRowsOrReport' :
+            '/ReportFormData/getCSVReport';*/
+        const url = '/ReportFormData/getCSVReport';
+        Ext.Ajax.request({
+            url,
+            method: 'POST',
+            // binary: true,
+            timeout: this.getTimeout(),
+            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) {
+                this.grid.unmask();
+                const csvContent = 'data:text/csv;charset=utf-8,%EF%BB%BF' + encodeURI(responce.responseText);
+                const link = document.createElement('a');
+                link.setAttribute('href', csvContent);
+                link.setAttribute('download', `${fileName}.csv`);
+                document.body.appendChild(link); // Required for FF
+                link.click();
+                link.parentNode.removeChild(link);
+            },
+            failure(error) {
+                this.grid.unmask();
+                Coon.log.error('ExportReportDataToFilePlugin error: ', error);
+                Ext.Msg.alert('ошибка', 'ошибка загрузки файла');
+            },
+            scope: this,
+        });
+    },
     printExcelFile: async function() {
         this.grid.mask('подождите пожалуйста...');
         const fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -27,11 +27,7 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
                 }
             ],
         });
-        if (this.dock === 'bottom') {
-            view.dockedItems.add(this.controller.unifiedButtonToolbar);
-        } else {
-            view.dockedItems.insert(0, this.controller.unifiedButtonToolbar);
-        }
+        view.addDocked(this.controller.unifiedButtonToolbar, this.dock === 'bottom' ? null : 0);
     },
     onBeforeCloseWindow() {
         this.save(true);
@@ -56,12 +52,7 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
     },
     save(windowClose) {
         this.windowClose = windowClose;
-        if (this.prepareBeanHandlerName &&
-            this.controller[this.prepareBeanHandlerName] &&
-            typeof this.controller[this.prepareBeanHandlerName] === 'function') {
-            this.compareCash = true;
-            this.controller[this.prepareBeanHandlerName].call();
-        }
+        this.callPrepareBeanHandler();
     },
     generateHash(params) {
         if (params && Ext.isObject(params)) {
@@ -80,6 +71,14 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
             }
         }
     },
+    callPrepareBeanHandler(compareCash = true) {
+        if (this.prepareBeanHandlerName &&
+            this.controller[this.prepareBeanHandlerName] &&
+            typeof this.controller[this.prepareBeanHandlerName] === 'function') {
+            this.compareCash = compareCash;
+            this.controller[this.prepareBeanHandlerName].call();
+        }
+    },
     async callSaveHandler(closeAfterSave) {
         if (
             this.saveHandlerName &&
@@ -87,9 +86,14 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
             typeof this.controller[this.saveHandlerName] === 'function'
         ) {
             if (this.controller[this.saveHandlerName] instanceof Promise) {
-                await this.controller[this.saveHandlerName].call(this.controller);
+                const isError = await this.controller[this.saveHandlerName].call(this.controller).catch(() => 'error');
+                if (isError === 'error') {
+                    closeAfterSave = false;
+                }
             } else {
-                this.controller[this.saveHandlerName].call(this.controller);
+                if (this.controller[this.saveHandlerName].call(this.controller) !== true) {
+                    closeAfterSave = false;
+                }
             }
             if (closeAfterSave) {
                 this.closeWindow();

package/src/version.js

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

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

@@ -1,7 +0,0 @@
-**спецификация:**
-
-входные параметры:
-
-- exportFileFormat [xls/pdf]
-- allowUserSelectColumnsToUpload
-- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)