ru.coon 2.7.32 → 2.7.34

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

@@ -0,0 +1,40 @@
+Ext.define('Coon.security.securitySettingComponent.url.RoleEditUrlController', {
+    extend: 'Ext.app.ViewController',
+
+    alias: 'controller.RoleEditUrlController',
+
+    loadUrlData(data, role) {
+        this.urlGitDataContent = data;
+        this.role = role;
+        this.getView().getStore().loadData(this.urlGitDataContent[this.role]);
+    },
+
+    getData(newRoleName, shouldDeleteCurrentRole) {
+        const urlData = this.getView().getStore().getRange();
+        this.urlGitDataContent[this.role] = urlData.map((el) => {
+            return {pattern: el.get('pattern'), allow: el.get('allow')};
+        });
+        if (newRoleName) {
+            this.urlGitDataContent[newRoleName] = urlData.map((el) => {
+                return {pattern: el.get('pattern'), allow: el.get('allow') || false};
+            });
+        }
+        if (shouldDeleteCurrentRole) {
+            delete this.urlGitDataContent[this.role];
+        }
+        return JSON.stringify(this.urlGitDataContent);
+    },
+
+    addUrlRecordHandler() {
+        this.getView().getStore().add({});
+    },
+
+    deleteUrlRecordHandler() {
+        const selectedRecord = this.getView().selection;
+        if (!selectedRecord) {
+            return;
+        }
+        this.getView().getStore().remove(selectedRecord);
+    },
+
+});

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

@@ -0,0 +1,53 @@
+Ext.define('Coon.security.securitySettingComponent.url.RoleEditUrlPanel', {
+    extend: 'Ext.grid.Panel',
+    alias: 'widget.RoleEditUrlPanel',
+    controller: 'RoleEditUrlController',
+    uses: [],
+    requires: [],
+
+    store: {},
+    flex: 1,
+
+    tbar: {
+        items: [
+            {
+                text: 'Добавить',
+                ui: 'orange-button',
+                handler: 'addUrlRecordHandler',
+            },
+            {
+                text: 'Удалить',
+                ui: 'green-button',
+                handler: 'deleteUrlRecordHandler',
+                disabled: true,
+                bind: {
+                    disabled: '{!urlGrid.selection}',
+                },
+            }
+        ],
+    },
+
+    columns: {
+        defaults: {
+            flex: 1,
+            editor: {
+                xtype: 'textfield',
+            },
+        },
+        items: [
+            {
+                xtype: 'hintColumn',
+                dataIndex: 'pattern',
+                text: 'Url',
+            },
+            {
+                xtype: 'checkcolumn',
+                dataIndex: 'allow',
+                text: 'allow',
+            }
+        ],
+    },
+    plugins: [
+        'cellediting'
+    ],
+});

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

@@ -0,0 +1,61 @@
+Ext.define('Coon.security.securitySettingComponent.user.RoleEditUserController', {
+    extend: 'Ext.app.ViewController',
+
+    alias: 'controller.RoleEditUserController',
+
+    loadUserData(data, role) {
+        this.userRoleGitDataContent = data;
+        this.role = role;
+        const userRoleGitData = Object.entries(this.userRoleGitDataContent).reduce((acc, [userName, roles]) => {
+            if (roles.find((role) => this.role === role)) {
+                acc.push({'userName': userName});
+            }
+            return acc;
+        }, []);
+        this.getView().getStore().loadData(userRoleGitData);
+    },
+
+    getData(newRoleName, shouldDeleteCurrentRole) {
+        const userNameGrid = this.getView().getStore().getRange();
+        userNameGrid.map((el) => {
+            const userName = el.get('userName');
+            this.userRoleGitDataContent[userName] = this.userRoleGitDataContent[userName] || [];
+            if (!this.userRoleGitDataContent[userName].includes(this.role)) {
+                this.userRoleGitDataContent[userName].push(this.role);
+            }
+            if (newRoleName && !this.userRoleGitDataContent[userName].includes(newRoleName)) {
+                this.userRoleGitDataContent[userName].push(newRoleName);
+            }
+            if (shouldDeleteCurrentRole) {
+                const index = this.userRoleGitDataContent[userName].findIndex((role) => role === this.role);
+                if (index !== -1) {
+                    this.userRoleGitDataContent[userName].splice(index, 1);
+                }
+            }
+        });
+        return JSON.stringify(this.userRoleGitDataContent);
+    },
+
+    addUserRecordHandler() {
+        this.getView().getStore().add({});
+    },
+
+    beforeEditUserNameGridHandler(editor, context) {
+        if (context.value) {
+            this.deleteUserNameRecordHandler();
+        }
+    },
+
+    deleteUserNameRecordHandler() {
+        const selectedUserRecord = this.getView().getSelection()[0];
+        const userName = selectedUserRecord.get('userName');
+        const index = this.userRoleGitDataContent[userName].findIndex((el) => el === this.role);
+        index !== -1 && this.userRoleGitDataContent[userName].splice(index, 1);
+        this.getView().getStore().remove(selectedUserRecord);
+    },
+
+    getUserRoleGitDataContent() {
+        return this.userRoleGitDataContent;
+    },
+
+});

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

