ru.coon 2.7.4 → 2.7.5

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.7.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98f5d7b3391db7e90e8818d6071c674b71cb6afd)
+* ## Features
+* <span style='color:green'>feat: TR-67883: reload main navigation on change menu structure</span> ([a6a849], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6a849e812bc3988abadc526aa4829830eb89ed2))
+
+* HT-7448 fix: Исправление проверки валидности параметров команды ([99c08a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99c08a16a68766ece123b717ef48400b14f51d54))
+* update: CHANGELOG.md ([90c0e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/90c0e823dcf1d3687c38ada3d6711a84fa15e083))
+
 # Version 2.7.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7becde7cc7cfb8254525c8beca11cbd4604b8181)
 * ## Features
 * <span style='color:green'>feat: HT-7823: refactor</span> ([07e9f0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/07e9f00376ea39fe7888e7d264d291222667ce0f))
@@ -99,17 +106,30 @@
 * update: CHANGELOG.md ([4e316a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e316ac4c2c96cb4de23ff0dfb73ff4db75ea4ec))
 
 # Version 2.6.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a85820f03c44ab7b35ae02ae88209c435f264807)
+* ## Features
+* <span style='color:green'>feat: TR-67883: move main view in ru.coon</span> ([174f7f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/174f7fa553ce35d1dfbc3f64603ffb1cc3ca50b0))
+
 * ## Fixes
 * <span style='color:red'> PrintPdfPlugin.handler call parseProperty on 'string'</span> ([8dec18], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8dec18c777cd4e6f3daf9fb1540726e613639220))
 
+* Merge remote-tracking branch 'origin/SUE-TR-67883' into SUE-TR-67883 ([99daa5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99daa5bd732a99ecc56761a010045548d609c217))
+* Merge remote-tracking branch 'origin/SUE-TR-67883' into SUE-TR-67883 ([186915], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1869158fbf8745c5659f595e0eed0899f62f0fe2))
+* Merge remote-tracking branch 'origin/SUE-TR-67883' into SUE-TR-67883 ([e4938b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e4938b6d9c3c90a67f2172f1f0c02b8bd6650959))
 * HT-7444: editing contextMenu display and cell data-qtip visibility ([9590ed], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9590edbc2eb57d22e4de581b1fe6b8f5c82617e7))
 * update: CHANGELOG.md ([e7aec8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7aec82f66947539e462f813c3d8249a6f071b6f))
 
 # Version 2.6.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0fda3b6a033bacf1d07829445c44a4fab42b440d)
+* ## Features
+* <span style='color:green'>feat: SUE-TR-67883: move main view to ru.coon</span> ([64ac15], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64ac1596034a1f8ae408d69aad695f2a8c9c8f8d))
+* <span style='color:green'>feat: TR-67883: move main view in ru.coon</span> ([5259d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5259d4161eabe864a73a055b0d1396d60c2a7912))
+* <span style='color:green'>feat: TR-67883: move main view in ru.coon</span> ([c5eb55], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c5eb551a8198e629d2863aad1a397558ab978e39))
+
 * ## Fixes
 * <span style='color:red'>fix SummaryPluginConfigPanelSummaryGrid, BFL-11632</span> ([c3c46a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c3c46a8581698ea75ccebe42105d0b36e59b3f25))
+* <span style='color:red'>fix AppNavigationMenu</span> ([b56e90], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b56e90f543f264d21c83b82f6fcf0eed15bf438b))
 * <span style='color:red'>HT-7444 fix rename context menu items</span> ([07fd4d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/07fd4d89f598b5d54807d280c82133ca6cd98a5a))
 
+* Merge remote-tracking branch 'origin/SUE-TR-67883' into SUE-TR-67883 ([de8166], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/de8166e822a62b9cb6c9261720536171692805a2))
 * update: CHANGELOG.md ([5f6155], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f615546aaa0efa9b209cb9705cab4af5a958f05))
 
 # Version 2.6.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ad5ed1315f5d90adfe7569f83a8f354025f96dd)
@@ -130,6 +150,9 @@
 * update: CHANGELOG.md ([122574], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12257435ce3081dc5641232b789cfa8b2b188e82))
 
 # Version 2.6.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b546bb7b481a9dbc4b408c99b9ce158b676a15fa)
+* ## Features
+* <span style='color:green'>feat: SUE-TR-67883: move main view to ru.coon</span> ([f7f75e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f7f75e64d2c531050514a323753e80285ed207b8))
+
 * ## Fixes
 * <span style='color:red'> BFL-11558 ExportReportDataToFilePlugin date format</span> ([109998], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/109998bd10e4fd67d98b88784c008f56c5e965c8))
 

