ru.coon 2.8.0 → 2.8.2

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 2.8.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2e3da084c82fa409dca30ef2388bab2f3ef267b)
+* ## Fixes
+* <span style='color:red'> TR-69409 исправление проверки значения свойства successMessage в ExecuteCommandPlugin</span> ([b77390], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b77390cabfdbdf3ad837c896b805a4bc7e5e92f3))
+
+* update: CHANGELOG.md ([ad61a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad61a8c449000e7b9ff6e921d39eecd97ddabea2))
+
+# Version 2.8.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/88c146ad577ce2a14d194c245e3d5151081af6af)
+* add unconditional versioning ([187668], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/187668ff86c8e91b440ce9b8a1052a191a7989d6))
+* update: CHANGELOG.md ([8386a7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8386a79fae89b882f1a3baf81849bb08ffd7a298))
+
 # 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))
 
@@ -12,6 +22,7 @@
 
 # Version 2.7.75, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/07c180f0c622d325ab34f62f832e1ee801609fdc)
 * ## Features
+* <span style='color:green'>feat: TR-67905 loginForm and TextFieldFormatter plugin</span> ([aafbfc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aafbfc81b05aa91a172905b47bf7c620f720be11))
 * <span style='color:green'>feat: HT-10115: chain plugin return result, log unified buttons call handlers result</span> ([408dab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/408dab15c6afc49e47bd80729bf55e1a541522cc))
 * <span style='color:green'>feat: [ReportTree][CharacteristicGridCopyPlugin] Added testId generation. Related to HT-8881.</span> ([2bc5e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2bc5e899f6a5d390844fcc25fc4511b5d195fbb8))
 

package/package.json

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

package/src/app/login/LoginForm.js

@@ -0,0 +1,143 @@
+Ext.define('Coon.app.login.LoginForm', {
+    extend: 'Ext.form.Panel',
+    xtype: 'LoginForm',
+    cls: 'login-form',
+    requires: [
+        'Ext.form.field.Text',
+        'Ext.layout.container.HBox',
+        'Ext.layout.container.VBox',
+        'Coon.report.plugin.form.EnterConfirmFormPlugin'
+    ],
+    controller: 'LoginFormController',
+    viewModel: 'LoginFormModel',
+    layout: {
+        type: 'vbox',
+        align: 'stretch',
+    },
+    plugins: [
+        {
+            ptype: 'EnterConfirmFormPlugin',
+            confirmHandler(panel) {
+                panel.fireEvent('submit');
+            },
+        }
+    ],
+    defaults: {
+        margin: '8px 0',
+    },
+    items: [
+        {
+            xtype: 'container',
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'label',
+                    reference: 'error',
+                    maxWidth: 300,
+                    hidden: true,
+                    flex: 1,
+                    bind: {
+                        text: '{error}',
+                        hidden: '{!error}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    hidden: true,
+                    cls: 'loginquestion',
+                    reference: 'details',
+                    iconCls: 'x-fas fa-question-circle',
+                    tooltip: 'Подробнее',
+                    handler: 'showDetails',
+                    bind: {
+                        hidden: '{!detailMessage}',
+                    },
+                }
+            ],
+        },
+        {
+            xtype: 'textfield',
+            align: 'stretch',
+            allowBlank: false,
+            ui: 'login-field',
+            emptyText: 'Логин',
+            bind: {
+                hidden: '{requireTwoFactor}',
+                value: '{loginPassData.username}',
+            },
+            plugins: {
+                TextFieldFormatter: {
+                    rules: ['noSpaces'],
+                },
+            },
+        },
+        {
+            xtype: 'textfield',
+            align: 'stretch',
+            ui: 'login-field',
+            inputType: 'password',
+            allowBlank: false,
+            emptyText: 'Пароль',
+            bind: {
+                hidden: '{requireTwoFactor}',
+                value: '{loginPassData.password}',
+            },
+            plugins: {
+                TextFieldFormatter: {
+                    rules: ['noSpaces'],
+                },
+            },
+        },
+        {
+            xtype: 'component',
+            bind: {
+                html: '{statusMessage}',
+                hidden: '{!statusMessage}',
+            },
+        },
+        {
+            xtype: 'textfield',
+            align: 'stretch',
+            ui: 'login-field',
+            hidden: true,
+            allowBlank: false,
+            emptyText: 'введите код,6 цифр',
+            bind: {
+                visible: '{requireTwoFactor}',
+                disabled: '{!requireTwoFactor}',
+                value: '{otp}',
+            },
+            plugins: {
+                TextFieldFormatter: {
+                    rules: ['noSpaces', 'number', 'length:6'],
+                },
+            },
+        },
+        {
+            xtype: 'button',
+            reference: 'submit',
+            ui: 'login-button',
+            scale: 'large',
+            text: 'Войти',
+            formBind: true,
+            handler: 'onSubmit',
+            bind: {
+                disabled: '{processLogin}',
+            },
+        },
+        {
+            xtype: 'button',
+            itemId: 'cancelBtn',
+            cls: 'twofactor-cancel-btn',
+            hidden: true,
+            text: 'Отменить',
+            handler: 'resetForm',
+            bind: {
+                visible: '{requireTwoFactor}',
+            },
+        }
+    ],
+});

