ru.coon 2.8.2 → 2.8.4

package/CHANGELOG.md

@@ -1,10 +1,25 @@
+# Version 2.8.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79f9eb3363e07fb47ac3ac23659b94b34c7423b9)
+* TR-69542 fix: восстановление утраченной авторизации по токену. ([402a8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/402a8a5e63da1342b44b6e95a7eed96d5b9a42aa))
+* update: CHANGELOG.md ([b11b4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b11b4c53ff53f0dde24c4e017e09046a77609ac4))
+
+# Version 2.8.3, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2bd405e3421aa5e65c5c112ce39cd61806e1e09)
+* update: CHANGELOG.md ([f52e7b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f52e7b66d3bb410cfe89272d0eccd0632d1c30e3))
+
 # Version 2.8.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2e3da084c82fa409dca30ef2388bab2f3ef267b)
+* ## Features
+* <span style='color:green'>feat: Added createFromString function. Related to BFL-15767.</span> ([cea621], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cea6218e44b5768116718379e25cc52706ef8a75))
+
 * ## Fixes
+* <span style='color:red'> Разрешены html теги в колонке "Описание". Related to BFL-13996.</span> ([8a1793], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1793a93a87dcb10f92d854d491c31aefcd2563))
 * <span style='color:red'> TR-69409 исправление проверки значения свойства successMessage в ExecuteCommandPlugin</span> ([b77390], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b77390cabfdbdf3ad837c896b805a4bc7e5e92f3))
 
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update Function.js35da450c2734c57db4cc7bd13380f6da400a9a96))
 * update: CHANGELOG.md ([ad61a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad61a8c449000e7b9ff6e921d39eecd97ddabea2))
 
 # Version 2.8.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/88c146ad577ce2a14d194c245e3d5151081af6af)
+* ## Fixes
+* <span style='color:red'> HT-9264 CoonChart lite fix</span> ([d8e2d7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8e2d7a5994649ea9707fd6e901d1201813bbc36))
+
 * add unconditional versioning ([187668], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/187668ff86c8e91b440ce9b8a1052a191a7989d6))
 * update: CHANGELOG.md ([8386a7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8386a79fae89b882f1a3baf81849bb08ffd7a298))
 

package/package.json

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

package/src/Function.js

@@ -783,4 +783,23 @@ Ext.define('Coon.Function', {
     beforeRequest(requestOptions, requestHash) {
         return this.debounceRequest(requestOptions, requestHash);
     },
+
+    /**
+     * Создает функцию из строки с определением функции.
+     * @param fnText
+     * @returns {Function | undefined}
+     * @throws {Error}
+     */
+    createFromString(fnText = '') {
+        if (typeof fnText === 'string' && fnText.startsWith('function')) {
+            // Extract the function body
+            const fnBody = fnText.slice(fnText.indexOf('{') + 1, fnText.lastIndexOf('}')).trim();
+
+            // Extract the parameter names
+            const argsMatch = fnText.match(/\(([^)]*)\)/);
+            const argNames = argsMatch ? argsMatch[1].split(',').map((arg) => arg.trim()) : [];
+
+            return new Function(...argNames, fnBody);
+        }
+    },
 });

package/src/app/Application.js

@@ -196,25 +196,41 @@ Ext.define('Coon.app.Application', {
         });
     },
 