package/package.json

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

package/src/app/Router.js

@@ -0,0 +1,44 @@
+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,
+                },
+            },
+        },
+    },
+    onClassMixedIn() {
+        this.prototype.setRoutes(this.prototype.config.routes);
+    },
+    onRouteEnter(route) {
+        const app = Ext.getApplication();
+        if (!app.initialRoute) {
+            app.initialRoute = route;
+        }
+        Coon.nav.MenuEntity.isValid(route.id).then(async (valid) => {
+            if (valid === true) {
+                Ext.fireEvent('route:change', route);
+            } else {
+                Ext.fireEvent('route:unmatched', route);
+            }
+        });
+    },
+    getRouterView() {
+        return Ext.ComponentQuery.query('centerview').shift();
+    },
+    getActiveComponent() {
+        const routerView = this.getRouterView();
+        return routerView && routerView.getLayout().getActiveItem();
+    },
+});

package/src/app/component/CenterView.js

@@ -0,0 +1,65 @@
+Ext.define('Coon.app.component.CenterView', {
+    extend: 'Ext.container.Container',
+    xtype: 'centerview',
+    requires: ['Coon.util'],
+    controller: 'CenterViewController',
+    layout: 'card',
+    viewModel: true,
+    defaultComponentType: 'panel',
+    style: {
+        backgroundColor: 'white',
+    },
+    constructor() {
+        this.callParent(arguments);
+        this.app = Ext.getApplication();
+        Ext.on('route:change', this.display.bind(this));
+    },
+    onRender() {
+        this.callParent(arguments);
+        const {initialRoute} = Ext.getApplication();
+        if (initialRoute) {
+            this.display(initialRoute);
+        }
+    },
+    findComponent(config) {
+        return (
+            this.items &&
+            this.items.findBy((item) =>
+                Coon.util.objectsIsEqual(item.initialConfig, config)
+            )
+        );
+    },
+    resolveComponentType(token) {
+        let type;
+        switch (String(token).toUpperCase()) {
+        case 'R':
+            type = 'report';
+            break;
+        case 'P':
+            type = 'panel';
+            break;
+        }
+        return type || token;
+    },
+    display(cmp) {
+        if (!cmp.id) {
+            return;
+        }
+        Coon.nav.MenuEntity.isValid(cmp.id).then(async (valid) => {
+            if (valid === true) {
+                const type = this.resolveComponentType(cmp.type) || this.defaultComponentType;
+                const config = await this.getController().create(cmp.id, type, cmp.params);
+                if (config) {
+                    Ext.fireEvent('nav:hide', !!config._preferFullScreen);
+                    const cmp = this.findComponent(config);
+                    const active = this.setActiveItem(
+                        cmp && !cmp.destroyed ? cmp : Ext.create(config)
+                    );
+                    active && active.fireEvent('router:activate', active);
+                } else {
+                    Ext.fireEvent('route:unmatched');
+                }
+            }
+        });
+    },
+});

package/src/app/component/CenterViewController.js

