ru.coon 2.7.76 → 2.8.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.8.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/74558cb55135099e1cc4ba5ec585ac75e12cbd83)
+* update: CHANGELOG.md ([46e9bc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/46e9bc47a9ddb94057c101cc12e5061ba7cf22ce))
+
+# Version 2.7.77, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed565df4038dd160f1166e689d81d359feb3003c)
+* update: CHANGELOG.md ([ae6b28], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ae6b28704a00eeaf40f433bba41ae4a6eaaa99f8))
+
 # Version 2.7.76, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aba7291e49ef3d047503bdb2b8dae078d617a8f2)
 * ## Fixes
 * <span style='color:red'>fix precision in CopyRowsFromGrid, HT-9263</span> ([a02eb9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a02eb9443ebf6794e35abdc924c45763c815b245))
@@ -345,16 +351,24 @@ fix: restore version of custom panel in editor</span> ([53a300], [link](http://g
 
 # Version 2.7.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a72ce199d2d79b7a5dcb52cc81cd68e46f34829a)
 * ## Features
+* <span style='color:green'>feat: TR-68867: fix undefined elems in main view</span> ([3e38e7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e38e74f415961b3aa87b86e646bdc5e253c0398))
 * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([97cda5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/97cda502cccce84bd63fd23a9f4b82fb42caa65b))
+* <span style='color:green'>feat: TR-68867: create coon application for all projects</span> ([1206ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1206ecc140735a0ddc99120be3283e5e1dfc0bf5))
+* <span style='color:green'>feat: TR-68867: create coon application for all projects</span> ([85563b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/85563b717f0cd6a5a79fd4f78262b6a4375dc8c9))
 
 * ## Fixes
 * <span style='color:red'> HT-8422: set filter panel height on afterlayout</span> ([d65a92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d65a9277c2fcedaba912ff40ba7a912049bdd7f7))
+* <span style='color:red'> TR-68867 fix for label fields on filterPanel</span> ([740ac7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/740ac7bbb89794e46b5bca99bd6d279350e2672f))
 * <span style='color:red'> HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([0a7edf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a7edf4357213fd7872ecb361ce47261b3102b4c))
 * <span style='color:red'> HT-8131 refactoring</span> ([f2b72a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2b72a804d99b23988f0e25d2f5e0ec831c694bb))
 
 * update: CHANGELOG.md ([880435], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/88043579448bda38f9c2b2ec4d159a2d502dba5a))
 
 # Version 2.7.29, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/567513e38f7c7e6b90e1873785d5fb69e9fb9f4b)
+* ## Features
+* <span style='color:green'>feat: TR-68867: create coon application for all projects</span> ([e815bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e815bf50e927dfa8ee863f0c51243ef51d034818))
+* <span style='color:green'>feat: TR-68867: create coon application for all projects</span> ([795acd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/795acd7893676751680af5a74a6a3b4467abc215))
+
 * ## Fixes
 * <span style='color:red'> HT-8131 set new menu</span> ([19b735], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19b73537c87c685cdf11156c4cc95e120b7eb89e))
 * <span style='color:red'> HT-8131 renaming</span> ([6a84ad], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a84ad2ca12ee556278e9f2bb25a9fe94b8ae38e))

package/package.json

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

package/src/app/Application.js

