ru.coon 2.8.3 → 2.8.6

package/CHANGELOG.md

@@ -1,9 +1,23 @@
+# Version 2.8.6, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71b44f6acfbe1db484173ac579218ed8c494ad3e)
+* update: CHANGELOG.md ([0b6d30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0b6d304fb344aaceedb55d591c80e4a815f339f0))
+
+# Version 2.8.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/224b99c8b4b9674f6732b71e76aa06961fd4e91d)
+* ## Fixes
+* <span style='color:red'>fix modified state for characteristic record, HT-10117</span> ([2f8762], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f876261d0065a0a02810ac5866f2832b2a36672))
+
+* update: CHANGELOG.md ([1e5402], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e5402b30bb754e5f58c5c3ccf70859dd6906f66))
+
+# 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))
+* <span style='color:green'>feat: HT-9649 Доработка DatePickerPresetsField (убран trigger clear)</span> ([4559c6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4559c6c4a8479928271e1b3daa34fc63a4eff8cb))
 
 * ## Fixes
 * <span style='color:red'> Разрешены html теги в колонке "Описание". Related to BFL-13996.</span> ([8a1793], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1793a93a87dcb10f92d854d491c31aefcd2563))
@@ -13,6 +27,9 @@
 * 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)
+* ## Features
+* <span style='color:green'>feat: HT-9649 Доработка DatePickerPresetsField</span> ([0f172e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0f172e42774d9f42ad8e228e5eda37880fd3b206))
+
 * ## Fixes
 * <span style='color:red'> HT-9264 CoonChart lite fix</span> ([d8e2d7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8e2d7a5994649ea9707fd6e901d1201813bbc36))
 

package/package.json

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

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/common/component/editor/CharacteristicGridCopyPlugin.js

@@ -86,8 +86,10 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
         if (!masterRecord) {
             return;
         }
-
-        slaveRecord.set('value', masterRecord.get('value'));
-        slaveRecord.set('valueDescription', masterRecord.get('valueDescription') || '');
+        slaveRecord.set({
+            markToCommit: true,
+            value: masterRecord.get('value'),
+            valueDescription: masterRecord.get('valueDescription') || '',
+        });
     },
 });

package/src/common/field/DatePickerPresetsField.js

@@ -9,9 +9,6 @@ Ext.define('Coon.common.field.DatePickerPresetsField', {
         prevYears: 10,
         nextYears: 0,
     },
-    viewModel: {
-        data: {},
-    },
     inclinedMonthNames: [
         'января',
         'февраля',
@@ -255,5 +252,4 @@ Ext.define('Coon.common.field.DatePickerPresetsField', {
             }
         },
     },
-
 });

package/src/version.js

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