package/src/app/login/LoginForm.scss

@@ -0,0 +1,103 @@
+.login-form {
+
+  @include extjs-button-large-ui(
+          $ui: 'login-button',
+          $font-family: "Tahoma",
+          $border-radius: 4px,
+          $border-color: darken($base-color, 20%),
+          $border-color-over: $base-color,
+          $border-color-focus: #cccccc,
+          $border-color-pressed: #cccccc,
+          $border-color-focus-over: #cccccc,
+          $border-color-focus-pressed: $base-color,
+          $border-color-disabled: #cccccc,
+          $background-color: $base-color,
+          $background-color-over: transparentize($base-color, 20%),
+          $background-color-focus: transparentize($base-color, 20%),
+          $background-color-pressed: $base-color,
+          $background-color-focus-over: transparentize($base-color, 20%),
+          $background-color-focus-pressed: $base-color,
+          $background-color-disabled: null,
+          $font-weight: normal,
+          $color: white
+  );
+
+  @include extjs-text-field-ui(
+          $ui: 'login-field',
+          $ui-background-color: transparent,
+          $ui-empty-color: #e3e3e3,
+          $ui-height: 30px,
+          $ui-border-radius: 4px,
+          $ui-font-size: 16px,
+          $ui-font-weight: normal,
+          $ui-font-family: "Tahoma"
+  );
+
+
+  $placeholderColor: #a0a0a0;
+
+  label {
+    color: red;
+  }
+
+  input {
+    text-align: center;
+    font-family: Tahoma;
+  }
+
+  input::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: $placeholderColor;
+    opacity: 1; /* Firefox */
+  }
+
+  input:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: $placeholderColor;
+  }
+
+  input::-ms-input-placeholder { /* Microsoft Edge */
+    color: $placeholderColor;
+  }
+
+  .x-form-empty-field::placeholder {
+    color: $placeholderColor;
+  }
+
+  .twofactor-cancel-btn {
+    background-color: white;
+  }
+
+
+  .x-form-text-field-body-login-field {
+    max-width: 100%;
+  }
+
+  .x-form-trigger-wrap-login-field{
+    height: 40px;
+    border: 1px solid #b5bfcc;
+    border-radius: 4px;
+    background-color: white;
+  }
+
+  .x-form-type-password .x-form-text {
+    height: 100%;
+  }
+
+  .x-panel-body-default{
+    background: transparent;
+  }
+
+  .loginquestion {
+    padding: 0 5px;
+    .x-btn-icon-el-default-small  {
+      color: red;
+    }
+    &.x-btn-pressed, &.x-btn-focus{
+      background-color: transparent !important;
+    }
+    &.x-btn-over:not(&.x-btn-focus) {
+      background-color: transparent !important;
+    }
+  }
+
+}
+

package/src/app/login/LoginFormController.js