@@ -0,0 +1,224 @@
+Ext.define('Coon.app.Application', {
+    extend: 'Ext.app.Application',
+    name: 'CoonApplication',
+    requires: ['Iconpack.*', 'Coon.*', 'Ext.*'],
+    config: {
+        applicationMainView: null,
+    },
+
+    appRouter: Coon.app.Router,
+
+    onLogout: function() {
+        Ext.Msg.show({
+            title: 'Сообщение системы',
+            msg: 'Вы действительно хотите выйти?',
+            buttons: Ext.Msg.YESNO,
+            fn: function(btn) {
+                if (btn === 'yes') {
+                    Ext.getBody().mask();
+                    this.setUserData();
+                    sessionStorage.clear();
+                    window.location.href = '/logout';
+                }
+            },
+            scope: this,
+        });
+    },
+
+    isAuthenticated() {
+        const userData = this.getUserData();
+        return userData && userData.authenticated === true;
+    },
+
+    getUserData() {
+        return localStorage.getJson('userData') || {};
+    },
+
+    setUserData(data) {
+        localStorage.setItem('userData', data || null);
+    },
+
+    clearUserData() {
+        this.processNotAuthorizedAction();
+    },
+
+    processNotAuthorizedAction() {
+        sessionStorage.clear();
+        this.setUserData();
+        window.location.reload();
+    },
+
+    createFxAnim(view, showFlag, callback) {
+        const cfg = showFlag ?
+            {
+                from: {hidden: false, style: {background: 'transparent'}, opacity: 0},
+                to: {opacity: 1},
+            } :
+            {
+                from: {hidden: false, opacity: 1},
+                to: {opacity: 0, hidden: true},
+
+            };
+        const cmp = Ext.create('Ext.fx.Anim', Ext.apply(cfg, {
+            target: view,
+            duration: 1000,
+        }));
+        if (callback) {
+            cmp.on('afteranimate', callback, this, {single: true});
+        }
+    },
+
+    onLoginSuccessful() {
+        this.createFxAnim(this.getApplicationMainView(), false, async function() {
+            this.getApplicationMainView().destroy();
+            this.setApplicationMainView(Ext.create({
+                xtype: 'mainview',
+                plugins: 'viewport',
+                hidden: true,
+            }));
+            this.createFxAnim(this.getApplicationMainView(), true);
+            this.getApplicationMainView().show();
+            this.afterAuthorized();
+        });
+        this.getApplicationMainView().show();
+    },
+
+    afterLoad: async function() {
+        this.appRouter.onBeforeRouteEnterFailedFn = this.processNotAuthorizedAction;
+        Ext.on('auth:loginSuccessful', this.onLoginSuccessful, this);
+
+        const {authenticated, requireTwoFactorAuthentication} = this.getUserData();
+        if (authenticated && requireTwoFactorAuthentication) {
+            this.setUserData();
+        }
+        const isAuthValid = authenticated === true && !requireTwoFactorAuthentication;
+        let view = isAuthValid ? 'mainview' : 'loginview';
+
+        if (window.location.href.indexOf('customForm') > -1) {
+            view = 'frameview';
+        }
+
+        this.setApplicationMainView(Ext.create({
+            xtype: view,
+            plugins: 'viewport',
+            hidden: true,
+            workspace: null,
+        }));
+
+
+        Ext.get('splash').destroy();
+
+        this.createFxAnim(this.getApplicationMainView(), true, () => {
+            Ext.getBody().removeCls('launching');
+        });
+        this.getApplicationMainView().show();
+
+        if (isAuthValid) {
+            this.afterAuthorized();
+        }
+    },
+    getErrorMessage(response) {
+        if (response.responseType === 'json') {
+            return response.responseJson;
+        }
+        const responseText = this.getResponseText(response);
+        try {
+            return Ext.decode(responseText);
+        } catch (ex) {
+            return responseText;
+        }
+    },
+
+    getResponseText: function(response) {
+        if (typeof response.responseText !== 'undefined') {
+            return response.responseText;
+        }
+        if (typeof response.responseBytes !== 'undefined') {
+            return new TextDecoder().decode(response.responseBytes);
+        }
+        return Ext.encode({
+            message: 'Неизвестная ошибка',
+        });
+    },
+
+    /**
+     * @method resendModifiedRequest
+     * resend request with additional parameters
+     *
+     * @param {Ext.data.Connection} conn
+     * @param {Object} responseData
+     * @param {Object} options
+     * @param {number} messageCategory
+     * @param {number} messageCode
+     */
+    resendModifiedRequest(conn, responseData, options, messageCategory, messageCode) {
+        const billingIgnoredValidation = responseData.billingIgnoredValidation || '';
+
+        // modify options with category and code
+        options.params.billingIgnoredValidation =
+            `${billingIgnoredValidation}${messageCategory},${messageCode};`,
+
+        conn.request(options);
+    },
+
+    onAppUpdate: function() {
+        Ext.Msg.show({
+            title: 'Сообщение системы',
+            closable: false,
+            message: 'Доступна новая версия, приложение будет обновлено',
+            cls: 'simplestInfoMsg',
+            buttons: Ext.Msg.OK,
+            left: 0,
+            icon: Ext.Msg.INFO,
+            fn: function(btn) {
+                if (btn === 'ok') {
+                    Ext.fireEvent('application:onAppUpdate');
+                    window.location.reload();
+                }
+            },
+        });
+    },
+
+    checkAuth() {
+        return Ext.Ajax.request({
+            url: '/info',
+            headers: {'X-CSRF-Token': localStorage.getItem('CSRFToken')},
+            method: 'GET',
+        }).then((res) => {
+            if (Ext.isString(res.responseText)) {
+                this.setUserData(res.responseText);
+            }
+        }).catch((res) => {
+            if (res.status === 401) {
+                this.processNotAuthorizedAction();
+            }
+            Ext.Msg.alert('ошибка', res.responseText, this.getErrorMessage(res));
+        });
+    },
+
+
+    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,
+                    },
+                },
+            });
+            this.afterCheckAuth();
+        });
+        this.afterLaunch();
+    },
+    afterAuthorized() {},
+
+    afterLaunch() {},
+
+    afterCheckAuth() {},
+
+});

