ru.coon 3.0.52 → 3.0.54

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Version 3.0.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/91b425e436e17c3f26aa3c6eabb1c23ac52686c1)
+* ## Fixes
+* <span style='color:red'> src/util:mapObject acc[rule.to] or defValue</span> ([f2355c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2355c41590bd574c51fdd6ed4a231ef59c29477))
+
+* add scss ([1a6380], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1a63800f3db4aa3b5e29853fc2c71058f19dba42))
+* update: CHANGELOG.md ([614a25], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/614a25f19071b375b0a09d2e771c8d7df2d63313))
+
+# Version 3.0.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/18d790002292ecd0650d868dca06ddcf668fcede)
+* ## Features
+* <span style='color:green'>feat: NEVA-974: bug fix. Передаю нужный контекст</span> ([22bb87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22bb870b28bdafac81dca86804b482e6e365c9c8))
+
+* fetch заменен на Ext.Ajax.request. Related to HT-13796. ([6c255d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6c255d3663c735c36b304a9fd1f67b93b8b3b9f7))
+* update: CHANGELOG.md ([b95dd9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b95dd96244579290f3c7c42f2bf32881a54ac96d))
+
 # Version 3.0.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/290ca0d6e133cd9631aae34caa6f0c63ab449128)
 * ## Features
 * <span style='color:green'>feat: NEVA-974: Добавил возможность выбора нескольких файлов</span> ([2f49c5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f49c53d5af263c1c7931497140faea164a94357))

package/package.json

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

package/src/common/panel/MainUploadPanel.js

@@ -162,14 +162,6 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
         this.fireEvent('close');
     },
 
-    getHeaders: function() {
-        const token = localStorage.getItem('CSRFToken');
-        return Ext.apply(this.headers, {
-            'X-CSRF-Token': token,
-            'Accept': 'application/json',
-        });
-    },
-
     getUrl: function() {
         return this.uploadURL;
     },
@@ -211,12 +203,15 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
             formData.append('upload', file);
         });
         const options = {
-            method: 'POST',
-            headers: this.getHeaders(),
-            body: formData,
+            url: this.uploadURL,
+            rawData: formData,
+            headers: {
+                'Content-Type': null,
+            },
+            withCredentials: true,
         };
         this.uploadForm.mask('Файл загружается на сервер...');
-        fetch(this.uploadURL, options)
+        Ext.Ajax.request(options)
             .then(this.extractResponse.bind(this))
             .then(function(response) {
                 this.uploadForm.unmask();
@@ -240,19 +235,16 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
 
     /**
      * Извлечение результата
-     * fetch обращает внимание на заголовок ответа content-type. В зависимости от заголовка до данных можно получить доступ по разному.
      * @param {Object} response
      * @returns {Promise<{data: (*|*), isJsonFormat: boolean, statusText: *, ok, status: *}>}
      */
-    extractResponse: async function(response) {
-        const resText = await response.text();
-        const isJsonFormat = this.isJsonFormat(resText);
+    extractResponse: async function({responseText, status, statusText}) {
         return {
-            ok: response.ok,
-            status: response.status,
-            statusText: response.statusText,
-            isJsonFormat,
-            data: resText,
+            ok: statusText.toLowerCase() === 'ok',
+            status,
+            statusText,
+            isJsonFormat: this.isJsonFormat(responseText),
+            data: responseText,
         };
     },
 

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

@@ -152,9 +152,8 @@ Ext.define('Coon.report.plugin.grid.OpenApiButtonPlugin', {
                     const data = Ext.JSON.decode(resp.responseText, true);
                     me.component.unmask();
                     Ext.isFunction(me.completeHandler) && me.completeHandler(data);
-
                     if (me.reloadAfterComplete) {
-                        me.component.fireEvent('needReload', this.reloadAfterComplete);
+                        me.component.fireEvent('needReload', me.reloadAfterComplete);
                     }
                     if (me.successMessage) {
                         Ext.Msg.alert(this.successTitle ? me.successTitle : 'Успешное выполнение'

package/src/uielement/component/settings/UiAceEditor.scss

@@ -0,0 +1,3 @@
+.UiAceEditor {
+    margin: 4px;
+}

package/src/util.js

@@ -325,7 +325,7 @@ Ext.define('Coon.util', {
                     } else {
                         acc[rule.to] = src[rule.from];
                     }
-                    acc[rule.to] = src[rule.to] || rule.defValue;
+                    acc[rule.to] = acc[rule.to] || rule.defValue;
                     return acc;
                 }
                 if (rule.to && !rule.from) {

package/src/version.js

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