@@ -0,0 +1,49 @@
+Ext.define('Coon.security.securitySettingComponent.user.RoleEditUserPanel', {
+    extend: 'Ext.grid.Panel',
+    alias: 'widget.RoleEditUserPanel',
+    controller: 'RoleEditUserController',
+    uses: [],
+    requires: [],
+    publishes: 'selection',
+
+    store: {},
+    flex: 1,
+
+    tbar: {
+        items: [
+            {
+                text: 'Добавить',
+                ui: 'orange-button',
+                handler: 'addUserRecordHandler',
+            },
+            {
+                text: 'Удалить',
+                ui: 'green-button',
+                handler: 'deleteUserNameRecordHandler',
+                disabled: true,
+                bind: {
+                    disabled: '{!userNameGrid.selection}',
+                },
+            }
+        ],
+    },
+    columns: [
+        {
+            dataIndex: 'userName',
+            text: 'Логин пользователя',
+            flex: 1,
+            editor: {
+                xtype: 'textfield',
+            },
+        }
+    ],
+    plugins: [
+        {
+            ptype: 'cellediting',
+            listeners: {
+                beforeEdit: 'beforeEditUserNameGridHandler',
+            },
+        }
+    ],
+
+});

package/src/uielement/component/EXTJSUiPanelUploadForm.js

@@ -6,6 +6,7 @@ Ext.define('Coon.report.component.EXTJSUiPanelUploadForm', {
         'Coon.CustomXMLReader'
     ],
     useXhr: true,
+    requiredAuth: true,
     title: 'Импорт настраиваемой панели',
     uploadFieldLabel: 'Файл с панелью',
     uploadURL: 'UIElement/import',

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

@@ -75,6 +75,9 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbar', {
     dock: 'bottom',
     config: {
         searchForm: null,
+        /**
+         * @param {boolean} Если true, то ЧИП, по которому был произведен поиск, можно закрывать. Что приведет к очистке поля, связанного с чипом.
+         */
         closableFilterCondition: false,
     },
     listeners: {
@@ -122,12 +125,6 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbar', {
             ],
         }*/
     ],
-    config: {
-        /**
-         * @param {boolean} Если true, то ЧИП, по которому был произведен поиск, можно закрывать. Что приведет к очистке поля, связанного с чипом.
-         */
-        closableFilterCondition: false,
-    },
 
     statics: {
         /**

package/src/uielement/component/formchips/FilterConditionToolbarController.js

@@ -201,8 +201,11 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
             const value = Ext.isFunction(field.getRawValue) ? field.getRawValue(): field.getValue();
             const isInitiallyHidden = field.initialConfig && field.initialConfig.hidden;
             if (!isInitiallyHidden && value) {
-                const label = field.fieldLabel || field.boxLabel;
+                const label = (field.fieldLabel || field.boxLabel || '').replaceAll(/<br>|<\/br>/g, ' ');
                 const chipLabel = ['Y', 'N'].includes(value);
+                if (field.isCheckbox && !field.checked) {
+                    continue;
+                }
                 result.push({
                     fieldLink: field,
                     label,
@@ -220,6 +223,12 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
         if (!this.searchForm) {
             return;
         }
+        const reportPanel = this.getView().up('ReportPanel');
+        // Если в отчете еще не было поиска, то чипы не отображаем.
+        if (!reportPanel.filtered) {
+            return;
+        }
+
         this.removeAllChips();
         this.fillChipsHandler();
     },

package/src/version.js

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