package/src/app/Application.scss

@@ -0,0 +1,9 @@
+.simplestInfoMsg {
+  .x-btn-default-small {
+    width: 100px;
+    left: 40% !important;
+  }
+  .x-window-item .x-box-layout-ct {
+    top: 15px !important;
+  }
+}

package/src/app/Router.js

@@ -1,27 +1,61 @@
 Ext.define('Coon.app.Router', {
     mixins: ['Ext.route.Mixin'],
-    routes: {
-        ':{type}/:{id}': {
-            action: 'onRouteEnter',
-        },
-        ':{id}': {
-            action: 'onRouteEnter',
-        },
-        ':{type}/:{id}/:{params...}': {
-            action: 'onRouteEnter',
-            types: {
-                '...': {
-                    re: '(.+)?',
-                    split: '/',
-                    parse: (value) => value,
+    singleton: true,
+    constructor() {
+        this.setRoutes({
+            ':{type}/:{id}': {
+                action: 'onRouteEnter',
+            },
+            ':{id}': {
+                action: 'onRouteEnter',
+            },
+            ':{type}/:{id}/:{params...}': {
+                action: 'onRouteEnter',
+                types: {
+                    '...': {
+                        re: '(.+)?',
+                        split: '/',
+                        parse: (value) => value,
+                    },
                 },
             },
-        },
+        });
+        Ext.on('router:goToLastRoute', () => {
+            this.onRouteEnter(this.lastRoute);
+        }, this);
+    },
+
+    lastRoute: null,
+
+    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;
     },
-    onClassMixedIn() {
-        this.prototype.setRoutes(this.prototype.config.routes);
+
+
+    getLastRoute() {
+        return this.lastRoute;
     },
+
     onRouteEnter(route) {
+        this.lastRoute = route;
+        if (!this.onBeforeRouteEnter()) {
+            this.onBeforeRouteEnterFailed();
+            return;
+        }
         const app = Ext.getApplication();
         if (!app.initialRoute) {
             app.initialRoute = route;
@@ -41,4 +75,5 @@ Ext.define('Coon.app.Router', {
         const routerView = this.getRouterView();
         return routerView && routerView.getLayout().getActiveItem();
     },
+
 });

package/src/app/{component → viewPort}/CenterView.js

@@ -1,4 +1,4 @@
-Ext.define('Coon.app.component.CenterView', {
+Ext.define('Coon.app.viewPort.CenterView', {
     extend: 'Ext.container.Container',
     xtype: 'centerview',
     requires: ['Coon.util'],

package/src/app/{component → viewPort}/CenterViewController.js

@@ -1,4 +1,4 @@
-Ext.define('Coon.app.component.CenterViewController', {
+Ext.define('Coon.app.viewPort.CenterViewController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.CenterViewController',
     requires: ['Coon.util', 'Coon.Function'],

package/src/app/viewPort/Main.js

@@ -18,7 +18,7 @@ Ext.define('Coon.app.viewPort.Main', {
             },
             items: [
                 {
-                    xtype: 'CoonAppTopView',
+                    xtype: 'panel',
                     height: 48,
                 },
                 {
@@ -28,7 +28,7 @@ Ext.define('Coon.app.viewPort.Main', {
                     dockedItems: [
                         {
                             dock: 'bottom',
-                            xtype: 'CoonAppBottomView',
+                            xtype: 'panel',
                         }
                     ],
                 }
@@ -52,13 +52,10 @@ Ext.define('Coon.app.viewPort.Main', {
                 {
                     xtype: 'AppNavigationBar',
                     flex: 1,
-                },
-                {
-                    xtype: 'CoonAppHeaderUserBlock',
                 }
             ],
         },
-        {xtype: 'CoonAppFooterView', reference: 'footerview', region: 'south', docked: 'bottom', weight: -2},
+        {xtype: 'panel', reference: 'footerview', region: 'south', docked: 'bottom', weight: -2},
         {xtype: 'centerview', reference: 'centerview', region: 'center', weight: -1},
         {
             xtype: 'panel',

package/src/common/plugin/form/RequiredFlagPlugin.js

@@ -24,6 +24,9 @@ Ext.define('Coon.common.plugin.form.RequiredFlagPlugin', {
     },
 
     init: function(field) {
+        if (typeof field.getValue !== 'function' || typeof field.isValid !== 'function') {
+            return;
+        }
         this.field = field;
         this.field.setEnableHighlightingRequiredFields = this.setEnableHighlightingRequiredFields.bind(this);
         this.field.getEnableHighlightingRequiredFields = this.getEnableHighlightingRequiredFields.bind(this);

package/src/nav/AppNavigationMenuController.js

@@ -10,6 +10,7 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
     selectThenMenuReady: undefined,
     addWorkspaceToUrl: false,
     menuUpdate: false,
+    lastRoute: false,
     init: function(view) {
         view.updateSelection = this.updateSelection.bind(this);
         view.getMenuReady = this.getMenuReady.bind(this);
@@ -17,7 +18,8 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         view.changeMicro = this.changeMicro.bind(this);
         view.changeWorkspace = this.changeWorkspace.bind(this);
         this.view.on('selectionchange', this.onSelectMenuItem, this);
-        this.loadMenu();
+        this.lastRoute = Ext.getApplication().appRouter.lastRoute || false;
+        this.loadMenu(false, !!this.lastRoute);
         Ext.on('route:initial', (route) => {
             this.selectThenMenuReady = route.id;
         });
@@ -178,7 +180,7 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
 
         return node;
     },
-    loadMenu(uiElementCd) {
+    loadMenu(uiElementCd, lastRoute) {
         Coon.nav.MenuEntity.get().then((menu) => {
             if (Array.isArray(menu)) {
                 const dataList = this.prepareMenuData(menu);
@@ -236,7 +238,11 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
                     this.changeWorkspace(this.getViewModel().get('workspace'), false);
                     this.selectMenuItem(uiElementCd, true);
                 } else {
-                    this.onMenuReady();
+                    if (!lastRoute) {
+                        this.onMenuReady();
+                    } else {
+                        Ext.fireEvent('router:goToLastRoute');
+                    }
                 }
             }
         });

package/src/version.js

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