ru.coon 2.7.50 → 2.7.52

package/src/report/plugin/grid/ToolbarButtonPlugin.scss

@@ -1,3 +1,3 @@
-.x-grid-cell-inner-action-col {
-	text-align: center !important;
-}
+.x-grid-cell-inner-action-col {
+	text-align: center !important;
+}

package/src/research/ResearchTreeView.scss

@@ -1,19 +1,19 @@
-.ResearchTreeView {
-  span.field-rep-name {
-    font-weight: bold;
-  }
-
-  span.field-ui-name {
-    font-weight: bold;
-  }
-
-  span.component-type-name {
-    font-weight: bold;
-  }
-
-  .x-tab-default .x-tab-close-btn:before {
-    content: '\f00d';
-    color: gray;
-  }
-
-}
+.ResearchTreeView {
+  span.field-rep-name {
+    font-weight: bold;
+  }
+
+  span.field-ui-name {
+    font-weight: bold;
+  }
+
+  span.component-type-name {
+    font-weight: bold;
+  }
+
+  .x-tab-default .x-tab-close-btn:before {
+    content: '\f00d';
+    color: gray;
+  }
+
+}

package/src/security/component/RoleFileUploadForm.scss

@@ -1,5 +1,5 @@
-.RoleFileUploadForm {
-    .x-btn-inner {
-        color: black!important;
-    }
+.RoleFileUploadForm {
+    .x-btn-inner {
+        color: black!important;
+    }
 }

package/src/security/component/ui/UiCPRestrictionEditor.scss

@@ -1,5 +1,5 @@
-.UiCPRestrictionEditor {
-    .saveBtn:not(.x-item-disabled) .x-btn-inner{
-        color: red;
-    }
+.UiCPRestrictionEditor {
+    .saveBtn:not(.x-item-disabled) .x-btn-inner{
+        color: red;
+    }
 }

package/src/security/securitySettingComponent/RoleEditPanel.scss

@@ -1,17 +1,17 @@
-.RoleEditPanel {
-  .x-grid-item {
-    .checked-row {
-      background-color: #f7f7f8;
-    }
-  }
-  .x-grid-item {
-    .unchecked-row {
-      background-color: white;
-    }
-  }
-  .x-grid-row {
-      &:hover {
-        background-color: #ebecee;
-      }
-  }
+.RoleEditPanel {
+  .x-grid-item {
+    .checked-row {
+      background-color: #f7f7f8;
+    }
+  }
+  .x-grid-item {
+    .unchecked-row {
+      background-color: white;
+    }
+  }
+  .x-grid-row {
+      &:hover {
+        background-color: #ebecee;
+      }
+  }
 }

package/src/security/securitySettingComponent/RoleEditPanelController.js

@@ -22,7 +22,7 @@ Ext.define('Coon.security.securitySettingComponent.RoleEditPanelController', {
         this.role = role;
         this.view.setTitle(`Редактирование роли ${role}`);
         if (isNew) {
-            this.lookup('menuGrid').getController().loadAllMenuData([], this.role);
+            this.processGitData();
         } else {
             this.getGitData().then(this.processGitData.bind(this)).finally(() => this.view.unmask()); ;
         }
@@ -47,16 +47,21 @@ Ext.define('Coon.security.securitySettingComponent.RoleEditPanelController', {
     },
 
     processGitData(data) {
-        const gitData = JSON.parse(data);
-        this.menuGitDataContent = JSON.parse(gitData.find((el) => el.path === this.paths['menuByRole']).content);
+        if (data) {
+            const gitData = JSON.parse(data);
+            const parseData = (path) => {
+                return JSON.parse(gitData.find((el) => el.path === this.paths(path)).content || '{}');
+            };
+            this.menuGitDataContent = parseData('menuByRole');
+            this.reportGitDataContent = parseData('reportPlugin');
+            this.uiCpGitDataContent = parseData('uiElement');
+            this.urlGitDataContent = parseData('urlPattern');
+            this.userRoleGitDataContent = parseData('roleByUser');
+        }
         this.lookup('menuGrid').getController().loadAllMenuData(this.menuGitDataContent, this.role);
-        this.reportGitDataContent = JSON.parse(gitData.find((el) => el.path === this.paths['reportPlugin']).content);
         this.lookup('reportsGridPanel').getController().loadReportData(this.reportGitDataContent, this.role);
-        this.uiCpGitDataContent = JSON.parse(gitData.find((el) => el.path === this.paths['uiElement']).content);
         this.lookup('uiCPGridPanel').getController().loadUiCPData(this.uiCpGitDataContent, this.role);
-        this.urlGitDataContent = JSON.parse(gitData.find((el) => el.path === this.paths['urlPattern']).content);
         this.lookup('urlGrid').getController().loadUrlData(this.urlGitDataContent, this.role);
-        this.userRoleGitDataContent = JSON.parse(gitData.find((el) => el.path === this.paths['roleByUser']).content);
         this.lookup('userNameGrid').getController().loadUserData(this.userRoleGitDataContent, this.role);
     },
 

package/src/security/securitySettingComponent/menu/RoleEditMenuController.js

@@ -96,9 +96,9 @@ Ext.define('Coon.security.securitySettingComponent.menu.RoleEditMenuController',
     },
 
     loadAllMenuData(data, role) {
-        this.menuGitDataContent = data;
+        this.menuGitDataContent = data || {};
         this.role = role;
-        const menuGitData = this.menuGitDataContent[this.role];
+        this.menuGitDataContent[this.role] = this.menuGitDataContent[this.role] || [];
         return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', this.reportId)
             .then((data) => {
                 if (Ext.isArray(data.list)) {
@@ -109,7 +109,7 @@ Ext.define('Coon.security.securitySettingComponent.menu.RoleEditMenuController',
                     });
                     this.allMenuData = transformData.reduce((acc, el) => {
                         el.leaf = el.LEAF_SW === 'Y';
-                        el.menuCheck = !!menuGitData.find((menu) => menu === el.MENU_ENTRY_CD);
+                        el.menuCheck = !!this.menuGitDataContent[this.role].find((menu) => menu === el.MENU_ENTRY_CD);
                         if (!acc.find((item) => item.ws === el.WORKSPACE_CD)) {
                             acc.push({
                                 text: el.WORKSPACE_DESCR,

package/src/security/securitySettingComponent/report/RoleEditReportController.js

@@ -3,13 +3,19 @@ Ext.define('Coon.security.securitySettingComponent.report.RoleEditReportControll
 
     alias: 'controller.RoleEditReportController',
 
+    reportGitDataContent: {},
+    reportGitDataObject: {},
+
     init() {
         this.lookup('reportPluginsGrid').getStore().on('datachanged', this.onEditReportGridButtonHandler.bind(this));
     },
 
     loadReportData(data, role) {
-        this.reportGitDataContent = data;
         this.role = role;
+        if (!data) {
+            return;
+        }
+        this.reportGitDataContent = data;
         this.reportGitDataObject = Object.entries(this.reportGitDataContent).reduce((acc, [repId, pluginsByRole]) => {
             if (pluginsByRole[this.role] && pluginsByRole[this.role].length) {
                 acc[repId] = pluginsByRole[this.role];

package/src/security/securitySettingComponent/uiCP/RoleEditUiCPController.js

@@ -3,14 +3,19 @@ Ext.define('Coon.security.securitySettingComponent.uiCP.RoleEditUiCPController',
 
     alias: 'controller.RoleEditUiCPController',
 
+    uiCpGitDataContent: {},
+    uiCpGitDataObject: {},
+
     init() {
         this.lookup('UICPButtonsGrid').getStore().on('datachanged', this.onEditUICPGridButtonHandler.bind(this));
     },
 
     loadUiCPData(data, role) {
-        this.uiCpGitDataContent = data;
         this.role = role;
-        this.uiCpGitDataObject = {};
+        if (!data) {
+            return;
+        }
+        this.uiCpGitDataContent = data;
         Object.keys(this.uiCpGitDataContent).map((uiName) => {
             const buttonArr = Object.entries(this.uiCpGitDataContent[uiName].buttons).reduce((acc, [butName, butRoles]) => {
                 if (butRoles.find((el) => el === this.role)) {

package/src/security/securitySettingComponent/url/RoleEditUrlController.js

@@ -3,9 +3,14 @@ Ext.define('Coon.security.securitySettingComponent.url.RoleEditUrlController', {
 
     alias: 'controller.RoleEditUrlController',
 
+    urlGitDataContent: {},
+
     loadUrlData(data, role) {
-        this.urlGitDataContent = data;
         this.role = role;
+        if (!data) {
+            return;
+        }
+        this.urlGitDataContent = data;
         this.getView().getStore().loadData(this.urlGitDataContent[this.role]);
     },
 

package/src/security/securitySettingComponent/user/RoleEditUserController.js

@@ -3,9 +3,14 @@ Ext.define('Coon.security.securitySettingComponent.user.RoleEditUserController',
 
     alias: 'controller.RoleEditUserController',
 
+    userRoleGitDataContent: {},
+
     loadUserData(data, role) {
-        this.userRoleGitDataContent = data;
         this.role = role;
+        if (!data) {
+            return;
+        }
+        this.userRoleGitDataContent = data;
         const userRoleGitData = Object.entries(this.userRoleGitDataContent).reduce((acc, [userName, roles]) => {
             if (roles.find((role) => this.role === role)) {
                 acc.push({'userName': userName});

package/src/uielement/component/MenuItemList.scss

@@ -1,35 +1,35 @@
-.MenuItemList {
-  .list-box {
-    border: 1px solid #e0e0e0;
-    margin: 3px;
-    //padding: 7px;
-    border-radius: 10px;
-  }
-
-  .parent-menu-item .x-treelist-item-text {
-    font-size: 16px;
-    color: #111;
-    font-weight: 600;
-  }
-
-  .x-treelist-item-text {
-    color: #1f5a8a;
-  }
-
-  .empty-bg {
-    background-color: #eeeeee !important;
-  }
-
-  .icon-orange {
-    background-color: #ff9800;
-    margin-top: 5px;
-  }
-
-  .x-treelist-row-over, .x-treelist-item-selected .x-treelist-row {
-    background-color: #FFFFFFFF;
-  }
-
-  .x-treelist-row-over .x-treelist-item-text, .x-treelist-item-selected .x-treelist-item-text {
-    color: #112b39;
-  }
-}
+.MenuItemList {
+  .list-box {
+    border: 1px solid #e0e0e0;
+    margin: 3px;
+    //padding: 7px;
+    border-radius: 10px;
+  }
+
+  .parent-menu-item .x-treelist-item-text {
+    font-size: 16px;
+    color: #111;
+    font-weight: 600;
+  }
+
+  .x-treelist-item-text {
+    color: #1f5a8a;
+  }
+
+  .empty-bg {
+    background-color: #eeeeee !important;
+  }
+
+  .icon-orange {
+    background-color: #ff9800;
+    margin-top: 5px;
+  }
+
+  .x-treelist-row-over, .x-treelist-item-selected .x-treelist-row {
+    background-color: #FFFFFFFF;
+  }
+
+  .x-treelist-row-over .x-treelist-item-text, .x-treelist-item-selected .x-treelist-item-text {
+    color: #112b39;
+  }
+}

package/src/uielement/component/formchips/FilterConditionToolbar.scss

@@ -1,74 +1,74 @@
-.x-menu-body .x-box-target, .FilterConditionToolbar {
-
-    .closable-chip, .unusable-chip, .chip, .service-chip {
-        display: inline-block;
-        cursor: default;
-        padding: 0 15px;
-        height: 26px;
-        line-height: 26px;
-        border-radius: 13px;
-        .chip-value {
-            font-size: 13px;
-        }
-        .closebtn {
-            padding-left: 10px;
-            color: #888;
-            font-weight: bold;
-            float: right;
-            font-size: 15px;
-            cursor: pointer;
-        }
-        .closebtn:hover {
-            color: #000;
-        }
-    }
-    .remote-search-chip {
-        background-color: #f5f5f5;
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .local-search-chip {
-        background-color: #dffad3;
-    }
-
-    /* Неиспользованное для поиска поле и сервисное поле */
-    .unusable-chip {
-        .chip-value {
-            font-size: 12px;
-            font-style: italic;
-            color: #111111;
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .service-chip {
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .chip, .service-chip, .unusable-chip {
-        .closebtn {
-            display: none;
-        }
-    }
-
-    .closable-chip {
-        .closebtn {
-            display: block;
-        }
-    }
-
-    .tool-eye-horus {
-        color: #002453;
-    }
-}
+.x-menu-body .x-box-target, .FilterConditionToolbar {
+
+    .closable-chip, .unusable-chip, .chip, .service-chip {
+        display: inline-block;
+        cursor: default;
+        padding: 0 15px;
+        height: 26px;
+        line-height: 26px;
+        border-radius: 13px;
+        .chip-value {
+            font-size: 13px;
+        }
+        .closebtn {
+            padding-left: 10px;
+            color: #888;
+            font-weight: bold;
+            float: right;
+            font-size: 15px;
+            cursor: pointer;
+        }
+        .closebtn:hover {
+            color: #000;
+        }
+    }
+    .remote-search-chip {
+        background-color: #f5f5f5;
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .local-search-chip {
+        background-color: #dffad3;
+    }
+
+    /* Неиспользованное для поиска поле и сервисное поле */
+    .unusable-chip {
+        .chip-value {
+            font-size: 12px;
+            font-style: italic;
+            color: #111111;
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .service-chip {
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .chip, .service-chip, .unusable-chip {
+        .closebtn {
+            display: none;
+        }
+    }
+
+    .closable-chip {
+        .closebtn {
+            display: block;
+        }
+    }
+
+    .tool-eye-horus {
+        color: #002453;
+    }
+}

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -1,10 +1,10 @@
-.UiCustomPanelEditor {
-    .good-hash {
-        color: #64AA2B;
-        font-size: 19px;
-    }
-    .bad-hash {
-        color: red;
-        font-size: 19px;
-    }
+.UiCustomPanelEditor {
+    .good-hash {
+        color: #64AA2B;
+        font-size: 19px;
+    }
+    .bad-hash {
+        color: red;
+        font-size: 19px;
+    }
 }

package/src/uielement/component/settings/config/UiCPConfigPanelController.scss

@@ -1,24 +1,24 @@
-.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
-	color: red !important;
-}
-
-.errorsCountBtn, .warningsCountBtn {
-	font-size: 15px !important;
-	background-color: white !important;
-}
-
-.warningsCountBtn span[data-ref="btnInnerEl"] {
-	color: #b9b92d !important;
-}
-
-.errorsCountMsg {
-	margin-top: 12px !important;
-}
-
-.x-warningsCountBtn-focus {
-	background-color: white !important;
-}
-
-.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
-	background-color: #d0d0d0 !important;
-}
+.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
+	color: red !important;
+}
+
+.errorsCountBtn, .warningsCountBtn {
+	font-size: 15px !important;
+	background-color: white !important;
+}
+
+.warningsCountBtn span[data-ref="btnInnerEl"] {
+	color: #b9b92d !important;
+}
+
+.errorsCountMsg {
+	margin-top: 12px !important;
+}
+
+.x-warningsCountBtn-focus {
+	background-color: white !important;
+}
+
+.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
+	background-color: #d0d0d0 !important;
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginGrid.scss

@@ -1,11 +1,11 @@
-.UiCustomPanelPluginGrid {
-    .x-title-icon {
-        color: gray!important;
-    }
-    .deletedRecord {
-        text-decoration: line-through;
-    }
-    .newRecord {
-        font-style:italic;
-    }
-}
+.UiCustomPanelPluginGrid {
+    .x-title-icon {
+        color: gray!important;
+    }
+    .deletedRecord {
+        text-decoration: line-through;
+    }
+    .newRecord {
+        font-style:italic;
+    }
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginPanel.scss

@@ -1,30 +1,30 @@
-.UiCustomPanelPluginPanel {
-    .pluginInfo .x-form-display-field{
-        text-align: left;
-        font-size: 1em;
-        font-weight: bold;
-        padding: 8px;
-    }
-    .x-docked.x-panel-header-collapsed {
-        padding: 8px 4px!important;
-    }
-
-    .deletedRecord {
-        color: darkred;
-        text-decoration: line-through;
-    }
-    .readOnlyRecord {
-        .x-grid-td {
-            background-color: #f5f5f5;
-            color: #555;
-        }
-    }
-
-    .readOnlyDeletedRecord {
-        .x-grid-td {
-            color: darkred;
-            text-decoration: line-through;
-            background-color: #f5f5f5;
-        }
-    }
-}
+.UiCustomPanelPluginPanel {
+    .pluginInfo .x-form-display-field{
+        text-align: left;
+        font-size: 1em;
+        font-weight: bold;
+        padding: 8px;
+    }
+    .x-docked.x-panel-header-collapsed {
+        padding: 8px 4px!important;
+    }
+
+    .deletedRecord {
+        color: darkred;
+        text-decoration: line-through;
+    }
+    .readOnlyRecord {
+        .x-grid-td {
+            background-color: #f5f5f5;
+            color: #555;
+        }
+    }
+
+    .readOnlyDeletedRecord {
+        .x-grid-td {
+            color: darkred;
+            text-decoration: line-through;
+            background-color: #f5f5f5;
+        }
+    }
+}

package/src/uielement/component/settings/version/UiCPVersionPanel.scss

@@ -1,15 +1,15 @@
-.headerAceDiffContainerLeftSection{
-  width: 50%;
-  height: 20px;
-  float: left;
-  text-align: center;
-}
-.headerAceDiffContainerRightSection{
-  width: 50%;
-  height: 20px;
-  float: right;
-  text-align: center;
-}
-.x-btn-icon-el-default-toolbar-small{
-  height: 24px;
-}
+.headerAceDiffContainerLeftSection{
+  width: 50%;
+  height: 20px;
+  float: left;
+  text-align: center;
+}
+.headerAceDiffContainerRightSection{
+  width: 50%;
+  height: 20px;
+  float: right;
+  text-align: center;
+}
+.x-btn-icon-el-default-toolbar-small{
+  height: 24px;
+}