-
     launch: function() {
         this.appRouter.onBeforeRouteEnterFn = this.isAuthenticated.bind(this);
         Ext.on('auth:logout', this.onLogout, this);
-        this.checkAuth().then(() => {
-            Ext.get('splash').fadeOut({
-                duration: 1000,
-                listeners: {
-                    afteranimate: {
-                        fn: this.afterLoad,
-                        single: true,
-                        scope: this,
-                    },
-                },
+        let jwtToken;
+        let beforeAuth = () => Promise.resolve();
+        if (Ext.isFunction(this.checkJwtAuth)) {
+            jwtToken = this.appRouter.getAuthToken();
+            if (jwtToken) {
+                beforeAuth = this.checkJwtAuth;
+            }
+        }
+
+        beforeAuth.call(this, jwtToken)
+            .then(this.checkAuth.bind(this))
+            .then(() => {
+                this.stopAnimation();
+                this.afterCheckAuth();
             });
-            this.afterCheckAuth();
-        });
+
         this.afterLaunch();
     },
+
+    stopAnimation() {
+        Ext.get('splash').fadeOut({
+            duration: 1000,
+            listeners: {
+                afteranimate: {
+                    fn: this.afterLoad,
+                    single: true,
+                    scope: this,
+                },
+            },
+        });
+    },
+
     afterAuthorized() {},
 
     afterLaunch() {},

package/src/app/Router.js

@@ -75,5 +75,14 @@ Ext.define('Coon.app.Router', {
         const routerView = this.getRouterView();
         return routerView && routerView.getLayout().getActiveItem();
     },
+    getAuthToken() {
+        const search = document.location.search;
+        let jwtToken;
+        if (Ext.isString(search) && search.includes('?')) {
+            const urlParameters = Ext.Object.fromQueryString(search);
+            jwtToken = urlParameters.jwtToken;
+        }
+        return jwtToken;
+    },
 
 });

package/src/chart/editor/CoonChartEditorController.js

@@ -246,8 +246,8 @@ Ext.define('Coon.chart.editor.CoonChartEditorController', {
         // vm.set('coonChart.propertyData', JSON.stringify(coonChart.propertyData));
         const validation = await this.validate();
         if (validation.state) {
-            const commandName = vm.get('mode') === 'EDIT' ? 'SaveUIElementCommand' : 'AddUIElementCommand';
-            const command = Ext.create('command.' + commandName, {activeComponent: this.getView()});
+            // const commandName = vm.get('mode') === 'EDIT' ? 'SaveUIElementCommand' : 'AddUIElementCommand';
+            const command = Ext.create('command.SaveUIElementCommand', {activeComponent: this.getView()});
             command.on('complete', function(coonChartBean) {
                 vm.set('editorMode', 'edit');
             }, this);

package/src/chart/editor/DataSourceChartBindForm.js

@@ -48,9 +48,9 @@ Ext.define('Coon.chart.editor.DataSourceChartBindForm', {
     },
 
     loadReportFields(data) {
-        const fields = data.map((r) => r.description);
+        // const fields = data.map((r) => r.description);
         this.links.form.removeAll();
-        fields.forEach((field) => {
+        data.forEach((field) => {
             this.links.form.add({
                 xtype: 'panel',
                 margin: 4,
@@ -61,12 +61,12 @@ Ext.define('Coon.chart.editor.DataSourceChartBindForm', {
                     pack: 'center',
                 },
                 items: [
-                    {xtype: 'displayfield', value: field, width: 130, fieldStyle: 'text-align: right'},
+                    {xtype: 'displayfield', value: field.description, width: 130, fieldStyle: 'text-align: right'},
                     {
                         xtype: 'combo',
-                        itemId: field,
+                        itemId: field.reportFieldCd,
                         maxWidth: 350,
-                        reference: field,
+                        reference: field.reportFieldCd,
                         flex: 1,
                         displayField: 'name',
                         valueField: 'value',
@@ -80,7 +80,7 @@ Ext.define('Coon.chart.editor.DataSourceChartBindForm', {
                         //     ],
                         // },
                         bind: {
-                            value: `{coonChart.fieldset.${field}}`,
+                            value: `{coonChart.fieldset.${field.reportFieldCd}}`,
                             store: '{comboStore}',
                         },
                         listeners: {
@@ -114,14 +114,14 @@ Ext.define('Coon.chart.editor.DataSourceChartBindForm', {
                     // },
                     {
                         xtype: 'textfield',
-                        itemId: `${field}_defval`,
+                        itemId: `${field.reportFieldCd}_defval`,
                         fieldLabel: 'default',
                         tooltip: 'значение по умолчанию(если получили пустое)',
                         width: 100,
                         disabled: true,
                         bind: {
-                            value: `{coonChart.fieldDefaults.${field}}`,
-                            disabled: `{!coonChart.fieldset.${field}}`,
+                            value: `{coonChart.fieldDefaults.${field.reportFieldCd}}`,
+                            disabled: `{!coonChart.fieldset.${field.reportFieldCd}}`,
                         },
                         listeners: {
                             disable: function(field) {
@@ -131,20 +131,20 @@ Ext.define('Coon.chart.editor.DataSourceChartBindForm', {
                     },
                     {
                         xtype: 'displayfield',
-                        itemId: `${field}_alertMsg`,
+                        itemId: `${field.reportFieldCd}_alertMsg`,
                         fieldStyle: {
                             color: 'red',
                         },
                         tooltip: 'уведомление о некорректных данных',
                         flex: 1,
                         bind: {
-                            value: `{fieldAlerts.${field}}`,
+                            value: `{fieldAlerts.${field.reportFieldCd}}`,
                         },
                     }
                 ],
             });
         });
-        this.links.grid.reconfigure(null, fields.map((key) => ({dataIndex: key, text: `${key}`, flex: 1})));
+        this.links.grid.reconfigure(null, data.map((key) => ({dataIndex: `${key.reportFieldCd}`, text: `${key.description}`, flex: 1})));
     },
 
     loadData(rows) {

package/src/report/component/settings/field/ReportFormFieldsGrid.js

@@ -123,6 +123,7 @@ Ext.define('Coon.report.component.settings.field.ReportFormFieldsGrid', {
                 editor: {
                     xtype: 'textfield',
                     allowBlank: false,
+                    vtype: false,
                 },
             },
             {

package/src/version.js

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