@@ -0,0 +1,152 @@
+Ext.define('Coon.app.component.CenterViewController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.CenterViewController',
+    requires: ['Coon.util', 'Coon.Function'],
+    cache: new Map(),
+    privates: {
+        paramsToObject(params) {
+            const entries = [];
+            if (Array.isArray(params) && params.length > 1) {
+                for (let i = 0; i < Math.floor(params.length / 2); i++) {
+                    entries.push([params[i * 2], params[i * 2 + 1]]);
+                }
+            }
+            return entries.length ? Object.fromEntries(entries) : null;
+        },
+        triggerPlugin(pluginId, target) {
+            if (target && Array.isArray(target.plugins)) {
+                const triggerPlugin = target.plugins.find((p) => p.pluginId === pluginId);
+                if (triggerPlugin && typeof triggerPlugin.handler === 'function') {
+                    triggerPlugin.handler.call(triggerPlugin);
+                }
+            }
+        },
+        onActivateComponent(params, cmp) {
+            if (cmp.xtype === 'ReportPanel') {
+                if (params) {
+                    cmp.updateFilterDefaults(params);
+                    if (params.plugin) {
+                        if (!cmp.grid) {
+                            cmp.on('gridReady', (reportPanel) => {
+                                this.triggerPlugin(params.plugin, reportPanel.grid);
+                            });
+                        } else {
+                            this.triggerPlugin(params.plugin, cmp.grid);
+                        }
+                    }
+                }
+            }
+        },
+        onRenderEditor(editor, id) {
+            const c = editor.getController();
+            typeof c.doInit === 'function' && c.doInit.call(c, id);
+        },
+    },
+    async create(id, type = 'panel', params = [], useCache = true) {
+        const cacheKey = useCache && JSON.stringify({id, type, params});
+        let config;
+        if (!id) {
+            return config;
+        }
+        if (cacheKey) {
+            const cached = this.cache.get(cacheKey);
+            if (cached) {
+                return cached;
+            }
+        }
+
+        const paramsObject = this.paramsToObject(params);
+        const filterDefaults =
+            (paramsObject && Object.assign(paramsObject, {doFilter: true})) || {};
+        switch (String(type).toUpperCase()) {
+        case 'REPORT':
+            config = {
+                xtype: 'ReportPanel',
+                reportID: id,
+                filterDefaults,
+                listeners: {
+                    'router:activate': this.onActivateComponent.bind(
+                        this,
+                        paramsObject
+                    ),
+                },
+            };
+            break;
+        case 'PANEL':
+            try {
+                config = await Coon.util.promisifyCmd(
+                    'Coon.uielement.command.GetUIElementCommand',
+                    id
+                );
+                if (typeof config === 'object') {
+                    if (typeof config.propertyData === 'string') {
+                        config.propertyData = JSON5.parse(
+                            config.propertyData,
+                            (key, value) => {
+                                if (value === 'true') {
+                                    return true;
+                                }
+                                if (value === 'false') {
+                                    return false;
+                                }
+                                return value;
+                            }
+                        );
+                    }
+                    config = Object.assign(
+                        {xtype: config.xtype},
+                        config.propertyData
+                    );
+                    if (config.xtype === 'ReportPanel') {
+                        Object.assign(config, {
+                            filterDefaults,
+                            listeners: {
+                                'router:activate': this.onActivateComponent.bind(
+                                    this,
+                                    paramsObject
+                                ),
+                            },
+                        });
+                    }
+                    if (config.xtype === 'UiCustomPanel') {
+                        Object.assign(config, {
+                            listeners: {
+                                'router:activate': this.onActivateComponent.bind(
+                                    this,
+                                    paramsObject
+                                ),
+                                'afterrender': (panel) =>
+                                    Coon.Function.executeComponentDoInit(panel, paramsObject),
+                            },
+                        });
+                    }
+                }
+            } catch (e) {
+                Coon.log.error(e.message);
+            }
+            break;
+        case 'EDIT-REPORT':
+            config = {
+                _preferFullScreen: true,
+                _allowRedirect: false,
+                xtype: 'ReportFormEditPanel',
+                listeners: {
+                    'afterrender': (panel) => this.onRenderEditor.call(this, panel, id),
+                },
+            };
+            break;
+        case 'EDIT-PANEL':
+            config = {
+                _preferFullScreen: true,
+                _allowRedirect: false,
+                xtype: 'UiCustomPanelEditor',
+                listeners: {
+                    'afterrender': (panel) => this.onRenderEditor.call(this, panel, id),
+                },
+            };
+            break;
+        }
+        cacheKey && this.cache.set(cacheKey, config);
+        return config;
+    },
+});

package/src/app/viewPort/Main.js

@@ -0,0 +1,76 @@
+Ext.define('Coon.app.viewPort.Main', {
+    extend: 'Ext.Container',
+    xtype: 'CoonAppMainViewPort',
+    layout: 'border',
+    viewModel: {
+        data: {
+            navCollapsed: false,
+        },
+    },
+    items: [
+        {
+            xtype: 'container',
+            region: 'west',
+            weight: -1,
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'CoonAppTopView',
+                    height: 48,
+                },
+                {
+                    xtype: 'AppNavigationMenu',
+                    reference: 'NavView',
+                    flex: 1,
+                    dockedItems: [
+                        {
+                            dock: 'bottom',
+                            xtype: 'CoonAppBottomView',
+                        }
+                    ],
+                }
+            ],
+        },
+        {
+            xtype: 'panel',
+            reference: 'headerview',
+            cls: 'coon-app-header-view',
+            region: 'north',
+            docked: 'top',
+            weight: -2,
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'AppNavigationToggleButton',
+                },
+                {
+                    xtype: 'AppNavigationBar',
+                    flex: 1,
+                },
+                {
+                    xtype: 'CoonAppHeaderUserBlock',
+                }
+            ],
+        },
+        {xtype: 'CoonAppFooterView', reference: 'footerview', region: 'south', docked: 'bottom', weight: -2},
+        {xtype: 'centerview', reference: 'centerview', region: 'center', weight: -1},
+        {
+            xtype: 'panel',
+            reference: 'detailview',
+            region: 'east',
+            docked: 'right', /* , bind: {width: '{detailview_width}'}*/
+        }
+    ],
+
+    onRender() {
+        this.callParent(arguments);
+        const {initialRoute} = Ext.getApplication();
+        initialRoute && Ext.fireEvent('route:initial', initialRoute);
+    },
+});