@@ -0,0 +1,140 @@
+Ext.define('Coon.app.login.LoginFormController', {
+    alternateClassName: 'SigmaUtilities.view.login.LoginFormController',
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.LoginFormController',
+
+    init() {
+        this.vm = this.getViewModel();
+        this.getView().on('submit', this.onSubmit, this);
+        const userData = localStorage.getJson('userData');
+        if (userData && userData.requireTwoFactorAuthentication) {
+            this.process2FA(userData);
+        }
+    },
+
+    onSubmit() {
+        this.vm.set({
+            'error': undefined,
+            'detailMessage': undefined,
+            'processLogin': true,
+        });
+        if (this.vm.get('requireTwoFactor')) {
+            this.process2FA();
+        } else {
+            this.onSubmitLogin();
+        }
+    },
+
+    resetForm() {
+        this.vm.set({
+            'statusMessage': false,
+            'requireTwoFactor': false,
+            'processLogin': false,
+            'loginPassData': {},
+            'otp': undefined,
+        });
+        this.getView().reset();
+    },
+
+    get2FAEmailMessage() {
+        const userData = localStorage.getJson('userData');
+        return `<span style="color:#555;">
+                    на почту <span style="color:black;">${userData.email}</span> отправлено письмо с проверочным одноразовым кодом
+                </span>`;
+    },
+
+    process2FA() {
+        this.vm.set({
+            'processLogin': false,
+            'requireTwoFactor': true,
+            'statusMessage': this.get2FAEmailMessage(),
+        });
+        const otpValue = this.vm.get('otp');
+        if (otpValue) {
+            this.vm.set({
+                'processLogin': true,
+                'statusMessage': 'проверка кода...',
+            });
+            return this.check2FACode(otpValue)
+                .then((res) => {
+                    if (res.responseText === 'true') {
+                        this.processView();
+                    } else {
+                        this.vm.set('statusMessage', this.get2FAEmailMessage());
+                    }
+                })
+                .catch((res) => {
+                    this.vm.set({
+                        'processLogin': false,
+                        'statusMessage': 'произошла ошибка отправки письма, попробуйте еще раз',
+                    });
+                    console.error(res.trace || res.error || res.responseText || res.message || res.localizedMessage);
+                });
+        }
+    },
+
+    check2FACode(oneTimePassword) {
+        return Ext.Ajax.request({
+            url: `/twoFactor/validateOneTimePasswordEmail`,
+            headers: {'X-CSRF-Token': localStorage.getItem('CSRFToken')},
+            method: 'POST',
+            params: {
+                oneTimePassword,
+            },
+        });
+    },
+
+    onSubmitLogin: function() {
+        const me = this;
+        const loginPassData = this.vm.get('loginPassData');
+        this.getLoginData(loginPassData)
+            .then(function(response) {
+                if (response.authenticated !== true) {
+                    me.vm.set({
+                        'processLogin': false,
+                        'error': 'Неправильно указан логин или пароль',
+                        'detailMessage': response.stackTrace});
+                    return;
+                }
+                localStorage.setJson('userData', response);
+                if (response.requireTwoFactorAuthentication) {
+                    return me.process2FA();
+                }
+                me.processView();
+            })
+            .catch((error) => {
+                me.vm.set('processLogin', false);
+                console.error(error);
+            });
+    },
+
+    processView() {
+        const tokenCommand = Ext.create('command.GetCSRFTokenCommand');
+        tokenCommand.on('complete', function(token) {
+            if (!Ext.isEmpty(token)) {
+                localStorage.setItem('CSRFToken', token);
+            }
+
+            Ext.fireEvent('auth:loginSuccessful');
+        }, this);
+        tokenCommand.execute();
+    },
+
+    showDetails: function() {
+        Ext.Msg.alert('Ошибка', this.vm.get('detailMessage'));
+    },
+
+    getLoginData: function(loginPassData) {
+        return Ext.Ajax.request({
+            url: 'login',
+            params: {
+                username: loginPassData.username,
+                password: loginPassData.password,
+            },
+        })
+            .then((response) => Ext.decode(response.responseText))
+            .catch((response) => {
+                throw new Error('server-side failure with status code ' + response.status);
+            });
+    },
+});

package/src/app/login/LoginFormModel.js

@@ -0,0 +1,17 @@
+Ext.define('Coon.app.login.LoginFormModel', {
+    alternateClassName: 'SigmaUtilities.view.login.LoginFormModel',
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.LoginFormModel',
+    data: {
+        requireTwoFactor: false,
+        statusMessage: undefined,
+        processLogin: undefined,
+        detailMessage: undefined,
+        loginPassData: {
+            username: undefined,
+            password: undefined,
+        },
+        otp: undefined,
+        error: undefined,
+    },
+});

package/src/plugin/TextFieldFormatter.js

