ru.coon 2.8.72 → 2.8.74

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.8.74, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/03f252993ff5fe140d9d4d7c932568938495c2f8)
+* ## Fixes
+* <span style='color:red'>fix csrf in ReportTreeStore</span> ([676398], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/67639846c3cd9c26080176d8df48b751877ee128))
+
+* update: CHANGELOG.md ([9146a2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9146a22751066fdcbb7df9295b52a61a6c5fa025))
+
+# Version 2.8.73, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f97bb01382aad65df2b647ad444e17832801b2b4)
+* ## Fixes
+* <span style='color:red'> UiCustomController.processAccessDecision on [boxready, afterrender]</span> ([869ca8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/869ca8f1e3c130533b820feee6dab0d75e778810))
+
+* update: CHANGELOG.md ([116a19], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/116a197b861a06d314893c3d0b6e26e5a17e6ac3))
+
 # Version 2.8.72, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a1eeb12f31b999e7392be579f66ab4708402f925)
 * ## Fixes
 * <span style='color:red'>fix zero date</span> ([e4bac1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e4bac11fa1b2e186857a9b2032745053ffa0eaa3))

package/package.json

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

package/src/app/router/CoonRouter.js

@@ -0,0 +1,19 @@
+Ext.define('Coon.app.router.CoonRouter', {
+    // mixins: ['Ext.route.Mixin'],
+    extend: 'Ext.app.Controller',
+
+    constructor() {
+        console.log('CoonRouter', this);
+        this.setRoutes(
+            Object.fromEntries(
+                Object.entries(this.routes).map(([key, route]) => {
+                    if (route.routeaction) {
+                        return Ext.create(`routeaction.${route.routeaction}`).get(route);
+                    } else {
+                        return [key, route];
+                    }
+                })
+            )
+        );
+    },
+});

package/src/app/router/action.js

@@ -0,0 +1,8 @@
+Ext.define('Coon.app.router.action', {
+    get(options) {
+        return Object.assign({
+            action: this.action,
+            before: this.before,
+        }, options);
+    },
+});

package/src/app/router/actions/MenuItemAction.js

@@ -0,0 +1,41 @@
+Ext.define('Coon.app.router.actions.MenuItemAction', {
+    extend: 'Coon.app.router.action',
+
+    alias: 'routeaction.MenuItemAction',
+
+    action(route) {
+        this.lastRoute = route;
+        const app = Ext.getApplication();
+        if (!app.initialRoute) {
+            app.initialRoute = route;
+        }
+        Ext.fireEvent('route:change', route);
+    },
+
+    async before(route) {
+        Coon.log.debug('validateMenuItem.run', route.id);
+        try {
+            route.menuItem = await Coon.nav.MenuEntity.getMenuItem(route.id);
+            if (!route.menuItem) {
+                Coon.log.debug('validateMenuItem: miss menuItem', route.id);
+                route.stop();
+                return;
+            }
+            route.uiElement = await Coon.util.promisifyCmd(
+                'Coon.uielement.command.GetUIElementCommand',
+                route.menuItem.UI_ELEMENT_CD
+            );
+            if (!route.uiElement) {
+                Coon.log.debug('validateMenuItem: miss uiElement');
+                route.stop();
+                return;
+            }
+            route.urlHash = window.location.hash;
+            return true;
+        } catch (ex) {
+            route.stop();
+            return;
+        }
+    },
+
+});

package/src/app/router/actions/OcpbAction.js

@@ -0,0 +1,22 @@
+Ext.define('Coon.app.router.actions.OcpbAction', {
+    extend: 'Coon.app.router.action',
+
+    alias: 'routeaction.OcpbAction',
+    action(route) {
+        route.urlHash = window.location.hash;
+        if (route.urlHash.length > Coon.app.Router.maxUrlLength) {
+            return;
+        }
+
+        if (Coon.app.Router.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});
+            });
+        }
+    },
+
+});

package/src/report/component/reportpanel/ReportTreeStore.js