package/src/app/viewPort/Main.scss

@@ -0,0 +1,133 @@
+.coon-app-header-view {
+  //font-size: 14px;
+  border: none;
+  color: $base-color-dark;
+  background-color: white;
+
+  .user-button {
+    $user-icon-color: #BCCAD2;
+    &.x-btn-pressed, &.x-btn-focus{
+      background-color: darken($user-icon-color, 5%)!important;
+    }
+    &.x-btn-over:not(&.x-btn-focus) {
+      background-color: lighten($user-icon-color, 0%)!important;
+    }
+  }
+
+  &.x-toolbar-default {
+    padding: 0;
+  }
+
+  .header-user-block {
+    .x-panel-body-default {
+      .x-btn-toolbutton-toolbar-small {
+        padding: 2px 18px 2px 18px;
+      }
+    }
+
+    .blue-text-button {
+      .x-btn-icon-el-toolbutton-toolbar-small {
+        color: $base-color;
+      }
+    }
+  }
+
+  .imgAll {
+    display: inline-block;
+    background-repeat: no-repeat;
+    background-size: 104%;
+    background-position: 50%;
+    border-radius: 50%;
+  }
+
+  .fio {
+    float: right;
+    line-height: 25px;
+    padding-left: 5px;
+    cursor: pointer;
+  }
+
+  .imgSmall {
+    width: 25px;
+    height: 25px;
+  }
+
+  .header-flex {
+    img {
+      width: 100%;
+      position: relative;
+      top: 30px;
+      height: 25px;
+    }
+  }
+
+  .header-bottom {
+    .x-panel-body-default {
+      background-color: $base-color;
+      color: white;
+
+      .x-btn-toolbutton-toolbar-small {
+        margin: 0 12px 0 12px;
+      }
+    }
+  }
+
+  .header-bottom-line {
+    background-color: $base-color;
+  }
+
+  .x-panel-body-default {
+    color: $base-color-dark;
+  }
+
+  .x-btn-default-small {
+    //width: 120px;
+
+    .x-box-target {
+      .x-btn-default-small {
+        background-color: $base-color-dark;
+        color: $base-color-dark;
+      }
+    }
+  }
+
+  .x-btn-icon-el {
+    &.svg-icon {
+      background-color: $base-color;
+      width: 33px;
+      height: 24px;
+    }
+
+    &.svg-icon:hover {
+      background-color: $base-color-dark;
+
+    }
+  }
+
+  .header-bottom .x-panel-body-default .x-btn-toolbutton-toolbar-small {
+    .x-btn-icon-el {
+      &.svg-icon {
+        background-color: lighten(lightgray, 5%);
+      }
+
+      &.svg-icon:hover {
+        background-color: white;
+
+      }
+    }
+  }
+}
+
+.x-edge {
+  .coon-app-header-view {
+    .svg-icon {
+      height: 24px;
+      width: 24px;
+      background-size: 70%;
+
+      .svg-icon-chat {
+        background-size: 80%;
+      }
+    }
+  }
+}

package/src/nav/AppNavigationMenu.js