@@ -0,0 +1,82 @@
+/**
+ * TextFieldFormatter Плагин позволяет задать правила форматирование value для поля ввода
+ * @param {[string]} rules список правил, которые применяются к тексту в поле в моменте change
+ * Для каждого правила должа быть соотвествующая функция, имя функции задается как имя правила + Fn,
+ * например rules: ['noSpaces']  вызовет функцию noSpacesFn
+ *
+ * Пример:
+ *  {
+ *   xtype: 'textfield',
+ *   allowBlank: false,
+ *   emptyText: 'Тест',
+ *   plugins: {
+ *      TextFieldFormatter: {
+ *            rules: ['noSpaces', 'number', 'length:6'],
+ *                 },
+ *             },
+ */
+
+Ext.define('Coon.plugin.TextFieldFormatter', {
+    extend: 'Ext.plugin.Abstract',
+    alias: 'plugin.TextFieldFormatter',
+    id: 'TextFieldFormatter',
+    config: {
+        rules: [],
+    },
+    transformers: {
+        noSpaces() { // текст без пробелов
+            this.fieldValue = this.fieldValue.replaceAll(' ', '');
+        },
+        length(length) { // ограничение мин/макс длины текста в поле
+            this.field.minLength = length;
+            this.fieldValue = this.fieldValue.substring(0, length);
+        },
+        number() { // ввод только числовое значение
+            this.fieldValue = this.fieldValue.replace(/\D/g, '');
+        },
+    },
+
+    init() {
+        this.field = this.getCmp();
+        this.fieldName = this.field.fieldLabel ? this.field.fieldLabel : (this.field.reference || this.field.name);
+        this.field.on('change', function() {
+            const newValue = this.field.getValue();
+            if (newValue !== this.fieldValue) {
+                this.fieldValue = newValue;
+                this.formatValue();
+                this.field.setValue(this.fieldValue);
+            }
+        }, this);
+    },
+
+    formatValue() {
+        const rules = this.getValidatedRules();
+        rules && rules.forEach((rule) => {
+            const [functionName, setting] = rule.split(':');
+            this.executeFunction(functionName, setting);
+        });
+    },
+
+    getValidatedRules: function() {
+        let rules = this.getRules();
+        if (!Array.isArray(rules)) {
+            Coon.log.error(`[TextFieldFormatter]: список rules для ${this.fieldName} должен быть массивом`);
+            return false;
+        }
+        rules = rules.filter((item) => typeof item === 'string' && isNaN(item));
+        if (Ext.isEmpty(rules)) {
+            Coon.log.error(`[TextFieldFormatter]: не найдено данных rules для форматирования поля ${this.fieldName}`);
+            return false;
+        }
+        return rules;
+    },
+
+    executeFunction: function(functionName, setting) {
+        const transformerFunction = this.transformers[functionName];
+        if (Ext.isFunction(transformerFunction)) {
+            transformerFunction.call(this, setting);
+        } else {
+            Coon.log.error(`[TextFieldFormatter]: не найдено функции форматирования [${functionName}] для поля ${this.fieldName}`);
+        }
+    },
+});

package/src/report/component/settings/AddVersioningTab.js

@@ -8,12 +8,7 @@ Ext.define('Coon.report.component.settings.AddVersioningTab', {
     },
 
     initAction: function() {
-        if (this.isEnabled()) {
-            this.getView().add({xtype: 'ReportFormHistoryPanel'});
-        }
+        this.getView().add({xtype: 'ReportFormHistoryPanel'});
     },
 
-    isEnabled: function() {
-        return Coon.setup.getOption('reportVersioning');
-    },
 });

package/src/uielement/component/settings/AddVersioningTab.js

@@ -8,19 +8,13 @@ Ext.define('Coon.uielement.component.settings.AddVersioningTab', {
     },
 
     initAction: function() {
-        if (this.isEnabled()) {
-            this.getView().down('tabpanel').add({
-                xtype: 'UiCPVersionPanel',
-                title: 'версии',
-                bind: {
-                    uiElement: '{uiElement}',
-                },
-            });
-        }
-    },
-
-    isEnabled: function() {
-        return Coon.setup.getOption('customPanelVersioning');
+        this.getView().down('tabpanel').add({
+            xtype: 'UiCPVersionPanel',
+            title: 'версии',
+            bind: {
+                uiElement: '{uiElement}',
+            },
+        });
     },
 
 });

package/src/uielement/plugin/ExecuteCommandPlugin.js

@@ -52,6 +52,9 @@ Ext.define('Coon.uielement.plugin.ExecuteCommandPlugin', {
                 preventRefocus: true,
             });
         }
+        if (typeof this.successMessage !== 'string' && this.successMessage) {
+            this.successMessage = 'alert';
+        }
     },
 
     parseProperty: function(obj, property) {
@@ -182,7 +185,7 @@ Ext.define('Coon.uielement.plugin.ExecuteCommandPlugin', {
         }
         if (this.successMessage) {
             Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPluginConfigPanelFormEditor.showMessage(
-                this.asAlert, this.successTitle, this.successText
+                this.successMessage, this.successTitle, this.successText
             );
         }
 

package/src/version.js

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