@@ -12,13 +12,13 @@ Ext.define('Coon.report.component.reportpanel.ReportTreeStore', {
     filterer: 'bottomup',
     proxy: {
         type: 'ajax',
-        headers: {
-            'X-CSRF-Token': localStorage.getItem('CSRFToken'),
-        },
         $configStrict: false,
         getMethod: function() {
             return 'POST';
         },
+        getHeaders: function() {
+            return {'X-CSRF-Token': localStorage.getItem('CSRFToken')};
+        },
         url: 'ReportFormData/get',
         reader: {
             type: 'json',

package/src/uielement/command/GetUIElementCommand.js

@@ -24,7 +24,7 @@ Ext.define('Coon.uielement.command.GetUIElementCommand', {
                     }
                     props.uiElementCd = this.uiElementCd;
                     props.accessDecision = data.accessDecision;
-                    Coon.log.debug('GetUIElementCommand.props', props);
+                    // Coon.log.debug('GetUIElementCommand.props', props);
                     data.propertyData = JSON5.stringify(props);
                 } catch (ex) {
                     Coon.log.error('GetUIElementCommand.UiCustomPanel: invalid propertyData JSON5');

package/src/uielement/component/UiCustomController.js

@@ -5,51 +5,66 @@ Ext.define('Coon.uielement.component.UiCustomController', {
 
     locals: {},
 
+    control: {
+        '#': {
+            boxready: 'processAccessDecision',
+            afterrender: 'processAccessDecision',
+        },
+    },
+
     init: function(view) {
         if (this.isTracePluginsEnabled()) {
             this.getTraceBuffer();
         }
+    },
+
+    processAccessDecision() {
+        if (this.isAccessDecisionProcessed) {
+            return;
+        }
+        this.isAccessDecisionProcessed = true;
+        const view = this.getView();
         const config = view.propertyData || view.initialConfig;
         if (!view || typeof view.on !== 'function') {
             Coon.log.debug(` [Error]UiCustomController.init - view not found or view.on is not a function`);
             return;
         }
-        view.on('afterrender', function() {
-            const {accessDecision, securePoints} = config;
-            Coon.log.debug('UiCustomController.accessProps', {accessDecision, securePoints});
-            if (!Ext.isObject(accessDecision) || accessDecision.allow) {
-                return;
-            }
-            const viewButtons = view.query('button');
-            const allowedMap = new Set(accessDecision.allowedItems);
-            if (Ext.isObject(securePoints.buttons) && Object.keys(securePoints.buttons).length) {
-                Coon.log.debug(`used securePoints, allowed: ${accessDecision.allowedItems}, secureButtons: ${Object.keys(securePoints.buttons)}`);
-                viewButtons.forEach((btn) => {
+        Coon.log.debug('UiCustomController.config', config);
+
+        const {accessDecision, securePoints} = config;
+        Coon.log.debug('UiCustomController.accessProps', {accessDecision, securePoints});
+        if (!Ext.isObject(accessDecision) || accessDecision.allow) {
+            return;
+        }
+        const viewButtons = view.query('button');
+        const allowedMap = new Set(accessDecision.allowedItems);
+        if (Ext.isObject(securePoints.buttons) && Object.keys(securePoints.buttons).length) {
+            Coon.log.debug(`used securePoints, allowed: ${accessDecision.allowedItems},\nsecureButtons: ${Object.keys(securePoints.buttons)}`);
+            viewButtons.forEach((btn) => {
+                const id = Coon.util.translit(btn.text || btn.iconCls);
+                if (securePoints.buttons[id] && !allowedMap.has(id)) {
+                    btn.hide();
+                }
+            });
+        } else {
+            const excludeBtns = [].concat(
+                view.query('tabpanel > tabbar > button').map((btn) => btn.id),
+                view.query('ReportPanel button').map((btn) => btn.id),
+                view.query('CharacteristicGridEditor button').map((btn) => btn.id)
+            );
+            const excludeIds = new Set(excludeBtns);
+            view.query('button')
+                .filter((btn) => btn.text && !excludeIds.has(btn.id))
+                .forEach((btn) => {
                     const id = Coon.util.translit(btn.text || btn.iconCls);
-                    if (securePoints.buttons[id] && !allowedMap.has(id)) {
+                    if (allowedMap.has(id)) {
+                        Coon.log.debug('PASSED: view.button.id', id);
+                    } else {
                         btn.hide();
+                        Coon.log.debug('HIDE: view.button.id', id);
                     }
                 });
-            } else {
-                const excludeBtns = [].concat(
-                    view.query('tabpanel > tabbar > button').map((btn) => btn.id),
-                    view.query('ReportPanel button').map((btn) => btn.id),
-                    view.query('CharacteristicGridEditor button').map((btn) => btn.id)
-                );
-                const excludeIds = new Set(excludeBtns);
-                view.query('button')
-                    .filter((btn) => btn.text && !excludeIds.has(btn.id))
-                    .forEach((btn) => {
-                        const id = Coon.util.translit(btn.text || btn.iconCls);
-                        if (allowedMap.has(id)) {
-                            Coon.log.debug('PASSED: view.button.id', id);
-                        } else {
-                            btn.hide();
-                            Coon.log.debug('HIDE: view.button.id', id);
-                        }
-                    });
-            }
-        }, this);
+        }
     },
 
     getData(view) {

package/src/version.js

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