@@ -1,43 +1,42 @@
 Ext.define('Coon.nav.AppNavigationMenu', {
     extend: 'Ext.Panel',
     xtype: 'AppNavigationMenu',
-
     // mixins: ['Coon.mixin.RelayMethods'],
-
     requires: [
         'Coon.nav.menu.WorkspaceMenuView',
         'Coon.nav.AppNavigationMenuController'
     ],
+    scrollable: 'y',
+    selectFirstOnLoad: true,
     controller: 'AppNavigationMenuController',
-
-    cls: 'AppNavigationMenu',
-
-    updateSelection: function(selection) {
-        return this.getController().selectMenuItem(selection);
-    },
-
-    getMenuReady: function() {
-        return this.getController().getMenuReady();
-    },
-
-    getFirstAvailable: function() {
-        return this.getController().getFirstAvailable();
-    },
-
-    changeMicro: function(micro) {
-        this.lookup('WorkspaceMenuView').setMicro(micro);
+    viewModel: {
+        data: {
+            workspace_descr: null,
+            workspace_list: null,
+            workspace_icon: null,
+            navCollapsed: false,
+            collapsedWidth: 44,
+            fullWidth: 260,
+        },
     },
-
-    changeWorkspace: function(workspace, selectFirst) {
-        return this.getController().changeWorkspace(workspace, selectFirst);
+    fullWidth: 260,
+    cls: 'AppNavigationMenu',
+    layout: {
+        type: 'vbox',
+        align: 'stretch',
     },
-
-    initComponent: function() {
-        this.layout = {
-            type: 'vbox',
-            align: 'stretch',
+    items: [
+        {
+            xtype: 'button',
+            textAlign: 'left',
+            bind: {
+                text: '{workspace_descr}',
+                menu: '{workspace_list}',
+                iconCls: '{workspace_icon}',
+                arrowVisible: '{!navCollapsed}',
+            },
         },
-        this.workspaceMenuView = Ext.create({
+        {
             xtype: 'WorkspaceMenuView',
             reference: 'WorkspaceMenuView',
             store: {
@@ -46,23 +45,15 @@ Ext.define('Coon.nav.AppNavigationMenu', {
                     children: null,
                 },
             },
-        });
-        this.items = [
-            {
-                xtype: 'button',
-                textAlign: 'left',
-                bind: {
-                    text: '{workspace_descr}',
-                    menu: '{workspace_list}',
-                    iconCls: '{workspace_icon}',
-                    arrowVisible: '{!navCollapsed}',
-                },
-            },
-            this.workspaceMenuView
-        ];
-        this.relayEvents(this.workspaceMenuView, ['selectionchange']);
-        // this.relayMethods(this, ['getFirstAvailable', 'getMenuReady', 'updateSelection']);
+        }
+    ],
+
+    bind: {
+        width: `{!navCollapsed ? fullWidth : collapsedWidth}`,
+    },
+    initComponent: function() {
         this.callParent();
+        this.relayEvents(this.lookup('WorkspaceMenuView'), ['selectionchange']);
     },
 
 });

package/src/nav/AppNavigationMenuController.js

@@ -6,13 +6,52 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         data: null,
     },
     menuReady: false,
-
+    selectThenMenuReady: undefined,
+    addWorkspaceToUrl: false,
     init: function(view) {
+        view.updateSelection = this.updateSelection.bind(this);
+        view.getMenuReady = this.getMenuReady.bind(this);
+        view.getFirstAvailable = this.getFirstAvailable.bind(this);
+        view.changeMicro = this.changeMicro.bind(this);
+        view.changeWorkspace = this.changeWorkspace.bind(this);
+        this.view.on('selectionchange', this.onSelectMenuItem, this);
         this.loadMenu();
         view.getFirstAvailable = this.getFirstAvailable.bind(this);
+        Ext.on('route:initial', (route) => {
+            this.selectThenMenuReady = route.id;
+        });
+        Ext.on('route:change', (route) => this.selectMenuItem.call(this, route.id));
+        Ext.on('route:unmatched', () => this.goTo(this.getFirstAvailable()));
+        const vm = this.getViewModel();
+        Ext.on('nav:toggle', () => {
+            vm.set('navCollapsed', !vm.get('navCollapsed'));
+            vm.getParent().set('navCollapsed', vm.get('navCollapsed'));
+            this.changeMicro(vm.get('navCollapsed'));
+        });
+        Ext.on('nav:reload', () => this.updateMenu());
+    },
+    initViewModel(vm) {
+        vm.set('fullWidth', this.getView().fullWidth);
+    },
+    onMenuReady() {
+        const ws = this.locals.data.ws.entries().next().value.at(0);
+        this.changeWorkspace(ws, false);
+        if (this.selectThenMenuReady) {
+            this.selectMenuItem(this.selectThenMenuReady);
+        } else {
+            this.view.selectFirstOnLoad && this.goTo(this.getFirstAvailable(), true);
+        }
+    },
+    updateSelection: function(selection) {
+        return this.selectMenuItem(selection);
+    },
+
+    changeMicro: function(micro) {
+        this.lookup('WorkspaceMenuView').setMicro(micro);
     },
 
     updateMenu: function() {
+        Coon.nav.MenuEntity.menuItems = null;
         this.loadMenu();
     },
 
@@ -74,6 +113,21 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         return Object.values(menu);
     },
 
+    goTo(id, force = false) {
+        if (id) {
+            let prefix = '';
+            if (this.addWorkspaceToUrl) {
+                const ws = this.getViewModel().get('workspace') || this.getFirstAvailable().ws.ws;
+                prefix = ws && ws + '/';
+            }
+            this.redirectTo(prefix + id, {force});
+        }
+    },
+
+    onSelectMenuItem: function(navCmp, item) {
+        this.goTo(item && item.get('UI_ELEMENT_CD'));
+    },
+
     selectMenuItem: function(uiElementCd) {
         if (!this.menuReady) {
             return;
@@ -90,6 +144,7 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
 
         if (!menuItem) {
             console.error('unmatchedRoute: ' + uiElementCd);
+            this.goTo(this.getFirstAvailable());
             return;
         }
 
@@ -111,65 +166,64 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         this.fireViewEvent('select', node);
         return node;
     },
-    loadMenu: function() {
-        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
-            .then((data) => {
-                if (Array.isArray(data.list)) {
-                    const transformData = data.list.map((el) => {
-                        return Coon.Function.convertObjectByMapping(el, {
-                            MENU_ENTRY_ICON: 'iconCls',
-                            MENU_ENTRY_DESCR: 'text',
-                        });
+    loadMenu() {
+        Coon.nav.MenuEntity.get().then((menu) => {
+            if (Array.isArray(menu)) {
+                const dataList = this.prepareMenuData(menu);
+                const transformData = dataList.map((el) => {
+                    return Coon.Function.convertObjectByMapping(el, {
+                        MENU_ENTRY_ICON: 'iconCls',
+                        MENU_ENTRY_DESCR: 'text',
+                    });
+                });
+                this.locals.data = transformData.reduce((acc, el) => {
+                    acc.ws.set(el.WORKSPACE_CD, {
+                        ws: el.WORKSPACE_CD,
+                        text: el.WORKSPACE_DESCR,
+                        iconCls: el.WORKSPACE_ICON,
                     });
-                    this.locals.data = transformData.reduce((acc, el) => {
-                        acc.ws.set(el.WORKSPACE_CD, {
-                            ws: el.WORKSPACE_CD,
-                            text: el.WORKSPACE_DESCR,
-                            iconCls: el.WORKSPACE_ICON,
-                        });
-                        acc.items[el.WORKSPACE_CD] = acc.items[el.WORKSPACE_CD] || {};
-                        acc.items[el.WORKSPACE_CD][el.MENU_ENTRY_CD] = el;
-                        acc.menu.push(el);
-                        return acc;
-                    }, {ws: new Map(), items: {}, menu: []});
-
-                    const items = [];
-                    const me = this;
-                    this.locals.data.ws.forEach((item) => {
-                        items.push({
-                            text: item.text,
-                            width: 260,
-                            value: item.ws,
-                            iconCls: item.iconCls,
-                            handler: function() {
-                                me.changeWorkspace(this.value, true);
-                            },
-                        });
+                    acc.items[el.WORKSPACE_CD] = acc.items[el.WORKSPACE_CD] || {};
+                    acc.items[el.WORKSPACE_CD][el.MENU_ENTRY_CD] = el;
+                    acc.menu.push(el);
+                    return acc;
+                }, {ws: new Map(), items: {}, menu: []});
+
+                const items = [];
+                const me = this;
+                this.locals.data.ws.forEach((item) => {
+                    items.push({
+                        text: item.text,
+                        width: this.getView().fullWidth,
+                        value: item.ws,
+                        iconCls: item.iconCls,
+                        handler: function() {
+                            me.changeWorkspace(this.value, true);
+                        },
                     });
-                    this.getViewModel().set('workspace_list', items);
-
-                    Object.entries(this.locals.data.items).forEach(function(workspace) {
-                        const [workspaceId, workspaceItems] = workspace;
-                        Object.values(workspaceItems).forEach(function(el) {
-                            el.leaf = el.LEAF_SW === 'Y';
-                            if (el.PARENT_MENU_ENTRY_CD) { // значит вложенный
-                                const parent = this.locals.data.items[workspaceId][el.PARENT_MENU_ENTRY_CD];
-                                if (parent) {
-                                    parent.children = parent.children || [];
-                                    parent.children.push(el);
-                                }
+                });
+                this.getViewModel().set('workspace_list', items);
+
+                Object.entries(this.locals.data.items).forEach(function(workspace) {
+                    const [workspaceId, workspaceItems] = workspace;
+                    Object.values(workspaceItems).forEach(function(el) {
+                        el.leaf = el.LEAF_SW === 'Y';
+                        if (el.PARENT_MENU_ENTRY_CD) { // значит вложенный
+                            const parent = this.locals.data.items[workspaceId][el.PARENT_MENU_ENTRY_CD];
+                            if (parent) {
+                                parent.children = parent.children || [];
+                                parent.children.push(el);
                             }
-                        }, this);
+                        }
                     }, this);
-                    this.menuReady = true;
-                    this.fireViewEvent('menuReady');
-                } else {
-                    Ext.Msg.alert('ошибка', 'некорректный формат ответа или нет данных');
-                }
-            });
+                }, this);
+                this.menuReady = true;
+                this.fireViewEvent('menuReady');
+                Ext.fireEvent('nav:ready');
+                this.onMenuReady();
+            }
+        });
     },
-
-    onToggleNavigationSize: function(micro) {
-        this.getViewModel().set('micro', micro);
+    prepareMenuData(data) {
+        return data;
     },
 });

package/src/nav/AppNavigationToggleButton.js

@@ -0,0 +1,9 @@
+Ext.define('Coon.nav.AppNavigationToggleButton', {
+    extend: 'Ext.button.Button',
+    xtype: 'AppNavigationToggleButton',
+    cls: 'AppNavigationToggleButton',
+    iconCls: 'svg-icon svg-icon-menu-open',
+    handler() {
+        Ext.fireEvent('nav:toggle');
+    },
+});

package/src/nav/AppNavigationToggleButton.scss

@@ -0,0 +1,6 @@
+.AppNavigationToggleButton{
+    .x-btn-icon-el.svg-icon{
+        width: 33px;
+        height: 24px;
+    }
+}

package/src/nav/MenuEntity.js

@@ -0,0 +1,35 @@
+Ext.define('Coon.nav.MenuEntity', {
+    singleton: true,
+    menuItems: null,
+    isLoading: false,
+    promise: null,
+    get() {
+        if (typeof this.menuItems === 'object' && Array.isArray(this.menuItems) && this.isLoading === false) {
+            return new Promise((resolve) => {
+                resolve(this.menuItems);
+            });
+        } else if (!this.promise) {
+            this.isLoading = true;
+            this.promise = Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
+                .then((data) => {
+                    if (Array.isArray(data.list)) {
+                        this.menuItems = data.list;
+                    } else {
+                        Ext.Msg.alert('ошибка', 'некорректный формат ответа или нет данных');
+                    }
+                    this.isLoading = false;
+                    return this.menuItems;
+                }).finally(() => {
+                    this.promise = null;
+                });
+        }
+        return this.promise;
+    },
+
+    isValid(uiElement) {
+        return this.get().then((data) => {
+            return !!data.find((i) => i.UI_ELEMENT_CD === uiElement);
+        });
+    },
+
+});

package/src/nav/editor/menu/NavMenuTreeController.js

@@ -188,6 +188,7 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
                 Coon.util.promisifyCmd('command.DeleteMenuCommand', menu)
                     .then(() => {
                         this.reloadMenu();
+                        Ext.fireEvent('nav:reload');
                         Ext.Msg.alert('Сообщение', 'Меню успешно удалено');
                     })
                     .catch((error) => {

package/src/nav/editor/menu/form/NavMenuFormViewController.js

@@ -96,6 +96,7 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
                 .then((menuBean) => {
                     vm.set('menu', menuBean);
                     this.getView().close();
+                    Ext.fireEvent('nav:reload');
                 })
                 .catch((error) => {
                     Coon.log.debug(error);

package/src/uielement/component/MenuItemList.js

@@ -1,5 +1,9 @@
 Ext.define('Coon.uielement.component.MenuItemList', {
-    extend: 'Ext.panel.Panel',
+    extend: 'Ext.window.Window',
+    title: 'Меню',
+    height: '100%',
+    width: '100%',
+    modal: true,
     cls: 'MenuItemList',
     alias: 'widget.MenuItemList',
     xtype: 'MenuItemList',
@@ -21,6 +25,7 @@ Ext.define('Coon.uielement.component.MenuItemList', {
         this.getController().updateView();
     },
     controller: {
+        // addWorkspaceToUrl: false,
         loadedData: null, itemsTotalCount: 0, updateView: function() {
             if (!this.loadedData) {
                 this.loadData();
@@ -42,6 +47,23 @@ Ext.define('Coon.uielement.component.MenuItemList', {
             });
             return tree;
         },
+        onItemClick(navCmp, context) {
+            const id = context && context.node && context.node.get('uiElementCd');
+            if (id) {
+                this.goTo(id);
+                this.getView().close();
+            }
+        },
+        goTo(id, force = false) {
+            if (id) {
+                /* let prefix = '';
+                if (this.addWorkspaceToUrl) {
+                    const ws = this.getViewModel().get('workspace') || this.getFirstAvailable().ws.ws;
+                    prefix = ws && ws + '/';
+                }*/
+                this.redirectTo(id, {force});
+            }
+        },
         renderView: function() {
             if (this.itemsTotalCount > 0) {
                 const itemsInColumn = Number(Number(this.itemsTotalCount) / Number(this.getView().columnsCount));
@@ -62,6 +84,9 @@ Ext.define('Coon.uielement.component.MenuItemList', {
                             cls: 'list-box',
                             rootVisible: true,
                             selectionModel: null,
+                            listeners: {
+                                itemclick: 'onItemClick',
+                            },
                             store: {
                                 type: 'tree', root: {
                                     text: 'Root', expanded: true,
@@ -131,11 +156,14 @@ Ext.define('Coon.uielement.component.MenuItemList', {
             }
             return resultList;
         },
-
-        loadData: function() {
-            Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS', '[]').then((resp) => {
-                if (resp && resp.list) {
-                    this.loadedData = resp.list.reduce((obj, item) => {
+        prepareMenuData(data) {
+            return data;
+        },
+        loadData() {
+            Coon.nav.MenuEntity.get().then((menu) => {
+                if (Array.isArray(menu)) {
+                    const dataList = this.prepareMenuData(menu);
+                    this.loadedData = dataList.reduce((obj, item) => {
                         if (Object.keys(obj).indexOf(item.WORKSPACE_CD) < 0) {
                             obj[item.WORKSPACE_CD] = {
                                 id: item.WORKSPACE_CD, text: item.WORKSPACE_DESCR, items: [],
@@ -157,6 +185,7 @@ Ext.define('Coon.uielement.component.MenuItemList', {
                             id: item.MENU_ENTRY_CD,
                             parentId: item.PARENT_MENU_ENTRY_CD ? item.PARENT_MENU_ENTRY_CD : item.WORKSPACE_CD,
                             expanded: true,
+                            uiElementCd: item.UI_ELEMENT_CD,
                             text: item.MENU_ENTRY_DESCR,
                             iconCls: 'svg-icon svg-icon-star-16 icon-orange',
                             expandable: false,

package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.js

@@ -125,11 +125,15 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
         const vm = this.getViewModel();
         this.prepareDataMapping();
         const comProp = this.lookup('reportPropertiesGrid').getData();
-        if (this.lookup('parametersRef').links.editor.isJSON5Valid()) {
-            vm.set('parameters', this.lookup('parametersRef').getValue());
-        } else {
-            Ext.Msg.alert('Ошибка', 'В параметрах присутствуют ошибки. Параметры прошлого плагина не сохранены');
+
+        if (this.lookup('parametersRef').rendered) {
+            if (this.lookup('parametersRef').links.editor.isJSON5Valid()) {
+                vm.set('parameters', this.lookup('parametersRef').getValue());
+            } else {
+                Ext.Msg.alert('Ошибка', 'В параметрах присутствуют ошибки. Параметры прошлого плагина не сохранены');
+            }
         }
+
         result['parameters'] = JSON5.parse(vm.get('parameters'));
         result['parameters']['_commandProperties'] = comProp;
         if (vm.get('mappingMode') === 'map') {
@@ -328,7 +332,10 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                             },
                             {
                                 xtype: 'ReportPropertiesGrid',
-                                title: 'Свойства',
+                                title: 'Свойства команды',
+                                bind: {
+                                    title: 'Свойства команды {ctype}',
+                                },
                                 reference: 'reportPropertiesGrid',
                                 loadPropertiesSource: {
                                     field: undefined,
@@ -337,14 +344,10 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                         ],
                     },
                     {
-                        title: 'Параметры',
-                        tooltip: 'Настройка свойств и параметров команды',
                         xtype: 'panel',
-                        layout: 'fit',
-                        // layout: {
-                        //     type: 'vbox', align: 'stretch',
-                        // },
                         title: 'Параметры',
+                        tooltip: 'Настройка параметров команды',
+                        layout: 'fit',
                         tbar: [
                             {
                                 text: 'Загрузить параметры',

package/src/version.js

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