ru.coon 2.8.36 → 2.8.37

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.8.37, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c1a016edfea1ebf863a02984d5a9589c69d75de3)
+* ## Fixes
+* <span style='color:red'>fix edit user roles</span> ([e034fb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e034fb3df5b31733e39f07c33ebc5b9404b757fe))
+* <span style='color:red'>fix edit user roles</span> ([dca366], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dca36619ae38ddbcbb4ac05353e59b4f0235f7b8))
+
+* update: CHANGELOG.md ([ff3de8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff3de8796fab3136358fed8cffd0ff1825a4b7e1))
+
 # Version 2.8.36, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac608fdca962cfa8af527838d308dcfd40f85f39)
 * ## Fixes
 * <span style='color:red'>fix edit user roles</span> ([23141a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/23141ac0b09283e97e0f7351f45feac800e5276a))

package/package.json

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

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

@@ -40,7 +40,7 @@ Ext.define('Coon.security.securitySettingComponent.report.RoleEditReportControll
     },
 
     onEditReportGridButtonHandler(store) {
-        const selection = this.lookup('reportsGrid').getSelection()[0];
+        const selection = this.lookup('reportsGrid').selection;
         if (!selection) {
             return;
         }
@@ -98,8 +98,8 @@ Ext.define('Coon.security.securitySettingComponent.report.RoleEditReportControll
     },
 
     deleteReportPluginRecordHandler() {
-        const selectedReportPluginRecord = this.lookup('reportPluginsGrid').getSelection()[0];
-        const masterReport = this.lookup('reportsGrid').getSelection()[0].get('report');
+        const selectedReportPluginRecord = this.lookup('reportPluginsGrid').selection;
+        const masterReport = this.lookup('reportsGrid').selection && this.lookup('reportsGrid').selection.get('report');
         const plugin = selectedReportPluginRecord.get('plugin');
         const pluginArray = this.reportGitDataContent[masterReport][this.role];
         if (pluginArray && pluginArray.length) {

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

@@ -50,14 +50,15 @@ Ext.define('Coon.security.securitySettingComponent.uiCP.RoleEditUiCPController',
         return JSON.stringify(this.uiCpGitDataContent);
     },
 
+    // чтобы исходная запись удалилась из объекта uiCpGitDataContent
     beforeEditUICPButtonRecordHandler(editor, context) {
         if (context.value) {
-            this.deleteUICPButtonRecordHandler();
+            this.removeUICPButtonFromGitObject();
         }
     },
 
     onEditUICPGridButtonHandler(store) {
-        const selection = this.lookup('uiCpGrid').getSelection()[0];
+        const selection = this.lookup('uiCpGrid').selection;
         if (!selection) {
             return;
         }
@@ -123,9 +124,9 @@ Ext.define('Coon.security.securitySettingComponent.uiCP.RoleEditUiCPController',
         uiCpGrid.getStore().remove(selectedRecord);
     },
 
-    deleteUICPButtonRecordHandler() {
-        const selectedUICPButtonRecord = this.lookup('UICPButtonsGrid').getSelection()[0];
-        const masterUiElement = this.lookup('uiCpGrid').getSelection()[0].get('uiElement');
+    removeUICPButtonFromGitObject() {
+        const selectedUICPButtonRecord = this.lookup('UICPButtonsGrid').selection;
+        const masterUiElement = this.lookup('uiCpGrid').selection && this.lookup('uiCpGrid').selection.get('uiElement');
         const button = selectedUICPButtonRecord.get('button');
         const buttonArray = this.uiCpGitDataContent[masterUiElement] && this.uiCpGitDataContent[masterUiElement]['buttons'][button];
         if (buttonArray && buttonArray.length) {
@@ -138,7 +139,12 @@ Ext.define('Coon.security.securitySettingComponent.uiCP.RoleEditUiCPController',
                 delete this.uiCpGitDataContent[masterUiElement];
             }
         }
-        // this.lookup('UICPButtonsGrid').getStore().remove(selectedUICPButtonRecord);
+    },
+
+    deleteUICPButtonRecordHandler() {
+        const selectedUICPButtonRecord = this.lookup('UICPButtonsGrid').selection;
+        this.removeUICPButtonFromGitObject();
+        this.lookup('UICPButtonsGrid').getStore().remove(selectedUICPButtonRecord);
     },
 
 });

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

@@ -45,21 +45,27 @@ Ext.define('Coon.security.securitySettingComponent.user.RoleEditUserController',
         this.getView().getStore().add({});
     },
 
+    // чтобы исходная запись удалилась из объекта userRoleGitDataContent
     beforeEditUserNameGridHandler(editor, context) {
         if (context.value) {
-            this.deleteUserNameRecordHandler();
+            this.removeUserNameFromGitObject();
         }
     },
 
-    deleteUserNameRecordHandler() {
-        const selectedUserRecord = this.getView().getSelection()[0];
+    removeUserNameFromGitObject() {
+        const selectedUserRecord = this.getView().selection;
         const userName = selectedUserRecord.get('userName');
         if (!this.userRoleGitDataContent[userName]) {
             return;
         }
         const index = this.userRoleGitDataContent[userName].findIndex((el) => el === this.role);
         index !== -1 && this.userRoleGitDataContent[userName].splice(index, 1);
-        // this.getView().getStore().remove(selectedUserRecord);
+    },
+
+    deleteUserNameRecordHandler() {
+        const selectedUserRecord = this.getView().selection;
+        this.removeUserNameFromGitObject();
+        this.getView().getStore().remove(selectedUserRecord);
     },
 
     getUserRoleGitDataContent() {

package/src/version.js

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

package/sass/var/all.scss

@@ -1,80 +0,0 @@
-$base-color : #1E3B4C;
-$base-color-dark : #112B39;
-$base-color-light : #3D6780;
-$active-color: #9A2D2A;
-$default-font-family: "Roboto" !default;
-$test-font-family: "Roboto" !default;
-
-$primary-color-text: #ffffff !default;
-$primary-background-color-hover: #2a4859 !default;
-$primary-background-color-active: #697f8a !default;
-$primary-color-text-disabled: #828282 !default;
-$primary-background-color-disabled: #dcdcdc !default;
-$primary-border-color-disabled: #dcdcdc !default;
-$primary-background-color: #3d6780 !default;
-$primary-border-color: #3d6780 !default;
-$primary-hovered-color: #3d6780 !default;
-$primary-box-shadow-color: #3d6780 !default;
-$primary-box-shadow-color-hover: rgba(17, 17, 17, 0.25) !default;
-$primary-box-shadow-color-active: rgba(0, 0, 0, 0.25) !default;
-$primary-icon-color: #ffffff !default;
-$primary-with-icon-box-shadow-color: rgba(0, 0, 0, 0.25) !default;
-$primary-icon-color-disabled: #828282 !default;
-$primary-only-icon-box-shadow-color-active: rgba(0, 0, 0, 0.25) !default;
-
-$secondary-background-color: #ffffff !default;
-$secondary-border-color-text: #3d6780 !default;
-$secondary-color-text: #3d6780 !default;
-$secondary-background-color-hover: #f2f4f5 !default;
-$secondary-background-color-active: #bccad2 !default;
-$secondary-background-color-disabled: #ffffff !default;
-$secondary-background-color-pressed: #3d6780 !default;
-$secondary-color-text-disabled: #979797 !default;
-$secondary-color-text-pressed: #ffffff !default;
-$secondary-border-color-disabled: #979797 !default;
-$secondary-icon-color: #3d6780 !default;
-$secondary-icon-color-disabled: #979797 !default;
-
-$tertiary-color-text: #3d6780 !default;
-$tertiary-background-color-hover: rgba(61, 103, 128, 0.04) !default;
-$tertiary-background-color-active: rgba(61, 103, 128, 0.12) !default;
-$tertiary-color-text-disabled: #979797 !default;
-$tertiary-icon-color: #3d6780 !default;
-$tertiary-icon-color-disabled: #979797 !default;
-
-$success-color-text: #ffffff !default;
-$success-background-color: #4caf50 !default;
-$success-border-color: #4caf50 !default;
-$success-background-color-hover: #388e3c !default;
-$success-background-color-active: rgba(129, 199, 132, 0.72) !default;
-$sucsess-color-text-disabled: #828282 !default;
-$sucsess-background-color-disabled: #dcdcdc !default;
-$sucsess-border-color-disabled: #dcdcdc !default;
-
-$success-outline-background-color: #ffffff !default;
-$success-outline-border-color: #4caf50 !default;
-$success-outline-text-color: #4caf50 !default;
-$success-outline-background-color-hover: rgb(221, 239, 219) !default;
-$success-outline-background-color-active: rgb(187, 225, 187) !default;
-$success-outline-background-color-disabled: #ffffff !default;
-$success-outline-border-color-disabled: #979797 !default;
-$success-outline-text-color-disabled: #979797 !default;
-
-$error-background-color: #b02121 !default;
-$error-border-color: #b02121 !default;
-$error-color-text: #ffffff !default;
-$error-background-color-hover: #7b1717 !default;
-$error-base-color-active: #bf4d4d !default;
-$error-color-text-disabled: #828282 !default;
-$error-background-color-disabled: #dcdcdc !default;
-$error-border-color-disabled: #dcdcdc !default;
-$error-box-shadow-color: rgba(0, 0, 0, 0.25) !default;
-
-$error-outline-background-color: #ffffff !default;
-$error-outline-border-color: #b02121 !default;
-$error-outline-text-color: #b02121 !default;
-$error-outline-background-color-hover: rgb(228, 209, 211) !default;
-$error-outline-background-color-active: rgb(222, 167, 165) !default;
-$error-outline-background-color-disabled: #ffffff !default;
-$error-outline-border-color-disabled: #979797 !default;
-$error-outline-text-color-disabled: #979797 !default;