ru.coon 3.0.61 → 3.0.62

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 3.0.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/84377986f250a0a6d0428be0f0b4439bc8e4b080)
+* sync ([368524], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/368524d52dd3f4fe03818291c6418246af14d81f))
+* sync ([7896b3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7896b3427c19ff691b961deca2c28bac9e39145d))
+* sync ([aa2c61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa2c61b0e9f0d57e1f8fa1a5a47231cc70cc7813))
+* update: CHANGELOG.md ([0624d1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0624d16d97c878b4e695b775a6a08cb00d3f12bd))
+
 # Version 3.0.61, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a79e6af1f962bbf5062d7a242281b679c4b0f35)
 * update: CHANGELOG.md ([dcc546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcc5460b35c3144e1f382de27906035b5a6057d8))
 
@@ -10,6 +16,11 @@
 
 * HT-13993 добавлена боковая панель фильтров для репортов ([e2d5c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e2d5c7436900d232cd48c9389a685affbacf721a))
 * HT-14628 открытие компонента внутри репорта - закрытие через крестик ([fc4f4e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fc4f4e9112a3ba1a85cb4a064d65d7a7cfb8cec1))
+* prerelease urls ([da6a94], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da6a94022df090290d9ff8f7ae96adf2f486fed8))
+* sync ([4f0a82], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f0a82ba634e89ef75c8c7006d691725c5252ba1))
+* sync ([f650de], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f650de035c4135485bbe05745b372095d807c565))
+* upd ([47ade3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/47ade3ed0f9782d87c3271b98fa746cb1f4d9157))
+* upd ([7f6bc5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7f6bc58a66df2cac0f35853416c2ef3a0c9a8455))
 * update: CHANGELOG.md ([e42a2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e42a2a6fb8b511ba174ab5060fc84c683a046945))
 
 # Version 3.0.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/065a134b1f6c6211d56ef758b127778d5e104faa)

package/package.json

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

package/src/app/Application.js

@@ -7,6 +7,8 @@ Ext.define('Coon.app.Application', {
         applicationMainView: null,
     },
 
+    links: {},
+
     init() {
         this.appRouter = Coon.app.Router;
     },
@@ -256,7 +258,6 @@ Ext.define('Coon.app.Application', {
     },
 
     launch: function() {
-        this.appRouter.onBeforeRouteEnterFn = this.isAuthenticated.bind(this);
         Ext.on('auth:logout', this.onLogout, this);
         let jwtToken;
         let beforeAuth = () => Promise.resolve();

package/src/app/Router.js

@@ -1,6 +1,8 @@
 Ext.define('Coon.app.Router', {
     mixins: ['Ext.route.Mixin'],
     singleton: true,
+
+    maxUrlLength: 2048,
     constructor() {
         this.setRoutes({
             '*': {before: 'onAny'},
@@ -8,6 +10,17 @@ Ext.define('Coon.app.Router', {
                 action: 'onRouteEnter',
                 before: 'validateMenuItem',
             },
+            'route/:{cmpId}?:{parameters}': {
+                action: 'onSpecificRoute',
+                conditions: {
+                    parameters: {
+                        re: '(.*)?',
+                        parse: function(values) {
+                            return Ext.isEmpty(values) ? {} : Ext.urlDecode(values);
+                        },
+                    },
+                },
+            },
         });
         Ext.on('router:goToLastRoute', () => {
             this.onRouteEnter(this.lastRoute);
@@ -16,9 +29,27 @@ Ext.define('Coon.app.Router', {
 
     lastRoute: null,
 
+    onSpecificRoute(route) {
+        route.urlHash = window.location.hash;
+        if (route.urlHash.length > Coon.app.Router.maxUrlLength) {
+            return;
+        }
+
+        if (this.getRouterView()) {
+            Ext.create('Coon.common.component.OpenComponent', {})
+                .loadUIElement(route.cmpId, route.parameters, {urlHash: route.urlHash});
+        } else {
+            Ext.getApplication().on('centerview:init', () => {
+                Ext.create('Coon.common.component.OpenComponent', {})
+                    .loadUIElement(route.cmpId, route.parameters, {urlHash: route.urlHash});
+            });
+        }
+    },
+
     onAny(action) {
         if (Ext.getApplication().isAuthenticated()) {
             action.resume();
+            return true;
         } else {
             Coon.log.debug('beforeAnyRoute: not authorized');
             if (action.stop) {
@@ -46,6 +77,7 @@ Ext.define('Coon.app.Router', {
                 route.stop();
                 return;
             }
+            route.urlHash = window.location.hash;
             return true;
         } catch (ex) {
             route.stop();
@@ -53,24 +85,6 @@ Ext.define('Coon.app.Router', {
         }
     },
 
-    onBeforeRouteEnterFn: null,
-
-    onBeforeRouteEnter() {
-        if (typeof this.onBeforeRouteEnterFn === 'function') {
-            return this.onBeforeRouteEnterFn();
-        }
-        return true;
-    },
-
-    onBeforeRouteEnterFailedFn: null,
-
-    onBeforeRouteEnterFailed() {
-        if (typeof this.onBeforeRouteEnterFailedFn === 'function') {
-            return this.onBeforeRouteEnterFailedFn();
-        }
-        return true;
-    },
-
     getLastRoute() {
         return this.lastRoute;
     },
@@ -85,7 +99,7 @@ Ext.define('Coon.app.Router', {
     },
 
     getRouterView() {
-        return Ext.ComponentQuery.query('centerview')[0];
+        return Ext.getApplication().links && Ext.getApplication().links.centerView;
     },
 
     getActiveComponent() {
@@ -103,4 +117,12 @@ Ext.define('Coon.app.Router', {
         return jwtToken;
     },
 
+    assign(urlHash) {
+        if (urlHash.length <= Coon.app.Router.maxUrlLength) {
+            window.location.assign(urlHash);
+        } else {
+            Coon.log.debug('urlHash too long');
+        }
+    },
+
 });

package/src/app/viewPort/CenterView.js

@@ -32,14 +32,17 @@ Ext.define('Coon.app.viewPort.CenterView', {
 
     initComponent() {
         this.callParent();
-
+        Ext.getApplication().links.centerView = this;
         Ext.on('route:change', this.setMenuComponent, this);
-
         this.on('beforeadd', function() {
             return !this.isTabLimit();
         }, this);
-
         this.on('add', function(_, component) {
+            component.on('activate', function(component) {
+                if (typeof component.urlHash === 'string' && component.urlHash.startsWith('#')) {
+                    Coon.app.Router.assign(component.urlHash);
+                }
+            }, this);
             component.on('render', function() {
                 this.setScrollButtonVisibility();
             }, this, {single: true});
@@ -47,6 +50,8 @@ Ext.define('Coon.app.viewPort.CenterView', {
         this.on('remove', function() {
             this.setScrollButtonVisibility();
         }, this);
+
+        Ext.getApplication().fireEvent('centerview:init');
     },
 
     setScrollButtonVisibility() {

package/src/common/ComponentFactory.js

@@ -161,6 +161,7 @@ Ext.define('Coon.common.ComponentFactory', {
         }
         const instanceConfig = {
             xtype: 'CVWrapperPanel',
+            urlHash: route.urlHash,
             closable: true,
             componentContext: config.componentContext,
             menuItem: config.menuItem,