commit c8b2f25d95bb15cd0f7539d8f83b1e4ecb4eaa83 Author: Булат Хайруллин Date: Tue Jun 11 10:58:00 2024 +0300 Project first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..de62d734 --- /dev/null +++ b/.gitignore @@ -0,0 +1,67 @@ +#ignore target dir +target*/ + +#gradle files +.gradle*/ + +*.orig +# +# Eclipse project files +# +#.classpath +#.project +#.settings*/ +.springBeans +.metadata/ +war*/ + +# +# IntelliJ IDEA project files +# +.idea*/ +.classes*/ +*.ipr +*.iml +*.iws +*.ids +atlassian-ide-plugin.xml + +#ignore NetBeans project files +nb-configuration.xml +profiles.xml +catalog.xml +nbactions.xml + +#ignore some temporary files +*.vpp~* + +# os meta files +Thumbs.db +.DS_Store + + +pom.xml.versionsBackup +*.jasper + +#studio +.studio*/ + +resources/src/main/generated-resources*/ +resources/src/main/resources/database/database_structure.xml + +frontend/build*/ +frontend/tmp*/ +frontend/.angular*/ +frontend/build_dev*/ +frontend/dist*/ +frontend/node_modules*/ +frontend/src/ts/**/*.js +frontend/src/ts/**/*.js.map +frontend/src/ts/**/*.ngsummary.json +frontend/src/ts/aot*/ +frontend/src/ts/generated*/ +npm-debug.log + +#Sublime project files +*.sublime-project +*.sublime-workspace diff --git a/.studioignore b/.studioignore new file mode 100644 index 00000000..3fc9113d --- /dev/null +++ b/.studioignore @@ -0,0 +1,29 @@ +#Files for Webbpm-Studio to ignore +frontend/build/ +frontend/build_dev/ +frontend/dist/ +frontend/node_modules/ +frontend/src/ts/page.routing.ts +frontend/src/ts/generated-sources/ +frontend/src/ts/generated/ +frontend/target/ + +backend/target/ +backend/src/main/generated-sources/ + +distribution/target/ + +resources/target/ + +test/ +extensions/ + +config/ +target/ +themes/ + +.studio/ +.git/ +.idea/ +.studioignore +**.js \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..acbeeb3d --- /dev/null +++ b/README.md @@ -0,0 +1,224 @@ +# Создание БД проекта + +Создание роли для основной схемы БД проекта + +``` +CREATE ROLE "" WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD ''; +``` + +Создание роли для схемы безопасности БД проекта + +``` +CREATE ROLE "" WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD ''; +``` + +Создание БД проекта + +``` +CREATE DATABASE "" + WITH + OWNER = ""; +``` + +ВНИМАНИЕ: в общем случае, отдельную БД для безопасности создавать не нужно. В конфигурации источника данных security-ds в файле standalone.xml в качестве имени базы данных используйте базу данных приложения. + +Предоставление необходимых прав для роли <your-project-security-role> + +``` +GRANT CREATE ON DATABASE "" TO ""; +``` + +Создание таблицы shedlock для автосинхронизации + +``` +CREATE TABLE shedlock +( + name varchar not null + constraint tasks_lock_pkey + primary key, + lock_until timestamp, + locked_at timestamp, + locked_by varchar +); + +comment on table shedlock is 'Таблица для синхронизации выполнения запланированных задач между нодами.'; + +ALTER TABLE shedlock + OWNER to "owner"; +``` + +## Дополнительные ограничения базы секьюрити + +Логин пользователя <user_account.username> и имена ролей <user_role.name> не должны совпадать, так как в ходе работы jbpm-а они сохраняются в одну и ту же таблицу. +Пример ошибки при совпадении: username = 'qa_test' и role_name = 'qa_test' (роль привязана к этому пользователю). Ошибка возникает при запуске любого процесса под этим пользователем. + +``` +ERROR [errorhandling.ExceptionHandlerController] (default task-5) [19usm9-bgyi63] +Organizational entity already exists with [GroupImpl:'qa_test'] id, +please check that there is no group and user with same id: +java.lang.RuntimeException: Organizational entity already exists with [GroupImpl:'qa_test'] id, +please check that there is no group and user with same id +``` + +## Создание нового администратора + +Создайте группу <your-admin-group> и предоставьте ей права в модуль администрирования. Для этого выполните в БД проекта + +``` +INSERT INTO security.user_group( + user_group_id, name, access_level_id) + (SELECT uuid_in(md5(random()::text || clock_timestamp()::text)::cstring), + '', access_level_id FROM security.access_level where level=999); +``` + +``` +INSERT INTO security.link_user_group_user_role( + link_user_group_user_role_id, user_group_id, user_role_id) + (SELECT uuid_in(md5(random()::text || clock_timestamp()::text)::cstring), + (SELECT user_group_id FROM security.user_group WHERE name = ''), + (SELECT user_role_id FROM security.user_role WHERE name = 'Security - User Admin')); +``` + +``` +INSERT INTO security.link_user_group_user_role( + link_user_group_user_role_id, user_group_id, user_role_id) + (SELECT uuid_in(md5(random()::text || clock_timestamp()::text)::cstring), + (SELECT user_group_id FROM security.user_group WHERE name = ''), + (SELECT user_role_id FROM security.user_role WHERE name = 'Security - Group Admin')); +``` + +``` +INSERT INTO security.link_user_group_user_role( + link_user_group_user_role_id, user_group_id, user_role_id) + (SELECT uuid_in(md5(random()::text || clock_timestamp()::text)::cstring), + (SELECT user_group_id FROM security.user_group WHERE name = ''), + (SELECT user_role_id FROM security.user_role WHERE name = 'Security - Role Admin')); +``` + +# Настройка браузера для входа в систему с помощью Kerberos + +1. Запустите браузер firefox. +2. В адресной строке введите about:config, нажать кнопку "я принимаю на себя риск" +3. С помощью поиска найдите параметр network.negotiate-auth.trusted-uris и в качестве значения ввести домен(например для домена example.com надо ввести .example.com) +4. Откройте в браузере приложение. Пример http://app.example.com/ . Приложение должно открыться без запроса логина/пароля + +# Восстановление структуры БД + +На основе БД проекта с помощью jOOQ генерируются Java классы для каждого объекта БД. Это происходит по нажатию кнопки Обновить на панели БД в студии. При необходимости можно сформировать DDL на основе данных классов. Пример класса для генерации DDL + +``` +package ru.cg.webbpm.test_project.db_beans; + +import org.jooq.*; +import org.jooq.impl.*; + +public class Main { + public static void main (String args []) { + DefaultConfiguration defaultConfiguration = new DefaultConfiguration(); + defaultConfiguration.setSQLDialect(SQLDialect.POSTGRES); + Queries ddl = DSL.using(defaultConfiguration).ddl(DefaultCatalog.DEFAULT_CATALOG); + + for (Query query : ddl.queries()) { + System.out.println(query); + } + } +} +``` + +** ВНИМАНИЕ: ** + +- этим способом нельзя восстановить функции/процедуры БД + +см. также [https://www.jooq.org/doc/latest/manual/sql-building/ddl-statements/generating-ddl/](https://www.jooq.org/doc/latest/manual/sql-building/ddl-statements/generating-ddl/) + +# Сборка проекта +## В dev режиме +```bash +mvn clean && mvn package +``` +## В prod режиме +```bash +mvn clean && mvn package -Pprod -DngcCoreCount=4 -DpagePackSizeMb=24 +``` +ngcCoreCount - количество ядер, выделяемых процессу компиляции ngc. По умолчанию - количество ядер - 1 +pagePackSizeMb - размер пачки в МБ. По умолчанию - количество ядер - 24 МБ. + +## С обновлением database beans +```bash +mvn clean && mvn package -Dwebbpm.generate-db-beans +``` + +# Версия проекта + +Если версия проекта содержит SNAPSHOT (например 1.0-SNAPSHOT), то при установке такой версии на сервере приложений будет запущена процедура остановки запущенных процессов данной версии. Этот режим удобен при отладке процесса на рабочем месте аналитика. +На боевом и тестовом стенде необходимо передавать дистрибутив проекта, с версией, которая не содержит SNAPSHOT. Например - 1.0 + +# Обновление платформы + +## Обновления версии платформы + +### С помощью студии + +1. Откройте проект в студии. Версия платформы обновится автоматически + +### Вручную + +1. Обновите значение webbpm-platform.version в pom.xml. Пример + + ```xml + 3.164.0-SNAPSHOT + ``` + +## Обновление базового пакета компонент + +### С помощью студии + +1. Откройте проект в студии. + +2. Откройте меню "Проект - Пакеты" + +3. Нажмите обновить. + + +### Вручную + +#### Из удаленного репозитория + +```bash +mvn webbpm:update-package -DpackageVersion="3.158.8" +``` + +#### Из файла + +```bash +mvn webbpm:update-package -DexecuteNpmInstall=false -Dpath=resources-.jar +``` + +#### Руками + +1. Измените версию платформы и backend модуля в файле [pom.xml](pom.xml) вашего проекта на нужную версию +2. Скопируйте ресурсы +``` +из директории: webbpm-platform\components\resources\target\classes\ +в директорию: {your-project}\packages\ru.cg.webbpm.packages.base.resources\ +``` +3. Скопируйте фронт +``` +из директории: webbpm-platform\components\frontend\dist +в директорию: {your-project}\frontend\node_modules\@webbpm\base-package\ +``` +4. Запретите выполнение npm install при запуске студии. Для этого добавьте параметр `-DexecuteNpmInstall=false` в настройках Run/Debug Configurations студии diff --git a/backend/pom.xml b/backend/pom.xml new file mode 100644 index 00000000..69eee9a6 --- /dev/null +++ b/backend/pom.xml @@ -0,0 +1,394 @@ + + + 4.0.0 + + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + + + ervu_lkrp_ul.ervu_lkrp_ul + backend + war + + + + + org.springframework.security + spring-security-jwt + + + io.jsonwebtoken + jjwt-api + + + io.jsonwebtoken + jjwt-impl + runtime + + + + ervu_lkrp_ul.ervu_lkrp_ul + resources + runtime + + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-fonts + runtime + + + + org.ocpsoft.prettytime + prettytime + + + + org.jooq + jooq + + + + org.apache.santuario + xmlsec + + + + javax.servlet + javax.servlet-api + + + org.slf4j + slf4j-api + provided + + + + org.springframework + spring-core + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + org.springframework + spring-aop + + + org.springframework + spring-jdbc + + + org.springframework + spring-tx + + + org.springframework + spring-aspects + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-config + + + + + ru.cg.webbpm.modules + inject + + + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-api + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm-api + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm + + + ru.cg.webbpm.modules.bpmn + bpmn-beans + + + ru.cg.webbpm.modules.bpmn + bpmn-variable-condition-adapter + + + ru.cg.webbpm.modules.bpmn + bpmn-deploy + + + + ru.cg.webbpm.modules + webkit-rpc + + + ru.cg.webbpm.modules + webkit-beans + + + + ru.cg.webbpm.modules.core + core-runtime-api + + + ru.cg.webbpm.modules.resources + resources-api + + + ru.cg.webbpm.modules.core + error-handling-api + + + + + ru.cg.webbpm.modules.database + database-api + + + ru.cg.webbpm.modules.database + database-impl + + + + ru.cg.webbpm.modules.jndi + jndi-beans + + + ru.cg.webbpm.modules.jndi + jndi-inject + + + + + com.sun.mail + javax.mail + + + + ru.cg.webbpm.modules.database + database-test + test + + + + ru.cg.webbpm.modules + standard-annotations + + + ru.cg.webbpm.modules.core + metrics + + + ru.cg.webbpm.modules.webkit + active-users-tracker + + + ru.cg.webbpm.modules.security + security-beans + + + ru.cg.webbpm.modules.security + security-api + + + ru.cg.webbpm.modules.security + security-esia + + + + + ru.cg.webbpm.modules.reporting + reporting-api + + + ru.cg.webbpm.modules.reporting + reporting-runtime-api + + + ru.cg.webbpm.modules.reporting + reporting-runtime-impl + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-impl + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-runtime-impl + + + ru.cg.webbpm.modules.reporting.reporting-xdoc + reporting-xdoc-impl + + + ru.cg.webbpm.modules.reporting.reporting-xdoc + reporting-xdoc-runtime-impl + + + + org.liquibase + liquibase-core + + + ru.cg.webbpm.modules + webkit-base + + + + ru.cg.webbpm.modules.security + security-db-synchronization-api + + + ru.cg.webbpm.modules.security + security-db-synchronization-ldap-impl + + + + xerces + xercesImpl + + + + com.google.guava + guava + + + + ru.micord.fias + client + + + + org.apache.tika + tika-core + + + + org.springframework.security.kerberos + spring-security-kerberos-core + + + + org.springframework.security.kerberos + spring-security-kerberos-web + + + + org.bouncycastle + bcprov-jdk15on + + + + org.bouncycastle + bcpkix-jdk15on + + + + org.mnode.ical4j + ical4j + + + + net.javacrumbs.shedlock + shedlock-spring + + + + net.javacrumbs.shedlock + shedlock-provider-jdbc-template + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + false + true + 17 + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + add-source + generate-sources + + add-source + + + + ${project.basedir}/target/generated-sources/java + + + + + + + + + + + studio + + + ru.cg.webbpm.modules.resources + resources-impl-development + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${project.artifactId} + + + + + + + dev + + + org.postgresql + postgresql + + + + + diff --git a/backend/src/main/java/AppConfig.java b/backend/src/main/java/AppConfig.java new file mode 100644 index 00000000..f7645b22 --- /dev/null +++ b/backend/src/main/java/AppConfig.java @@ -0,0 +1,65 @@ +import java.time.Duration; +import javax.sql.DataSource; + +import net.javacrumbs.shedlock.core.LockProvider; +import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider; +import net.javacrumbs.shedlock.spring.ScheduledLockConfiguration; +import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; + +/** + * Root application context + * This context imports XML configs from all the other jars, and is created by {@link WebAppInitializer} + * NB: modules are excluded from component scan since spring-context.xml sometimes holds important parameters and / or annotations + * @author krylov + */ +@Configuration +@ComponentScan(basePackages = { + "service", + "dao", + "bpmn", + "i18n", + "errorhandling", + "database", + "security", + "component.addresses", + "gen", + "ru.cg", + "ru.micord" +}) +@EnableAspectJAutoProxy(proxyTargetClass = true) +@EnableWebMvc +@EnableScheduling +public class AppConfig { + + @Bean + public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer(){ + return new PropertySourcesPlaceholderConfigurer(); + } + + @Bean + public ScheduledLockConfiguration taskScheduler(LockProvider lockProvider) { + ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); + scheduler.setPoolSize(12); + scheduler.initialize(); + return ScheduledLockConfigurationBuilder + .withLockProvider(lockProvider) + .withTaskScheduler(scheduler) + .withDefaultLockAtMostFor(Duration.ofHours(4)) + .build(); + } + + @Bean + public LockProvider lockProvider(@Qualifier("datasource") DataSource dataSource) { + return new JdbcTemplateLockProvider(dataSource); + } +} diff --git a/backend/src/main/java/WebAppInitializer.java b/backend/src/main/java/WebAppInitializer.java new file mode 100644 index 00000000..f4fef231 --- /dev/null +++ b/backend/src/main/java/WebAppInitializer.java @@ -0,0 +1,31 @@ +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; +import org.springframework.web.util.IntrospectorCleanupListener; + +/** + * This initializer creates root context and registers dispatcher servlet + * Spring scans for initializers automatically + */ +public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { + + public void onStartup(ServletContext servletContext) throws ServletException { + super.onStartup(servletContext); + servletContext.addListener(new IntrospectorCleanupListener()); + } + + protected String[] getServletMappings() { + return new String[]{"/"}; + } + + @Override + protected Class[] getRootConfigClasses() { + return new Class[]{AppConfig.class}; + } + + @Override + protected Class[] getServletConfigClasses() { + return new Class[0]; + } +} diff --git a/backend/src/main/java/controller/ProfileController.java b/backend/src/main/java/controller/ProfileController.java new file mode 100644 index 00000000..c1a4e96c --- /dev/null +++ b/backend/src/main/java/controller/ProfileController.java @@ -0,0 +1,34 @@ +package controller; + +import dto.jivoprofile.JivoProfileDto; +import org.hsqldb.lib.StringUtil; +import org.springframework.web.bind.annotation.*; + +import ru.cg.webbpm.modules.security.api.model.User; +import ru.cg.webbpm.modules.security.api.service.UserService; + +@RestController +public class ProfileController { + + private UserService userService; + + public ProfileController(UserService userService) { + this.userService = userService; + } + + @RequestMapping(value = "/profile/jivo/{userId}", method = RequestMethod.GET) + public JivoProfileDto profile(@PathVariable("userId") String userId) { + + if (StringUtil.isEmpty(userId)) { + return new JivoProfileDto(); + } + + User user = userService.get(userId); + + JivoProfileDto profileDto = new JivoProfileDto(); + profileDto.setUsername(user.firstName()); + profileDto.setEmail(user.email()); + profileDto.setPhone(user.phone()); + return profileDto; + } +} diff --git a/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java b/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java new file mode 100644 index 00000000..c53717e8 --- /dev/null +++ b/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java @@ -0,0 +1,35 @@ +package dto.jivoprofile; + +import ru.cg.webbpm.modules.webkit.annotations.Model; + +@Model +public class JivoProfileDto { + + public String username; + public String email; + public String phone; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } +} \ No newline at end of file diff --git a/backend/src/main/resources/.gitkeep b/backend/src/main/resources/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/config.md b/config.md new file mode 100644 index 00000000..74557103 --- /dev/null +++ b/config.md @@ -0,0 +1,749 @@ +# Описание параметров конфигурации сервера приложений + +Файл /standalone/configuration/standalone.xml + +## Общие + +- `webbpm.security.login.case_sensitive`. Default value = true. Параметр отвечающий за чувствительность к регистру при обработке логина пользователя. + - true - Login и login, обрабатываются как разные логины. + - false - Login и login, обрабатывается как один и тот же логин. +- `webbpm.db.pool_size`. Нужен только для `webbpm.mode` = development. +- `webbpm.mode`. Режим работы приложения. Значения - development, production. + - development - в этом режиме используется соединение к БД проекта, заданное в Studio. + - production - в этом режиме используется соединение к БД проекта, заданное с помощью jndi имени. + +## jBPM + +- `com.arjuna.ats.arjuna.allowMultipleLastResources` +- `webbpm.jbpm.audit-log.disabled` - флаг, отвечающий за включение/отключение аудита jBPM +- `webbpm.jbpm.cleaner_cron` - cron расписание автоматической очистки БД JBPM, по умолчанию "-" т.е. выключен. Очищаются незавершенные процессы. +- `webbpm.jbpm.cleaner_timeout` - время, спустя которое процесс считается устаревшим. По умолчанию - 10 часов. +- `webbpm.jbpm.finished_process_cleaner_cron` - cron расписание автоматической очистки аудита процессов в БД JBPM, по умолчанию "-" + т.е. выключен +- `webbpm.jbpm.finished_process_cleaner_timeout` - время, спустя которое процесс считается устаревшим. По умолчанию - 10 часов. + +Пример: + +```xml + + + +``` + +### jBPM Runtime Strategy + +Возможные варианты runtime strategy: + +- SINGLETON +- PER_REQUEST (значение по умолчанию) +- PER_PROCESS_INSTANCE +- PER_CASE + +Пример: + +```xml + +``` + +## Способ аутентификации + +- authentication.method - способ аутентификации. Поддерживаемые способы аутентификации: form, kerberos, cert_over_db, cert_over_ldap + +### По логину и паролю + +Пример конфигурации: + +```xml + +``` + +### По сертификату + +- cert_over_db - проверка наличия пользователя в базе данных безопасности +- cert_over_ldap - проверка наличия пользователя в базе данных безопасности и в LDAP + +Примеры: + +```xml + + +``` + +Параметр способа аутентификации authentication.method должен быть также установлен на клиентской части приложения в app-config.json + +Также для аутентификации по сертификату нужны свойства для хранилища сертификатов: + +- certificate.keystore.location - путь до java key store. Key store - это хранилище доверенных сертификатов, с помощью которых можно проверить корневой сертификат. Сертификат устанавливается с помощью команды: + + ```text + keytool -importcert -alias myAlias -file Example.cer -keystore exampleKeyStore + ``` + +- certificate.keystore.password - пароль для keystore, установленный при импорте сертификата + +Примеры: + +```xml + + +``` + +### Kerberos + +Получите от администратора Kerberos .keytab файл, из которого командой `klist -k http.keytab` можно получить список principal-ов +Проверить успешность авторизации principal-а можно командой `kinit -t -i http.keytab %principal%`. +В +случае успешной авторизации команда `klist` в качестве default principal которым проводилась авторизация. +После этого в standalone.xml поправить параметр `app.service-principal` на principal, которым успешно авторизовались. principal имеет формат: `HTTP/%hostname%@%REALM%` + +Пример конфигурации: + +```xml + + + +``` + +- app.service-principal. Пример - HTTP/oleg-rxserver.alt.dom@ALT.DOM +- app.keytab-location - расположение keytab файла. Пример - ${jboss.home.dir}/ +- http.keytab. + +Также необходимо в настройках браузера на клиенте задать параметр `network.negotiate-auth.trusted-uris` задать значение `.%domain%`. +Пример: + +```xml +.ALT.DOM +``` + +### Ldap + +Аутентификация происходит посредством логина и пароля синхронизированного пользователя Ldap. +Логин и пароль введенные в форму входа, будут проверены сервисом Ldap. + +Пример конфигурации: + +```xml + + + + + +``` + +#### Настройка сервера приложений для работы с Kerberos + +1. создать учетные записи в домене: + + - тестовые для проверки работоспособности функционала (пользователи домена, почтовые ящики): + + `User1 pass1 user1@example.com` + + `User2 pass2 user2@example.com` + + - сервисную для доступа сервиса(приложения) к MS AD - (пользователь домена - снять устаревание пароля, ограничение по времени действия, почтовый ящик): + + `serviceUser servicePass serviceuser@example.com` + + --- + +2. завести учетную запись машины `appserver.machine.name` (fqdn-имя сервиса) в AD (вручную, как запись в computer) и в DNS (A-запись) + + `appserver.machine.name 10.250.216.91` + +3. сгенерировать keytab (утилита ktpass) для аутентификации сервисов(приложения) для единой точки входа - `serviceUser` - с именем test.file.name.keytab - привязав к ней пользователя serviceUser + + например, так: + + ``` + ktpass -princ http/appserverMachineName.example.com@example.com -mapuser example.com\serviceUser -pass "пароль_уз_serviceUser" -crypto All -ptype KRB5_NT_PRINCIPAL -out "путь_к_директории_выгрузки_файла\test.file.name.keytab" + ``` + +##### Kerberos FAQ + +- В случае, если авторизация не проходит и в логах сервера приложений присутствует следующий вывод: + + ``` + 2019-05-14 05:33:36,588 INFO [security.controller.KerberosAuthenticationController] (default task-3) Authentication request header Authorization not exists + 2019-05-14 05:33:36,588 INFO [security.controller.KerberosAuthenticationController] (default task-3) Authentication object is not presented + ``` + + необходимо проверить настройку браузера firefox `network.negotiate-auth.trusted-uris`, она должна соответствовать домену из principal-а. + Для этого в поисковую строку браузера вводим "about:config", в открывшемся окне нажимаем "accept with risk and continue", в поисковой строке открывшейся страницы ввести `network.negotiate-auth.trusted-uris`. + Пример: для principal-а `HTTP/oleg-rxserver.alt.dom@ALT.DOM` настройка в браузере должна быть `.alt.dom`, приложение в браузере должно открываться по `http:\\oleg-rxserver.alt.dom:8080\...` + +- если в логах сервера приложений есть ошибка: + + ```xml + 2019-05-13 14:13:07,095 WARN [org.springframework.security.kerberos.web.authentication.SpnegoAuthenticationProcessingFilter] (default task-1) Negotiate Header was invalid: Negotiate TlRMTVNTUAABAAAAl4II4gAAAAAAAAAAAAAAAAAAAAAKAGNFAAAADw==: org.springframework.security.authentication.BadCredentialsException: Kerberos validation not successful + ... + + Caused by: java.security.PrivilegedActionException: GSSException: Defective token detected (Mechanism level: GSSHeader did not find the right tag) + at java.security.AccessController.doPrivileged(Native Method) [rt.jar:1.8.0_211] + at javax.security.auth.Subject.doAs(Subject.java:422) [rt.jar:1.8.0_211] + at org.springframework.security.kerberos.authentication.sun.SunJaasKerberosTicketValidator.validateTicket(SunJaasKerberosTicketValidator.java:68) [spring-security-kerberos-core-1.0.1.RELEASE.jar:1.0.1.RELEASE] + ... 66 more + Caused by: GSSException: Defective token detected (Mechanism level: GSSHeader did not find the right tag) + at sun.security.jgss.GSSHeader.(GSSHeader.java:97) [rt.jar:1.8.0_211] + at sun.security.jgss.GSSContextImpl.acceptSecContext(GSSContextImpl.java:306) [rt.jar:1.8.0_211] + at sun.security.jgss.GSSContextImpl.acceptSecContext(GSSContextImpl.java:285) [rt.jar:1.8.0_211] + at org.springframework.security.kerberos.authentication.sun.SunJaasKerberosTicketValidatorKerberosValidateAction.run(SunJaasKerberosTicketValidator.java:170) [spring-security-kerberos-core-1.0.1.RELEASE.jar:1.0.1.RELEASE] + at org.springframework.security.kerberos.authentication.sun.SunJaasKerberosTicketValidatorKerberosValidateAction.run(SunJaasKerberosTicketValidator.java:153) [spring-security-kerberos-core-1.0.1.RELEASE.jar:1.0.1.RELEASE] + ... 69 more + ``` + + необходимо проверить правильность указанного в standalone.xml principal-а. + +### Комбинации нескольких способов аутентификации + +Приложение может обрабатывать запросы на несколько способов аутентификации. Для этого необходимо переичислить нужные профили через запятую. +Примеры: + +```xml + + + + +``` + +### Время жизни токенов аутентификации + +```xml + + + +``` + +`webbpm.security.access_token.duration.minutes` - опциональный параметр (значение по умолчанию 60), время жизни в минутах, сколько будет действителен токен, после истечения этого времени токен будет обновлён `webbpm.security.refresh_token.duration.days` - опциональный параметр (значение по умолчанию 30), время жизни в днях, после истечения этого времени с последнего обновления, пользователю будет необходимо повторно войти `webbpm.security.session.active.count` - опциональный параметр (значение по умолчанию 1), количество сохраняемых в базу токенов обновления (количество активных сессий) + +Примечания. + +- Нельзя использовать одновременно профили cert_over_db c cert_over_ldap и kerberos с form. + +## Синхронизация пользователей с LDAP + +```xml + + + + + + + +``` + +Настройки подключения к LDAP: + +- `ldap.auto.sync.enabled` - включает/отключает автоматическую синхронизацию с LDAP +- `ldap.synchronizer.cron` - cron расписание автоматической синхронизации с LDAP +- `ldap.url`. Пример - ldap://localhost:389 +- `ldap.base`. Пример - dc=alt,dc=dom +- `ldap.username`. Пример - uid=test,ou=People,dc=alt,dc=dom +- `ldap.password` +- `webbpm.ldap.implementation`. Допускается два значения: open-ldap и active-directory. + +## WEBGUARD + +Для синхронизации пользователей в WEBGUARD и для корректной работы админки необходимо указать настройки соединения к REST API WEBGUARD + +```xml + + + +``` + +## Статистика + +### jbpm hibernate statistics + +Статистика hibernate jbpm доступна по jmx по пути `org.hibernate:type=Stats,name=jbpm`. +Полный список параметров можно посмотреть через jconsole. + +По умолчанию включена, отключить можно настройкой `webbpm.jbpm.hibernate_statistics.enabled`: + +```xml + +``` + +## Schedulers по очистке базы *jbpm*. + +- Очистка таблиц аудита от завершенных процессов по истечении таймаута + + - `webbpm.jbpm.finished_process_cleaner_cron` - задает расписание (*spring cron*), если настройка не задана - джоб не запускается + - `webbpm.jbpm.finished_process_cleaner_timeout` - таймаут в часах (*целое числовое значение*) + + Пример: + + ```xml + + + ``` + + ## Ограничения для запросов БД. + +- `webbpm.db.query_limit_enabled` - флаг, отвечающий за вывод сообщений о превышении лимитов на количество возвращаемых записей. По умолчанию - false. + +- `webbpm.db.select_records_max_limit` - максимальный лимит возвращаемых строк для запросов в БД, при превышении/равенстве данного лимита будет выброшена ошибка (*целое числовое значение*). По умолчанию - 100000 + +- `webbpm.db.select_records_min_limit` - минимальный лимит возвращаемых строк для запросов в БД, при превышении/равенстве данного лимита в логи будет выведен warning (*целое числовое значение*). По умолчанию - 1000 + +- `webbpm.db.execution_time_threshold`. The threshold for time of executing a statement. Система выводит сообщение в логи при превышении. Действует для запросов, созданных в jOOQ. По умолчанию - 1000 миллисекунд + +- `webbpm.db.result_read_time_threshold`. The threshold for time of fetching a set of records from a ResultSet. + . Система выводит сообщение в логи при превышении. Действует для запросов, созданных в jOOQ. По умолчанию - 50 миллисекунд + +- `webbpm.db.results_count_threshold`. Система выводит сообщение в логи при превышении. Действует для запросов, созданных в jOOQ. По умолчанию - 1000 записей + +- `webbpm.db.full_time_threshold`. Ограничение на полное время выполнения запроса. Система выводит сообщение в логи при превышении. Действует для запросов, созданных в jOOQ. По умолчанию sum(webbpm.db.result_read_time_threshold, webbpm.db.execution_time_threshold) миллисекунд + +- `webbpm.db.query_timeout`. Ограничение на время выполнения запроса. При превышении запрос будет отклонен. Действует для запросов, созданных в jOOQ в dev режиме. По умолчанию 120 секунд. + +Пример: + +```xml + + + + + + + + +``` + +## Добавление версии приложения в URL при запросах к backend-у + +При сборке приложения с профилем enable-version-in-url в URL будет добавляться версия приложения, указанная в pom.xml. +Шаблон URL: + +``` +//:/backend/ +``` + +## Включение регистрации пользователя + +1. Укажите конфигурацию почтового сервера для отправки писем с подтверждением регистрации. +Для этого в файле проекта *jndi-resources.xml* добавьте ресурс SmtpConfiguration. +Шаблон: +``` +{"host":"host","port":1234,"login":"user","password":"password","from":"email_from","senderName":"sender_name","isSecured":true} +``` +Почтовый сервер - зарегистрированный актуальный почтовый адрес. В поле password нужно указывать не пароль для входа в почту, а создать пароль для приложений в учетке почты и указать его. +2. Для включения регистрации добавьте в *standalone.xml* свойство +``` + +``` +3. Также в *standalone.xml* укажите ресурс для отправки писем для подтверждения регистрации (из п.1) +``` + +``` +4. При необходимости, отредактируйте шаблон письма для подтверждения регистрации +(resources/src/main/resources/mail/confirmation.html) + +5. При необходимости, отредактируйте шаблон письма для восстановления пароля +(resources/src/main/resources/mail/reset_password.html) + + +#### Настройка браузера для входа в систему с помощью Kerberos + +1. Запустите браузер firefox. +2. В адресной строке введите about:config, нажать кнопку "я принимаю на себя риск" +3. С помощью поиска найдите параметр network.negotiate-auth.trusted-uris и в качестве значения ввести домен(например для домена example.com надо ввести .example.com) +4. Откройте в браузере приложение. Пример [http://app.example.com/](http://app.example.com/) . Приложение должно открыться без запроса логина/пароля + +## Восстановление структуры БД + +На основе БД проекта с помощью jOOQ генерируются Java классы для каждого объекта БД. Это происходит по нажатию кнопки Обновить на панели БД в студии. При необходимости можно сформировать DDL на основе данных классов. Пример класса для генерации DDL + +``` +package ru.cg.webbpm.test_project.db_beans; + +import org.jooq.*; +import org.jooq.impl.*; + +public class Main { + public static void main (String args []) { + DefaultConfiguration defaultConfiguration = new DefaultConfiguration(); + defaultConfiguration.setSQLDialect(SQLDialect.POSTGRES); + Queries ddl = DSL.using(defaultConfiguration).ddl(DefaultCatalog.DEFAULT_CATALOG); + + for (Query query : ddl.queries()) { + System.out.println(query); + } + } +} +``` + +** ВНИМАНИЕ: ** + +- этим способом нельзя восстановить функции/процедуры БД + +см. также [Generating DDL from objects](https://www.jooq.org/doc/latest/manual/sql-building/ddl-statements/generating-ddl/) + +## Распределенный кэш (Hazelcast) + +В платформе подключен кэш. Он используется для подсчёта количества пользователей и кэширования подсистемы безопасности + +- `webbpm.cache.hazelcast.port` - входящий порт hazelcast. по дефолту 5701. +- Обязательное задать одно из двух следующих параметров + - `webbpm.cache.hazelcast.hosts` - список хостов серверов приложений. + webbpm.cache.hazelcast.hosts = hostname1,hostname2,hostname3 + - `webbpm.cache.hazelcast.kubernetes.service_name` - имя сервиса в среде kubernetes, + используемый для обнаружения других подов. Подходит как стратегия обнаружения, если используется + kubernetes +- `webbpm.cache.hazelcast.outbound_port_definitions` - исходящие порты hazelcast. по дефолту не задано, система сама выбирает свободные порты. Задать диапазон 5801 - 5820 +- `webbpm.cache.hazelcast.backup_count`. Нужны чтобы когда сервер выключается был доступен бекап. Если предполагается выключать несколько серверов за раз, то нужно увеличить. + Данный бекап делает копии синхронно с основной записью и операция записи ждет пока будет записана везде. Можно делать бекап асинхронно, настраивается через async_backup_count + подробнее про бекапы [Hazelcast IMDG Reference Manual](https://docs.hazelcast.org/docs/3.11/manual/html-single/index.html#backing-up-maps) . по дефолту 1 +- `webbpm.cache.hazelcast.async_backup_count` +- `webbpm.cache.hazelcast.public_address` +- `webbpm.cache.hazelcast.interfaces` + +Пример конфигурации: + +```xml + + ` +``` + +## Подключение компоненты адреса в режиме ГАР (Государственный адресный реестр) + +Необходимо задать параметры: + +- `gar.enable` - флаг, который включает/отключает сервис для работы с ГАР. Должен быть задан для работы компоненты в режиме ГАР. По умолчанию true, для отключения задать false. +- `gar.elastic.url.host` - хост на котором развернут elasticsearch. +- `gar.elastic.password` - пароль для аутентификации elasticsearch. + +Дополнительные параметры: + +- `gar.elastic.url.port` - порт на котором развернут elasticsearch. +- `gar.elastic.username` - логин для аутентификации elasticsearch. + +Пример конфигурации: + +```xml + + + +``` + +## Метрики + +Отчет + +Отчет собирается раз в 30 секунд по дефолту, меняется параметром `webbpm.metrics.report_period_ms`. +Все метрики идут за отчетный период, после сбора отчета они сбрасываются. + +Получить json со всеми метриками можно по урлу `backend/metrics/v1/all` - метрики будут с последнего собранного отчета, запрос не триггерит сбор отчета - это независимые операции. Отчет содержит только метрики по которым был совершен хотя бы один вызов в отчетный период. То есть, если какая-то операция не была совершена в отчетный период, то соответствующая ей метрика не попадет в отчет - ее не будет в json. + +### Значения метрик + +Все метрики идут за отчетный период, после сбора отчета они сбрасываются. +Нас в основном интересуют `callsCountSum`, `latencyMin`, `latencyAvg`, `latencyMax` + +- `callsCountSum` - количество завершенных вызовов +- `latencyMin` - минимальное время выполнения +- `latencyAvg` - среднее время выполнения +- `latencyMax` - максимальное время выполнения +- `activeCallsCountMax` - количество начатых, но еще не завершенных вызовов. +- `activeCallsLatencyMax` - длительность самого долгого еще не завершенного вызова + +### Текущие метрики приложения + +- Получение коннекта из пула + + - `webbpm.jbpm.db.connection.acquire` + - `webbpm.security.db.connection.acquire` + - `webbpm.db.connection.acquire` + +- Время с момента получения коннекта до возврата его в пул + + - `webbpm.jbpm.db.connection.in_use` + - `webbpm.security.db.connection.in_use` + - `webbpm.db.connection.in_use` + +- Время выполнения запроса на бд проекта + + - `webbpm.db.query.success.execution_time` + +- Время выполнения запроса на бд проекта + время получения коннекта из пула + + - `webbpm.db.query.success.full_time` + +- active-users-count.indicatorMax + +- active-users-count-ttl.indicatorMax + + # Количество пользователей + +- `webbpm.active_users_counter.enabled` - включает подсчет пользователей, нужно чтобы не запускать hazelcast на дев машинах. по дефолту false. На боевых серверах необходимо установить в true. + +- `webbpm.active_users_counter.max_time_between_operations_in_seconds` - время, которое пользователь считается активным после действия. по дефолту 15 минут. + +- `webbpm.active_users_counter.hazelcast.app_pool_size`. Запись в hazelcast производится асинхронно в отдельном пуле, не блокируя обработку http запроса. Это размер этого пула. по дефолту 4. Можно пока оставить 4 и последить за метриками pool.hazelcast-executor.queue.indicatorMax и pool.hazelcast-executor.activeThreads.indicatorMax. Если очередь будет сильно копиться, то увеличить. + +## Настройка логов + +Все настройки делаются в файле `standalone.xml`, если не указано иначе. + +### Общие настройки + +Платформа Web-bpm использует корневую категорию логирования `ru.cg.webbpm`, рекомендуется выставлять ее в уровень `info`. todo check prod config + +```xml + + + +``` + +При этом компоненты используемые в проекте могут использовать другие категории. + +### Параметры конфигурации + +**Рекомендованное использование:** всегда в `info`. + +Все параметры конфигурации загружаемые платформой web-bpm и пользовательским приложением через api webbpm логируются категорией `ru.cg.webbpm.modules.core.app_info.api.property.BaseProperty`. Она всегда должна быть выставлена в `info`. + +Пример вывода: + +``` +2017-12-04 16:02:19,074 INFO [ru.cg.webbpm.modules.core.app_info.api.property.BaseProperty] (EclipseGeminiBlueprintExtenderThread-1) System property [webbpm.active_users_counter.enabled] not set. Using default value [false] +2017-12-04 16:02:19,074 INFO [ru.cg.webbpm.modules.core.app_info.api.property.BaseProperty] (EclipseGeminiBlueprintExtenderThread-1) System property [webbpm.active_users_counter.hazelcast.hosts] set to [127.0.0.1] +``` + +### БД проекта + +#### Логирование запросов в бд security и бд проекта + +**Рекомендованное использование:** только при разработке. + +Использовать только при разработке. Категория `org.jooq.tools.LoggerListener` в `debug` уровень. + +```xml + + + +``` + +Пример вывода: + +``` +2017-12-04 18:21:10,391 DEBUG [org.jooq.tools.LoggerListener] (default task-19) Executing query : select "department"."department_name", "department"."department_id", "department"."parent_department_id", "department"."parent_department_id", "department"."department_id", (select (count(*) <> ?) from "public"."department" as "$$child" where "$$child"."parent_department_id" = "department"."department_id") as "$$hasChildren" from "public"."department" as "department" limit ? +2017-12-04 18:21:10,395 DEBUG [org.jooq.tools.LoggerListener] (default task-19) -> with bind values : select "department"."department_name", "department"."department_id", "department"."parent_department_id", "department"."parent_department_id", "department"."department_id", (select (count(*) <> 0) from "public"."department" as "$$child" where "$$child"."parent_department_id" = "department"."department_id") as "$$hasChildren" from "public"."department" as "department" limit 2147483647 +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) Fetched result : +-----------------+-------------+--------------------+--------------------+-------------+-------------+ +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |department_name |department_id|parent_department_id|parent_department_id|department_id|$$hasChildren| +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : +-----------------+-------------+--------------------+--------------------+-------------+-------------+ +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |Головной офис 1 | 8| {null}| {null}| 8|true | +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |Головной офис 2 | 9| {null}| {null}| 9|true | +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |Головной офис 3 | 10| {null}| {null}| 10|true | +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |Подразделение 1.1| 11| 8| 8| 11|true | +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |Подразделение 1.2| 12| 8| 8| 12|true | +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : +-----------------+-------------+--------------------+--------------------+-------------+-------------+ +2017-12-04 18:21:10,568 DEBUG [org.jooq.tools.LoggerListener] (default task-19) : |...55 record(s) truncated... +``` + +#### Логирование больших запросов + +**Рекомендованное использование:** всегда в `info`, с подобранными для проекта значениями. В проде значения должны быть проверены что они не вызывают излишнее логирование. + +1. Для отслеживания больших запросов в пользовательскую базу нужно задать параметры что считать большими запросами, логироваться будут запросы больше заданных показателей. + Чтобы логировать все запросы можно задать значение `-1`. Добавляются как property в раздел `system-properties`: + + ```xml + + + ``` + + В `info` режиме работают: + + - `webbpm.db.full_time_threshold` - полное время выполнения запроса в миллисекундах. Включает построение запроса библиотекой, выполнение и загрузку результатов. Пример сообщения
`2023-01-11 13:09:38,361 WARN [ru.cg.webbpm.modules.database.impl.analytics.PerformanceListener] (default task-33) Query full time threshold exceeded. full_time=[6565ms] execution_time=[6565ms] read_time=[0ms] results_count=[4] query=[]` + - `webbpm.db.results_count_threshold` - количество записей, которое вернул запрос. Пример сообщения
`2023-01-11 13:10:34,088 WARN [ru.cg.webbpm.modules.database.impl.analytics.PerformanceListener] (default task-41) Query results count threshold exceeded. results_count=[11177] query=[]` + + В `debug` режиме дополнительно к работающим в info: + + - `webbpm.db.execution_time_threshold` - время выполнения запроса + построения запроса библиотекой. + - `webbpm.db.result_read_time_threshold` - время чтения результатов запроса + +2. После задания настроек нужно настроить логирование - категория `ru.cg.webbpm.modules.database.impl.analytics.PerformanceListener`, уровень `info` или `debug`. + + ```xml + + + + ``` + +### JBPM + +#### Основные настройки + +JBPM использует 3 корневых категории логирования – `org.jbpm`, `org.drools`, `org.kie`. Все они должны быть выставлены в `warn`. + +```xml + + + + + + + + + +``` + +#### Логирование запросов в БД + +**Рекомендованное использование:** только при разработке. + +Для логирования sql запросов нужно включить категорию `org.hibernate.SQL` в `debug`: + +```xml + + + +``` + +Чтобы вывести параметры запросов и результат выполнения – категорию `org.hibernate.type.descriptor.sql` в `trace`: + +```xml + + + +``` + +Пример вывода: + +``` +18:21:06,938 DEBUG [org.hibernate.SQL] (default task-47) select names0_.Task_Names_Id as Task_Nam7_16_0_, names0_.id as id1_16_0_, names0_.id as id1_16_1_, names0_.language as language2_16_1_, names0_.shortText as shortTex3_16_1_, names0_.text as text4_16_1_ from I18NText names0_ where names0_.Task_Names_Id=? +18:21:06,939 TRACE [org.hibernate.type.descriptor.sql.BasicBinder] (default task-47) binding parameter [1] as [BIGINT] - [180] +18:21:06,940 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([id1_16_1_] : [BIGINT]) - [539] +18:21:06,940 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([language2_16_1_] : [VARCHAR]) - [en-UK] +18:21:06,940 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([shortTex3_16_1_] : [VARCHAR]) - [Список записей] +18:21:06,941 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([text4_16_1_] : [CLOB]) - [Список записей] +18:21:06,941 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([Task_Nam7_16_0_] : [BIGINT]) - [180] +18:21:06,942 TRACE [org.hibernate.type.descriptor.sql.BasicExtractor] (default task-47) extracted value ([id1_16_0_] : [BIGINT]) - [539] +``` + +#### Дополнительные логи hibernate + +**Рекомендованное использование:** только при разработке в случае необходимости. + +1. Время выполнения запроса и количество результатов. + + Включаются категорией `org.hibernate.stat` в `debug`. При этом в hibernate должен быть включен сбор статистики. + Похоже что логируется только hql select запросов. + + ```xml + + + + ``` + + Пример вывода: + + ``` + 18:21:06,858 DEBUG [org.hibernate.stat.internal.ConcurrentStatisticsImpl] (default task-41) HHH000117: HQL: select t from AuditTaskImpl t where t.taskId = :taskId, time: 6ms, rows: 1 + ``` + +2. Показатели hibernate сессий + + Включаются категорией `org.hibernate.engine.internal.StatisticalLoggingSessionEventListener` в `info`. + При этом в hibernate должен быть включен сбор статистики. Тут может быть интересно количество запросов, флашей и общее время на все запросы сессией. + + Пример вывода: + + ``` + 2017-12-04 17:25:58,493 INFO [org.hibernate.engine.internal.StatisticalLoggingSessionEventListener] (default task-21) Session Metrics { + 63408365 nanoseconds spent acquiring 17 JDBC connections; + 521509 nanoseconds spent releasing 17 JDBC connections; + 65732621 nanoseconds spent preparing 17 JDBC statements; + 31471897 nanoseconds spent executing 17 JDBC statements; + 0 nanoseconds spent executing 0 JDBC batches; + 0 nanoseconds spent performing 0 L2C puts; + 0 nanoseconds spent performing 0 L2C hits; + 0 nanoseconds spent performing 0 L2C misses; + 297556 nanoseconds spent executing 1 flushes (flushing a total of 16 entities and 0 collections); + 430168 nanoseconds spent executing 1 partial-flushes (flushing a total of 16 entities and 16 collections) + } + ``` + +#### Логирование hbm2ddl + +**Рекомендованное использование:** всегда в `trace`. + +Должно быть включено всегда. Позволяет убедиться что hibernate не накатывал никакие миграции на базу. Этот функционал отключен у нас в коде. + +```xml + + + +``` + +# Описание параметров конфигурации клиентской части + +Свойства задаются в файле frontend/src/resources/app-config.json или frontend.war/src/resources/app-config.json + +## Общие + +- `dev_mode` - настройка задающая dev_mode для просмотра логов (true/false). При отсутствие оставляет значение при сборке +- `guard.confirm_exit` - выводить или нет диалог подтверждения, если обнаружены несохраненные данные в форме. Значение по умолчанию - false. +- `password.pattern` - Регулярное выражение для валидации пароля. +- `password_pattern_error` - Сообщение об ошибке валидации. +- `show.client.errors` - отвечает за отображение ошибок javascript-a пользователю (должна использоваться только в тестовых контурах) по умолчанию выключена +- 'available_task.single_fetch' - Отвечает за количество запросов available_task при завершении процесса. true - одиночный запрос, false/не указано - 10 запросов(старая реализация). + +## Вывод сообщений + +- `message_service_error_timeout` время в мс, в течение которого будет отображено сообщение об ошибке. Значение по умолчанию - таймаут не задан (окно не закрывается). +- `message_service_warning_timeout` время в мс, в течение которого будет отображено предупреждающее сообщение. Значение по умолчанию - таймаут не задан (окно не закрывается). +- `message_service_success_timeout` время в мс, в течение которого будет отображено сообщение об успехе. Значение по умолчанию - таймаут не задан (окно не закрывается). +- `message_service_info_timeout` время в мс, в течение которого будет отображено информационное сообщение. Значение по умолчанию - таймаут не задан (окно не закрывается). + +## Электронная подпись + +### Esmart + +- `electronic_sign.esmart_extension_url` - url для создания расширенной подписи. Подробная информация по ссылке [http://demo.esmart.ru](http://demo.esmart.ru) +- `electronic_sign.tsp_address` - адрес сервера службы штампов времени + +Пример: + +```text +"electronic_sign.esmart_extension_url": "http://dsig.ibsdemo.ru/ibs_dsig/ibs_dSig.asmx" +``` + +## Способ аутентификации + +- `auth_method` - способ аутентификации. Может принимать одно значение из списка: form, kerberos, cert_over_db, cert_over_ldap + +## Таймер очистки закешированных значений фильтров + +- `filter_cleanup_interval_hours` - время жизни закешированного значения фильтра в часах. По умолчанию - 720 часов, +- `filter_cleanup_check_period_minutes` - период проверки наличия просроченных закешированных значений в минутах. По умолчанию - 30 минут + +## Добавление версии приложения в URL при запросах к frontend-у + +В модуле frontend в src/resources/app-config.json добавлены 2 переменные + +- `"enable.version.in.url": "%enable.version.in.url%"` - подставлять ли версию в URL приложения. По умолчанию false. Если сборка произведена +- `"app.version": "%project.version%"` - версия приложения. + с профилем `enable-version-in-url`, то значение будет true. + +## Добавление Jivo чат в проект + +Свойства задаются в файле frontend/src/resources/app-config.json или frontend.war/src/resources/app-config.json + +- `jivo_chat_widget_api_url` - API url для работы Jivo чата. Необходимо заменить {WIDGET_ID} на реальный Widget API ID +- `jivo_chat_widget_enabled` - параметр отвечающий за активацию Jivo чата. По дефолту false, для активации задать true. + +Пример: + +```json + "jivo_chat_widget_api_url": "https://code.jivo.ru/widget/{WIDGET_ID}", + "jivo_chat_widget_enabled": false +``` + +# Прочее + +## Смена удалённого репозитория + +1. Смените адрес NPM registry в файле frontend.npmrc. Пример - registry=https://repo.example.com/repository/npm-all/ +2. Поменяйте ссылки в блоке , файла pom.xml diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 00000000..ba9a786b --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,2 @@ +/*.ear +/*.jar diff --git a/config/Dockerfile b/config/Dockerfile new file mode 100644 index 00000000..3183f9e9 --- /dev/null +++ b/config/Dockerfile @@ -0,0 +1,41 @@ +FROM quay.io/wildfly/wildfly:26.1.3.Final-jdk17 +USER root +ARG POSTGRES_DRIVER_VERSION=42.7.3 +RUN yum -y install sudo && chown -R jboss: /opt/jboss/ + +USER jboss +WORKDIR $JBOSS_HOME +ENV JAVA_ARGS=-Xmx3g +RUN echo 'JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=*:8787,server=y,suspend=n"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=1g"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.logmanager.nocolor=true"' >> bin/standalone.conf && \ + echo 'JAVA_OPTS="$JAVA_OPTS $JAVA_ARGS"' >> bin/standalone.conf + +### Locale support ru_RU ### +USER root +RUN localedef -i ru_RU -f UTF-8 ru_RU.UTF-8 +RUN echo "LANG=\"ru_RU.UTF-8\"" > /etc/locale.conf +USER jboss +ENV LANG ru_RU.UTF-8 +ENV LANGUAGE ru_RU.UTF-8 +ENV LC_ALL ru_RU.UTF-8 +### Locale Support END ### + +COPY --chown=jboss entrypoint.sh . +COPY --chown=jboss patches patches +RUN (cd patches && wget https://repo.micord.ru/repository/libs-releases-local/org/jboss/ironjacamar/ironjacamar-core-impl/1.5.3.Final/ironjacamar-core-impl-1.5.3.Final.jar) +RUN (cd patches/system && wget https://repo1.maven.org/maven2/org/postgresql/postgresql/$POSTGRES_DRIVER_VERSION/postgresql-$POSTGRES_DRIVER_VERSION.jar -O postgresql-driver.jar) + +RUN chmod -R +x patches && \ + chmod +x entrypoint.sh && \ + ./entrypoint.sh && \ + rm -rf patches + +ENV SERVER_START=true +COPY --chown=jboss *.ear $JBOSS_HOME/standalone/deployments/ + +HEALTHCHECK --timeout=3s --start-period=3600s CMD curl --fail 127.0.0.1:8080/backend/version || exit 1 diff --git a/config/Dockerfile.build b/config/Dockerfile.build new file mode 100644 index 00000000..00cefb87 --- /dev/null +++ b/config/Dockerfile.build @@ -0,0 +1,10 @@ +FROM maven:3-jdk-11-slim +RUN apt update \ + && apt upgrade -y \ + && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ + && apt install -y git nodejs \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /app +COPY ../ . +RUN mvn clean -T4C && mvn package -T4C diff --git a/config/Dockerfile.secdb b/config/Dockerfile.secdb new file mode 100644 index 00000000..f9eeaac3 --- /dev/null +++ b/config/Dockerfile.secdb @@ -0,0 +1,5 @@ +FROM postgres:11-alpine + +COPY secdb.sql . + +CMD psql "postgresql://${DB_SEC_USERNAME:-security}:${DB_SEC_PASSWORD:-secpassword}@${DB_SEC_HOST:-db}/${DB_SEC_NAME:-security}" < secdb.sql diff --git a/config/JDK_version b/config/JDK_version new file mode 100644 index 00000000..98d9bcb7 --- /dev/null +++ b/config/JDK_version @@ -0,0 +1 @@ +17 diff --git a/config/browsers.json b/config/browsers.json new file mode 100644 index 00000000..68edc1e1 --- /dev/null +++ b/config/browsers.json @@ -0,0 +1,31 @@ +{ + "firefox": { + "default": "112.0", + "versions": { + "112.0": { + "image": "selenoid/firefox:112.0", + "port": "4444", + "path": "/wd/hub", + "tmpfs": { + "/tmp": "size=512m" + }, + "env" : ["LANG=ru_RU.UTF-8", "LANGUAGE=ru:en", "LC_ALL=ru_RU.UTF-8"], + "shmSize": 1073741824 + } + } + }, + "chrome": { + "default": "121.0", + "versions": { + "121.0": { + "image": "selenoid/chrome:121.0", + "port": "4444", + "tmpfs": { + "/tmp": "size=512m" + }, + "env" : ["LANG=ru_RU.UTF-8", "LANGUAGE=ru:en", "LC_ALL=ru_RU.UTF-8"], + "shmSize": 1073741824 + } + } + } +} \ No newline at end of file diff --git a/config/create-databases.sh b/config/create-databases.sh new file mode 100644 index 00000000..7550486a --- /dev/null +++ b/config/create-databases.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e + +IFS=',' +for databases in $WILDFLY_DATABASES + do + IFS=':' read name user password <<< $databases + psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL + CREATE USER $user WITH PASSWORD '$password'; + CREATE DATABASE $name WITH OWNER $user; +EOSQL +done diff --git a/config/docker-compose.secdb.yaml b/config/docker-compose.secdb.yaml new file mode 100644 index 00000000..2f6671b4 --- /dev/null +++ b/config/docker-compose.secdb.yaml @@ -0,0 +1,12 @@ +version: "3" +services: + secdb: + build: + context: . + dockerfile: Dockerfile.secdb + depends_on: + - db + env_file: + - testing.env + labels: + - "tmp=true" diff --git a/config/docker-compose.selenoid.yaml b/config/docker-compose.selenoid.yaml new file mode 100644 index 00000000..f284e11b --- /dev/null +++ b/config/docker-compose.selenoid.yaml @@ -0,0 +1,28 @@ +version: "3" + services: + selenoid: + network_mode: bridge + image: aerokube/selenoid:latest-release + container_name: "selenoid" + environment: + - OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/video + volumes: + - ".:/etc/selenoid/:ro" + - "/var/run/docker.sock:/var/run/docker.sock" + - "./logs:/opt/selenoid/logs/" + - "./video/:/opt/selenoid/video/" + command: -session-attempt-timeout 1m -retry-count 3 -limit ${LIMIT:-4} -save-all-logs -log-output-dir /opt/selenoid/logs -video-output-dir /opt/selenoid/video + ports: + - "4444:4444" + +selenoid-ui: +image: aerokube/selenoid-ui +container_name: "selenoid-ui" +network_mode: bridge +depends_on: + - selenoid +links: + - "selenoid:selenoid" +ports: + - "8080:8080" +command: --selenoid-uri http://selenoid:4444` \ No newline at end of file diff --git a/config/docker-compose.tests.yaml b/config/docker-compose.tests.yaml new file mode 100644 index 00000000..bd0a2ed9 --- /dev/null +++ b/config/docker-compose.tests.yaml @@ -0,0 +1,41 @@ +version: "3" +services: + db: + ports: + - 5432:5432 + environment: + - WILDFLY_DATABASES=app:app_user:apppassword,security:security_user:secpassword,jbpm:jbpm:jbpmpassword + + webbpm-app: + env_file: + - testing.env + + selenoid: + network_mode: bridge + image: aerokube/selenoid:latest-release + container_name: "selenoid" + environment: + - OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/video + volumes: + - "$PWD:/etc/selenoid/:ro" + - "/var/run/docker.sock:/var/run/docker.sock" + - "$PWD/logs:/opt/selenoid/logs/" + - "$PWD/video/:/opt/selenoid/video/" + command: -session-attempt-timeout 1m -retry-count 3 -limit ${LIMIT:-4} -save-all-logs -log-output-dir /opt/selenoid/logs -video-output-dir /opt/selenoid/video + ports: + - "4444:4444" + depends_on: + - webbpm-app + + selenoid-ui: + image: aerokube/selenoid-ui + container_name: "selenoid-ui" + network_mode: bridge + depends_on: + - selenoid + links: + - "selenoid:selenoid" + ports: + - "8080:8080" + command: --selenoid-uri http://selenoid:4444 + diff --git a/config/docker-compose.yaml b/config/docker-compose.yaml new file mode 100644 index 00000000..34a29594 --- /dev/null +++ b/config/docker-compose.yaml @@ -0,0 +1,31 @@ +version: "3" +services: + db: + image: postgres:15 + volumes: + - ./create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh + command: + - "--max_prepared_transactions=100" + ports: + - 5432 + environment: + - WILDFLY_DATABASES=security:security_user:secpassword,jbpm:jbpm:jbpmpassword + - POSTGRES_PASSWORD=supersecretpassword + labels: + - "tmp=true" + + webbpm-app: + build: + context: . + dockerfile: Dockerfile + depends_on: + - db + ports: + - 9990 + - 8080 + - 8787 + - 12345 + env_file: + - testing.env + labels: + - "tmp=true" diff --git a/config/entrypoint.sh b/config/entrypoint.sh new file mode 100644 index 00000000..7178804e --- /dev/null +++ b/config/entrypoint.sh @@ -0,0 +1,48 @@ +#! /bin/bash +set -e + +function wait_for_server() { + until `$JBOSS_HOME/bin/jboss-cli.sh -c ":read-attribute(name=server-state)" 2> /dev/null | grep -q running`; do + echo "Retry ..." + done +} + +echo "dump environment variables to env.properties file" +printenv > env.properties + +echo "starting JBoss" +nohup $JBOSS_HOME/bin/standalone.sh --admin-only 1>&2 2>/dev/null & + +# running system patches +wait_for_server +$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/init.cli" --properties=env.properties +$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/add-postgresql-driver.cli" --properties=env.properties +bash "./patches/system/add-demo-user.sh" + +# running project patches +find ./patches/ -type f -name '*.cli' -not -path './patches/system/*' -print0 | +while IFS= read -r -d '' f; do + wait_for_server + echo "running $f" + $JBOSS_HOME/bin/jboss-cli.sh --connect --file="$f" --properties=env.properties +done; + +find ./patches/ -type f -name '*.sh' -not -path './patches/system/*' -print0 | +while IFS= read -r -d '' f; do + wait_for_server + echo "running $f" + bash "$f" +done + +echo "stopping JBoss" +wait_for_server +$JBOSS_HOME/bin/jboss-cli.sh --connect --command=:shutdown + +if ! [[ -z $SERVER_START ]]; then + echo "starting JBoss in standalone" + sleep 10 # without this occurs error "address already in use" + /opt/jboss/wildfly/bin/standalone.sh -c standalone.xml -b 0.0.0.0 -bmanagement 0.0.0.0 +else + echo "cleaning up JBoss logs" + rm -rf $JBOSS_HOME/standalone/log +fi diff --git a/config/patches/add-logger-database.cli b/config/patches/add-logger-database.cli new file mode 100644 index 00000000..83ee8938 --- /dev/null +++ b/config/patches/add-logger-database.cli @@ -0,0 +1,3 @@ +/subsystem=logging/logger=org.jooq.tools:add() +/subsystem=logging/logger=org.jooq.tools:write-attribute(name=level, value=DEBUG) +/subsystem=logging/logger=org.jooq.tools:add-handler(name=CONSOLE) \ No newline at end of file diff --git a/config/patches/default.cli b/config/patches/default.cli new file mode 100644 index 00000000..a965cb04 --- /dev/null +++ b/config/patches/default.cli @@ -0,0 +1,64 @@ +xa-data-source add \ + --name=AppDS \ + --enabled=true \ + --driver-name=postgresql \ + --jndi-name=java:/webbpm/AppDS \ + --user-name=${env.DB_APP_USERNAME:app_user} \ + --password=${env.DB_APP_PASSWORD:apppassword} \ + --use-ccm=true \ + --valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \ + --validate-on-match=false \ + --background-validation=true \ + --background-validation-millis=5000 \ + --exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \ + --statistics-enabled=true \ + --max-pool-size=50 \ + --query-timeout=300 \ + --xa-datasource-properties=ServerName=${env.DB_APP_HOST:db},PortNumber=${env.DB_APP_PORT:5432},DatabaseName=${env.DB_APP_NAME:app} + +xa-data-source add \ + --name=JBPMDS \ + --enabled=true \ + --driver-name=postgresql \ + --jndi-name=java:jboss/datasources/jbpmDS \ + --user-name=${env.DB_JBPM_USERNAME:jbpm} \ + --password=${env.DB_JBPM_PASSWORD:jbpmpassword} \ + --use-ccm=true \ + --valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \ + --validate-on-match=false \ + --background-validation=true \ + --background-validation-millis=5000 \ + --exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \ + --statistics-enabled=true \ + --max-pool-size=50 \ + --query-timeout=300 \ + --xa-datasource-properties=ServerName=${env.DB_JBPM_HOST:db},PortNumber=${env.DB_JBPM_PORT:5432},DatabaseName=${env.DB_JBPM_NAME:jbpm} + +xa-data-source add \ + --name=SECURITYDS \ + --enabled=true \ + --driver-name=postgresql \ + --jndi-name=java:/webbpm/security-ds \ + --user-name=${env.DB_SEC_USERNAME:security_user} \ + --password=${env.DB_SEC_PASSWORD:secpassword} \ + --max-pool-size=70 \ + --valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \ + --validate-on-match=false \ + --background-validation=true \ + --background-validation-millis=5000 \ + --exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \ + --statistics-enabled=true \ + --query-timeout=300 \ + --xa-datasource-properties=ServerName=${env.DB_SEC_HOST:db},PortNumber=${env.DB_SEC_PORT:5432},DatabaseName=${env.DB_SEC_NAME:app} + +/system-property=ldap.mapping.login.param:add(value=${env.WEBBPM_LDAP_LOGIN_ATTR:uid}) +/system-property=ldap.mapping.org.code.param:add(value=${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou}) +/system-property=jboss.as.management.blocking.timeout:add(value=900) +/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=record-request-start-time,value=true) +/subsystem=undertow/server=default-server/host=default-host/setting=access-log:add(pattern=%h %t "%r" %s %b %D) +/system-property=webbpm.cache.hazelcast.hosts:add(value="127.0.0.1") +/system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820") +/system-property=webbpm.security.session.active.count:add(value="20") +/system-property=gar.enable:add(value=false) +/system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$") +/system-property=fias.enable:add(value=false) \ No newline at end of file diff --git a/config/patches/system/add-demo-user.sh b/config/patches/system/add-demo-user.sh new file mode 100644 index 00000000..32b2986a --- /dev/null +++ b/config/patches/system/add-demo-user.sh @@ -0,0 +1 @@ +$JBOSS_HOME/bin/add-user.sh demo@example.com demo diff --git a/config/patches/system/add-postgresql-driver.cli b/config/patches/system/add-postgresql-driver.cli new file mode 100644 index 00000000..66566bf1 --- /dev/null +++ b/config/patches/system/add-postgresql-driver.cli @@ -0,0 +1,5 @@ +/subsystem=datasources/jdbc-driver=postgresql:add( \ + driver-name="postgresql", \ + driver-module-name="org.postgresql", \ + driver-xa-datasource-class-name="org.postgresql.xa.PGXADataSource" \ +) diff --git a/config/patches/system/init.cli b/config/patches/system/init.cli new file mode 100644 index 00000000..100c4d37 --- /dev/null +++ b/config/patches/system/init.cli @@ -0,0 +1,14 @@ +/system-property=webbpm.mode:add(value=production) +/system-property=authentication.method:add(value=form) +/subsystem=undertow/configuration=filter/gzip=gzipFilter:add() +/subsystem=undertow/server=default-server/host=default-host/\ + filter-ref=gzipFilter:add(predicate="exists('%{o,Content-Type}') and regex(pattern='(?:application/javascript|text/css|text/html|text/xml|application/json)(;.*)?', value=%{o,Content-Type}, full-match=true)") +/subsystem=undertow/configuration=filter/response-header=vary-header:add(header-name="Vary", header-value="Accept-Encoding") +/subsystem=undertow/server=default-server/host=default-host/filter-ref=vary-header:add() +/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=max-post-size,value=${env.MAX_POST_SIZE:104857600}) +data-source remove --name=ExampleDS +/subsystem=ee/service=default-bindings:remove +/system-property=jboss.bind.address.management:add(value=0.0.0.0) +/system-property=jboss.bind.address:add(value=0.0.0.0) +module add --name=org.postgresql --resources=./patches/system/postgresql-driver.jar --dependencies=javax.api,javax.transaction.api +shutdown --restart diff --git a/config/secdb.sql b/config/secdb.sql new file mode 100644 index 00000000..46856aa8 --- /dev/null +++ b/config/secdb.sql @@ -0,0 +1,25 @@ +INSERT INTO security.user_group(user_group_id, name, created, updated, access_level_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'Example', '2019-07-04 11:12:01.263+03', '2019-08-26 16:40:11.953+03', (SELECT access_level_id FROM security.access_level where level = 0)) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Example'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Demo'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING; + +INSERT INTO security.user_group(user_group_id, name, created, updated, access_level_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'Example', '2019-07-04 11:12:01.263+03', '2019-08-26 16:40:11.953+03', (SELECT access_level_id FROM security.access_level where level = 0)) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Example'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Demo'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING; + +INSERT INTO security.user_account(user_account_id, email, first_name, last_name, middle_name, created, updated, locked, org_unit_id, username) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'qa_test@micord.ru', 'Пользователь', 'Основной-Тестовый', NULL, '2020-01-20 08:41:25.526+03', '2020-01-20 09:57:07.25+03', false, (SELECT id from security.org_unit where code = 'DEFAULT'), 'qa_test') ON CONFLICT DO NOTHING; +INSERT INTO security.simple_credentials( user_account_id, password, password_expires, password_updated) VALUES ((SELECT user_account_id from security.user_account where username = 'qa_test'), '$2a$11$uTzaeewDp2NehwjmfRe/euxP.cy.4ecl5nYA.E5TV9AGjjDKdJwI2', NULL, '2020-01-20 05:41:25.746') ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Security Admin')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Superuser')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Admin')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Example')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN User')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Demo')) ON CONFLICT DO NOTHING; + +INSERT INTO security.user_account(user_account_id, email, first_name, last_name, middle_name, created, updated, locked, org_unit_id, username) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'qa_admin@micord.ru', 'qa_admin', 'qa_admin', NULL, '2020-01-20 08:41:25.526+03', '2020-01-20 09:57:07.25+03', false, (SELECT id from security.org_unit where code = 'DEFAULT'), 'qa_admin') ON CONFLICT DO NOTHING; +INSERT INTO security.simple_credentials( user_account_id, password, password_expires, password_updated) VALUES ((SELECT user_account_id from security.user_account where username = 'qa_admin'), '$2a$11$Zzmuga/xw1c1UnUe9nP9c.aqJ2O.OAI/AbmphOm2jurxMI0S6VAcy', NULL, '2020-01-20 05:41:25.746') ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Security Admin')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Superuser')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Admin')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Example')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN User')) ON CONFLICT DO NOTHING; +INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Demo')) ON CONFLICT DO NOTHING; diff --git a/config/testing.env b/config/testing.env new file mode 100644 index 00000000..889ea2e9 --- /dev/null +++ b/config/testing.env @@ -0,0 +1,37 @@ +# Security datasource +DB_SEC_USERNAME=security_user +DB_SEC_PASSWORD=secpassword +DB_SEC_HOST=db +DB_SEC_PORT=5432 +DB_SEC_NAME=security +# App datasource +DB_APP_USERNAME=app_user +DB_APP_PASSWORD=apppassword +DB_APP_HOST=db +DB_APP_PORT=5432 +DB_APP_NAME=app +# jBPM datasorce +DB_JBPM_USERNAME=jbpm +DB_JBPM_PASSWORD=jbpmpassword +DB_JBPM_HOST=db +DB_JBPM_PORT=5432 +DB_JBPM_NAME=jbpm +# Elasticsearch +WEBBPM_ELASTIC_HOST= +WEBBPM_ELASTIC_USER_PASSWORD= +# LDAP +WEBBPM_LDAP_URL= +WEBBPM_LDAP_BASE= +WEBBPM_LDAP_USER= +WEBBPM_LDAP_PASSWORD= +WEBBPM_LDAP_SYNC_ENABLED=false +WEBBPM_LDAP_SYNC_CRON=0 0 * * * * +WEBBPM_LDAP_LOGIN_ATTR=uid +WEBBPM_LDAP_ORGANIZATION_ATTR=ou +# JIRA +WEBBPM_JIRA_URL=https:/jira.com +WEBBPM_JIRA_USER=jiraUser +WEBBPM_JIRA_PASSWORD=jiraPass +TZ=Europe/Moscow +WEBBPM_TELEGRAM_BOT_TOKEN= +WEBBPM_TELEGRAM_BOT_NAME= \ No newline at end of file diff --git a/distribution/pom.xml b/distribution/pom.xml new file mode 100644 index 00000000..a7c0b9fc --- /dev/null +++ b/distribution/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + + + ervu_lkrp_ul.ervu_lkrp_ul + distribution + ear + + + /backend + + + + + ervu_lkrp_ul.ervu_lkrp_ul + backend + war + + + ervu_lkrp_ul.ervu_lkrp_ul + frontend + war + + + + + + + org.apache.maven.plugins + maven-ear-plugin + 3.2.0 + + + + ervu_lkrp_ul.ervu_lkrp_ul + frontend + / + frontend.war + + + ervu_lkrp_ul.ervu_lkrp_ul + backend + ${backendContext} + backend.war + + + + + + ${project.parent.artifactId} + + + + + enable-version-in-url + + /backend-${project.version} + + + + diff --git a/frontend/.npmrc b/frontend/.npmrc new file mode 100644 index 00000000..8ed054b1 --- /dev/null +++ b/frontend/.npmrc @@ -0,0 +1 @@ +registry=https://repo.micord.ru/repository/npm-all/ diff --git a/frontend/angular.json b/frontend/angular.json new file mode 100644 index 00000000..965697d3 --- /dev/null +++ b/frontend/angular.json @@ -0,0 +1,71 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "webbpm-frontend": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist", + "index": "src/index.html", + "main": "src/ts/main.ts", + "tsConfig": "src/tsconfig.json", + "polyfills": "src/ts/polyfills.ts", + "assets": [ + "src/resources" + ], + "styles": [ + ], + "scripts": [ + "node_modules/jquery/dist/jquery.min.js", + "node_modules/moment/min/moment-with-locales.js", + "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js", + "node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js", + "node_modules/selectize/dist/js/standalone/selectize.min.js", + "node_modules/downloadjs/download.min.js" + ] + }, + "configurations": { + "production": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "webbpm-frontend:build" + }, + "configurations": {} + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "webbpm-frontend:build" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [], + "exclude": [] + } + } + } + } + }, + "defaultProject": "webbpm-frontend" +} diff --git a/frontend/bs-config.json b/frontend/bs-config.json new file mode 100644 index 00000000..448da143 --- /dev/null +++ b/frontend/bs-config.json @@ -0,0 +1,10 @@ +{ + "port": 8000, + "open": false, + "files": [ + "./**/*.{html,htm,css,js}" + ], + "server": { + "baseDir": "./" + } +} \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html new file mode 100644 index 00000000..a48550ae --- /dev/null +++ b/frontend/index.html @@ -0,0 +1,23 @@ + + + + ervu_lkrp_ul + + + + + + + + + + + + +
+ + diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html new file mode 100644 index 00000000..6286b76e --- /dev/null +++ b/frontend/index.webpack.html @@ -0,0 +1,11 @@ + + + + ervu_lkrp_ul + + + + +
+ + diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 00000000..7fb71ad4 --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,100 @@ +{ + "name": "webbpm-frontend", + "version": "1.0.0", + "scripts": { + "lite": "node ./node_modules/lite-server/bin/lite-server", + "cleanup": "npm run cleanup-ngc && node ./node_modules/rimraf/bin ./build ./dist", + "cleanup-ngc": "node ./node_modules/rimraf/bin ./src/ts/**/*.js ./src/ts/**/*.json ./src/ts/page.routing.ts", + "cleanup-and-ngc": "npm run cleanup && npm run ngc", + "ngc": "node --max-old-space-size=14336 ./node_modules/@angular/compiler-cli/src/main -p tsconfig.aot.json", + "build-webpack": "node --max-old-space-size=14336 ./node_modules/webpack/bin/webpack --config webpack.aot.config.js --progress --profile", + "save-ts-metadata": "node save.ts.metadata.js", + "tsc": "node ./node_modules/typescript/bin/tsc", + "tsc-watch": "node ./node_modules/typescript/bin/tsc --watch", + "ts-watch": "node node_modules/cross-env/dist/bin/cross-env.js TSC_NONPOLLING_WATCHER=true npm run tsc-watch", + "ts": "npm install && npm run tsc", + "compile": "npm run ts-watch", + "install-compile": "npm install && npm run ts-watch" + }, + "dependencies": { + "@angular/animations": "7.2.15", + "@angular/common": "7.2.15", + "@angular/compiler": "7.2.15", + "@angular/core": "7.2.15", + "@angular/forms": "7.2.15", + "@angular/http": "7.2.15", + "@angular/platform-browser": "7.2.15", + "@angular/platform-browser-dynamic": "7.2.15", + "@angular/router": "7.2.15", + "@ng-bootstrap/ng-bootstrap": "4.1.1", + "ag-grid-angular": "29.0.0-micord.4", + "ag-grid-community": "29.0.0-micord.4", + "angular-calendar": "0.28.28", + "autonumeric": "4.5.10-cg", + "bootstrap": "4.3.1", + "bootstrap-icons": "1.10.3", + "cadesplugin_api": "2.0.4-micord.1", + "chart.js": "3.8.0-cg.1", + "chartjs-adapter-moment": "1.0.0", + "core-js": "2.4.1", + "date-fns": "2.29.3", + "downloadjs": "1.4.8", + "eonasdan-bootstrap-datetimepicker": "4.17.47-micord.4", + "esmarttokenjs": "2.2.1-cg", + "font-awesome": "4.7.0", + "google-libphonenumber": "3.0.9", + "inputmask": "5.0.5-cg.2", + "jquery": "3.3.1", + "js-year-calendar": "1.0.0-cg.2", + "jsgantt-improved": "2.0.10-cg", + "moment": "2.17.1", + "moment-timezone": "0.5.11", + "ngx-cookie": "3.0.1", + "ngx-international-phone-number": "1.0.6", + "ngx-toastr": "10.2.0-cg", + "popper.js": "1.14.7", + "reflect-metadata": "0.1.13", + "rxjs": "6.4.0", + "rxjs-compat": "6.4.0", + "selectize": "0.12.4-cg.10", + "systemjs": "0.21.4", + "systemjs-plugin-babel": "0.0.25", + "tslib": "1.9.3", + "zone.js": "0.8.29" + }, + "devDependencies": { + "@angular-devkit/build-optimizer": "0.13.9", + "@angular-devkit/core": "7.3.9", + "@angular/cli": "7.3.9", + "@angular/compiler-cli": "7.2.15", + "@angular/platform-server": "7.2.15", + "@babel/core": "7.9.6", + "@babel/preset-env": "7.9.6", + "@types/bootstrap": "3.3.39", + "@types/jquery": "2.0.49", + "@types/node": "7.0.5", + "@types/selectize": "0.12.33", + "angular-router-loader": "0.8.5", + "angular2-template-loader": "0.6.2", + "babel-loader": "8.1.0", + "codelyzer": "5.2.1", + "copy-webpack-plugin": "5.0.3", + "cross-env": "5.2.1", + "css-loader": "2.1.0", + "del": "2.2.2", + "file-loader": "3.0.1", + "html-webpack-plugin": "4.5.2", + "lite-server": "2.3.0", + "mini-css-extract-plugin": "0.6.0", + "mkdirp": "0.5.1", + "raw-loader": "1.0.0", + "style-loader": "0.23.1", + "terser-webpack-plugin": "1.2.4", + "tslint": "5.13.1", + "typescript": "3.2.4", + "typescript-parser": "2.6.1-cg-fork", + "webpack": "4.32.2", + "webpack-bundle-analyzer": "3.3.2", + "webpack-cli": "3.3.2" + } +} diff --git a/frontend/pom.xml b/frontend/pom.xml new file mode 100644 index 00000000..f007ad0e --- /dev/null +++ b/frontend/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + + + ervu_lkrp_ul.ervu_lkrp_ul + frontend + war + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + replace-version-in-url + process-resources + + replace + + + + + + ${basedir}/src/resources/app-config.json + ${basedir}/dist/src/resources/app-config.json + ${basedir}/src/resources/app.version + ${basedir}/dist/src/resources/app.version + + + + %project.version% + ${project.version} + + + %enable.version.in.url% + ${enable.version.in.url} + + + + + + + + + + dev + + true + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + ${basedir} + + src/resources/**/* + build_dev/**/* + node_modules/**/* + index.html + systemjs.config.js + + + + + + + + + + compile-ts + + false + + + + prod + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + ${basedir}/dist + + + + + + + + + enable-version-in-url + + true + + + + diff --git a/frontend/preview.html b/frontend/preview.html new file mode 100644 index 00000000..45e34e99 --- /dev/null +++ b/frontend/preview.html @@ -0,0 +1,23 @@ + + + + Web BPM + + + + + + + + + + + + +
+ + diff --git a/frontend/save.ts.metadata.js b/frontend/save.ts.metadata.js new file mode 100644 index 00000000..3e193d07 --- /dev/null +++ b/frontend/save.ts.metadata.js @@ -0,0 +1,72 @@ +#!/usr/bin/env node +var tsp = require("typescript-parser"); +var fs = require('fs'); +var path = require('path'); +var ts = require("typescript"); + +var parser = new tsp.TypescriptParser(); +var excludedDirs = [ + 'generated-sources' +]; + +var walkFileTree = function (dir, action) { + if (typeof action !== "function") { + return; + } + + fs.readdirSync(dir).forEach(function (file) { + var path = dir + "/" + file; + var stat = fs.statSync(path); + var extension = ".ts"; + if (stat && stat.isDirectory() && excludedDirs.indexOf(file) === -1) { + walkFileTree(path, action); + } + else if (path.indexOf(extension, path.length - extension.length) !== -1) { + action(null, path); + } + }); +}; + +var dateInLong = Date.now(); +var arr = []; + +var basePath = path.resolve(__dirname, "src/ts/"); +walkFileTree(basePath, function (err, file) { + var content = fs.readFileSync(file).toString(); + var jsonStructure = parser.parseTypescript(ts.createSourceFile( + file, + content, + ts.ScriptTarget.Latest, + true, + ts.ScriptKind.TS + ), + '/'); + jsonStructure['packageName'] = path.relative(path.resolve(__dirname, "src/ts/"),jsonStructure['filePath']); + jsonStructure['imports'].forEach( function (val) { + if (val.libraryName.startsWith(".")) { + val['libraryName'] = path.resolve(path.dirname(jsonStructure['filePath']), val['libraryName']); + val['libraryName'] = path.relative(path.resolve(__dirname, "src/ts/"), val['libraryName']); + val['libraryName'] = path.dirname(val['libraryName']).split(path.sep).join("."); + } + }); + delete jsonStructure['filePath']; + jsonStructure['packageName'] = path.dirname(jsonStructure['packageName']).split(path.sep).join( "."); + arr.push(jsonStructure); +}); +var cache = []; + +fs.writeFileSync("./../.studio/typescript.metadata.json", + JSON.stringify(arr, function (key, value) { + if (typeof value === 'object' && value !== null) { + if (cache.indexOf(value) !== -1) { + // Circular reference found, discard key + return; + } + // Store value in our collection + cache.push(value); + } + return value; + })); + +cache = null; +console.log("typescript parse time = " + (Date.now() - dateInLong)); \ No newline at end of file diff --git a/frontend/src/resources/app-config.json b/frontend/src/resources/app-config.json new file mode 100644 index 00000000..2ccb6a6a --- /dev/null +++ b/frontend/src/resources/app-config.json @@ -0,0 +1,19 @@ +{ + "electronic_sign.esmart_extension_url": "", + "electronic_sign.tsp_address": "", + "filter_cleanup_interval_hours": 720, + "filter_cleanup_check_period_minutes": 30, + "auth_method": "form", + "enable.version.in.url": "%enable.version.in.url%", + "guard.confirm_exit": false, + "message_service_error_timeout": "", + "message_service_warning_timeout": "", + "message_service_success_timeout": "", + "message_service_info_timeout": "", + "jivo_chat_widget_api_url": "https://code.jivo.ru/widget/{ID}", + "jivo_chat_widget_enabled": false, + "password_pattern": "^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$", + "password_pattern_error": "Пароль должен содержать заглавные или прописные буквы и как минимум 1 цифру", + "show.client.errors": false, + "available_task.single_fetch": true +} diff --git a/frontend/src/resources/app.version b/frontend/src/resources/app.version new file mode 100644 index 00000000..8b9b8b3d --- /dev/null +++ b/frontend/src/resources/app.version @@ -0,0 +1 @@ +%project.version% \ No newline at end of file diff --git a/frontend/src/resources/css/components-app.css b/frontend/src/resources/css/components-app.css new file mode 100644 index 00000000..abaf1703 --- /dev/null +++ b/frontend/src/resources/css/components-app.css @@ -0,0 +1,1569 @@ +@charset "utf-8"; + +.webbpm [id="page"] > div > div > [page-object] { + padding: 0 40px; +} + +.webbpm #dashboard { + padding: 15px 40px 0 40px; +} + +.webbpm .title { + font-size: 24px; + font-family: 'SegoeSB'; + padding: 10px 0 0 0; +} + +.webbpm .sub-header { + color: #fff; + font-weight: normal; + padding: 0 20px; + margin-top: 10px; + border-radius: 20px; + background: #4c5969; +} + +.webbpm .sub-header > .form-group { + padding: 10px 0; + margin-bottom: 0; +} + +.webbpm .sub-header>div > div:last-of-type { + font-size: 18px; + padding: 0; +} + +.webbpm .form-signup input.ng-invalid.ng-touched, +.webbpm .form-signup input.ng-invalid.ng-touched ~ .input-group-append > .input-group-text, +.webbpm .form-signup input.ng-invalid.ng-dirty, +.webbpm .form-signup input.ng-invalid.ng-dirty ~ .input-group-append > .input-group-text { + border-color: #1c92ea !important; +} + +.webbpm .form-signup .msg-alert { + color: #1c92ea; +} + +.webbpm input[type="text"], +.webbpm input[type="date"], +.webbpm input[type="email"], +.webbpm input[type="password"], +.webbpm input[type="number"], +.webbpm input.form-control, +.webbpm textarea, +.webbpm select, +.webbpm .selectize-control.single .selectize-input, +.webbpm .multi.plugin-remove_button .selectize-input { + color: #404954; + font-size: 16px; + min-height: 38px; + padding: 6px 8px; + border: 1px solid #e3e6ed; + border-radius: 8px; + background-color: #fff; + background-image: none; + box-shadow: none; +} + +.webbpm .wb-touched.wb-invalid .form-control, +.webbpm .wb-touched.wb-invalid .form-control:focus, +.webbpm .wb-touched.wb-invalid input.form-control, +.webbpm .wb-touched.wb-invalid input.form-control:focus, +.webbpm .wb-touched.wb-invalid .input-group-addon, +.webbpm .wb-touched.wb-invalid .input-group-addon:focus, +.webbpm .wb-touched.wb-invalid .selectize-input, +.webbpm .wb-touched.wb-invalid .selectize-input:focus { + border-color: #1c92ea !important; + box-shadow: none !important; +} + +.webbpm select option:checked { + color: #1c92ea; +} + +.webbpm .input-group input[name="password"], +.webbpm .input-group input[name="confirmPassword"], +.webbpm .date input[type="text"] { + border-right: 0 ; + border-top-right-radius: 0; + border-bottom-right-radius: 0 ; +} + +.webbpm .input-group input[name="password"] ~ .input-group-append > .input-group-text, +.webbpm .input-group input[name="confirmPassword"] ~ .input-group-append > .input-group-text, +.webbpm .date input ~ .input-group-addon { + color: #404954; + border-color: #e3e6ed; + border-radius: 8px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + background-color: transparent; +} + +.webbpm .input-group input[name="password"] ~ .input-group-append > .input-group-text, +.webbpm .input-group input[name="confirmPassword"] ~ .input-group-append > .input-group-text, +.webbpm .date input ~ .input-group-addon { + color: #404954; + border-color: #e3e6ed; + border-radius: 8px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + background-color: transparent; +} + +.webbpm international-phone-number .input-group-addon.flagInput { + border: 0; + background-color: transparent; +} + +.webbpm international-phone-number .input-group-addon.flagInput .btn { + border: 1px solid #e3e6ed; + border-right: 0; + border-radius: 10px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.webbpm international-phone-number .input-group-addon.flagInput ~ input { + border-right: 1px solid #e3e6ed; + border-radius: 10px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.webbpm .selectize-dropdown { + box-shadow: none; +} + +.webbpm .selectize-dropdown-content { + border: 1px solid #e3e6ed; + border-radius: 10px; + background-color: #fff; + box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%); +} + +.webbpm .selectize-dropdown .active { + color: #1c92ea; + background-color: transparent; +} + +.webbpm .form-group > label, +.webbpm .form-group > div { + display: inline-block; + vertical-align: top; +} +.webbpm .width-full .form-group > label, +.webbpm .width-full .form-group > div { + display: table-cell; +} + +.webbpm .form-control { + background-color: inherit; +} + +.webbpm .form-control[disabled], +.webbpm .form-control[readonly], +.webbpm .date .form-control[disabled] ~ .input-group-addon, +.webbpm .date .form-control[readonly] ~ .input-group-addon, +.webbpm fieldset[disabled] .form-control, +.webbpm .selectize-control .selectize-input.disabled { + background-color: #f5f7fa; +} + +.webbpm .selectize-control.form-control { + min-height: 38px; +} + +.webbpm .selectize-control.single .selectize-input > .item { + line-height: normal; +} + +.webbpm .selectize-control.single .selectize-input input { + line-height: normal !important; + border-radius: 0; +} + +.webbpm drop-down-button .dropdown-menu.show { + border: 1px solid #e3e6ed; + border-radius: 10px; + background-color: #fff; + box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%); +} + +.webbpm drop-down-button .dropdown-menu.show .btn { + padding-top: 4px; + padding-bottom: 4px; + border: 0; + box-shadow: none; +} + +.webbpm .selectize-dropdown-content { + font-size: 16px; +} + +.webbpm .selectize-dropdown .more_values { + color: #404954; + background-color: #f0f7fd; +} + +/*----------------- Button ---------------- */ +.webbpm .btn { + font-size: 16px; + font-family: 'SegoeSB'; + padding: 6px 14px; + margin-bottom: 0; + border-radius: 20px; +} + +.webbpm .btn:focus, +.webbpm .btn:active:focus { + box-shadow: none !important; +} + +.webbpm .btn-main { + border-color: transparent !important; + background: transparent !important; +} + +.webbpm .btn-main > * > .btn, +.webbpm .btn-primary { + color: #fff !important; + border-color: #1c92ea; + background: #1c92ea; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%); +} +.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):hover, +.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):active, +.webbpm .btn-primary:hover, +.webbpm .btn-primary:active { + border-color: #1b84d2; + background: #1b84d2; +} +.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):focus, +.webbpm .btn-primary:focus { + border-color: #1b84d2; + background: #1b84d2; + box-shadow: none; +} + +.webbpm .btn-secondary, +.webbpm .btn-default { + color: #404954; + border: 1px solid #e3e6ed; + background: #fff; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%); +} +.webbpm .btn-secondary:not(:disabled):not(.disabled):hover, +.webbpm .btn-secondary:not(:disabled):not(.disabled):active, +.webbpm .btn-default:not(:disabled):not(.disabled):hover, +.webbpm .btn-default:not(:disabled):not(.disabled):active { + color: #1c92ea; + border-color: #e3e6ed; + background-color: #fff; +} +.webbpm .btn-secondary:not(:disabled):not(.disabled):focus, +.webbpm .btn-default:not(:disabled):not(.disabled):focus { + border-color: #e3e6ed; + background-color: #fff; + box-shadow: none; +} + +.webbpm .btn.disabled, +.webbpm .btn:disabled { + color: #666; + border-color: #f3f3f3; + background-color: #f3f3f3; + box-shadow: none; +} + +.webbpm .btn.btn-primary.disabled, +.webbpm .btn.btn-primary:disabled, +.webbpm .btn-main .btn.disabled, +.webbpm .btn-main .btn:disabled { + color: rgba(255, 255, 255, 0.8) !important; + border-color: #1c92ea; + background-color: #1c92ea; + box-shadow: none; +} + +.webbpm ag-grid-angular .state-btn-edit, +.webbpm ag-grid-angular .state-btn-delete { + color: #1c92ea !important; + border: 0; + background: transparent; + box-shadow: none; +} + +.webbpm button.close { + outline: none; +} +/*---------------- end - Button -------------- */ + +/*----------------- Bread-crumb -------------- */ +.webbpm bread-crumb { + display: flex; + flex-direction: column; + max-width: 800px; + margin-top: 20px; +} + +.webbpm bread-crumb .status_bar { + position: relative; + display: flex; + flex-direction: row; + justify-content: stretch; +} + +.webbpm bread-crumb .status_bar .crumb-element { + color: #fff; + font-size: 14px; + padding: 4px 15px; + background-color: #4c5969; + border-radius: 20px; + z-index: 1; +} + +.webbpm bread-crumb .status_bar > div + div { + position: relative; + display: flex; + justify-content: end; + flex: 1; +} +.webbpm bread-crumb .status_bar > div + div::before { + content: ""; + position: absolute; + left: 0; + right: 0; + top: 50%; + height: 2px; + background-color: #4c5969; +} + +.webbpm bread-crumb .status_bar > div.active ~ div::before { + background-color: #e3e6ed; +} + +.webbpm bread-crumb .status_bar > div.active .crumb-element { + background-color: #1c92ea; +} + +.webbpm bread-crumb .status_bar > div.active ~ div .crumb-element { + color: #989fa8; + background-color: #e3e6ed; +} +/*--------------- end Bread-crumb ------------ */ + +.webbpm grid-v2-with-project-defined-sidebar, +.webbpm in-memory-route-param-filter-grid { + display: flex; + flex-direction: column; + flex: 1 1 auto; +} + +.webbpm .container-inside > div > div > grid, +.webbpm .container-inside > div > div > grid-v2-with-project-defined-sidebar{ + height: auto !important; + flex: 1 1 auto; + overflow: hidden; +} + +.webbpm ag-grid-angular .ag-body-viewport, +.webbpm ag-grid-angular .ag-row-odd, +.webbpm ag-grid-angular .ag-row-even { + background-color: transparent; +} + +.webbpm ag-grid-angular .ag-side-bar { + border: 0; + background-color: transparent; +} + +.webbpm ag-grid-angular .ag-header-cell { + line-height: 40px; + padding: 0 10px; + border: 0; +} +.webbpm ag-grid-angular .ag-header-cell::after, +.webbpm ag-grid-angular .ag-header-group-cell::after { + border-color: transparent; +} + +.webbpm ag-grid-angular { + font-family: 'Segoe'; + font-weight: normal; +} + +.webbpm ag-grid-angular .ag-header { + border: 0; + border-radius: 12px; + background: #f5f7fa; +} + +.webbpm ag-grid-angular .ag-header-row { + color: #404954; + font-family: 'SegoeSB'; + font-size: 14px; + font-weight: normal; +} + +.webbpm ag-grid-angular .grid-filter-hide .ag-floating-filter-body, +.webbpm ag-grid-angular .grid-filter-hide .ag-floating-filter-button { + display: none; +} + +.webbpm ag-grid-angular .ag-header-group-cell { + font-family: 'SegoeB'; + font-size: 16px; +} + +.webbpm ag-grid-angular .ag-header-cell>.ag-cell-label-container>.ag-header-cell-label>.ag-header-cell-text { + white-space: nowrap; +} + +.webbpm ag-grid-angular .ag-header .ag-floating-filter-body input { + font-family: 'Segoe'; + font-size: 14px; + min-height: 20px; + padding: 2px; + border: 1px solid #e3e6ed; + border-radius: 4px; + background: transparent; +} + +.webbpm ag-grid-angular .ag-root, +.webbpm ag-grid-angular .ag-header-row { + border: 0; +} + +.webbpm ag-grid-angular .ag-root { + position: static; +} + +.webbpm ag-grid-angular .ag-row { + border-color: #e3e6ed; +} +.webbpm ag-grid-angular .ag-row::before { + display: none; +} + +.webbpm ag-grid-angular .ag-row:not(.ag-row-first) { + border-width: 1px 0 0; + border-style: solid; +} +.webbpm ag-grid-angular .ag-row-last:not(.ag-row-first) { + border-width: 1px 0; +} + +.webbpm ag-grid-angular .ag-row.ag-row-odd, +.webbpm ag-grid-angular .ag-row.ag-row-selected { + background-color: inherit !important; +} + +.webbpm ag-grid-angular .ag-row.ag-row-selected .ag-cell { + color: #1c92ea; +} + +.webbpm ag-grid-angular .ag-body-viewport .ag-row.ag-row-hover { + border-radius: 10px; +} +.webbpm ag-grid-angular .ag-body-viewport .ag-row.ag-row-hover, +.webbpm ag-grid-angular .ag-body-viewport .ag-row.ag-row-hover .ag-cell { + background-color: #f9f9f9 !important; +} + +.webbpm ag-grid-angular .ag-body-viewport .ag-row.ag-row-hover:not(.ag-full-width-row)::before, +.webbpm ag-grid-angular .ag-body-viewport .ag-row.ag-row-hover.ag-full-width-row.ag-row-group::before { + background-color: transparent; +} + +.webbpm ag-grid-angular .ag-row.ag-row-hover, +.webbpm ag-grid-angular .ag-row.ag-row-hover + .ag-row { + border-color: transparent; +} + +.webbpm ag-grid-angular .ag-row .ag-cell { + display: inline-flex; + color: #404954; + font-size: 16px; + padding: 0 10px; + border: 1px solid transparent; +} + +.webbpm ag-grid-angular .ag-row .ag-cell.webbpm-checkbox-grid-column { + justify-content: center; +} + +.webbpm ag-grid-angular .ag-row .ag-cell .ag-cell-wrapper { + flex: 1 1 auto; + overflow: hidden; +} + +.webbpm ag-grid-angular .ag-row .ag-cell.ag-cell-last-left-pinned:not(.ag-cell-range-right):not(.ag-cell-range-single-cell) { + border-right: 0; +} + +.webbpm ag-grid-angular .ag-pinned-left-floating-bottom:not(.ag-hidden) .ag-row, +.webbpm ag-grid-angular .ag-pinned-left-floating-bottom:not(.ag-hidden) ~ .ag-floating-bottom-viewport { + border: 0; + border-radius: 12px; + background: #f0f7fd; + overflow-y: auto !important; +} + +.webbpm ag-grid-angular .ag-pinned-left-floating-bottom:not(.ag-hidden) .ag-row { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.webbpm ag-grid-angular .ag-pinned-left-floating-bottom:not(.ag-hidden) ~ .ag-floating-bottom-viewport { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.webbpm ag-grid-angular .ag-floating-bottom-container .ag-row { + border: 0; + border-radius: 12px; + background: #f0f7fd; + overflow-y: auto !important; +} + +.webbpm ag-grid-angular .ag-cell.ag-cell-focus.ag-cell-inline-editing { + height: 100%; +} + +.webbpm ag-grid-angular .ag-cell.ag-cell-focus.ag-cell-inline-editing input { + font-size: 16px; + padding: 0; + border: 0; + background: transparent; + box-shadow: none; +} + +.webbpm ag-grid-angular .ag-paging-panel { + color: #404954; + font-size: 14px; + border: 0; + border-radius: 12px; + background: #f5f7fa; +} + +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button { + display: flex; + width: 32px; + height: 32px; + border: 1px solid #e3e6ed; + border-radius: 16px; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%); +} +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button:not(:disabled) { + opacity: 1; +} + +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button > span { + display: flex; + align-items: center; + justify-content: center; + width: 100%; +} + +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button + .ag-paging-button { + margin-left: 8px; +} + +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button[ref="btPrevious"] { + margin-right: 16px; +} +.webbpm ag-grid-angular .ag-paging-panel .ag-paging-button[ref="btNext"]{ + margin-left: 16px; +} + +.webbpm ag-grid-angular .ag-floating-bottom { + border-top: 0; + overflow-y: auto !important; +} + +.webbpm ag-grid-angular .ag-floating-bottom-container .ag-cell { + display: flex; + align-items: center; +} + +.webbpm ag-grid-angular .ag-floating-bottom-container input { + color: #404954; + font-family: 'SegoeSB'; + font-size: 16px; + height: 20px; + padding: 0; + border: 0; + background: transparent; + box-shadow: none; +} + +.webbpm ag-grid-angular .ag-header-cell-menu-button .ag-icon-menu { + height: 25px; +} + +.webbpm .grid-setting-icon { + width: 16px; + height: 25px; + right: 12px; + padding: 0; + background-position: center; +} + +.webbpm .grid-mtm { + width: 46%; +} +.webbpm .grid-mtm + .many-to-many-move-buttons { + width: 8%; +} +.webbpm .grid-mtm + .many-to-many-move-buttons button.btn { + width: 100%; +} + +.webbpm ag-grid-angular .ag-overlay-loading-center { + border: 1px solid #e3e6ed; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%); +} + +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) > .ag-row.ag-row-selected, +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) > .ag-row.ag-row-hover { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) + .ag-center-cols-clipper > div > div > .ag-row.ag-row-selected, +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) + .ag-center-cols-clipper > div > div > .ag-row.ag-row-hover { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) > .ag-row.ag-row-first, +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) + .ag-center-cols-clipper > div > div > .ag-row.ag-row-first { + border-width: 1px 0 0 0; +} + + +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) > .ag-row:not(.ag-row-first), +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) + .ag-center-cols-clipper > div > div > .ag-row:not(.ag-row-first) { + border-width: 1px 0 0 0; +} + +.webbpm editable-grid ag-grid-angular .ag-floating-bottom .ag-row, +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) > .ag-row-hover, +.webbpm editable-grid ag-grid-angular .ag-pinned-left-cols-container:not(.ag-hidden) + .ag-center-cols-clipper > div > div > .ag-row-hover { + border-color: transparent; +} + +.webbpm editable-grid ag-grid-angular .ag-floating-bottom { + margin-top: 2px; + border: 0; + border-radius: 10px; + background-color: #f0f7fd; +} + +.webbpm editable-grid ag-grid-angular .ag-cell-wrapper { + height: 100%; +} + +.webbpm editable-grid ag-grid-angular .ag-row.ag-row-first { + border-style: solid; + border-width: 0; + border-color: transparent; +} + +.webbpm editable-grid ag-grid-angular .ag-cell input { + padding: 0; + border-color: transparent !important; + background-color: transparent; + box-shadow: none; +} +.webbpm editable-grid ag-grid-angular .ag-cell input:focus { + border-color: transparent !important; + box-shadow: none !important; +} +.webbpm editable-grid ag-grid-angular .ag-cell.ag-cell-value.wb-invalid { + border-color: transparent; +} + +.webbpm editable-grid ag-grid-angular .ag-cell-inline-editing { + background-color: transparent; +} + +.webbpm editable-grid ag-grid-angular check-box-grid-editor .form-group { + margin-bottom: 0; +} + +.webbpm editable-grid ag-grid-angular check-box-grid-editor .form-group > label { + display: flex; + align-items: center; + padding-top: 0; +} + +.webbpm editable-grid ag-grid-angular .ag-body-viewport .ag-row .ag-cell.ag-cell-inline-editing { + border: 0 !important; + background-color: #f0f7fd !important; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor { + padding: 0 !important; + border: 0 !important; + border-radius: 0 !important; + background-color: transparent; + box-shadow: none !important; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor .form-group, +.webbpm editable-grid ag-grid-angular number-field-grid-editor .form-group, +.webbpm editable-grid ag-grid-angular text-field-grid-editor .form-group { + margin-bottom: 0; +} + +.webbpm editable-grid ag-grid-angular text-area-grid-editor .form-control { + font-size: 16px; + min-height: 100px; + border: 0; + background-color: #f0f7fd; +} +.webbpm editable-grid ag-grid-angular text-area-grid-editor .form-control:focus { + box-shadow: none; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-many-grid-editor > div, +.webbpm editable-grid ag-grid-angular .ag-popup-editor auto-complete-grid-editor > div, +.webbpm editable-grid ag-grid-angular .ag-popup-editor combo-box-grid-editor > div, +.webbpm editable-grid ag-grid-angular .ag-popup-editor static-combo-box-grid-editor > div { + align-items: center; + margin-top: -1px; +} + +.webbpm editable-grid ag-grid-angular .ag-header .alarm, +.webbpm editable-grid ag-grid-angular .ag-overlay-loading-center, +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor label, +.webbpm editable-grid ag-grid-angular number-field-grid-editor label { + display: none; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor { + flex: 1; + height: 100%; + padding: 0; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .form-group { + display: flex; + height: 100%; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .component-float { + flex: 1; + width: auto; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .selectize-control, +.webbpm editable-grid ag-grid-angular .ag-popup-editor auto-complete-grid-editor .selectize-control, +.webbpm editable-grid ag-grid-angular .ag-popup-editor combo-box-grid-editor .selectize-control, +.webbpm editable-grid ag-grid-angular .ag-popup-editor static-combo-box-grid-editor .selectize-control, +.webbpm editable-grid ag-grid-angular .ag-popup-editor .date > div, +.webbpm editable-grid ag-grid-angular .ag-popup-editor .date .input-group { + height: 100%; + min-height: auto; + width: 100%; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .selectize-control.single .selectize-input, +.webbpm editable-grid ag-grid-angular .ag-popup-editor auto-complete-grid-editor .selectize-control.single .selectize-input, +.webbpm editable-grid ag-grid-angular .ag-popup-editor combo-box-grid-editor .selectize-control.single .selectize-input, +.webbpm editable-grid ag-grid-angular .ag-popup-editor static-combo-box-grid-editor .selectize-control.single .selectize-input, +.webbpm editable-grid ag-grid-angular .ag-popup-editor .date input, +.webbpm editable-grid ag-grid-angular .ag-popup-editor .date .input-group-addon { + display: inline-flex; + align-items: center; + height: 100%; + min-height: auto; + padding: 0 10px 1px 11px; + border: 0; + border-radius: 0; + background: #f0f7fd; + box-shadow: none; +} +.webbpm editable-grid ag-grid-angular .ag-popup-editor .date input { + padding-right: 0; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .selectize-control.single .selectize-input.dropdown-active { + padding-right: 3px; +} +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .selectize-control.single .selectize-input.dropdown-active::before, +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor .selectize-control.single .selectize-input::after { + display: none; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor input { + padding-left: 5px !important; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor + button-component { + height: 100%; + background: #f0f7fd; +} + +.webbpm editable-grid ag-grid-angular .ag-popup-editor one-to-may-auto-complete-grid-editor + button-component .btn { + color: #404954 !important; + white-space: nowrap; + padding: 0; + background-color: transparent !important; + border: 0 !important; + box-shadow: none !important; +} + +/*---------------- Table Header Menu --------------- */ +.webbpm ag-grid-angular .ag-menu { + padding: 6px; + border: 1px solid #f5f5f5; + border-radius: 12px; + background-color: #fff; + box-shadow: 0px 100px 80px rgb(0 0 0 / 7%), 0px 40px 30px rgb(0 0 0 / 5%), 0px 22px 18px rgb(0 0 0 / 4%), 0px 12.5px 10px rgb(0 0 0 / 4%), 0px 6.5px 5px rgb(0 0 0 / 3%), 0px 2.5px 2px rgb(0 0 0 / 2%); +} + +.webbpm ag-grid-angular .ag-tab-header { + border: 0; + background-color: #fff; +} + +.webbpm ag-grid-angular .ag-tab-header .ag-tab { + margin: 0 6px 6px 0; +} + +.webbpm ag-grid-angular .ag-tab-header .ag-tab.ag-tab-selected { + border-color: transparent; + border-radius: 6px; + background-color: #f2f2f2; +} + +.webbpm ag-grid-angular .ag-pinned-left-header { + border-right: 0; +} + +.webbpm ag-grid-angular .ag-header-checkbox-container .ag-icon-checkbox-checked, +.webbpm ag-grid-angular .ag-header-checkbox-container .ag-icon-checkbox-unchecked { + margin-top: 5px; +} + +.webbpm ag-grid-angular .ag-tab-body { + color: #404954; + font-size: 14px; + padding: 0; +} + +.webbpm ag-grid-angular .ag-menu > .ag-menu-list { + margin: 0px; +} + +.webbpm ag-grid-angular .ag-menu .ag-menu-option { + color: #404954; + font-size: 14px; +} + +.webbpm ag-grid-angular .ag-menu .ag-menu-option-active { + background-color: #f5f5f5; +} +.webbpm ag-grid-angular .ag-menu .ag-menu-option-active > *:first-child { + border-top-left-radius: 8px; + border-bottom-left-radius: 8px; +} +.webbpm ag-grid-angular .ag-menu .ag-menu-option-active > *:last-child { + border-top-right-radius: 8px; + border-bottom-right-radius: 8px; +} + +.webbpm ag-grid-angular .ag-menu .ag-menu-separator > span { + height: 9px; + background-image: url("data:image/svg+xml;utf8,"); +} + +/*---------------- Side-bar --------------- */ +.webbpm ag-grid-angular .ag-status-bar, +.webbpm ag-grid-angular .ag-side-bar, +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons, +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel { + border: 0; +} +.webbpm ag-grid-angular .ag-side-bar { + background: transparent; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-tool-panel-wrapper { + width: 300px; + border: 1px solid #efefef; + border-radius: 12px 0 0 12px; + background: #fff; + box-shadow: -2px 0px 12px -6px rgb(0 0 0 / 20%); +} + +.webbpm ag-grid-angular .ag-side-bar .ag-tool-panel-wrapper, +.webbpm ag-grid-angular .ag-side-bar .ag-tool-panel-wrapper .ag-filter-toolpanel-header { + color: #404954; + font-size: 16px; + font-weight: normal; + background: transparent; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-tool-panel-wrapper .ag-filter-panel .ag-filter-air { + padding: 0; + border: 0; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons { + width: 30px; + padding-top: 0; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons .ag-side-button { + padding-left: 4px; + +} + +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons .ag-side-button button { + color: #404954; + font-family: 'Segoe'; + font-size: 14px; + border: 0; + border-radius: 10px; +} +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons .ag-side-button button:hover { + color: #eb5757; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-side-buttons .ag-side-button.ag-selected button { + color: #eb5757; + background: #f2f2f2; +} + +.webbpm ag-grid-angular .ag-primary-cols-header-panel, +.webbpm ag-grid-angular .ag-filter-toolpanel-search { + align-items: center; + height: 50px; + padding-top: 0; + border-bottom: 1px solid #efefef; +} + +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-panel-column-select { + border: 0; +} + +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel .ag-column-tool-panel-column-group, +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel .ag-column-tool-panel-column { + height: 30px; + line-height: 30px; + margin-left: 6px; + margin-right: 6px; + border-radius: 8px; +} +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel .ag-column-tool-panel-column-group:hover, +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel .ag-column-tool-panel-column:hover { + background: #f5f5f5; + cursor: pointer; +} + +.webbpm ag-grid-angular .ag-tool-panel-wrapper .ag-column-select-panel .ag-column-tool-panel-column-group { + font-family: 'SegoeSB'; +} + +.webbpm ag-grid-angular .ag-column-select-panel .ag-column-tool-panel-column.ag-toolpanel-add-group-indent { + padding-left: 44px; +} + +.webbpm ag-grid-angular .ag-icon-settings { + height: 10px; + width: 10px; + background: url('../img/icons/settings-sm.svg') center no-repeat; + opacity: 0.7; +} + +.webbpm ag-grid-angular .ag-side-bar .card { + border: 0; +} + +.webbpm ag-grid-angular .ag-side-bar .card-header { + text-align: left; + padding: 6px; + border: 0; + background: transparent; +} + +.webbpm ag-grid-angular .ag-side-bar .card-header i { + float: none; + font-size: 14px; + text-align: center; + width: 16px; + margin: 0; +} +.webbpm ag-grid-angular .ag-side-bar .card-header i.fa-chevron-right::before { + content: "\f105"; +} +.webbpm ag-grid-angular .ag-side-bar .card-header i.fa-chevron-down::before { + content: "\f107"; +} + +.webbpm ag-grid-angular .ag-side-bar .card-block, +.webbpm ag-grid-angular.ag-side-bar .ag-filter-toolpanel-body { + margin: 0px 6px; +} + +.webbpm ag-grid-angular .ag-side-bar .card-block button { + color: #404954; + min-height: 35px; + margin-bottom: 6px; + border: 1px solid #e3e6ed; + border-radius: 8px; + background: #fff; + box-shadow: 0px 2px 3px -2px rgb(0 0 0 / 20%); +} + +.webbpm ag-grid-angular .ag-side-bar .ag-filter-body-wrapper > *, +.webbpm ag-grid-angular .ag-filter .ag-filter-body-wrapper > * { + margin-bottom: 6px; +} + +.webbpm ag-grid-angular .ag-side-bar .ag-filter-toolpanel .ag-group, +.webbpm ag-grid-angular .ag-side-bar .ag-filter-toolpanel .ag-group .ag-filter-toolpanel-instance-filter { + margin: 0; + border: 0; +} + +.webbpm ag-grid-angular .ag-column-drop-horizontal.ag-column-drop { + padding: 0; + border: 0; + background-color: transparent; +} + +.webbpm ag-grid-angular .ag-column-drop-horizontal.ag-column-drop > div:not(.ag-column-drop-list) { + display: none; +} + +.webbpm ag-grid-angular .ag-popup .ag-select-list-item { + font-size: 16px; + background: transparent; +} +.webbpm ag-grid-angular .ag-popup .ag-select-list-item.ag-active-item { + color: #1c92ea; +} + +.webbpm ag-grid-angular .ag-popup .ag-popup-child:not(.ag-tooltip-custom) { + padding: 6px 4px; + border: 0; + border-radius: 10px; + background-color: #fff; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 12%); +} + +.webbpm ag-grid-angular .ag-column-drag { + margin: 0 0 0 6px; + background: url('../img/icons/dots-six-vertical.svg') 0 0 no-repeat; +} + +.webbpm sales-grid .grid { + display: flex; + flex-direction: column; +} + +.webbpm sales-grid .grid > ag-grid-angular { + flex: 1; + overflow: hidden; +} + +.webbpm sales-grid .grid .ag-paging-panel { + display: flex; + flex-direction: row; +} + +.webbpm sales-grid .grid .table-panel-legend { + display: flex; + flex: 1; + justify-content: right; + margin: 0 80px 0 0; +} + +.webbpm sales-grid .grid .table-panel-legend > span { + position: relative; + margin-left: 48px; +} +.webbpm sales-grid .grid .table-panel-legend > span::before { + content: ""; + position: absolute; + width: 16px; + height: 16px; + left: -24px; + top: 0; + border: 1px solid #fff; + border-radius: 8px; + box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 45%); +} +.webbpm sales-grid .grid .table-panel-legend > .order-reject::before { + background: #feffee; +} +.webbpm sales-grid .grid .table-panel-legend > .order-return::before { + background: #fff1f1; +} +.webbpm sales-grid .grid .table-panel-legend > .order-self-redemption::before { + background: #edfcf8; +} + +.webbpm ag-grid-angular .ag-overlay-loading-center { + color: #404954; + font-size: 14px; + padding: 20px; + border: 1px solid #f5f5f5; + border-radius: 12px; + background: #fff; + box-shadow: 0px 100px 80px rgb(0 0 0 / 7%), 0px 40px 30px rgb(0 0 0 / 5%), 0px 22px 18px rgb(0 0 0 / 4%), 0px 12.5px 10px rgb(0 0 0 / 4%), 0px 6.5px 5px rgb(0 0 0 / 3%), 0px 2.5px 2px rgb(0 0 0 / 2%); +} + +.webbpm ag-grid-angular .ag-filter .ag-filter-header-container { + height: 32px; +} + +.webbpm ag-grid-angular .ag-filter .ag-filter-header-container:nth-child(2) { + margin-top: 8px; + border-bottom: 1px solid #e2e2e2; +} + +.webbpm ag-grid-angular .ag-virtual-list-item:hover { + border-radius: 8px; + background: #f5f5f5; +} + +.webbpm ag-grid-angular .ag-virtual-list-item:hover > label { + cursor: pointer; +} + +.webbpm ag-grid-angular .ag-filter label { + font-size: 16px; + width: auto; + margin: 0; +} + +.webbpm ag-grid-angular .ag-filter .ag-filter-checkbox { + margin-right: 6px; +} + +.webbpm .modal-content { + border: 0; + border-radius: 15px; + box-shadow: 0px 0px 30px 2px rgb(77 72 91 / 12%); + background-color: #fff; +} + +.webbpm .modal-header { + border-bottom: 1px solid #e3e6ed; +} + +/*-------------- Containers --------------- */ +.webbpm .block-content { + margin: 0; + border: 0; +} + +.webbpm .block-content, +.webbpm .block-content > div { + display: flex; + flex-direction: column; + height: 100%; +} + +.webbpm .nav-tabs { + width: max-content; + margin-bottom: 30px; + border: 0; + border-radius: 20px; + background-color: #e3e6ed; +} + +.webbpm .nav-tabs .nav-item { + margin-bottom: 0; +} + +.webbpm .nav-tabs .nav-link { + color: #404954; + padding: 6px 14px; + border: 0; + background-color: transparent; +} + +.webbpm .nav-tabs .nav-link:hover, +.webbpm .nav-tabs .nav-link:focus, +.webbpm .nav-tabs .nav-link:active { + background-color: transparent; +} + +.webbpm .nav-tabs .active .nav-link { + color: #fff; + border: 0; + border-radius: 20px; + background-color: #1c92ea; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 24%); +} + +.webbpm tab-container .nav-tabs ~ .tab-active > .active { + flex-direction: column; + display: flex; + padding: 0; + border: 0; +} +/*------------- end Containers ------------ */ + +/*----------------- Filters ---------------- */ +.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card, +.webbpm .fieldset { + border: 0; + border-radius: 8px; + background-color: #f5f7fa; +} + +.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-header, +.webbpm .fieldset > legend { + font-family: 'SegoeSB'; + font-size: 18px; + padding: 15px 20px; + border: 0; + background: transparent; +} + +.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-header .font-bold { + margin-top: 10px; +} + +.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-block { + padding: 0 20px 15px 20px; +} + +.webbpm .fieldset > .legend + div { + padding: 55px 20px 15px 20px; +} + +.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card i { + float: none; + font-size: 14px; + margin-right: 6px; + margin-left: 0; +} +/*-------------- end Filters -------------- */ + +/*-------------- Admin-pages -------------- */ +.webbpm [page-processinstance], +.webbpm #process-instance, +.webbpm #process-instance > vbox, +.webbpm #process-instance > vbox > div { + height: 100%; +} + +.webbpm [page-processinstance] #process-instance tab-container > div, +.webbpm [page-processinstance] #process-instance tab-container .tab-active { + display: flex !important; +} + +.webbpm [id^="user-management-"], +.webbpm #process-instance-list, +.webbpm #process-instance { + padding: 0 40px; +} + +.webbpm [id^="user-management-"] > vbox > div > *:not(.title), +.webbpm #process-instance-list > vbox > div > *:not(.title) { + margin-bottom: 20px; +} + +.webbpm [id^="user-management-"] .card label, +.webbpm #process-instance-list .card label { + display: inline-flex; +} + +.webbpm [id^="user-management-"] .card .width-full>div > label, +.webbpm #process-instance-list .card .width-full>div > label { + display: table-cell; + padding-top: 5px; +} + +.webbpm #user-management-authorities { + margin-top: 40px; +} + +.webbpm #process-instance-list static-column-grid { + margin-top: 20px; +} + +.webbpm #process-instance-list .radio-block .radio-content { + display: flex; + flex-direction: row; + align-items: flex-start; +} + +.webbpm #process-instance-list .radio-block .radio-content label.control-label { + padding-top: 0; +} + +.webbpm #process-instance bpmn-back-button { + margin: 20px 0; +} +/*----------- end Admin-pages ------------- */ + +/*---------------- Calendar --------------- */ +.webbpm .calendar .months-container { + display: flex !important; + flex-wrap: wrap; + width: 100%; +} + +.webbpm .calendar .month-container { + float: none; + height: max-content; + margin-bottom: 20px; +} + +.webbpm .calendar .month .day { + font-size: 14px; +} + +.webbpm .calendar .month .day.day-start { + color: #fff; + border-radius: 4px; + background-color: #1c92ea !important; +} +.webbpm .calendar .month .day.day-start .day-content:hover { + color: #fff; +} + +.webbpm .calendar .month .day .day-content:hover { + color: #1c92ea; + background-color: transparent; +} + +.webbpm .date .bootstrap-datetimepicker-widget { + color: #404954; + width: min-content; + padding: 10px; + margin: 0; + border: 1px solid #e3e6ed; + + border-radius: 10px; + background-color: #fff; + box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%); +} +.webbpm .date .bootstrap-datetimepicker-widget.dropdown-menu.bottom:before, +.webbpm .date .bootstrap-datetimepicker-widget.dropdown-menu.bottom:after, +.webbpm .date .bootstrap-datetimepicker-widget table td.today:before { + display: none; +} + +.webbpm .date .bootstrap-datetimepicker-widget table thead tr:first-child th:hover { + color: #1c92ea; + background-color: transparent; +} + +.webbpm .bootstrap-datetimepicker-widget table td.day:hover, +.webbpm .bootstrap-datetimepicker-widget table td.hour:hover, +.webbpm .bootstrap-datetimepicker-widget table td.minute:hover, +.webbpm .bootstrap-datetimepicker-widget table td.second:hover { + color: #1c92ea; + background-color: transparent; +} + +.webbpm .date .bootstrap-datetimepicker-widget table td.today, +.webbpm .date .bootstrap-datetimepicker-widget table td.today:hover { + color: #fff !important; + background-color: #1c92ea; +} + +.webbpm .date .bootstrap-datetimepicker-widget table td.active { + color: #404954 !important; + text-shadow: none; + background-color: #f9f9f9; +} + +.webbpm .btn-group-viewdate.btn-group .btn { + width: 38px; + height: 38px; + border-radius: 19px; + cursor: pointer; +} + +.webbpm .btn-group-viewperiod.btn-group .btn { + border-radius: 20px; + cursor: pointer; +} + +.webbpm .btn-group-viewperiod.btn-group .btn.active { + color: #fff !important; + border-color: #1c92ea !important; + background: #1c92ea !important; + box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%); +} +.webbpm .btn-group-viewperiod.btn-group .btn.active:hover, +.webbpm .btn-group-viewperiod.btn-group .btn.active:active { + border-color: #1b84d2 !important; + background: #1b84d2 !important; +} +.webbpm .btn-group-viewperiod.btn-group .btn.active:focus { + border-color: #1b84d2 !important; + background: #1b84d2 !important; + box-shadow: none; +} + +.webbpm .btn-group-viewdate.btn-group .btn + .btn, +.webbpm .btn-group-viewperiod.btn-group .btn + .btn { + margin-left: 10px; +} + +.webbpm .cal-week-view .cal-header.cal-weekend span { + color: #1c92ea; + opacity: 0.7; +} + +.webbpm .cal-month-view .cal-day-badge { + height: 20px; + background-color: #1c92ea; +} + +.webbpm .cal-month-view .cal-open-day-events { + color: #404954; + background-color: #e6ebee; + box-shadow: none; +} + +.webbpm .cal-week-view .cal-event { + color: #1c92ea; +} +/*------------- Calendar - end ------------ */ + +/*---------- Block-dialog - end ----------- */ +.webbpm .block-dialog { + position: relative; + max-width: 800px; + padding: 60px 60px 50px 110px !important; + margin: 30px auto; + border: 0; + border-radius: 15px; + background-color: #fff; + box-shadow: 0px 0px 30px 2px rgb(77 72 91 / 12%); +} +.webbpm .block-dialog::before { + content: "\f332"; + position: absolute; + color: #1c92ea; + font-family: bootstrap-icons !important; + font-size: 30px; + top: 60px; + left: 60px; +} + +.webbpm .block-dialog .title, +.webbpm .block-dialog .title > div > div:last-of-type{ + padding: 0; +} +/*---------- Block-dialog - end ----------- */ + +/*------------------ Левое меню -------------------*/ +/* +.webbpm .task-container { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: 0 !important; + padding: 0 !important; + overflow: hidden; +} + +.webbpm .task-left-menu { + float: none; + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 240px; + padding: 0; + margin: 0; + background: #eef2f4; + z-index: 1; + overflow: auto; +} + +.webbpm .task-right-content { + float: none; + position: absolute; + top: 0; + bottom: 0; + left: 240px; + right: 0; + padding: 0; + margin: 0; + overflow: auto; +} + +.webbpm .task-left-menu > div { + padding: 15px 10px 15px 15px; +} + +.webbpm .task-left-menu auto-complete .component-float { + width: 100%; +} + +.webbpm .task-right-content > div { + padding: 0 15px 15px; +} + +.webbpm .menu-group-title { + font-weight: normal; +} + +.webbpm .menu-element > li > div:first-child { + font-size: 15px; + width: 100%; +} + +.webbpm .menu-element > li > div:last-child { + padding: 2px 6px; + border-radius: 6px; +} + +.webbpm .menu-group-title + menu { + padding-left: 0; +} + +.webbpm .menu-group .menu-group { + padding-left: 15px; +} +*/ +/*----------------- end - Левое меню -----------------*/ + +/*-------------------- Диаграмма Ганта --------------------*/ +.webbpm .gmajorheading { + background-color: #e0e5e9; +} +.webbpm .gminorheading { + background-color: #f1f5f7; +} +.webbpm .gminorheadingwkend { + background-color: #cce9f4; +} +.webbpm .gtaskcellwkend { + background-color: #f9fafb; +} + +.webbpm .gitemhighlight td { + background-color: #bcedfc !important; +} +/*----------------- end - Диаграмма Ганта -----------------*/ + +.webbpm .modal-backdrop.show { + filter: alpha(opacity=25); + opacity: 0.25; + background-color: #000; +} + +/*------------------ FilePreview ------------------*/ +.webbpm .files-view { + width: auto; +} +/*--------------- end - FilePreview ---------------*/ diff --git a/frontend/src/resources/css/inbox-app.css b/frontend/src/resources/css/inbox-app.css new file mode 100644 index 00000000..ac378d03 --- /dev/null +++ b/frontend/src/resources/css/inbox-app.css @@ -0,0 +1,351 @@ +@font-face { + font-family: 'Segoe'; + src: url('../fonts/Segoe.ttf'); +} +@font-face { + font-family: 'SegoeSL'; + src: url('../fonts/SegoeSL.ttf'); +} +@font-face { + font-family: 'SegoeSB'; + src: url('../fonts/SegoeSB.ttf'); +} +@font-face { + font-family: 'SegoeB'; + src: url('../fonts/SegoeB.ttf'); +} +@font-face { + font-family: 'SegoeBL'; + src: url('../fonts/SegoeBL.ttf'); +} + +.webbpm a { + color: #1c92ea; +} +.webbpm a:hover, +.webbpm a:focus, +.webbpm a:active { + color: #1b84d2; + text-decoration: none; +} + +body.webbpm { + display: flex; + flex-direction: column; + color: #404954; + font-family: 'Segoe'; + background-color: #fff; +} + +.webbpm .container { + padding: 70px 0 0; +} + +body.webbpm [id="page"], +.webbpm .container .container-inside { + font-family: 'Segoe'; + font-size: 16px; +} + +.webbpm .logo { + height: auto; + width: auto; +} + +.webbpm .header { + display: flex; + font-family: 'Segoe'; + width: 100%; + height: auto; + min-height: 70px; + border-bottom: 1px solid #f5f7fa; + background: #fff; + box-shadow: 0px 15px 20px 0px rgb(0 0 0 / 4%); +} + +.webbpm .header-logo { + display: flex; + flex-direction: row; + align-items: center; + margin-left: 40px; +} + +.webbpm .header-logo .logo a { + background: url('../../../src/resources/img/logo-full.png') no-repeat 0 50%; +} + +.webbpm .header-menu { + display: flex; + flex-direction: row; + margin-left: auto; + margin-right: 40px; +} + +.webbpm .header > div > * { + position: relative; + display: flex; + align-items: center; +} + +.webbpm .header-menu > * { + margin-right: 20px; +} +.webbpm .header-menu > *:last-child { + margin-right: 0; +} + +.webbpm .header-menu .nav-link { + display: flex; + align-items: center; + justify-content: center; + color: #fff; + font-size: 16px; + width: 30px; + height: 30px; + padding: 0; + border: 0; + border-radius: 15px; + background-color: #404954; + outline: transparent; +} +.webbpm .header-menu .nav-link::after { + display: none; +} + +.webbpm .header-menu .nav-link:hover, +.webbpm .header-menu .nav-link:focus, +.webbpm .header-menu .nav-link:active { + background-color: #1c92ea; +} + +.webbpm .header-menu .logout .user-info { + display: flex; + flex-direction: column; + color: #000; + padding: 4px 20px; + background: transparent; + cursor: default; +} + +.webbpm .header-menu .user-info > * { + display: flex; + padding-bottom: 10px; + margin: 0 0 10px 0; + border-bottom: 1px solid #f1f5f9; +} +.webbpm .header-menu .user-info > *:last-child { + margin-bottom: 0; +} + +.webbpm .header-menu .user-info .user-fio { + padding-bottom: 0; + margin-bottom: 0; + border-bottom: 0; +} + +.webbpm .header-menu .user-info .user-department { + color: #a0b1bc; + line-height: 1.2; +} + +.webbpm .header .dropdown-menu.show { + top: 69px !important; + right: 0px !important; + left: auto !important; + transform: none !important; + margin: 0; + border: 0; + border-radius: 0 0 10px 10px; + background-color: #fff; + box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%); +} + +.webbpm .header .nav-item .dropdown-menu.show .dropdown-menu-inner { + max-height: calc(100vh - 140px); + overflow-y: auto; +} + +.webbpm .header process .dropdown-menu.show, +.webbpm .header admin-menu .dropdown-menu.show { + top: 49px !important; +} + +.webbpm .header .logout .dropdown-menu.show { + width: 300px; +} + +.webbpm .dropdown-menu-inner:hover { + background-color: transparent; +} + +.webbpm .dropdown-item { + padding: 4px 20px; +} + +.webbpm .dropdown-item:hover, +.webbpm .dropdown-item:focus, +.webbpm .dropdown-item:active { + color: #1c92ea; + background-color: transparent; + outline: transparent; +} + +.webbpm footer { + color: #404954; + font-size: 14px; + left: 0; + right: 0; + padding: 15px 40px; + border-top: 1px solid #e3e6ed; +} + +.webbpm footer a { + color: #404954; +} +.webbpm footer a:hover { + color: #1c92ea; +} + +/*-------------- Menu tasks -------------- */ +.webbpm .task-list-tree-panel { + padding: 0 40px; +} + +.webbpm .task-list-tree-panel .task-list-filter { + font-family: 'Segoe'; + box-shadow: none; +} + +.webbpm .task-list-workplace { + padding: 20px 40px 0 40px; +} + +.webbpm .task-list-tree-panel .task-list-filter li:first-of-type { + font-family: 'SegoeSB'; + font-weight: normal; + padding-left: 0; +} + +.webbpm .task-tbl .tr.task-ontime > .td.task::before, +.webbpm .task-tbl .tr.task-overdue > .td.task::before { + top: 24px; + background-color: #31c980; +} + +.webbpm .task-list-tree-panel .task-list-filter li.ontime label div { + background-color: #31c980; +} + +.webbpm .task-tbl .tr.task-overdue > .td.task::before, +.webbpm .task-list-tree-panel .task-list-filter li.overdue label div { + background-color: #1c92ea; +} + +.webbpm .task-tbl .thead { + display: table-header-group; + border: 0; + background: transparent; +} + +.webbpm .task-tbl .th { + color: #404954; + font-family: 'SegoeSB'; + font-size: 14px; + font-weight: normal; + padding: 9px 12px; + border: 0; + background: #f5f7fa; +} +.webbpm .task-tbl .th:first-child { + border-top-left-radius: 12px; + border-bottom-left-radius: 12px; +} +.webbpm .task-tbl .th:last-child { + border-top-right-radius: 12px; + border-bottom-right-radius: 12px; +} + +.webbpm .task-tbl .td { + color: #404954; + font-size: 16px; + padding: 16px 12px; + border: 0; +} + +.webbpm .task-tbl .thead ~ .tr { + border-color: #e3e6ed; + border-width: 1px 0 0 0; + border-style: solid; +} +.webbpm .task-tbl .thead + .tr { + border-top-color: transparent; +} + +.webbpm .task-tbl .thead ~ .tr:hover { + border-top-color: transparent; + border-bottom-color: transparent; +} +.webbpm .task-tbl .thead ~ .tr:hover +.tr { + border-top-color: transparent; +} + +.webbpm .task-tbl .thead ~ .tr:hover .td { + background-color: #f9f9f9; +} +.webbpm .task-tbl .thead ~ .tr:hover .td:first-child { + border-top-left-radius: 12px; + border-bottom-left-radius: 12px; +} +.webbpm .task-tbl .thead ~ .tr:hover .td:last-child { + border-top-right-radius: 12px; + border-bottom-right-radius: 12px; +} +/*------------- end Menu tasks ----------- */ + +/*----------------- Login ---------------- */ +.webbpm .form-signin, +.webbpm .form-signup, +.webbpm .confirm { + color: #404954; + width: 560px; + padding: 60px 80px; + margin: 30px auto; + border: 0; + border-radius: 15px; + box-shadow: 0px 0px 30px 2px rgb(77 72 91 / 12%); + background-color: #fff; +} + +.webbpm .form-signin .row.title, +.webbpm .form-signup .row.title { + position: relative; + padding: 0; +} + +.webbpm .form-signin h1, +.webbpm .form-signin h2, +.webbpm .form-signup h2, +.webbpm .confirm h2 { + font-family: 'SegoeB'; + font-size: 32px; + text-align: left; + margin-bottom: 20px; +} + +.webbpm .form-signin .logo, +.webbpm .form-signup .logo, +.webbpm .confirm .logo { + position: absolute; + top: -10px; + right: 0; + width: 145px; + height: 40px; + background: none; +} + +.webbpm .form-signin .row.registration > * + *, +.webbpm .form-signin .login-btn-box .password, +.webbpm .form-signin .login-btn-box .btn + .btn { + margin-left: 20px; +} +/*--------------- end Login -------------- */ \ No newline at end of file diff --git a/frontend/src/resources/css/structure.css b/frontend/src/resources/css/structure.css new file mode 100644 index 00000000..09854cbd --- /dev/null +++ b/frontend/src/resources/css/structure.css @@ -0,0 +1,859 @@ +* { + margin: 0; + padding: 0; +} + +*, *:before, *:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + + +body.webbpm { + color: #000; +} + +body.webbpm .form-signin label { + width: 160px; + margin-right: 0; +} + +.webbpm .progress { + position: absolute; + width: 64px; + height: 64px; + margin-bottom: 0 !important; + background: url("../img/progress.gif") no-repeat 0 0; +} + +.webbpm > .progress { + top: 50%; + left: 50%; + margin-top: -30px; + margin-left: -30px; +} + +.webbpm .search-task-progress-bar { + text-align: center; +} + +.webbpm .modal-body .progress, +.webbpm .search-task-progress-bar .progress { + position: relative; + top: 0; + margin-top: 0; +} + +/*-- common class --*/ +.webbpm a { + color: #428bca; +} + +.webbpm .fl-left { + float: left; +} + +.webbpm .fl-right { + float: right; +} + +.webbpm .anchor { + float: none; + clear: both; +} + +.webbpm ul li, .webbpm ol li { + list-style: none; +} + +.webbpm h1, .webbpm h2, .webbpm h3 { + margin: 0; +} + +.webbpm h1 { + font-size: 2.33em; + font-weight: normal; +} + +.webbpm h2 { + font-size: 2em; + font-weight: normal; +} + +.webbpm h3 { + font-size: 1.5em; + font-weight: normal; +} + +.webbpm .table { + display: table; +} + +.webbpm .tr { + display: table-row; +} + +.webbpm .td, .webbpm .th { + display: table-cell; +} + +/*-- layout --*/ +html, body.webbpm { + width: 100%; + height: 100%; + display: block; +} + +body.webbpm { + background-color: #f9f9fa; + font-family: Arial; + font-size: 14px; + min-height: 0; + padding: 0; +} + +.webbpm .wrapper { + height: 100%; + min-height: 100%; + position: relative; +} + +.webbpm .container { + width: 100%; + max-width: 100%; + height: auto; + margin: 0; + padding: 67px 0 0; + position: absolute; + top: 0px; + left: 0; + right: 0; + bottom: 50px; + border: 0; + overflow: hidden; +} + +.webbpm .container [ng-include="taskPageFile"] { + position: relative; + min-height: 100%; + height: 100%; + overflow: auto; +} + +.webbpm .container .container-inside { + font-family: Arial; + font-size: 14px; + position: relative; + height: 100%; + overflow: auto; +} + +.webbpm footer { + position: absolute; + color: #000; + font-size: 12px; + bottom: 0; + left: 15px; + right: 15px; + height: 50px; + padding: 15px 0; + border-top: 1px solid #c1c1c1; + background: transparent; +} + +.webbpm footer span + span { + padding-left: 20px; +} + +/*--------- TOP MENU ----------*/ +.webbpm .header { + position: absolute; + color: #fff; + font-family: Corbel; + font-size: 14px; + top: 0; + left: 0; + right: 0; + height: 67px; + min-height: 67px; + line-height: normal; + border: 0; + padding: 0; + background: #b9c0ca; + z-index: 997; +} + +.webbpm .logo { + display: inline-block; + margin: 4px 10px; + float: left; +} + +.webbpm .logo, +.webbpm .logo a { + margin: 0; + width: 200px; + height: 67px; +} + +.webbpm .logo a { + position: absolute; + background: url("../img/logo.png") no-repeat 0 0; +} + +.webbpm .header .nav .nav-link { + color: #fff; + float: none; + display: block; + line-height: 60px; + padding: 0 15px 0 60px; + text-shadow: none; + cursor: pointer; +} + +.webbpm .header .nav .nav-link:hover { + text-decoration: none; +} + +.webbpm .dropdown-menu { + background-color: #eee; +} + +.webbpm .nav .nav-item .dropdown-menu:after { + border-bottom: 6px solid #eee; +} + +.webbpm .inner { + overflow-y: auto; +} + +@media (min-width: 768px) { + .webbpm .navbar .nav > * { + float: left; + } +} + +@media (max-width: 767px) { + .webbpm .dropdown-menu > div > button { + color: #d1dbe5; + } +} + +/*--------- end - TOP MENU ----------*/ +.webbpm .user-department, +.webbpm .user-info { + color: #5a6473; +} + +.webbpm .user-info > * { + display: inline-block; + margin-left: 5px; +} + +.webbpm [log-out] { + max-width: 40%; + margin-right: 15px; +} + +.webbpm .content { + padding: 0 20px; +} + +.webbpm .inner { + min-height: 100%; + height: 100%; + overflow-y : scroll; +} + +/*--------------task-list------------------*/ + +.task-list { + font-size: 0; + height: 100%; + min-height: 100%; +} + +.task-list > div { + display: block; + float: left; + height: 100%; + min-height: 100%; + font-size: 14px; +} + +.task-list-tree-panel { + width: 20%; + background: #e9edf2; + border-right: 1px solid #b9c1ca; +} + +.task-list-tree-panel .task-list-filter { + position: relative; + margin-top: 15px; + z-index: 10; +} + +.task-list-tree-panel .task-list-filter li { + position: relative; + padding: 8px 10px; + margin: 2px 10px; +} + +.task-list-tree-panel .task-list-filter li::before { + content: ""; + position: absolute; + left: 0px; + bottom: 0px; + right: 0; + top: 0; + border: 1px solid rgb(206, 212, 219); + border-radius: 4px; + background-color: #fff; + opacity: 0.6; +} + +.task-list-tree-panel .task-list-filter li label:hover { + cursor: pointer; +} + +.task-list-tree-panel .task-list-filter li label { + position: relative; + width: 100%; + margin: 0; + z-index: 11; +} + +.task-list-tree-panel .task-list-filter li label input[type="radio"] { + float: left; + margin-top: 2px; + margin-right: 4px; +} + +.task-list-tree-panel .task-list-filter li label span { + float: right; + background-color: #bbb; + padding: 0px 4px; + border-radius: 3px; + min-width: 25px; + text-align: center; + color: #fff; +} + +.task-list-tree-panel .task-list-filter li.ontime label span { + background-color: #a0c367; +} + +.task-list-tree-panel .task-list-filter li.overdue label span { + background-color: #fc2d2d; +} + +.task-list-header { + border-bottom: 1px solid #b9c1ca; + background-color: #ccd6e0; + height: 30px; + line-height: 30px; + color: #565968; + font-size: 14px; + padding: 0 12px; +} + +.structure-box { + padding: 15px; +} + +.task-list-workplace { + width: 80%; + padding: 15px 15px 0; + overflow-y: auto; +} +/*--------------task-list end--------------*/ + +/*---------------table-list----------------*/ +.task-tbl { + background: #fff; + width: 100%; + border-collapse: collapse; +} + +.task-tbl .td, .task-tbl .th { + border: 1px solid #b9c1ca; + padding: 10px 15px; +} + +.task-tbl .th { + color: #565968; +} + +.task-tbl .td { + color: #333; +} + +.task-tbl .thead { + background: #ccd6e0; +} + +.task-tbl > .tr:hover { + cursor: pointer; + background: #e9edf2; +} + +.task-tbl .tr.task-ontime > .td.task, +.task-tbl .tr.task-overdue > .td.task { + position: relative; + padding-left: 20px; +} + +.task-tbl .tr.task-ontime > .td.task::before, +.task-tbl .tr.task-overdue > .td.task::before { + content: ""; + position: absolute; + top: 12px; + left: 5px; + width: 10px; + height: 10px; + background-color: #a0c367; + border-radius: 10px; + z-index: 1; +} + +.task-tbl .tr.task-overdue > .td.task::before { + background-color: #ff0000; +} +/*----------------table-list end----------------*/ + +/*--------------Окно сообщения об ошибке--------------*/ +.webbpm #toast-container { + font-size: 12px; + bottom: auto; + overflow-y: auto; + overflow-x: hidden; + max-height: 95%; +} + +.webbpm #toast-container .toast:hover { + box-shadow: 0 0 12px #999999; +} + +.webbpm #toast-container .ngx-toastr { + min-width: 540px; + opacity: 0.9; +} + +.webbpm #toast-container .toast-error { + background-color: #d9534f; +} + +.webbpm #toast-container .toast-close-button { + text-shadow: none; +} + +.webbpm .toast-message > div { + display: none; +} + +.webbpm .toast-message > .active { + display: block; +} + +.webbpm .toast-message > .active::after { + display: block; + content: ""; + float: none; + clear: both; +} + +.webbpm .toast-message > .active a { + float: right; + margin: 5px 0; +} + +.webbpm .toast-message > .toast-msg-close.active ~ .toast-msg-text { + display: block; + font-size: 0.8em; +} + +.webbpm .toast-message a:not([href]):not([tabindex]) { + text-decoration: underline; +} +/*------------Окно сообщения об ошибке end------------*/ + +/*----------------- Ошибка 404 -------------------*/ +.webbpm .container .task-not-found-page { + position: relative; + display: table; + width: 100%; + height: 100%; +} + +.webbpm .container .task-not-found-container { + display: table-cell; + color: #000; + font-size: 1.8em; + background-color: #c9d4e0; + text-align: center; + vertical-align: middle; +} + +.webbpm .container .task-not-found-container > div { + display: inline-block; +} + +.webbpm .container .task-not-found-container > div:first-child { + color: #fff; + font-size: 7.8em; + font-weight: bold; +} + +.webbpm .container .task-not-found-container > div:last-child { + text-align: left; + margin-left: 40px; +} + +.webbpm .container .task-not-found-container h2 { + font-size: 2em; + margin-bottom: 10px; +} + + +.webbpm .container .task-not-found-container a { + cursor: pointer; +} +/*--------------- end Ошибка 404 -----------------*/ + +/*-------------- MOBILE --------------*/ +.webbpm.mobile .task-list-tree-panel, +.webbpm.mobile footer { + display: none; +} + +.webbpm.mobile .task-list-workplace { + margin-left: 0; +} + +.webbpm.mobile .container { + bottom: 0; +} + +.webbpm.mobile form { + overflow: hidden; +} + +.webbpm.mobile .form-signin { + width: auto; + padding: 20px; + margin: 40px 20px; + border-radius: 4px; +} + +.webbpm.mobile .form-signin h1, +.webbpm.mobile .form-signin h2 { + margin-left: 0; +} + +.webbpm.mobile .form-signin label { + text-align: left; +} + +.webbpm.mobile .form-signin input[type="text"], +.webbpm.mobile .form-signin input[type="password"] { + width: 100%; +} + +.webbpm.mobile .form-signin .login-btn-box { + width: auto; + margin-right: 0; +} +/*-------------- end MOBILE --------------*/ + + +/*-------------- НОВЫЙ ДИЗАЙН --------------*/ +/*------------------ Фильтры ------------------*/ +.webbpm .task-list { + height: auto; + min-height: auto; +} + +.webbpm .task-list > .task-list-tree-panel { + background: #fff; + border-right: 0; +} + +.webbpm .task-list > .task-list-tree-panel, +.webbpm .task-list > .task-list-workplace { + font-size: 14px; + float: none; + width: 100%; + height: auto; + min-height: auto; +} + +.webbpm .task-list-tree-panel .task-list-filter { + font-family: Corbel; + margin: 0; + box-shadow: 0px 4px 10px -5px rgba(40, 40, 40, 0.3); +} + +.webbpm .task-list-tree-panel .task-list-filter ul { + margin: 0; +} + +.webbpm .task-list-tree-panel .task-list-filter li { + display: inline-block; + padding: 12px 0px; + margin: 0; +} + +.webbpm .task-list-tree-panel .task-list-filter li:first-of-type { + font-size: 1.4em; + font-weight: bold; + width: 197px; + padding: 0 15px; +} + +.webbpm .task-list-tree-panel .task-list-filter li::before { + display: none; +} + +.webbpm .task-list-tree-panel .task-list-filter li label { + font-size: 1.3em; + font-weight: normal; +} + +.webbpm .task-list-tree-panel .task-list-filter li label div { + display: inline-block; + width: 10px; + height: 10px; + border-radius: 10px; + margin-right: 8px; +} + +.webbpm .task-list-tree-panel .task-list-filter li.ontime label div { + background-color: #2da6a1; +} + +.webbpm .task-list-tree-panel .task-list-filter li.overdue label div { + background-color: #9c5d7a; +} + +.webbpm .task-list-tree-panel .task-list-filter li label input[type="radio"] { + float: none; + display: none; +} + +.webbpm .task-list-tree-panel .task-list-filter li label span { + float: none; + color: #000; + font-weight: normal; + text-align: left; + min-width: auto; + padding: 5px 15px; + border-radius: 0; + background-color: transparent; +} + +.task-list-tree-panel .task-list-filter li label input[type="radio"].ng-valid-parse ~ span { + background-color: #eaedf2; + +} +/*-------------- end НОВЫЙ ДИЗАЙН --------------*/ + +.webbpm .dialog-stack-trace { + overflow-x: auto; + overflow-y: auto; + max-height: 300px; +} +.webbpm .dialog-show-button { + text-decoration: underline; + cursor: pointer; +} +.webbpm .dialog-error-number { + font-size: 1.25rem; +} +.webbpm .dialog-error-title { + font-size: 1rem; +} + +/*-- login --*/ +.webbpm .form-signin, +.webbpm .form-signup, +.webbpm .confirm { + color: #333; + width: 580px; + padding: 80px 100px; + margin: 20px auto; + border: 1px solid #b2b6b8; + background: #fff; +} + +.webbpm .form-signin.esia { + width: 450px; + text-align: center; + padding: 45px 55px 35px 55px; +} + +.webbpm .form-signin h1, +.webbpm .form-signin h2, +.webbpm .form-signup h2, +.webbpm .confirm h2 { + text-align: center; + margin-bottom: 20px; +} + +.webbpm .form-signin.esia h1, +.webbpm .form-signin.esia h2 { + margin-left: 0; +} + +.webbpm .form-signin label, +.webbpm .form-signup label { + margin-bottom: 0; +} + +.webbpm .form-signin input { + width: 240px; + font-size: 14px; + display: inline-block; +} + +.webbpm .form-signin.esia input { + width: 160px; + margin-top: 40px; +} + +.webbpm .form-signin .row, +.webbpm .form-signup .row { + display: flex; + margin: 0 0 20px; +} + +.webbpm .registration-link, +.webbpm .login-link { + margin-right: 20px; + font-size: 14px; +} + +.webbpm .form-signin .row.registration { + flex-direction: row; +} + +.webbpm .form-signin .login-btn-box { + display: flex; + flex-direction: row; + align-items: center; +} + +.webbpm .form-signin .row.registration > * + *, +.webbpm .form-signin .login-btn-box .password, +.webbpm .form-signin .login-btn-box .btn + .btn { + margin-left: 10px; +} + +.webbpm .input-group > .input-group-append > .input-group-text { + border-radius: 0; +} + +.webbpm .form-signin .register-btn-box, +.webbpm .form-signup .register-btn-box, +.webbpm .form-signup .reset-password-btn-box { + width: 220px; +} + +.webbpm .form-signup .row international-phone-number .flagInput .btn { + border-left: 1px solid #c6cdd3; +} +.webbpm .form-signup .row international-phone-number .flagInput ~ input { + border-left: none; +} + +.webbpm .form-signin .has-error .help-block { + padding-left: 125px; + font-size: 14px; +} + +.webbpm .form-signup .has-account a { + + margin-left: 10px; +} + +/*------------------ Формы регистрации и подтверждения ------------------*/ +.form-signup .has-account { + flex-direction: row; +} + +.form-signup .has-account a span, +.confirm a span { + margin-right: 4px; +} + +.form-signup .dropbtn.btn { + margin-bottom: 0; +} + +.form-signup .input-group-text { + border-left-width: 0; +} + +.form-signup input.ng-invalid.ng-touched, +.form-signup input.ng-invalid.ng-dirty { + border-color: red !important; +} + +.form-signup .msg-alert { + color: red; + font-size: 11px; + padding: 3px 0 0; +} + +.form-signup .consent { + color: #929292; + font-size: 13px; + margin-top: 20px; +} +/*------------------ End - Формы регистрации и подтверждения ------------------*/ + +/*------------------ Сообщения об ошибке ------------------*/ +.webbpm .error_message { + width: 650px; + margin: 0 auto; + margin-top: 10%; +} + +.webbpm .error_title { + position: relative; + color: #9c5d7a; + font-size: 5.5em; + font-weight: bold; + margin-left: 100px; + line-height: 1; +} +.webbpm .error_title::before { + position: absolute; + content: ""; + left: -100px; + width: 75px; + height: 75px; + border-radius: 40px; + background-color: #9c5d7a; + background-image: url("../img/access_denied.png"); + background-repeat: no-repeat; + background-position: 50% 50%; +} + +.webbpm .error_title_long { + margin-bottom: 20px; + font-size: 2.5em; +} + +.webbpm .error_body { + font-size: 2em; + line-height: 1.2; + margin: 5px 0 0 100px; +} +/*---------------- end Сообщения об ошибке ---------------*/ +/*-------------- Поле телефона ------------ */ +.flag { + background-image: url('./../img/country-flags.jpg') !important; +} +/*-------------- end Поле телефона ------------ */ + diff --git a/frontend/src/resources/css/style.css b/frontend/src/resources/css/style.css new file mode 100644 index 00000000..d7d29b3e --- /dev/null +++ b/frontend/src/resources/css/style.css @@ -0,0 +1,10 @@ +@import "../../../node_modules/angular-calendar/css/angular-calendar.css"; +@import "../../../node_modules/bootstrap/dist/css/bootstrap-grid.css"; +@import "../../../node_modules/bootstrap/dist/css/bootstrap-reboot.css"; +@import "../../../node_modules/bootstrap/dist/css/bootstrap.css"; +@import "../../../node_modules/bootstrap-icons/font/bootstrap-icons.css"; +@import "../../../node_modules/font-awesome/css/font-awesome.css"; +@import "../../../node_modules/@webbpm/base-package/css/style.css"; +@import "structure.css"; +@import "inbox-app.css"; +@import "components-app.css"; \ No newline at end of file diff --git a/frontend/src/resources/fonts/Segoe.ttf b/frontend/src/resources/fonts/Segoe.ttf new file mode 100644 index 00000000..0f52cbd9 Binary files /dev/null and b/frontend/src/resources/fonts/Segoe.ttf differ diff --git a/frontend/src/resources/fonts/SegoeB.ttf b/frontend/src/resources/fonts/SegoeB.ttf new file mode 100644 index 00000000..ff196d60 Binary files /dev/null and b/frontend/src/resources/fonts/SegoeB.ttf differ diff --git a/frontend/src/resources/fonts/SegoeBL.ttf b/frontend/src/resources/fonts/SegoeBL.ttf new file mode 100644 index 00000000..b2966570 Binary files /dev/null and b/frontend/src/resources/fonts/SegoeBL.ttf differ diff --git a/frontend/src/resources/fonts/SegoeSB.ttf b/frontend/src/resources/fonts/SegoeSB.ttf new file mode 100644 index 00000000..90b39f72 Binary files /dev/null and b/frontend/src/resources/fonts/SegoeSB.ttf differ diff --git a/frontend/src/resources/fonts/SegoeSL.ttf b/frontend/src/resources/fonts/SegoeSL.ttf new file mode 100644 index 00000000..a276476a Binary files /dev/null and b/frontend/src/resources/fonts/SegoeSL.ttf differ diff --git a/frontend/src/resources/img/access_denied.png b/frontend/src/resources/img/access_denied.png new file mode 100644 index 00000000..463c9ca0 Binary files /dev/null and b/frontend/src/resources/img/access_denied.png differ diff --git a/frontend/src/resources/img/admin.png b/frontend/src/resources/img/admin.png new file mode 100644 index 00000000..875b0957 Binary files /dev/null and b/frontend/src/resources/img/admin.png differ diff --git a/frontend/src/resources/img/country-flags.jpg b/frontend/src/resources/img/country-flags.jpg new file mode 100644 index 00000000..84041f1c Binary files /dev/null and b/frontend/src/resources/img/country-flags.jpg differ diff --git a/frontend/src/resources/img/create.png b/frontend/src/resources/img/create.png new file mode 100644 index 00000000..6acd9d09 Binary files /dev/null and b/frontend/src/resources/img/create.png differ diff --git a/frontend/src/resources/img/logo-full.png b/frontend/src/resources/img/logo-full.png new file mode 100644 index 00000000..902c1b92 Binary files /dev/null and b/frontend/src/resources/img/logo-full.png differ diff --git a/frontend/src/resources/img/logo.png b/frontend/src/resources/img/logo.png new file mode 100644 index 00000000..d2d91c91 Binary files /dev/null and b/frontend/src/resources/img/logo.png differ diff --git a/frontend/src/resources/img/progress.gif b/frontend/src/resources/img/progress.gif new file mode 100644 index 00000000..1a3b525b Binary files /dev/null and b/frontend/src/resources/img/progress.gif differ diff --git a/frontend/src/resources/img/project.png b/frontend/src/resources/img/project.png new file mode 100644 index 00000000..1ff9bcf1 Binary files /dev/null and b/frontend/src/resources/img/project.png differ diff --git a/frontend/src/resources/img/tasks.png b/frontend/src/resources/img/tasks.png new file mode 100644 index 00000000..4a70c519 Binary files /dev/null and b/frontend/src/resources/img/tasks.png differ diff --git a/frontend/src/resources/template/app/component/access_denied.html b/frontend/src/resources/template/app/component/access_denied.html new file mode 100644 index 00000000..c7db7c20 --- /dev/null +++ b/frontend/src/resources/template/app/component/access_denied.html @@ -0,0 +1,4 @@ +
+
403
+
Доступ запрещен
+
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/admin_menu.html b/frontend/src/resources/template/app/component/admin_menu.html new file mode 100644 index 00000000..f187ba8a --- /dev/null +++ b/frontend/src/resources/template/app/component/admin_menu.html @@ -0,0 +1,34 @@ +
+ +
+ + + + + + +
+
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/app_footer.html b/frontend/src/resources/template/app/component/app_footer.html new file mode 100644 index 00000000..041c050e --- /dev/null +++ b/frontend/src/resources/template/app/component/app_footer.html @@ -0,0 +1,10 @@ + diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html new file mode 100644 index 00000000..2b65eabd --- /dev/null +++ b/frontend/src/resources/template/app/component/app_header.html @@ -0,0 +1,13 @@ + diff --git a/frontend/src/resources/template/app/component/application_version.html b/frontend/src/resources/template/app/component/application_version.html new file mode 100644 index 00000000..61be19b2 --- /dev/null +++ b/frontend/src/resources/template/app/component/application_version.html @@ -0,0 +1 @@ +Версия: {{applicationVersion}} \ No newline at end of file diff --git a/frontend/src/resources/template/app/component/confirm-user-email.html b/frontend/src/resources/template/app/component/confirm-user-email.html new file mode 100644 index 00000000..65a5d1d2 --- /dev/null +++ b/frontend/src/resources/template/app/component/confirm-user-email.html @@ -0,0 +1,27 @@ +
+ +
+
+

Подтверждение почты

+ +
+ Подтверждение... +
+
+
+ Адрес электронной почты успешно подтвержден +
+
+
+
{{ errorMessage }}
+
+ + +
+
+
diff --git a/frontend/src/resources/template/app/component/log_out.html b/frontend/src/resources/template/app/component/log_out.html new file mode 100644 index 00000000..9fc26834 --- /dev/null +++ b/frontend/src/resources/template/app/component/log_out.html @@ -0,0 +1,9 @@ + +
+ + +
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/login.html b/frontend/src/resources/template/app/component/login.html new file mode 100644 index 00000000..109c8b9a --- /dev/null +++ b/frontend/src/resources/template/app/component/login.html @@ -0,0 +1,51 @@ + diff --git a/frontend/src/resources/template/app/component/new_password.html b/frontend/src/resources/template/app/component/new_password.html new file mode 100644 index 00000000..4b315762 --- /dev/null +++ b/frontend/src/resources/template/app/component/new_password.html @@ -0,0 +1,103 @@ + diff --git a/frontend/src/resources/template/app/component/process_list.html b/frontend/src/resources/template/app/component/process_list.html new file mode 100644 index 00000000..a24adc3b --- /dev/null +++ b/frontend/src/resources/template/app/component/process_list.html @@ -0,0 +1,12 @@ +
+ +
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/progress-indication.html b/frontend/src/resources/template/app/component/progress-indication.html new file mode 100644 index 00000000..95a901e6 --- /dev/null +++ b/frontend/src/resources/template/app/component/progress-indication.html @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/register.html b/frontend/src/resources/template/app/component/register.html new file mode 100644 index 00000000..42cae8c0 --- /dev/null +++ b/frontend/src/resources/template/app/component/register.html @@ -0,0 +1,121 @@ + diff --git a/frontend/src/resources/template/app/component/reset_password.html b/frontend/src/resources/template/app/component/reset_password.html new file mode 100644 index 00000000..b2bb7527 --- /dev/null +++ b/frontend/src/resources/template/app/component/reset_password.html @@ -0,0 +1,45 @@ + diff --git a/frontend/src/resources/template/app/component/task.html b/frontend/src/resources/template/app/component/task.html new file mode 100644 index 00000000..dd079b2d --- /dev/null +++ b/frontend/src/resources/template/app/component/task.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/task_list.html b/frontend/src/resources/template/app/component/task_list.html new file mode 100644 index 00000000..7d245ba3 --- /dev/null +++ b/frontend/src/resources/template/app/component/task_list.html @@ -0,0 +1,49 @@ +
+
+
+
+
    +
  • Фильтры
    • +
  • +
    • +
  • +
    • +
  • +
    • +
+
+
+
+
{{errorMessage}}
+
+
+
+
Процесс
+
Версия
+
Задача
+
Дата создания
+
Срок
+
+
+
+
{{ task.processName }}
+
{{ task.processVersion }}
+
{{ task.name }}
+
{{ task.createdOn | date:'dd.MM.yyyy HH:mm:ss' }}
+
{{ task.expirationTime | date:'dd.MM.yyyy HH:mm:ss' }}
+
+
+
+
+
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/task_not_found.html b/frontend/src/resources/template/app/component/task_not_found.html new file mode 100644 index 00000000..23796747 --- /dev/null +++ b/frontend/src/resources/template/app/component/task_not_found.html @@ -0,0 +1,8 @@ +
+
+
:(
+

Ошибка

+ Данная задача не существует.
+ Перейти к списку задач
+
+
\ No newline at end of file diff --git a/frontend/src/resources/template/preview/preview.html b/frontend/src/resources/template/preview/preview.html new file mode 100644 index 00000000..dd079b2d --- /dev/null +++ b/frontend/src/resources/template/preview/preview.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/frontend/src/resources/template/preview/preview_container.html b/frontend/src/resources/template/preview/preview_container.html new file mode 100644 index 00000000..90c6b646 --- /dev/null +++ b/frontend/src/resources/template/preview/preview_container.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/resources/template/webbpm/home.html b/frontend/src/resources/template/webbpm/home.html new file mode 100644 index 00000000..50fb0d64 --- /dev/null +++ b/frontend/src/resources/template/webbpm/home.html @@ -0,0 +1,6 @@ +
+
+
+
+
+
\ No newline at end of file diff --git a/frontend/src/resources/template/webbpm/page.html b/frontend/src/resources/template/webbpm/page.html new file mode 100644 index 00000000..5d28658d --- /dev/null +++ b/frontend/src/resources/template/webbpm/page.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/frontend/src/resources/template/webbpm/webbpm.html b/frontend/src/resources/template/webbpm/webbpm.html new file mode 100644 index 00000000..720b940d --- /dev/null +++ b/frontend/src/resources/template/webbpm/webbpm.html @@ -0,0 +1,12 @@ +
+ + + +
+
+ +
+
+ + +
diff --git a/frontend/src/ts/main.aot.ts b/frontend/src/ts/main.aot.ts new file mode 100644 index 00000000..ddd43fdf --- /dev/null +++ b/frontend/src/ts/main.aot.ts @@ -0,0 +1,8 @@ +import "../../src/resources/css/style.css"; +import {platformBrowser} from '@angular/platform-browser'; +import {enableProdMode} from "@angular/core"; +import {WebbpmModuleNgFactory} from "./modules/webbpm/webbpm.module.ngfactory"; + +window['dev_mode'] = false; +enableProdMode(); +platformBrowser().bootstrapModuleFactory(WebbpmModuleNgFactory); \ No newline at end of file diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts new file mode 100644 index 00000000..d53c69a3 --- /dev/null +++ b/frontend/src/ts/main.ts @@ -0,0 +1,7 @@ +import {platformBrowserDynamic} from "@angular/platform-browser-dynamic"; +import {enableProdMode} from "@angular/core"; +import {WebbpmModule} from "./modules/webbpm/webbpm.module"; + +window['dev_mode'] = true; +enableProdMode(); +platformBrowserDynamic().bootstrapModule(WebbpmModule); diff --git a/frontend/src/ts/modules/app/app-routing.module.ts b/frontend/src/ts/modules/app/app-routing.module.ts new file mode 100644 index 00000000..92343088 --- /dev/null +++ b/frontend/src/ts/modules/app/app-routing.module.ts @@ -0,0 +1,72 @@ +import {NgModule} from "@angular/core"; +import {RouterModule, Routes} from "@angular/router"; +import {AccessDeniedComponent} from "./component/access-denied.component"; +import {LoginComponent} from "./component/login.component"; +import {AuthenticationGuard, ConfirmExitGuard, SignedInGuard, ProcessInstanceRouteResolver} from "@webbpm/base-package"; +import {RegisterComponent} from "./component/register.component"; +import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component"; +import {ResetPasswordComponent} from "./component/reset-password.component"; +import {NewPasswordComponent} from "./component/new-password.component"; +import {TaskListComponent} from "./component/task-list.component"; + +const appRoutes: Routes = [ + { + path: 'login', + component: LoginComponent, + canActivate: [SignedInGuard] + }, + { + path: 'access-denied', + component: AccessDeniedComponent, + canActivate: [AuthenticationGuard, ConfirmExitGuard] + }, + { + path: 'registration', + component: RegisterComponent, + canActivate: [SignedInGuard] + }, + { + path: 'confirm', + component: ConfirmUserEmailComponent + }, + { + path: 'reset-password', + component: ResetPasswordComponent + }, + { + path: 'new-password', + component: NewPasswordComponent + }, + { + path: 'process', + canActivate: [AuthenticationGuard, ConfirmExitGuard], + children: [ + { + path: 'instance', + loadChildren: 'generated-sources/page-process-instance-list.module#PageprocessinstancelistModule', + resolve: { + processInstanceId: ProcessInstanceRouteResolver + } + }, + { + path: 'instance/:processInstanceId', + loadChildren: 'generated-sources/page-process-instance.module#PageprocessinstanceModule', + resolve: { + processInstanceId: ProcessInstanceRouteResolver + } + }, + { + path: 'tasks', + component: TaskListComponent, + } + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(appRoutes)], + exports: [RouterModule] +}) +export class AppRoutingModule { + +} diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts new file mode 100644 index 00000000..33d67dba --- /dev/null +++ b/frontend/src/ts/modules/app/app.module.ts @@ -0,0 +1,80 @@ +import {forwardRef, NgModule} from "@angular/core"; +import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; +import {CommonModule, registerLocaleData} from "@angular/common"; +import localeRu from '@angular/common/locales/ru'; +import {FormsModule} from "@angular/forms"; +import {AgGridModule} from "ag-grid-angular"; +import { + BpmnModule, + ComponentsModule, + CoreModule, + ProgressIndicationService, + SecurityModule +} from "@webbpm/base-package"; +import {AdminMenuComponent} from "./component/admin-menu.component"; +import {AppHeaderComponent} from "./component/app-header.component"; +import {AppFooterComponent} from "./component/app-footer.component"; +import {LogOutComponent} from "./component/logout.component"; +import {LoginComponent} from "./component/login.component"; +import {AccessDeniedComponent} from "./component/access-denied.component"; +import {ApplicationVersionComponent} from "./component/application-version.component"; +import {RouterModule} from "@angular/router"; +import {RegisterComponent} from "./component/register.component"; +import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component"; +import {InternationalPhoneNumberModule} from "ngx-international-phone-number"; +import {ResetPasswordComponent} from "./component/reset-password.component"; +import {NewPasswordComponent} from "./component/new-password.component"; +import {AppProgressIndicationComponent} from "./component/app-progress-indication.component"; +import {AppProgressIndicationService} from "./service/app-progress-indication.service"; +import {TaskListComponent} from "./component/task-list.component"; +import {ProcessListComponent} from "./component/process-list.component"; +import {TaskComponent} from "./component/task.component"; +import {TaskNotFoundComponent} from "./component/task-not-found.component"; + +registerLocaleData(localeRu); +export const DIRECTIVES = [ + forwardRef(() => AppHeaderComponent), + forwardRef(() => AppFooterComponent), + forwardRef(() => AdminMenuComponent), + forwardRef(() => ApplicationVersionComponent), + forwardRef(() => LogOutComponent), + forwardRef(() => LoginComponent), + forwardRef(() => AccessDeniedComponent), + forwardRef(() => RegisterComponent), + forwardRef(() => ConfirmUserEmailComponent), + forwardRef(() => ResetPasswordComponent), + forwardRef(() => NewPasswordComponent), + forwardRef(() => AppProgressIndicationComponent), + forwardRef(() => TaskListComponent), + forwardRef(() => ProcessListComponent), + forwardRef(() => TaskComponent), + forwardRef(() => TaskNotFoundComponent) +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + CoreModule, + NgbModule, + BpmnModule, + SecurityModule, + ComponentsModule, + AgGridModule, + RouterModule, + InternationalPhoneNumberModule + ], + declarations: [ + DIRECTIVES + ], + exports: [ + DIRECTIVES + ], + providers: [ + { provide: ProgressIndicationService, useClass: AppProgressIndicationService } + ], + bootstrap: [], + entryComponents: [AppProgressIndicationComponent, TaskNotFoundComponent] + }) +export class AppModule { +} diff --git a/frontend/src/ts/modules/app/component/access-denied.component.ts b/frontend/src/ts/modules/app/component/access-denied.component.ts new file mode 100644 index 00000000..269011bd --- /dev/null +++ b/frontend/src/ts/modules/app/component/access-denied.component.ts @@ -0,0 +1,11 @@ +import {ChangeDetectionStrategy, Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "access-denied", + templateUrl: "../../../../../src/resources/template/app/component/access_denied.html", + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AccessDeniedComponent { + +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/admin-menu.component.ts b/frontend/src/ts/modules/app/component/admin-menu.component.ts new file mode 100644 index 00000000..81130918 --- /dev/null +++ b/frontend/src/ts/modules/app/component/admin-menu.component.ts @@ -0,0 +1,23 @@ +import {ChangeDetectionStrategy, Component, Input} from "@angular/core"; +import {UserService, Session} from "@webbpm/base-package"; +import {NgbDropdownConfig, Placement} from "@ng-bootstrap/ng-bootstrap"; +import {Observable} from "rxjs"; + +@Component({ + moduleId: module.id, + selector: 'admin-menu', + templateUrl: '../../../../../src/resources/template/app/component/admin_menu.html', + providers: [NgbDropdownConfig], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AdminMenuComponent { + + @Input() + public placement: Placement = 'bottom'; + public currentSession: Observable; + + constructor(protected userService: UserService, public config: NgbDropdownConfig) { + this.config.placement = this.placement; + this.currentSession = this.userService.getCurrentSession(); + } +} diff --git a/frontend/src/ts/modules/app/component/app-footer.component.ts b/frontend/src/ts/modules/app/component/app-footer.component.ts new file mode 100644 index 00000000..63787987 --- /dev/null +++ b/frontend/src/ts/modules/app/component/app-footer.component.ts @@ -0,0 +1,9 @@ +import {Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "app-footer", + templateUrl: "../../../../../src/resources/template/app/component/app_footer.html" +}) +export class AppFooterComponent { +} diff --git a/frontend/src/ts/modules/app/component/app-header.component.ts b/frontend/src/ts/modules/app/component/app-header.component.ts new file mode 100644 index 00000000..25a77eb8 --- /dev/null +++ b/frontend/src/ts/modules/app/component/app-header.component.ts @@ -0,0 +1,24 @@ +import {ChangeDetectionStrategy, Component} from "@angular/core"; +import {Router} from "@angular/router"; +import {UserService, Session} from "@webbpm/base-package"; +import {Observable} from "rxjs"; + +@Component({ + moduleId: module.id, + selector: "app-header", + templateUrl: "../../../../../src/resources/template/app/component/app_header.html", + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AppHeaderComponent { + + public currentSession: Observable; + + constructor(protected userService: UserService, + protected router: Router) { + this.currentSession = this.userService.getCurrentSession(); + } + + public openTaskList(): void { + this.router.navigateByUrl("/process/tasks"); + } +} diff --git a/frontend/src/ts/modules/app/component/app-progress-indication.component.ts b/frontend/src/ts/modules/app/component/app-progress-indication.component.ts new file mode 100644 index 00000000..006fdb76 --- /dev/null +++ b/frontend/src/ts/modules/app/component/app-progress-indication.component.ts @@ -0,0 +1,11 @@ +import {ChangeDetectionStrategy, Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'progress-indication-dialog-content', + templateUrl: '../../../../../src/resources/template/app/component/progress-indication.html' +}) +export class AppProgressIndicationComponent { + +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/application-version.component.ts b/frontend/src/ts/modules/app/component/application-version.component.ts new file mode 100644 index 00000000..a10da22c --- /dev/null +++ b/frontend/src/ts/modules/app/component/application-version.component.ts @@ -0,0 +1,24 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core"; +import {HttpClient} from "@angular/common/http"; + +@Component({ + moduleId: module.id, + selector: "application-version", + templateUrl: "../../../../../src/resources/template/app/component/application_version.html", + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ApplicationVersionComponent { + @Input() + public applicationVersion: string; + + constructor(private httpClient: HttpClient, private cd: ChangeDetectorRef) { + this.loadAppVersion(); //TODO: check version url + } + + private loadAppVersion() { + this.httpClient.get("version").toPromise().then((version: any) => { + this.applicationVersion = version.number; + this.cd.markForCheck(); + }) + } +} diff --git a/frontend/src/ts/modules/app/component/confirm-user-email.component.ts b/frontend/src/ts/modules/app/component/confirm-user-email.component.ts new file mode 100644 index 00000000..92c34b1c --- /dev/null +++ b/frontend/src/ts/modules/app/component/confirm-user-email.component.ts @@ -0,0 +1,51 @@ +import {ActivatedRoute, Router} from "@angular/router"; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core"; +import {Session, UserService} from "@webbpm/base-package"; +import {Observable} from "rxjs"; + +enum VerificationStatus { + VERIFYING = "VERIFYING", + VERIFIED = "VERIFIED", + FAILED = "FAILED" +} + +@Component({ + moduleId: module.id, + selector: "confirm", + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: "../../../../../src/resources/template/app/component/confirm-user-email.html" +}) +export class ConfirmUserEmailComponent { + public verificationStatus = VerificationStatus.VERIFYING; + public currentSession: Observable; + + @Input() + public errorMessage: string; + + constructor(private router: Router, private userService: UserService, + private route: ActivatedRoute, private cd: ChangeDetectorRef) { + this.currentSession = this.userService.getCurrentSession(); + } + + ngOnInit() { + const link: string = this.route.snapshot.queryParamMap.get("link"); + // remove link from url to prevent http referer leakage + this.router.navigate([], { relativeTo: this.route, replaceUrl: true }); + this.userService.confirm( + link, + (reason) => { + this.verificationStatus = VerificationStatus.FAILED; + if (reason.status === 404) { + this.errorMessage = 'Ссылка недействительна. Требуется повторная регистрация.'; + } + else { + this.errorMessage = 'Произошла ошибка, обратитесь в службу технической поддержки!'; + } + this.cd.markForCheck(); + }) + .then(() => { + this.verificationStatus = VerificationStatus.VERIFIED; + this.cd.markForCheck(); + }); + } +} diff --git a/frontend/src/ts/modules/app/component/login.component.ts b/frontend/src/ts/modules/app/component/login.component.ts new file mode 100644 index 00000000..6e790b21 --- /dev/null +++ b/frontend/src/ts/modules/app/component/login.component.ts @@ -0,0 +1,68 @@ +import {Component, Input} from "@angular/core"; +import {ActivatedRoute, Router} from "@angular/router"; +import {UserService, Credentials} from "@webbpm/base-package"; + +@Component({ + moduleId: module.id, + selector: "login", + templateUrl: "../../../../../src/resources/template/app/component/login.html" +}) +export class LoginComponent { + + @Input() + public username: string; + + @Input() + public password: string; + public passwordType: boolean; + + @Input() + public errorMessage: string; + + @Input() + public confirmationSent: boolean; + + constructor(private router: Router, private userService: UserService, + private route: ActivatedRoute) { + } + + ngOnInit() { + this.confirmationSent = this.route.snapshot.queryParamMap.get('confirmationSent') === 'true'; + this.router.navigate([], { relativeTo: this.route, replaceUrl: true }); + } + + public login(): void { + let credentials: Credentials = new Credentials(); + credentials.username = this.username; + credentials.password = this.password; + + this.userService.login(credentials, "Password") + .then(() => this.router.navigateByUrl("/"), + (reason: any) => { + switch (reason.status) { + case 401: { + this.errorMessage = "Неправильный логин или пароль"; + break; + } + case 404: { + this.errorMessage = "Приложение стартует. Пожалуйста, подождите..."; + break; + } + default: { + this.errorMessage = + "Произошла неизвестная ошибка, обратитесь в службу технической поддержки!"; + break; + } + } + } + ); + } + + public goToRegister(): void { + this.router.navigateByUrl("/register"); + } + + togglePasswordType(): void { + this.passwordType = !this.passwordType; + } +} diff --git a/frontend/src/ts/modules/app/component/logout.component.ts b/frontend/src/ts/modules/app/component/logout.component.ts new file mode 100644 index 00000000..9cc3081a --- /dev/null +++ b/frontend/src/ts/modules/app/component/logout.component.ts @@ -0,0 +1,37 @@ +import {Component} from "@angular/core"; +import {UserService, Session, AuthenticationMethodService} from "@webbpm/base-package"; +import {Observable} from "rxjs"; + +@Component({ + moduleId: module.id, + selector: "[log-out]", + templateUrl: "../../../../../src/resources/template/app/component/log_out.html" +}) +export class LogOutComponent { + + public currentSession: Observable; + + constructor(private userService: UserService, private authenticationMethodService: AuthenticationMethodService) { + this.currentSession = userService.getCurrentSession(); + } + + public logout(): void { + this.userService.logout(); + } + + public getCurrentUserName(): string { + return this.userService.getCurrentUserName(); + } + + public getFullUserName(): string { + return this.userService.getFullUserName(); + } + + public isLogoutButtonVisible(): boolean { + return this.authenticationMethodService.isFormAuth(); + } + + public getOrgUnitName(): string { + return this.userService.getOrgUnitName(); + } +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/new-password.component.ts b/frontend/src/ts/modules/app/component/new-password.component.ts new file mode 100644 index 00000000..ac7c4341 --- /dev/null +++ b/frontend/src/ts/modules/app/component/new-password.component.ts @@ -0,0 +1,79 @@ +import {ActivatedRoute, Router} from "@angular/router"; +import {Component, Input} from "@angular/core"; +import {Session, UserPasswordResetRequestDto, UserService} from "@webbpm/base-package"; +import {Observable} from "rxjs"; + +@Component({ + moduleId: module.id, + selector: "newPassword", + templateUrl: "../../../../../src/resources/template/app/component/new_password.html" + }) +export class NewPasswordComponent { + public currentSession: Observable; + + private token: string; + + @Input() + public password: string; + public passwordType: boolean; + + @Input() + public confirmPassword: string; + public confirmPasswordType: boolean; + + @Input() + public errorMessage: string; + + constructor(private router: Router, private userService: UserService, + private route: ActivatedRoute) { + this.currentSession = this.userService.getCurrentSession(); + } + + ngOnInit() { + this.token = this.route.snapshot.queryParamMap.get("token"); + + this.router.navigate([], {relativeTo: this.route, replaceUrl: true}); + + if (this.token == undefined || this.token === '') { + this.errorMessage = 'Ссылка недействительна. Требуется повторить восстановление пароля.'; + return; + } + } + + public changePassword(): void { + let dto: UserPasswordResetRequestDto = new UserPasswordResetRequestDto(); + dto.password = this.password; + dto.passwordConfirm = this.confirmPassword; + this.userService.changePassword(dto, this.token) + .then(() => this.router.navigateByUrl("/"), + () => { + this.errorMessage = + 'Произошла неизвестная ошибка, обратитесь в службу технической поддержки!'; + }); + } + + togglePasswordType(): void { + this.passwordType = !this.passwordType; + } + + toggleConfirmPasswordType(): void { + this.confirmPasswordType = !this.confirmPasswordType; + } + + validPasswords(): boolean { + if (this.password === undefined || this.confirmPassword === undefined) { + return false; + } + + let eq = this.password === this.confirmPassword; + if (!eq) { + this.errorMessage = 'Введенные пароли не совпадают. Убедитесь, что данные, ' + + 'введенные в поле "Подтверждение пароля", совпадают с теми, ' + + 'которые указаны в поле "Пароль".'; + } + else { + this.errorMessage = ''; + } + return eq; + } +} diff --git a/frontend/src/ts/modules/app/component/process-list.component.ts b/frontend/src/ts/modules/app/component/process-list.component.ts new file mode 100644 index 00000000..0b464181 --- /dev/null +++ b/frontend/src/ts/modules/app/component/process-list.component.ts @@ -0,0 +1,44 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core"; +import {Process, TaskService, ProcessDefinitionResource, ProcessService} from "@webbpm/base-package"; + +@Component({ + moduleId: module.id, + selector: 'process', + templateUrl: '../../../../../src/resources/template/app/component/process_list.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ProcessListComponent { + + @Input() + public processList: Process[]; + @Input() + public errorMessage: string; + + constructor(private processDefinitionResource: ProcessDefinitionResource, + private taskService: TaskService, + private cd: ChangeDetectorRef, + private processService: ProcessService) { + this.processList = []; + this.loadProcessList(); + } + + loadProcessList() { + this.processDefinitionResource.list().then( + (processList) => { + this.processList = processList; + this.cd.markForCheck(); + }, + () => { + this.errorMessage = "Error load process list"; + this.cd.markForCheck(); + }) + } + + startProcess(processDefinitionId: string) { + this.processService.start(processDefinitionId, null).then( + (processInstanceId: number) => { + this.taskService.startAndOpenNextTask(processInstanceId); + } + ); + } +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/register.component.ts b/frontend/src/ts/modules/app/component/register.component.ts new file mode 100644 index 00000000..2501c03b --- /dev/null +++ b/frontend/src/ts/modules/app/component/register.component.ts @@ -0,0 +1,71 @@ +import {Component, Input, ViewChild} from "@angular/core"; +import {AppConfigService, UserDto, UserService} from "@webbpm/base-package"; +import {Router} from "@angular/router"; +import {PhoneNumberComponent} from "ngx-international-phone-number"; + +@Component({ + moduleId: module.id, + selector: "register", + templateUrl: "../../../../../src/resources/template/app/component/register.html" +}) +export class RegisterComponent { + + public passwordPattern: string; + public passwordPatternErrorMessage: string; + public errorMessage: string; + + @Input() + public username: string; + + @Input() + public email: string; + @ViewChild(PhoneNumberComponent) + public phone: PhoneNumberComponent; + public phoneNumber: string; + + public phoneIsTouched: boolean = false; + @Input() + public password: string; + + public fieldType: boolean; + + @Input() + public consent: string; + + constructor(private router: Router, private userService: UserService,private appConfigService: AppConfigService) { + this.passwordPattern = appConfigService.getParamValue("password_pattern"); + this.passwordPatternErrorMessage = appConfigService.getParamValue("password_pattern_error"); + } + + public register(): void { + let user: UserDto = new UserDto(); + user.username = this.username; + user.email = this.email; + user.name = this.username; + user.phone = this.phone.value; + user.password = this.password; + + this.userService.register(user) + .then(() => this.router.navigateByUrl("/login?confirmationSent=true"), + (reason: any) => { + if (reason.status === 409) { + this.errorMessage = 'Пользователь с данным почтовым адресом уже существует'; + } + else { + this.errorMessage = 'Произошла неизвестная ошибка, обратитесь в службу технической поддержки!'; + } + }); + } + + toggleFieldType(): void { + this.fieldType = !this.fieldType; + } + + phoneHasOnlyDialCode(): boolean { + return this.phone.phoneNumber.trim() === this.phone.getSelectedCountryDialCode().trim() + } + + phoneInputFocusOut(): void { + this.phoneIsTouched = true; + } +} diff --git a/frontend/src/ts/modules/app/component/reset-password.component.ts b/frontend/src/ts/modules/app/component/reset-password.component.ts new file mode 100644 index 00000000..e9b9ee23 --- /dev/null +++ b/frontend/src/ts/modules/app/component/reset-password.component.ts @@ -0,0 +1,30 @@ +import {Component, Input} from "@angular/core"; +import {UserService} from "@webbpm/base-package"; +import {Router} from "@angular/router"; + +@Component({ + moduleId: module.id, + selector: "resetPassword", + templateUrl: "../../../../../src/resources/template/app/component/reset_password.html" + }) +export class ResetPasswordComponent { + + @Input() + public email: string; + + @Input() + public errorMessage: string; + + constructor(private router: Router, private userService: UserService) { + } + + resetPassword(): void { + + this.userService.resetPassword(this.email) + .then(() => this.router.navigateByUrl("/"), + (reason: any) => { + this.errorMessage = + 'Произошла неизвестная ошибка, обратитесь в службу технической поддержки!'; + }); + } +} diff --git a/frontend/src/ts/modules/app/component/task-list.component.ts b/frontend/src/ts/modules/app/component/task-list.component.ts new file mode 100644 index 00000000..4c27199d --- /dev/null +++ b/frontend/src/ts/modules/app/component/task-list.component.ts @@ -0,0 +1,121 @@ +import {Component, Input} from "@angular/core"; +import {Task, TaskService, TaskStatus, TaskReference, TaskResource, ProcessVariable, UserService, RolesService, ProcessService} from "@webbpm/base-package"; + +@Component({ + moduleId: module.id, + selector: "task-list", + templateUrl: "../../../../../src/resources/template/app/component/task_list.html" +}) +export class TaskListComponent { + @Input() + public tasks: Task[]; + + @Input() + public onTimeTasks: Task[]; + + @Input() + public overdueTasks: Task[]; + + @Input() + public visibleTasks: Task[]; + + @Input() + public showMode: string; + + @Input() + public errorMessage: string; + + @Input() + public roles: string[]; + + constructor(private taskService: TaskService, + private $taskResource: TaskResource, + private userService: UserService, + private rolesService: RolesService, + private processService: ProcessService) { + this.tasks = []; + this.onTimeTasks = []; + this.overdueTasks = []; + this.visibleTasks = []; + this.roles = []; + this.showMode = 'All'; + + this.rolesService.getRoles().then((roles: string[]) => { + this.roles = roles; + }); + + this.loadTasks(); + } + + private loadTasks(): void { + this.$taskResource.list() + .then( + (tasks: Task[]) => this.initTasks(tasks), + () => this.errorMessage = "Error load tasks" + ); + } + + public startTask(task: Task): Promise { + let taskRef: TaskReference = new TaskReference(); + taskRef.processInstanceId = task.processInstanceId; + taskRef.taskId = task.id; + + if (task.status == TaskStatus.InProgress) { + return this.taskService.openTask(taskRef); + } + else if (task.status == TaskStatus.Reserved || task.status == TaskStatus.Ready) { + return this.taskService.startAndOpenTask(taskRef); + } + } + + private initTasks(tasks: Task[]): void { + this.tasks = tasks; + this.filterOnTimeTasks(); + this.filterOverdueTasks(); + this.filterVisibleTasks(); + } + + public isVisible(task: Task): boolean { + return this.showMode == 'All' || + this.showMode == 'OnTime' && !this.isOverdue(task) || + this.showMode == 'Overdue' && this.isOverdue(task); + } + + public isOverdue(task: Task): boolean { + if (!task.expirationTime) { + return false; + } + return new Date(task.expirationTime).getTime() <= new Date().getTime(); + } + + public isOnTime(task: Task): boolean { + return !this.isOverdue(task); + } + + public startProcess(processDefinitionId: string, processVars?: Array) { + this.processService.start(processDefinitionId, processVars).then( + (processInstanceId: number) => { + this.taskService.startAndOpenNextTask(processInstanceId); + } + ); + } + + public filterOnTimeTasks() { + this.onTimeTasks = this.tasks + .filter((task: Task) => this.isOnTime(task)); + } + + public filterOverdueTasks() { + this.overdueTasks = this.tasks + .filter((task: Task) => this.isOverdue(task)); + } + + public filterVisibleTasks() { + this.visibleTasks = this.tasks + .filter((task: Task) => this.isVisible(task)); + } + + public hasRole(role: string) { + return this.roles.includes(role); + } +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/task-not-found.component.ts b/frontend/src/ts/modules/app/component/task-not-found.component.ts new file mode 100644 index 00000000..98b6ae41 --- /dev/null +++ b/frontend/src/ts/modules/app/component/task-not-found.component.ts @@ -0,0 +1,18 @@ +import {ChangeDetectionStrategy, Component} from "@angular/core"; +import {Router} from "@angular/router"; + +@Component({ + moduleId: module.id, + selector: 'task-not-found', + templateUrl: '../../../../../src/resources/template/app/component/task_not_found.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class TaskNotFoundComponent { + + constructor(private router: Router) { + } + + goToTaskList() { + return this.router.navigateByUrl("/process/tasks"); + } +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/task.component.ts b/frontend/src/ts/modules/app/component/task.component.ts new file mode 100644 index 00000000..c0be0551 --- /dev/null +++ b/frontend/src/ts/modules/app/component/task.component.ts @@ -0,0 +1,9 @@ +import {Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "[task]", + templateUrl: "../../../../../src/resources/template/app/component/task.html" +}) +export class TaskComponent { +} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/service/app-jivo-chat.service.ts b/frontend/src/ts/modules/app/service/app-jivo-chat.service.ts new file mode 100644 index 00000000..3284b4d6 --- /dev/null +++ b/frontend/src/ts/modules/app/service/app-jivo-chat.service.ts @@ -0,0 +1,298 @@ +import {Injectable, OnDestroy} from "@angular/core"; +import {HttpClient} from "@angular/common/http"; +import {UserService, AppConfigService, Session} from "@webbpm/base-package"; +import { + JivoProfileDto +} from "../../../generated/dto/jivoprofile/JivoProfileDto"; +import {Observable, Subscription} from "rxjs"; + +declare function jivo_InitProfile(name, email, phone); + +declare function jivo_ClearHistory(); + +@Injectable() +export class AppJivoChatWidgetService implements OnDestroy { + + public static LIVE_CHAT_WIDGET_API_URL: string = "jivo_chat_widget_api_url"; + public static LIVE_CHAT_WIDGET_ENABLE: string = "jivo_chat_widget_enabled"; + public static LIVE_CHAT_WIDGET_DEFAULT_VALUE: boolean = false; + + private JIVO_CSS: string = ` +/* hide the original widget - that there were no two labels on the screen*/ +#jivo_chat_widget{ + display: none; +} + +/* the default style - for offline messages if no one is online */ +#jivo_custom_widget{ + position: fixed; + z-index: 300000; + cursor: pointer; + + display: block; + right: 60px; + bottom: 10px; + + width: 60px; + height: 60px; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAABmJLR0QA/wD/AP+gvaeTAAAI1UlEQVR4nO2ca5AUVxXH/+f29MzsEkDiWkQeZRLKKgsIC6EqlJgHpCKG6G6mezL5kCqTaBmifkiV5AMp83A1QavUpEiq/BC0SqxUIjo7D2ah1oohPBQSKYnJApZgECGy4ZUlIbLz6O57/DBb5e6Ghe7e7t7H3N/HmXPPOff+p2/PvX36AgqFQqFQKBQKhUKhUCgUCoVCoVAoFAqFQqEYJ9BYJ+AWzmS0/mp1pq7rsyTwWSHlDAiRBNBEUiYBgIWoAChDyooU4rwA3rcsq7c5kThN2awztj1wx7gUpJzJXCdsexmIbhBEC5j5BgCfA6D5dOkAOE5EByTzIQA9Usq/NBWL/w4s6YAYF4JwJvMZS8o2MK8AsALA3IhCnwCwC8w79FhsK2WzZyOKOyJjJgi3t8+0YrF7wWyC6Bb4//UHhQNgN4jyupS/p0LhzFgkEbkgtVRqKYRYA+B+AMmo47ukRkRbAGyM5XLbCeCoAkciCANUS6dNYn4KwKIoYgbIOwz8MJ7PF6MQJnRBKqbZLoCnMfGEGM47gvmJWKGwNcwgoQnSb5pzdGADA+mwYowFTLRVCvFIUzZ7LAz/ImiHDJBlmo/GgMOTTQwAIOavaY5z0Eqn13IIP+hAHXJbW0tN1zcR8NUg/Y5jXtM17euUzZ4KymFggtRSqaUkRImBWUH5nAgQcJKJ2uK53N+C8BfIlGUZxu0ger3RxAAABmaDebdlGHcG4W/UglRN02CibhBNCyKhCcpVTLSlYprto3U0qinLMozbmOgPGL8LvKipkBCr9M7OP/l14FuQaiYznxxnL4Dpfn1MSojOM7A8kcv9w09zX1MWr16dIMd5BUqMT8I8g5iz/OCDvmYNX4JYzc0/BdDqp22DsNC6cOEnfhp6nrJqqdRiCLEfISwqJxkSUt4ULxb3e2nkfVCF+Jmvdo2HGBgrj408YBnG7QDu8BqkgVlpGcZtXhp4EoSJ1njLR8FED3mxd30P4UzmastxTkKtObxS0avVWbRt23k3xq6vkJptr0K4YljM/CMbmKtrWgJSLgOweyRjBk4x0X16uTxdt+1pzHwvAScv4/9NEuJLermctGx7NhE9AaAaeC8+SbKWTH7ZrbFrQYhoub983MHMmUSh8IPmfP4/WLDAjheL+/RFi1YS0HUJ8w9s216ayOV+i+7uj3HjjRcThUI2pmlLGLjUzutruqbdrHd27sWyZdaUUqlXz+XWkxDtiOIpoJSux87LPWSZj1xcQUApUShs6b/77rk103zb6ump1NLp56ijQ1qa9h3UCxAGNaAnp5RKvXY6fZdlmmesAwfOVQ3DpGz2LBE9Nsw9Sym/TdmsUzWMZ6yennLNMA5VUql5emfnqwB+F1a/BuXreuzcXyHAHH/ZXBkGdgBATNPWor7g1MH8vWo6vaA5mz0J5sND7KXcCQCS+VkALWCeQUQbAMARYscw9yeSxeLRcip1LRE9DiAOovlC09bVO0bD7QOHPJQ1uRaEgU/7S+fKEHNiIMZHgz52JPN/6waUuJQ9htp/BAAk5RBbBhIAkCTqB2AN+rze9v++QsPL2LkShNes0THQsTBgohR3dIi4bT8L5t+AaD+YH2rK54/XUqnFAOYNszcAgJm/BebtAHYBeAAANCnNwbYEXGMZxhepUDjDRA8A+CuAV+KVyo8HHsEaYfVrEMmBMbwirv/21kzzQ4S4mUjA9/V8fsj+D6dSn7KEeB3AkmHmVQAr4vn8m0NyTKeXgPnPAJqHWDP/XQdupULhgyH2hvEIiJ4PrBMjczGez1/lxtCLIEcAfN53Si4goETMv5RCnAXzYgKeZGD2COYWM28QwDYQsQTuJGAtRriSGThF9XKktwTR1cz8zQiLMI7H8/lr3Rh6EWQnAE/bAIoBmHfGC4WVbky93NR9PwVrdBjY49bWtSAC+KO/dBQa0RtubV0LEmtpeQPMF/yl1ND0adOmbXdr7H5huHGjBeBXvlJqbF6mTZsqbo09bb87sdjzGLS4UlwRyUQvemngSZCmbPYEgM2eUmpkmF9K5HKHvDTx/ChWB9aByNXefoNTdmKxp7w28iwI5fPvQ8pHvbZrQNYNzCie8FUoxwDVTLOrgarcPcFEW+O5XLufN658VY8QwPFy+T4APX7aT3KOxGu1b/h9/c13OQ91d1+wbHs1gPf8+phsENDrSPkV6uo659fHqOqrppRKvcx8FwG9o/EzSTgtiVaP9jCCURe8JQqFg5am3YTGnr6OSaJbErncqMcgsDeoBsqEtgC4OSifE4Q9OrMZ1EEDgZWEUjbbp/f1rSTmx9AYq3kG0Qt6S8vKIE99COW1aOuee5azlC8BuD4M/+OAY8T8sF4oBL4DHkrRtN7ZuVfXtFZmXg+gP4wYY0SVgWd0TVsQhhhABCc59JvmnFj90en9mLhV8zaYX5bMTyeLxaNhBors8BnLMO5kou6o4gVEFcybpRDrk7ncP6MIGIsiCAA4sdi7wpkQh7oBwL8IeDGmab+O+gytyAQRUn43qlg+OQEgT8y5WGvrXurokGORRDTHM9Xrq04AmBpFPJd8SPXCjV0s5U69WHwrynOxRiKSK6SmaY8Ts1cxjoD5BSa6hup/n68HcB2AmR79nAXRKWJ+VwIHwXwAwMF4a+vhsboKLkf452WlUvOEEIfgrRT1oG7bd1CpdHr4F9zW1lxJJlvItpOCeSrFYlPJtpugacRAjYGP4Ti2I8S5ZLl8irq7o3gHJDBCv0I0IZ5jL2IQva0LsYry+UveTKmrqx/1+X5SEuq6oGaaDzPg+vwPAgq6ECvGw+mgY0VoU1bVMBYS0T4ATS7ML4J5XbxQ+EVY+UwUQrlCOJOZTvU3k9yIsdkGvqDEqBP4PYQzmSbLcUogmn8ZsxoRbWHH+Xm8WNwXdA4TmUAF4fb2qZbjFAHceomvzxCwh4GSrmklymb7gow9WQhUEFvTFgLoIuZXIYTFzH0kxHu2bR8dj+esKxQKhUKhUCgUCoVCoVAoFAqFQqFQKBQKhUJxGf4HQacsFGPlFpMAAAAASUVORK5CYII='); + background-size: 60px 60px; + background-repeat: no-repeat; +} + +#jivo_custom_widget:hover{ + bottom: 13px; +} + +/* if there are operators online - show other label*/ +#jivo_custom_widget.jivo_online{ + height: 60px; + width: 60px; + background-size: 60px 60px; + background-repeat: no-repeat; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAABmJLR0QA/wD/AP+gvaeTAAAI/ElEQVR4nO2cbXBU1RnH/8+5m2wgAoLYZDcJbHZj2wGsOMzIlFYFx1K0hal0ygdnqtNOlbYfmJpkE8SXWYug7CaIzPiBtjNtx9FBnFoS6ehYUcCClharCB3B3Wxe7yaAYG0DSfbe8/RDsBNSAvfe3Lt52fP7kmT3f57nufe/59yce88eQKFQKBQKhUKhUCgUCoVCoVAoFAqFQqFQKBTjBBrrAiyzi7WKdEdJAXxBFhwQLGZCcBEDU8BcBAAg6iPgAiT1SZLnSFImC0PvqKzowRoyx/gILDEuDZmb6K70wVwMphslYT4YNxJhLgDNYUiTGW0gfCQYxwE+aprir60PB1rdrNsNxoUhVZsz10ufXElESxlYCqAiR6nbCdjP4LdFVuxJbgiczlHeERkzQyq39ZSIAWONJFpNwK1w/ul3CxOEA8z8ioC2KxUtPTUWReTckEiDvkhKPEiE+wAU5Tq/RQaI0MTMv2qpDe4FEecqcW4MYaZwIrMaRI8D/LWc5HSPDwl4IlUb2J0LYzw3pLKxaxVJsXECGjGcD8Hi0Za60j1eJvHMkKotneVSiG0Avu9VjjGBeI/J2rq2aGnai/DC9YjMVNmQqZFCnMBkMwMAmL6rQR4LJ/RqMLv+gXY14Jcb9NkG43cAvuNm3HHMm5J9P2yt+1K3WwFdMyTSoC8CUzODg27FnCB0CcErkzVl/3AjmCtDViTRfQcz3spDMwCgTEo6EInrK9wINmpDIgn9HoZ8DcB0F+qZqFzDhKbKxq5Vow00qiErFM/cLohfx/id4OWaPmYsT9cF33EawLEhVQ2ZeZL5EIAZTmNMUs5JwpLW2uDHTho7GrKqtn/il8wvQplxOWYKxsuhWNrRqOHIELO/OA7gJidt84QFotj/lJOGtoesULxzoSBxBF5MKicXkgi3pGqDR+w0sn1SBYmEk3Z5iGAgYbuRHXEk0X0HgDvtJslbGMtC8cztdprYMkQSP2ivIoUAP2BHb/kaUr61Y1ahqXVBzTns0mcY2WD7w3PPWRFb7iF+UyyHt2ZkwfxLIWXFlN5zfpa0GMCBK+i7QXyv8PtnFMiC6cy0BkDXSGJifo8Ef0P4e4uy0ihj4FEA/W4fxGUo0nyF37Iq9lkVShJLiL17YCbAP0jWlTUBAGIsUE+HEeNl4eLu3QCvHKpl4FNDGos66ufoYCY8AUKMXq7anNknC/gogNJh4d9MhYIrsIZMxFggRjqATZVx/W9EeB0eP6gj5iUAdlnRWu4hBF7suKKrxWZqTkbLmiKNXRXhhP5BuDjTF47rWxEj6dOMnwEwh+kf66ifo4fjmbvDDZlT4eLMmXCDvjq5IXCaiNYPC8+CtZ9iDZmRhP5kuDhzIZzQj1fFeyLpuuAbAL3k1XH9r14b5866IUzlzsq5Okz8NgCwpGoMTjgLQHio6unM/JPVFV0ATgzVm8z7LhbVCGA2gJlgbAMANgZjDaE9WVeSCj2VCTHwCIBCAPOYzHoAIPo/veswkeVlTZYNYfB1zsqxFN1/8ee/hrxomj7+z8Xf/UPVRPKLv4fqB38X5iXaL9pqPjoPIDsk56Be8nC9F1g+d5YMWbSDCzDspLgJMb6HGIsCWdjIwO8BHAH4gXRtsC0U71wIIDJUL0D3AABB/ARMewnYLxj3DwYTq4eFL61KdH49FS09BeL7AfwdwItZw9gMZmIxGMtjii6ew6ti+WIWTuifwdubiRtaosFL7v+EnklfS4b/LQJuHqbtl0Isba0pfW/oi1WNXTdLSX8BMHWY/p+FWXnbxxvKPx36YiShr2PgWdeOYGR6W6LBa6wI7RhyEsANjkuyADE1M+jXknBag1zIwGMAykaQZxm8jVn8iQQzMVYAqMbIPbkbRBsl0fvC5Fkg/jFytwijrSUaDFkRWjYkktD3MWDrNoBiEAb2paPBZVa0li/qkuH4KVi+I4CDNrSWlX92VI0CDHrXqtayIbOmBd4F8LmjivKbs7K3b69VsWVDjqylLIDfOCopj2GiF1pjlX1W9fYeNJl4FpdMrhRXQWoGdthpYMuQlvXBdgJ22qspf2Hg+eT6wHE7bWw/ijV8BfUALN3bz3MukInH7TaybUjbQ9dnAK6x2y7fIOb6lvXBdtvtHGVjpnBD5lXkzyp3exDvaakJrnLyjStnq0eIWPj99wJ01FH7yc1JH+hHTr/+5ng5T3LddZ9nZfYuAB1OY0w2CKRLg759sjZ4xmmMUa2v6qifoxPE3QTSRxNnUsDokTDuGu1mBKNe8JaKlh7TNOOWPB++0oB5azpaMepz4NrD/YvLhJoAfNOtmBOEgwSx2q2NBlxbEtpZXXF2Tm9gGcDrkR+zeWZg+8zpgWVu7vrgyfKXSGPXEmnS80QIexF/HJBm4rXp2jLX74B7smg6VVN2aGqx7yYCNgE470WOMaKfGU8OaOZ8L8wAcrCTQ9WWznKp0UYw3YeJu2reYOAFjbWNybqSlJeJcrb5TCSur2DCa7nK5xL9DOwkNje11FV8kouElpeSjj6TmYQ51jswWYMZLQK8gwzx21zvoZUzQ9jQfj4+tksbkXYAr4Dwh3Rv4BBiJMeiiJycotAz6WuF4W8HMC0X+SzyGUDvMGG/AO9L1QTez+W+WCORkx6iGYWPsH0zTjLTdoBLiRAm5jCDKkEosRnnNBjdICQZOAamjyTzsbYLgROX9IJam1E9wvv/suI9EUnmcdhbinqMC7Q7078o6Rn+RjCmTy0qwmwUyCJiMY2YpjFhCksQSA5IaP/WSBoSOKMV9nYn192Qi++AuIbnPYQht8KeGR+ILC1PRksuezHVY8HzGBzvJyWezgsiCX0tE9vZ/+OPMIuWjofdQccKz4asSKJ7AUMeBjDFgryXmerTdYHnvKpnouBJDwk/fXYGQ74ES2bQTiHlV5UZg7h+DSnf2jEFZl8zgHlXkA0QoUma1JCuDxx2u4aJjKuGfGXL6WlZc2A3gNsu8/YpAAeJqbnfZzR3VlecdTP3ZMFVQ0zRvwAQrwL8BkBZYjrLmtkhB7TUeNxnXaFQKBQKhUKhUCgUCoVCoVAoFAqFQqFQKBSKK/Bf/RI0U2U6gOkAAAAASUVORK5CYII='); +}`; + + private JIVO_JS: string = ` +/* Callback function that is called immediately after JivoChat is loaded */ +function jivo_onLoadCallback() { + window.jivo_cstm_widget = document.createElement('div'); + jivo_cstm_widget.setAttribute('id', 'jivo_custom_widget'); + document.body.appendChild(jivo_cstm_widget); + + /* Adds handlers click on the icon - to maximize the window when clicked */ + jivo_cstm_widget.onclick = function () { + jivo_api.open(); + } + + /* Change the CSS class if there are agents online */ + if (jivo_config.chat_mode === "online") { + jivo_cstm_widget.setAttribute("class", "jivo_online"); + } + + /* Show the user a shortcut */ + window.jivo_cstm_widget.style.display = 'block'; +} + +/* + Callback function jivo_onOpen and jivo_onClose called whenever the chat window JivoChat + is expanded or collapsed by the user or by the proactive invitations rule. +*/ +function jivo_onOpen() { + /* If chat is deployed - hide shortcut */ + if (jivo_cstm_widget) + jivo_cstm_widget.style.display = 'none'; +} + +function jivo_onClose() { + /* If chat is minimized - show label */ + if (jivo_cstm_widget) + jivo_cstm_widget.style.display = 'block'; +} + +function jivo_ClearHistory() { + jivo_api.clearHistory(); + jivo_api.close(); +} + +function jivo_InitProfile(name, email, phone) { + let chatMode = jivo_api.chatMode(); + + let args = { + name: name ? name : '', + email: email ? email : '', + phone: phone ? phone : '' + }; + + if (chatMode === 'offline') { + jivo_api.sendOfflineMessage(args); + } + else { + jivo_api.setContactInfo(args); + } +} +`; + + private currentUserName: string; + private currentEmail: string; + private currentPhone: string; + + private jsLoaded = false; + private jivoWidgetApiUrl: string; + + private currentSession: Observable; + private currentSessionSubscription: Subscription; + private session: Session; + private sessionInitJivoChatWidget: boolean; + + constructor(private httpClient: HttpClient, + private appConfigService: AppConfigService, + private userService: UserService) { + + this.currentSession = userService.getCurrentSession(); + this.currentSessionSubscription = + this.currentSession.subscribe(val => { + + if (!this.sessionInitJivoChatWidget || !this.session) { + this.initJivoChatWidget(); + this.sessionInitJivoChatWidget = true; + } + + if (this.session && !val) { + // logout + this.clearJivoProfile(); + this.session = null; + this.sessionInitJivoChatWidget = false; + } + + if (val) { + this.session = val; + } + }); + } + + private initJivoChatWidget() { + let liveChatWidgetEnabled = this.getValueFromAppConfig( + AppJivoChatWidgetService.LIVE_CHAT_WIDGET_ENABLE, + AppJivoChatWidgetService.LIVE_CHAT_WIDGET_DEFAULT_VALUE); + + if (liveChatWidgetEnabled) { + this.jivoWidgetApiUrl = this.getValueFromAppConfig( + AppJivoChatWidgetService.LIVE_CHAT_WIDGET_API_URL, + ''); + + if (!this.jivoWidgetApiUrl) { + throw new Error( + `The configuration file does not contain the 'Jivo API url'. Please check that '${AppJivoChatWidgetService.LIVE_CHAT_WIDGET_API_URL}' has data`); + } + + let userId = this.userService.getCurrentUserId(); + if (userId) { + this.clearJivoProfile(); + this.httpClient.get('profile/jivo/' + userId) + .toPromise() + .then((profile: JivoProfileDto) => { + + this.currentUserName = profile.username; + this.currentEmail = profile.email; + this.currentPhone = profile.phone; + + let initProfileFunction = () => this.initProfile(this.currentUserName, + this.currentEmail, + this.currentPhone); + this.loadScripts(initProfileFunction); + }); + } + else { + let initProfileFunction = () => this.initProfile(this.currentUserName, this.currentEmail, + this.currentPhone); + this.loadScripts(initProfileFunction); + } + } + } + + private clearJivoProfile() { + this.clearProfileData(); + try { + jivo_ClearHistory(); + } + catch (ignore) { + } + } + + private clearProfileData() { + this.currentUserName = ''; + this.currentEmail = ''; + this.currentPhone = ''; + } + + private loadScripts(initProfileFunction): void { + let afterLoadMainJs = () => { + this.loadScriptJsContent('jivoCustomJs', this.JIVO_JS, initProfileFunction); + } + this.loadScript('jivoWidget', this.jivoWidgetApiUrl, true, afterLoadMainJs); + this.loadStyleContent('jivoCustomCss', this.JIVO_CSS); + } + + private initProfile(username: string, email: string, phone: string): void { + try { + jivo_InitProfile(username, email, phone); + } + catch (e) { + if (e instanceof ReferenceError) { + if (!this.jsLoaded) { + this.jsLoaded = true; + setTimeout(() => { + jivo_InitProfile(username, email, phone); + }, 3000); + } + } + } + } + + private loadScript(elementId, js, async, callback): void { + let jivoJsLink = document.getElementById(elementId); + if (!jivoJsLink) { + let node = document.createElement('script'); + node.src = js; + node.type = 'text/javascript'; + node.id = elementId; + node.async = async; + node.charset = 'utf-8'; + if (callback) { + node.onload = function () { + callback(); + }; + } + document.getElementsByTagName('head')[0].appendChild(node); + } + else { + if (callback) { + callback(); + } + } + } + + private loadScriptJsContent(elementId, js, callback): void { + let jivoJs = document.getElementById(elementId); + if (!jivoJs) { + let node = document.createElement('script'); + node.innerHTML = js; + node.type = 'text/javascript'; + node.id = elementId; + node.charset = 'utf-8'; + if (callback) { + callback(); + } + document.getElementsByTagName('head')[0].appendChild(node); + } + else { + if (callback) { + callback(); + } + } + } + + private loadStyleContent(elementId, styleCss): void { + let jivoCss = document.getElementById(elementId); + if (!jivoCss) { + const style = document.createElement('style'); + style.id = elementId; + style.innerHTML = styleCss; + document.getElementsByTagName('head')[0].appendChild(style); + } + } + + private getValueFromAppConfig(key, defaultValue) { + let enabled = this.appConfigService.getParamValue(key); + if (enabled === undefined) { + return defaultValue; + } + return enabled; + } + + ngOnDestroy(): void { + this.currentSessionSubscription.unsubscribe(); + } + +} diff --git a/frontend/src/ts/modules/app/service/app-progress-indication.service.ts b/frontend/src/ts/modules/app/service/app-progress-indication.service.ts new file mode 100644 index 00000000..48100d5f --- /dev/null +++ b/frontend/src/ts/modules/app/service/app-progress-indication.service.ts @@ -0,0 +1,95 @@ +import {Injectable} from "@angular/core"; +import {AppProgressIndicationComponent} from "../component/app-progress-indication.component"; +import {NgbModal, NgbModalOptions, NgbModalRef} from "@ng-bootstrap/ng-bootstrap"; + +@Injectable() +export class AppProgressIndicationService { + + private static readonly EVENT_INTERCEPTOR = (event) => { + event.preventDefault(); + event.stopPropagation(); + }; + + private counter: number = 0; + private focused: any; + private ngbModalRef: NgbModalRef; + private options: NgbModalOptions = { + backdrop: 'static', + keyboard: false, + windowClass: 'modal-center loader' + }; + + constructor(private ngbModal: NgbModal) { + } + + public showProgressBar(): boolean { + if (this.counter == 0) { + this.disableEvents(); + this.saveFocus(); + this.showProgressIndicator(); + } + ++this.counter; + return this.counter == 1; + } + + public hideProgressBar(): boolean { + if (this.counter == 0) { + return false; + } + if (this.counter == 1) { + this.hideProgressIndicator(); + this.restoreFocus(); + this.enableEvents(); + } + --this.counter; + return this.counter == 0; + } + + public unconditionallyHideProgressBar(): void { + this.enableEvents(); + this.hideProgressIndicator(); + } + + public restoreProgressBar(): void { + + if (this.counter > 0 && this.ngbModalRef == null) { + this.disableEvents(); + this.showProgressIndicator(); + } + } + + private showProgressIndicator() { + this.ngbModalRef = this.ngbModal.open(AppProgressIndicationComponent, this.options); + } + + private hideProgressIndicator() { + this.ngbModalRef.dismiss('cancel'); + this.ngbModalRef = null; + } + + private saveFocus() { + this.focused = $(':focus'); + } + + private restoreFocus() { + if (this.focused) { + this.focused.focus(); + this.focused = null; + } + } + + private disableEvents() { + let body = $('body'); + body.keydown(AppProgressIndicationService.EVENT_INTERCEPTOR); + body.keyup(AppProgressIndicationService.EVENT_INTERCEPTOR); + body.contextmenu(AppProgressIndicationService.EVENT_INTERCEPTOR) + } + + private enableEvents() { + let body = $('body'); + body.off('keydown', AppProgressIndicationService.EVENT_INTERCEPTOR); + body.off('keyup', AppProgressIndicationService.EVENT_INTERCEPTOR); + body.off('contextmenu', AppProgressIndicationService.EVENT_INTERCEPTOR); + } + +} diff --git a/frontend/src/ts/modules/preview/component/preview-container.component.ts b/frontend/src/ts/modules/preview/component/preview-container.component.ts new file mode 100644 index 00000000..f8cdd27c --- /dev/null +++ b/frontend/src/ts/modules/preview/component/preview-container.component.ts @@ -0,0 +1,9 @@ +import {Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "[preview-container]", + templateUrl: "../../../../../src/resources/template/preview/preview_container.html" +}) +export class PreviewContainerComponent { +} diff --git a/frontend/src/ts/modules/preview/component/preview.component.ts b/frontend/src/ts/modules/preview/component/preview.component.ts new file mode 100644 index 00000000..b1ecab62 --- /dev/null +++ b/frontend/src/ts/modules/preview/component/preview.component.ts @@ -0,0 +1,9 @@ +import {Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "[preview]", + templateUrl: "../../../../../src/resources/template/preview/preview.html" +}) +export class PreviewComponent { +} diff --git a/frontend/src/ts/modules/preview/preview-routing.module.ts b/frontend/src/ts/modules/preview/preview-routing.module.ts new file mode 100644 index 00000000..0a5c665f --- /dev/null +++ b/frontend/src/ts/modules/preview/preview-routing.module.ts @@ -0,0 +1,20 @@ +import {NgModule} from "@angular/core"; +import {RouterModule, Routes} from "@angular/router"; +import {PreviewComponent} from "./component/preview.component"; +import {DYNAMIC_ROUTING} from "../../page.routing"; + +const previewRoutes: Routes = [ + { + path: 'preview', + component: PreviewComponent, + children: DYNAMIC_ROUTING, + } +]; + +@NgModule({ + imports: [RouterModule.forRoot(previewRoutes, {useHash: true})], + exports: [RouterModule] +}) +export class PreviewRoutingModule { + +} \ No newline at end of file diff --git a/frontend/src/ts/modules/preview/preview.main.ts b/frontend/src/ts/modules/preview/preview.main.ts new file mode 100644 index 00000000..2a5de47f --- /dev/null +++ b/frontend/src/ts/modules/preview/preview.main.ts @@ -0,0 +1,7 @@ +import {platformBrowserDynamic} from "@angular/platform-browser-dynamic"; +import {enableProdMode} from "@angular/core"; +import {PreviewModule} from "./preview.module"; + +window['dev_mode'] = true; +enableProdMode(); +platformBrowserDynamic().bootstrapModule(PreviewModule); diff --git a/frontend/src/ts/modules/preview/preview.module.ts b/frontend/src/ts/modules/preview/preview.module.ts new file mode 100644 index 00000000..a2817177 --- /dev/null +++ b/frontend/src/ts/modules/preview/preview.module.ts @@ -0,0 +1,53 @@ +import {NgModule, NgZone} from "@angular/core"; +import {FormsModule} from "@angular/forms"; +import {BrowserModule} from "@angular/platform-browser"; +import {AgGridModule} from "ag-grid-angular"; +import {PreviewComponent} from "./component/preview.component"; +import {PreviewRoutingModule} from "./preview-routing.module"; +import {PreviewContainerComponent} from "./component/preview-container.component"; +import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; +import {ToastNoAnimationModule} from "ngx-toastr"; +import {AppModule} from "../app/app.module"; +import {ComponentsModule, CoreModule, SecurityModule} from "@webbpm/base-package"; +import {TaskParamsProvider} from "@webbpm/base-package"; +import {HTTP_INTERCEPTORS} from "@angular/common/http"; +import {HttpPreviewInterceptor} from "./service/http-preview-interceptor.service"; + +export const HTTP_INTERCEPTOR_PROVIDERS = [ + { provide: HTTP_INTERCEPTORS, useClass: HttpPreviewInterceptor, multi: true } +]; + +let IMPORTS = [ + BrowserModule, + FormsModule, + NgbModule, + ToastNoAnimationModule.forRoot(), + AgGridModule, + CoreModule, + ComponentsModule, + AppModule, + SecurityModule, + PreviewRoutingModule +]; + +@NgModule({ + imports: IMPORTS, + declarations: [ + PreviewContainerComponent, + PreviewComponent + ], + exports: [], + providers: [ + TaskParamsProvider, + HTTP_INTERCEPTOR_PROVIDERS + ], + bootstrap: [ + PreviewContainerComponent + ] +}) +export class PreviewModule { + + constructor(zone: NgZone) { + window['zoneImpl'] = zone; + } +} diff --git a/frontend/src/ts/modules/preview/service/http-preview-interceptor.service.ts b/frontend/src/ts/modules/preview/service/http-preview-interceptor.service.ts new file mode 100644 index 00000000..ca7d7b5f --- /dev/null +++ b/frontend/src/ts/modules/preview/service/http-preview-interceptor.service.ts @@ -0,0 +1,16 @@ +import {Injectable} from "@angular/core"; +import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http"; +import {EMPTY, Observable} from "rxjs"; +import {catchError} from "rxjs/operators"; + +@Injectable() +export class HttpPreviewInterceptor implements HttpInterceptor { + + intercept(req: HttpRequest, next: HttpHandler): Observable> { + + return next.handle(req).pipe(catchError(() => { + return EMPTY; + } + )); + } +} \ No newline at end of file diff --git a/frontend/src/ts/modules/webbpm/component/home.component.ts b/frontend/src/ts/modules/webbpm/component/home.component.ts new file mode 100644 index 00000000..7361c8a4 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/component/home.component.ts @@ -0,0 +1,9 @@ +import {Component} from "@angular/core"; + +@Component({ + moduleId: module.id, + selector: "home", + templateUrl: './../../../../../src/resources/template/webbpm/home.html' +}) +export class HomeComponent { +} diff --git a/frontend/src/ts/modules/webbpm/component/webbpm.component.ts b/frontend/src/ts/modules/webbpm/component/webbpm.component.ts new file mode 100644 index 00000000..bbbe45a8 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/component/webbpm.component.ts @@ -0,0 +1,36 @@ +import {Component} from "@angular/core"; +import { + Event, + NavigationCancel, + NavigationEnd, + NavigationError, + NavigationStart, + Router +} from "@angular/router"; +import {ProgressIndicationService} from "@webbpm/base-package"; +import {AppJivoChatWidgetService} from "../../app/service/app-jivo-chat.service"; + +@Component({ + moduleId: module.id, + selector: '[webbpm]', + templateUrl: './../../../../../src/resources/template/webbpm/webbpm.html' +}) +export class WebbpmComponent { + public headerVisible: boolean = true; + public footerVisible: boolean = true; + + constructor(private router: Router, + private progressIndicationService: ProgressIndicationService, + private appJivoChatWidgetService: AppJivoChatWidgetService) { + router.events.subscribe((event: Event) => { + if (event instanceof NavigationStart) { + progressIndicationService.showProgressBar(); + } + else if (event instanceof NavigationEnd + || event instanceof NavigationError + || event instanceof NavigationCancel) { + progressIndicationService.hideProgressBar(); + } + }) + } +} diff --git a/frontend/src/ts/modules/webbpm/handler/global-error.handler.prod.ts b/frontend/src/ts/modules/webbpm/handler/global-error.handler.prod.ts new file mode 100644 index 00000000..5665de78 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/handler/global-error.handler.prod.ts @@ -0,0 +1,10 @@ +import {ErrorHandler, Injectable, Injector} from '@angular/core'; +import {BaseErrorHandler} from "@webbpm/base-package"; + +@Injectable({providedIn: 'root'}) +export class GlobalErrorHandler extends BaseErrorHandler implements ErrorHandler { + + constructor(injector: Injector) { + super(injector); + } +} diff --git a/frontend/src/ts/modules/webbpm/handler/global-error.handler.ts b/frontend/src/ts/modules/webbpm/handler/global-error.handler.ts new file mode 100644 index 00000000..4350c080 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/handler/global-error.handler.ts @@ -0,0 +1,35 @@ +import {ErrorHandler, Injectable, Injector} from '@angular/core'; +import {BaseErrorHandler} from "@webbpm/base-package"; + +//todo: will be used after angular update in dev mode +@Injectable({providedIn: 'root'}) +export class GlobalErrorHandler extends BaseErrorHandler implements ErrorHandler { + + constructor(injector: Injector) { + super(injector); + } + + handleError(error) { + const chunkFailedMessage = /Loading chunk [\d]+ failed/; + + if (chunkFailedMessage.test(error.message)) { + window.location.reload(); + } + else if (!this.isPreviewPage()) { + super.handleError(error); + } + } + + internalHandleError(error) { + if (this.isPreviewPage()) { + return; + } + else { + super.internalHandleError(error); + } + } + + private isPreviewPage() { + return window.location.hash.includes("webbpm-preview"); + } +} diff --git a/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.prod.ts b/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.prod.ts new file mode 100644 index 00000000..07735d52 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.prod.ts @@ -0,0 +1,12 @@ +import {HTTP_INTERCEPTORS} from "@angular/common/http"; +import { + FormDirtyInterceptor, + HttpSecurityErrorInterceptor, + HttpSecurityInterceptor +} from "@webbpm/base-package"; + +export const DEFAULT_HTTP_INTERCEPTOR_PROVIDERS = [ + {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityInterceptor, multi: true}, + {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityErrorInterceptor, multi: true}, + {provide: HTTP_INTERCEPTORS, useClass: FormDirtyInterceptor, multi: true} +]; diff --git a/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.ts b/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.ts new file mode 100644 index 00000000..ee46e0c2 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/interceptor/default-interceptors.ts @@ -0,0 +1,9 @@ +import {HTTP_INTERCEPTORS} from "@angular/common/http"; +import {FormDirtyInterceptor, HttpSecurityInterceptor} from "@webbpm/base-package"; +import {DevHttpSecurityErrorInterceptor} from "./http-security-error-interceptor.dev"; + +export const DEFAULT_HTTP_INTERCEPTOR_PROVIDERS = [ + {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityInterceptor, multi: true}, + {provide: HTTP_INTERCEPTORS, useClass: DevHttpSecurityErrorInterceptor, multi: true}, + {provide: HTTP_INTERCEPTORS, useClass: FormDirtyInterceptor, multi: true} +]; diff --git a/frontend/src/ts/modules/webbpm/interceptor/http-security-error-interceptor.dev.ts b/frontend/src/ts/modules/webbpm/interceptor/http-security-error-interceptor.dev.ts new file mode 100644 index 00000000..11a0c2b2 --- /dev/null +++ b/frontend/src/ts/modules/webbpm/interceptor/http-security-error-interceptor.dev.ts @@ -0,0 +1,31 @@ +import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http"; +import {HttpSecurityErrorInterceptor, MessagesService, UserService} from "@webbpm/base-package"; +import {Injectable} from "@angular/core"; +import {Router} from "@angular/router"; +import {EMPTY, Observable} from "rxjs"; +import {catchError} from "rxjs/operators"; + +@Injectable() +export class DevHttpSecurityErrorInterceptor extends HttpSecurityErrorInterceptor + implements HttpInterceptor { + private router: Router; + + + constructor(router: Router, messagesService: MessagesService, userService: UserService) { + super(router, messagesService, userService); + this.router = router; + } + + intercept(req: HttpRequest, next: HttpHandler): Observable> { + + if (window.location.hash.includes("webbpm-preview")) { + return next.handle(req).pipe(catchError(() => { + return EMPTY; + } + )); + } + else { + return super.intercept(req, next); + } + } +} diff --git a/frontend/src/ts/modules/webbpm/user-management-routing.module.ts b/frontend/src/ts/modules/webbpm/user-management-routing.module.ts new file mode 100644 index 00000000..140ba29c --- /dev/null +++ b/frontend/src/ts/modules/webbpm/user-management-routing.module.ts @@ -0,0 +1,88 @@ +import {RouterModule, Routes} from "@angular/router"; +import {NgModule} from "@angular/core"; +import { + AuthenticationGuard, + ConfirmExitGuard +} from "@webbpm/base-package"; + +const routes: Routes = [ + { + path: 'user-management', + canActivate: [AuthenticationGuard], + children: [ + { + path: 'users', + loadChildren: 'generated-sources/page-user-management-users.module#PageusermanagementusersModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'users/new', + loadChildren: 'generated-sources/page-user-management-user-create.module#PageusermanagementusercreateModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'users/:id', + loadChildren: 'generated-sources/page-user-management-user-edit.module#PageusermanagementusereditModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'org-units', + loadChildren: 'generated-sources/page-user-management-org-units.module#PageusermanagementorgunitsModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'org-units/new', + loadChildren: 'generated-sources/page-user-management-org-unit.module#PageusermanagementorgunitModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'org-units/:id', + loadChildren: 'generated-sources/page-user-management-org-unit.module#PageusermanagementorgunitModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'roles', + loadChildren: 'generated-sources/page-user-management-roles.module#PageusermanagementrolesModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'roles/new', + loadChildren: 'generated-sources/page-user-management-role.module#PageusermanagementroleModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'roles/:id', + loadChildren: 'generated-sources/page-user-management-role.module#PageusermanagementroleModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'groups', + loadChildren: 'generated-sources/page-user-management-groups.module#PageusermanagementgroupsModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'groups/new', + loadChildren: 'generated-sources/page-user-management-group-create.module#PageusermanagementgroupcreateModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'groups/:id', + loadChildren: 'generated-sources/page-user-management-group-edit.module#PageusermanagementgroupeditModule', + canActivate: [ConfirmExitGuard] + }, + { + path: 'authorities', + loadChildren: 'generated-sources/page-user-management-authorities.module#PageusermanagementauthoritiesModule', + canActivate: [ConfirmExitGuard] + } + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class UserManagementRoutingModule { + +} diff --git a/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts b/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts new file mode 100644 index 00000000..853adb1b --- /dev/null +++ b/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts @@ -0,0 +1,51 @@ +import {NgModule} from "@angular/core"; +import {RouterModule, Routes} from "@angular/router"; +import {HomeComponent} from "./component/home.component"; +import { + AuthenticationGuard, + HistoryLocationGuard, + TaskPageRouteResolver, + ConfirmExitGuard +} from "@webbpm/base-package"; +import {DYNAMIC_ROUTING} from "../../page.routing"; +import {TaskComponent} from "./../app/component/task.component"; +import {TaskNotFoundComponent} from "./../app/component/task-not-found.component"; + +const webbpmRoutes: Routes = [ + { + path: '', + component: HomeComponent, + canActivate: [AuthenticationGuard, ConfirmExitGuard], + pathMatch: 'full', + }, + { + path: 'process/:processInstanceId/task/:taskId', + component: TaskComponent, + children: DYNAMIC_ROUTING, + canActivate: [HistoryLocationGuard], + resolve: { + taskPage: TaskPageRouteResolver + }, + runGuardsAndResolvers: "always" + }, + { + path: 'process/task-not-found', + component: TaskNotFoundComponent, + canActivate: [AuthenticationGuard] + }, + { + path: '**', + redirectTo: '', + } +]; + +@NgModule({ + imports: [RouterModule.forRoot(webbpmRoutes, { + useHash: true, + onSameUrlNavigation: "reload" + })], + exports: [RouterModule] +}) +export class WebbpmRoutingModule { + +} diff --git a/frontend/src/ts/modules/webbpm/webbpm.module.ts b/frontend/src/ts/modules/webbpm/webbpm.module.ts new file mode 100644 index 00000000..427c848b --- /dev/null +++ b/frontend/src/ts/modules/webbpm/webbpm.module.ts @@ -0,0 +1,62 @@ +import {ErrorHandler, NgModule} from "@angular/core"; +import {BrowserModule} from "@angular/platform-browser"; +import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; +import {FormsModule} from "@angular/forms"; +import {AgGridModule} from "ag-grid-angular"; +import {WebbpmComponent} from "./component/webbpm.component"; +import {WebbpmRoutingModule} from "./webbpm-routing.module"; +import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; +import {ToastNoAnimationModule} from "ngx-toastr"; +import {AppModule} from "../app/app.module"; +import {HomeComponent} from "./component/home.component"; +import { + BpmnModule, + ComponentsModule, + CoreModule, + SecurityModule, +} from "@webbpm/base-package"; +import {TaskParamsProvider} from "@webbpm/base-package"; +import {ProcessInstanceParamsProvider} from "@webbpm/base-package"; +import {AppRoutingModule} from "../app/app-routing.module"; +import {AppJivoChatWidgetService} from "../app/service/app-jivo-chat.service"; +import {UserManagementRoutingModule} from "./user-management-routing.module"; +import {GlobalErrorHandler} from "./handler/global-error.handler.prod"; +import {DEFAULT_HTTP_INTERCEPTOR_PROVIDERS} from "./interceptor/default-interceptors.prod"; + +let IMPORTS = [ + BrowserAnimationsModule, + BrowserModule, + FormsModule, + NgbModule, + ToastNoAnimationModule.forRoot(), + AgGridModule, + AppRoutingModule, + UserManagementRoutingModule, + BpmnModule, + CoreModule, + ComponentsModule, + SecurityModule, + AppModule, + WebbpmRoutingModule +]; + +@NgModule({ + imports: IMPORTS, + declarations: [ + WebbpmComponent, + HomeComponent + ], + exports: [], + providers: [ + TaskParamsProvider, + ProcessInstanceParamsProvider, + AppJivoChatWidgetService, + {provide: ErrorHandler, useClass: GlobalErrorHandler}, + DEFAULT_HTTP_INTERCEPTOR_PROVIDERS + ], + bootstrap: [ + WebbpmComponent + ] + }) +export class WebbpmModule { +} diff --git a/frontend/src/ts/page.routing.d.ts b/frontend/src/ts/page.routing.d.ts new file mode 100644 index 00000000..ff077ee3 --- /dev/null +++ b/frontend/src/ts/page.routing.d.ts @@ -0,0 +1,3 @@ +import {Routes} from "@angular/router"; + +declare const DYNAMIC_ROUTING: Routes; \ No newline at end of file diff --git a/frontend/src/ts/polyfills.ts b/frontend/src/ts/polyfills.ts new file mode 100644 index 00000000..4eb6fea2 --- /dev/null +++ b/frontend/src/ts/polyfills.ts @@ -0,0 +1,59 @@ +/** IE9, IE10 and IE11 requires all of the following polyfills. **/ +import 'core-js/es6/symbol'; +import 'core-js/es6/object'; +import 'core-js/es6/function'; +import 'core-js/es6/parse-int'; +import 'core-js/es6/parse-float'; +import 'core-js/es6/number'; +import 'core-js/es6/math'; +import 'core-js/es6/string'; +import 'core-js/es6/date'; +import 'core-js/es6/array'; +import 'core-js/es6/regexp'; +import 'core-js/es6/map'; +import 'core-js/es6/weak-map'; +import 'core-js/es6/set'; +import 'core-js/es6/promise'; +import 'core-js/es7'; +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. + +/** IE10 and IE11 requires the following for the Reflect API. */ +// import 'core-js/es6/reflect'; + +​ +/** Evergreen browsers require these. **/ +// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. + + + +/** + * Required to support Web Animations `@angular/platform-browser/animations`. + * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation + **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + +/** + * By default, zone.js will patch all possible macroTask and DomEvents + * user can disable parts of macroTask/DomEvents patch by setting following flags + */ + + // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame + // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick + // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + + /* + * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js + * with the following flag, it will bypass `zone.js` patch for IE/Edge + */ +// (window as any).__Zone_enable_cross_context_check = true; +​ +/*************************************************************************************************** + * Zone JS is required by default for Angular itself. + */ +import 'zone.js/dist/zone';// Included with Angular CLI.​ + +​ +/*************************************************************************************************** + * APPLICATION IMPORTS + */ diff --git a/frontend/src/ts/vendor.ts b/frontend/src/ts/vendor.ts new file mode 100644 index 00000000..797b170c --- /dev/null +++ b/frontend/src/ts/vendor.ts @@ -0,0 +1,38 @@ +// Angular +import '@angular/core'; +import '@angular/common'; +import '@angular/common/http'; +import '@angular/forms'; +import '@angular/platform-browser'; +import '@angular/router'; +import '@angular/animations'; +import '@webbpm/base-package'; +// RxJS +import 'rxjs'; +import 'rxjs-compat'; +import 'rxjs/operators'; +import 'rxjs/internal-compatibility'; +import 'rxjs/ajax'; +import 'rxjs/testing'; +import 'rxjs/webSocket'; +//jquery +import 'jquery'; +//popper +import 'popper.js'; +//bootstrap +import '@ng-bootstrap/ng-bootstrap'; +import 'bootstrap'; +//mask +import 'inputmask'; +//grid +import 'ag-grid-community'; +import 'ag-grid-angular'; +//selectize +import 'selectize'; +//datepicker +import 'eonasdan-bootstrap-datetimepicker'; +import 'moment-timezone'; +//ngx-toastr +import 'ngx-toastr'; +//ngx-cookie +import 'ngx-cookie'; diff --git a/frontend/systemjs.config.js b/frontend/systemjs.config.js new file mode 100644 index 00000000..5b9937f0 --- /dev/null +++ b/frontend/systemjs.config.js @@ -0,0 +1,93 @@ +(function(global) { + System.config({ + transpiler: 'plugin-babel', + paths: { + 'npm:': 'node_modules/', + 'generated-sources': 'build_dev/js/generated-sources' + }, + map: { + 'webbpm': 'build_dev/js', + '@angular/core': 'npm:@angular/core/bundles/core.umd.js', + '@angular/common': 'npm:@angular/common/bundles/common.umd.js', + '@angular/common/http': 'npm:@angular/common/bundles/common-http.umd.js', + '@angular/common/locales': 'npm:@angular/common/locales', + '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js', + '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js', + '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', + '@angular/router': 'npm:@angular/router/bundles/router.umd.js', + '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.js', + '@angular/animations/browser': 'npm:@angular/animations/bundles/animations-browser.umd.js', + '@angular/platform-browser/animations':'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', + '@ng-bootstrap/ng-bootstrap': 'npm:@ng-bootstrap/ng-bootstrap/bundles/ng-bootstrap.umd.js', + 'bootstrap': 'npm:bootstrap', + '@webbpm/base-package': 'npm:@webbpm/base-package/bundles/webbpm-base-package.umd.js', + 'angular-calendar': 'npm:angular-calendar/bundles/angular-calendar.umd.js', + 'angular-calendar/date-adapters/date-fns': 'npm:angular-calendar/date-adapters/date-fns/index.js', + 'angular-draggable-droppable': 'npm:angular-draggable-droppable/bundles/angular-draggable-droppable.umd.js', + 'angular-resizable-element': 'npm:angular-resizable-element/bundles/angular-resizable-element.umd.js', + 'calendar-utils': 'npm:calendar-utils/bundles/calendar-utils.umd.js', + 'calendar-utils/date-adapters/date-fns': 'npm:calendar-utils/date-adapters/date-fns/index.js', + 'date-fns': 'npm:date-fns', + 'ngx-cookie': 'npm:ngx-cookie/bundles/ngx-cookie.umd.js', + 'moment': 'npm:moment', + 'moment-timezone': 'npm:moment-timezone', + 'positioning': 'npm:positioning/dist/positioning.js', + 'rxjs': 'npm:rxjs', + 'rxjs-compat': 'npm:rxjs-compat', + 'rxjs/operators': 'npm:rxjs/operators', + 'rxjs/internal-compatibility': 'npm:rxjs/internal-compatibility', + 'rxjs/ajax': 'npm:rxjs/ajax', + 'rxjs/testing': 'npm:rxjs/testing', + 'rxjs/webSocket': 'npm:rxjs/webSocket', + 'jquery': 'npm:jquery/dist/jquery.js', + 'popper.js': 'npm:popper.js/dist/umd/popper.js', + 'sifter': 'npm:sifter/sifter.min.js', + 'microplugin': 'npm:microplugin/src/microplugin.js', + 'selectize': 'npm:selectize/dist/js/selectize.min.js', + 'ngx-toastr': 'npm:ngx-toastr/bundles/ngx-toastr.umd.min.js', + 'eonasdan-bootstrap-datetimepicker': 'npm:eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js', + 'autonumeric': 'npm:autonumeric', + 'jsgantt-improved': 'npm:jsgantt-improved/dist/jsgantt.js', + 'js-year-calendar': 'npm:js-year-calendar/dist/js-year-calendar.js', + 'ag-grid-angular': 'npm:ag-grid-angular/bundles/ag-grid-angular.umd.js', + 'ag-grid-community': 'npm:ag-grid-community/dist/ag-grid-community.cjs.js', + 'inputmask': 'npm:inputmask', + 'downloadjs': 'npm:downloadjs/download.js', + 'esmarttokenjs': 'npm:esmarttokenjs/esmarttoken.js', + 'cadesplugin_api': 'npm:cadesplugin_api/index.js', + 'plugin-babel': 'npm:systemjs-plugin-babel/plugin-babel.js', + 'systemjs-babel-build': 'npm:systemjs-plugin-babel/systemjs-babel-browser.js', + 'chart.js': 'npm:chart.js/dist', + 'chartjs-adapter-moment': 'npm:chartjs-adapter-moment/dist/chartjs-adapter-moment.js', + 'tslib': 'npm:tslib/tslib.js', + 'ngx-international-phone-number': 'npm:ngx-international-phone-number/ngx-international-phone-number.umd.js', + 'google-libphonenumber': 'npm:google-libphonenumber/dist/libphonenumber.js' + }, + packages: { + 'webbpm': { main: 'main', defaultExtension: 'js'}, + '@angular/common/locales': { defaultExtension: 'js'}, + 'date-fns': { main: 'index.js', defaultExtension: 'js'}, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, + 'rxjs-compat': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/operators': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/internal-compatibility':{ main: "index.js", defaultExtension: 'js'}, + 'rxjs/ajax': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/testing': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/webSocket': { main: "index.js", defaultExtension: 'js'}, + 'moment': { main: 'min/locales.min', defaultExtension: 'js' }, + 'moment-es6': { main: 'index.js', defaultExtension: 'js' }, + 'moment-timezone': { main: 'builds/moment-timezone-with-data.min', defaultExtension: 'js' }, + 'bootstrap': { main: 'dist/js/bootstrap', defaultExtension: 'js'}, + 'lib': { format: 'register', defaultExtension: 'js' }, + 'autonumeric': { + main: 'dist/autoNumeric.js' + }, + 'chart.js': { main: 'chart.js', defaultExtension: 'js' }, + 'inputmask': { + main: 'dist/inputmask.js', + defaultExtension: 'js' + } + } + }); +})(this); diff --git a/frontend/systemjs.preview.config.js b/frontend/systemjs.preview.config.js new file mode 100644 index 00000000..d2c44870 --- /dev/null +++ b/frontend/systemjs.preview.config.js @@ -0,0 +1,92 @@ +(function(global) { + System.config({ + transpiler: 'plugin-babel', + paths: { + 'npm:': 'node_modules/', + 'generated-sources': 'build_dev/js/generated-sources' + }, + map: { + 'preview': 'build_dev/js', + '@angular/core': 'npm:@angular/core/bundles/core.umd.js', + '@angular/common': 'npm:@angular/common/bundles/common.umd.js', + '@angular/common/http': 'npm:@angular/common/bundles/common-http.umd.js', + '@angular/common/locales': 'npm:@angular/common/locales', + '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js', + '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js', + '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', + '@angular/router': 'npm:@angular/router/bundles/router.umd.js', + '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.js', + '@angular/animations/browser': 'npm:@angular/animations/bundles/animations-browser.umd.js', + '@angular/platform-browser/animations':'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', + '@ng-bootstrap/ng-bootstrap': 'npm:@ng-bootstrap/ng-bootstrap/bundles/ng-bootstrap.umd.js', + 'bootstrap': 'npm:bootstrap', + '@webbpm/base-package': 'npm:@webbpm/base-package/bundles/webbpm-base-package.umd.js', + 'angular-calendar': 'npm:angular-calendar/bundles/angular-calendar.umd.js', + 'angular-calendar/date-adapters/date-fns': 'npm:angular-calendar/date-adapters/date-fns/index.js', + 'angular-draggable-droppable': 'npm:angular-draggable-droppable/bundles/angular-draggable-droppable.umd.js', + 'angular-resizable-element': 'npm:angular-resizable-element/bundles/angular-resizable-element.umd.js', + 'calendar-utils': 'npm:calendar-utils/bundles/calendar-utils.umd.js', + 'calendar-utils/date-adapters/date-fns': 'npm:calendar-utils/date-adapters/date-fns/index.js', + 'date-fns': 'npm:date-fns', + 'ngx-cookie': 'npm:ngx-cookie/bundles/ngx-cookie.umd.js', + 'moment': 'npm:moment', + 'moment-timezone': 'npm:moment-timezone', + 'positioning': 'npm:positioning/dist/positioning.js', + 'rxjs': 'npm:rxjs', + 'rxjs-compat': 'npm:rxjs-compat', + 'rxjs/operators': 'npm:rxjs/operators', + 'rxjs/internal-compatibility': 'npm:rxjs/internal-compatibility', + 'rxjs/ajax': 'npm:rxjs/ajax', + 'rxjs/testing': 'npm:rxjs/testing', + 'rxjs/webSocket': 'npm:rxjs/webSocket', + 'jquery': 'npm:jquery/dist/jquery.js', + 'popper.js': 'npm:popper.js/dist/umd/popper.js', + 'sifter': 'npm:sifter/sifter.min.js', + 'microplugin': 'npm:microplugin/src/microplugin.js', + 'selectize': 'npm:selectize/dist/js/selectize.min.js', + 'ngx-toastr': 'npm:ngx-toastr/bundles/ngx-toastr.umd.min.js', + 'eonasdan-bootstrap-datetimepicker': 'npm:eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js', + 'autonumeric': 'npm:autonumeric', + 'jsgantt-improved': 'npm:jsgantt-improved/dist/jsgantt.js', + 'js-year-calendar': 'npm:js-year-calendar/dist/js-year-calendar.js', + 'ag-grid-angular': 'npm:ag-grid-angular/bundles/ag-grid-angular.umd.js', + 'ag-grid-community': 'npm:ag-grid-community/dist/ag-grid-community.cjs.js', + 'inputmask': 'npm:inputmask', + 'downloadjs': 'npm:downloadjs/download.js', + 'esmarttokenjs': 'npm:esmarttokenjs/esmarttoken.js', + 'cadesplugin_api': 'npm:cadesplugin_api/index.js', + 'plugin-babel': 'npm:systemjs-plugin-babel/plugin-babel.js', + 'systemjs-babel-build': 'npm:systemjs-plugin-babel/systemjs-babel-browser.js', + 'chart.js': 'npm:chart.js/dist', + 'chartjs-adapter-moment': 'npm:chartjs-adapter-moment/dist/chartjs-adapter-moment.js', + 'tslib': 'npm:tslib/tslib.js', + 'ngx-international-phone-number': 'npm:ngx-international-phone-number/ngx-international-phone-number.umd.js', + 'google-libphonenumber': 'npm:google-libphonenumber/dist/libphonenumber.js' + }, + packages: { + 'preview': { main: './modules/preview/preview.main', defaultExtension: 'js'}, + '@angular/common/locales': { defaultExtension: 'js'}, + 'date-fns': { main: 'index.js', defaultExtension: 'js'}, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, + 'rxjs-compat': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/operators': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/internal-compatibility':{ main: "index.js", defaultExtension: 'js'}, + 'rxjs/ajax': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/testing': { main: "index.js", defaultExtension: 'js'}, + 'rxjs/webSocket': { main: "index.js", defaultExtension: 'js'}, + 'moment': { main: 'min/locales.min', defaultExtension: 'js' }, + 'moment-timezone': { main: 'builds/moment-timezone-with-data.min', defaultExtension: 'js' }, + 'bootstrap': { main: 'dist/js/bootstrap', defaultExtension: 'js'}, + 'lib': { format: 'register', defaultExtension: 'js' }, + 'autonumeric': { + main: 'dist/autoNumeric.js' + }, + 'chart.js': { main: 'chart.js', defaultExtension: 'js' }, + 'inputmask': { + main: 'dist/inputmask.js', + defaultExtension: 'js' + } + } + }); +})(this); diff --git a/frontend/tsconfig.aot.json b/frontend/tsconfig.aot.json new file mode 100644 index 00000000..8e2aad30 --- /dev/null +++ b/frontend/tsconfig.aot.json @@ -0,0 +1,42 @@ +{ + "compilerOptions": { + "target": "es5", + "module": "commonjs", + "moduleResolution": "node", + "declaration": false, + "sourceMap": false, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "removeComments": false, + "skipLibCheck": true, + "noImplicitAny": false, + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2016", + "dom", + "es2017.object", + "es2018.promise" + ] + }, + "compileOnSave": false, + "buildOnSave": false, + "include": [ + "src/ts/**/*" + ], + "exclude": [ + "node_modules", + "./node_modules/@types", + "src/ts/main.ts", + "**/*.spec.ts", + "src/test.ts" + ], + "angularCompilerOptions": { + "skipMetadataEmit": true, + "alwaysCompileGeneratedCode":true, + "preserveWhitespaces": false, + "annotationsAs": "decorators", + "mainPath": "./src/ts" + } +} \ No newline at end of file diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json new file mode 100644 index 00000000..d977dd54 --- /dev/null +++ b/frontend/tsconfig.json @@ -0,0 +1,40 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "target": "es5", + "module": "commonjs", + "moduleResolution": "node", + "declaration": false, + "inlineSourceMap": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "removeComments": false, + "skipLibCheck": true, + "noImplicitAny": false, + "outDir": "build_dev/js", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2016", + "dom", + "es2017.object", + "es2018.promise" + ] + }, + "compileOnSave": false, + "buildOnSave": false, + "include": [ + "src/ts/**/*" + ], + "exclude": [ + "node_modules", + "./node_modules/@types", + "**/*.ngfactory.ts", + "**/*.shim.ts", + "src/ts/main.aot.ts", + "src/ts/generated-sources/**/*", + "src/ts/page.routing.ts", + "src/ts/aot" + ] +} diff --git a/frontend/webpack.aot.config.js b/frontend/webpack.aot.config.js new file mode 100644 index 00000000..6615ed72 --- /dev/null +++ b/frontend/webpack.aot.config.js @@ -0,0 +1,136 @@ +'use strict'; +const path = require('path'); +const webpack = require('webpack'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +const MiniCssExtractPlugin = require("mini-css-extract-plugin"); +const TerserPlugin = require('terser-webpack-plugin'); + +function _path(p) { + return path.join(__dirname, p); +} + +module.exports = { + mode: 'production', + entry: { + 'polyfills': './build/scripts/polyfills.js', + 'vendor': './build/scripts/vendor.js', + 'main': './build/scripts/main.aot.js' + }, + + context: process.cwd(), + + output: { + path: path.join(process.cwd(), './dist'), + filename: '[name].[chunkhash].bundle.js', + chunkFilename: '[id].[chunkhash].chunk.js' + }, + + module: { + rules: [ + { + test: /\.js$/, + loader: 'babel-loader', + include: [path.resolve(__dirname, "node_modules")], + options: { + presets: ['@babel/preset-env'] + } + }, + { + test: /\.js$/, + loader: 'angular-router-loader?aot=true' + }, + { + test: /\.html$/, + loader: 'raw-loader' + }, + { + test: /\.css$/, + use: [ + { + loader: MiniCssExtractPlugin.loader, + options: { + // you can specify a publicPath here + // by default it use publicPath in webpackOptions.output + // publicPath: '../' + } + }, + "css-loader" + ] + }, + { + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|otf)$/, + loader: 'file-loader?name=src/resources/[name].[hash].[ext]' + } + ] + }, + + optimization: { + minimizer: [ + new TerserPlugin({ + cache: true, + parallel: true, + terserOptions: { + // https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions + } + }) + ], + splitChunks: { + // include all types of chunks + chunks: 'all' + } + }, + + plugins: [ + // new BundleAnalyzerPlugin(), + new HtmlWebpackPlugin({ + template: 'index.webpack.html', + filename: 'index.html', + chunksSortMode : 'none' + }), + new CopyWebpackPlugin([ + {from: 'index.webpack.html', to: 'index.html'}, + {from: 'src/resources/img/progress.gif', to: 'src/resources/img/progress.gif'}, + {from: 'src/resources/img/logo.png', to: 'src/resources/img/logo.png'}, + {from: 'src/resources/app-config.json', to: 'src/resources/app-config.json'}, + {from: 'src/resources/app.version', to: 'src/resources/app.version'} + ]), + new MiniCssExtractPlugin({ + filename: '[name].[hash].css', + chunkFilename: '[id].[hash].css' + }), + new webpack.ProvidePlugin({ + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery", + Popper: ['popper.js', 'default'] + }) + ], + + resolve: { + alias: { + 'jquery': _path('node_modules/jquery/dist/jquery.min'), + 'inputmask': _path('node_modules/inputmask/dist/inputmask'), + 'downloadjs': _path('node_modules/downloadjs/download.min.js'), + 'esmarttokenjs': _path('node_modules/esmarttokenjs/esmarttoken.js'), + 'cadesplugin_api': _path('node_modules/cadesplugin_api/index.js'), + 'eonasdan-bootstrap-datetimepicker': _path('node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker'), + 'autonumeric': _path('node_modules/autonumeric/dist/autoNumeric.js'), + 'jsgantt-improved': _path('node_modules/jsgantt-improved/dist/jsgantt.js'), + 'js-year-calendar': _path('node_modules/js-year-calendar/dist/js-year-calendar.js'), + 'chart.js': _path('node_modules/chart.js/dist/chart.js') + }, + modules: [ + 'node_modules', + path.resolve(process.cwd(), './build'), + path.resolve(process.cwd(), './build/scripts'), + ], + extensions: ['.js'] + }, + + stats: { + children: false + }, + devtool: false +}; diff --git a/packages/.gitkeep b/packages/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..9a0f9b97 --- /dev/null +++ b/pom.xml @@ -0,0 +1,659 @@ + + + 4.0.0 + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + pom + + + backend + resources + test + + + + scm:git:git://gitserver/webbpm/webbpm-components.git + + + + 1.0.1.RELEASE + 6.15.0 + 2.9.2 + UTF-8 + 72000 + 1.60 + false + 3.172.4 + + + + + + ru.cg.webbpm + platform-bom + ${webbpm-platform.version} + pom + import + + + ervu_lkrp_ul.ervu_lkrp_ul + backend + ${project.version} + war + + + ru.cg.webbpm.packages.base + backend + ${webbpm-platform.version} + + + ervu_lkrp_ul.ervu_lkrp_ul + backend + ${project.version} + classes + + + ervu_lkrp_ul.ervu_lkrp_ul + frontend + ${project.version} + war + + + ervu_lkrp_ul.ervu_lkrp_ul + resources + ${project.version} + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-fonts + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.core + core-runtime-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.core + error-handling-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.core + metrics + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.webkit + active-users-tracker + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.resources + resources-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.resources + resources-impl + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.resources + resources-impl-development + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules + webkit-base + ${webbpm-platform.version} + + + ru.cg.webbpm.modules + webkit-beans + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.database + database-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.database + database-impl + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.security + security-beans + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.security + security-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.bpmn + bpmn-deploy + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.bpmn + bpmn-beans + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.bpmn + bpmn-variable-condition-adapter + ${webbpm-platform.version} + + + ru.cg.webbpm.modules + webkit-rpc + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.jndi + jndi-beans + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.jndi + jndi-inject + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.database + database-test + ${webbpm-platform.version} + + + ru.cg.webbpm.modules + standard-annotations + ${webbpm-platform.version} + + + ru.cg.webbpm.modules + inject + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.reporting + reporting-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.reporting + reporting-runtime-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.reporting + reporting-runtime-impl + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-impl + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.reporting.reporting-jasper + reporting-jasper-runtime-impl + ${webbpm-platform.version} + runtime + + + bcmail-jdk14 + bouncycastle + + + bcprov-jdk14 + bouncycastle + + + bcprov-jdk14 + org.bouncycastle + + + bcmail-jdk14 + org.bouncycastle + + + + + ru.cg.webbpm.modules.reporting.reporting-xdoc + reporting-xdoc-impl + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.reporting.reporting-xdoc + reporting-xdoc-runtime-impl + ${webbpm-platform.version} + runtime + + + ru.cg.webbpm.modules.security + security-esia + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.security + security-db-synchronization-api + ${webbpm-platform.version} + + + ru.cg.webbpm.modules.security + security-db-synchronization-ldap-impl + ${webbpm-platform.version} + + + ru.cg.webbpm + web-tests-core + ${webbpm-platform.version} + + + org.bouncycastle + bcprov-jdk15on + ${org.bouncycastle.version} + + + org.bouncycastle + bcpkix-jdk15on + ${org.bouncycastle.version} + + + org.springframework.security.kerberos + spring-security-kerberos-core + ${spring-security-kerberos.version} + + + org.springframework.security.kerberos + spring-security-kerberos-web + ${spring-security-kerberos.version} + + + org.apache.httpcomponents + httpcore + 4.4.12 + + + org.apache.httpcomponents + httpclient + 4.5.1 + + + org.mnode.ical4j + ical4j + 3.0.5 + + + org.apache.pdfbox + pdfbox + 2.0.21 + + + org.odftoolkit + odfdom-java + 0.8.7 + + + org.mockito + mockito-junit-jupiter + ${mockito-jupiter.version} + test + + + org.slf4j + slf4j-simple + 1.7.28 + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + true + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-site-plugin + 3.9.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + 3 + true + -Xmx1024m + + + + maven-war-plugin + 3.1.0.cg1 + + true + false + + + true + + + ${buildNumber} + jdk.unsupported + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.3.0 + false + + bom + + resolve + + true + /opt/buildAgent/work/d225ceb2ad727ec/project-archetype/target/classes + + + + flatten.clean + clean + + clean + + + + flatten + process-resources + + flatten + + + + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.19.0-Micord.1 + + true + true + 1 + true + true + true + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.1.0 + + + enforce + + enforce + + + + + true + + + ru.cg.webbpm.studio.plugins:java-metadata-plugin,ru.cg.webbpm.studio.plugins:rpc-generation-plugin,ru.cg.webbpm.studio.application:build-plugin,ru.cg.webbpm.studio.plugins:db-relation-plugin + + + true + true + + postgresql + + + + [3.6.0,) + + + [17,) + + + MODULE_ORDER,PLUGIN_MANAGEMENT_ORDER + + + true + false + true + + + + + + + + org.commonjava.maven.enforcer + enforce-managed-deps-rule + 1.2 + + + com.github.ferstl + pedantic-pom-enforcers + 2.1.0 + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.0.0 + + + validate + + create + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + + + + micord-public + micord-public + https://repo.micord.ru/repository/maven-public + + + micord + micord + https://repo.micord.ru/repository/maven-micord + + + + + micord-public + micord-public + https://repo.micord.ru/repository/maven-public + + + micord + micord + https://repo.micord.ru/repository/maven-micord + + + + + studio + + + dev + + true + + + distribution + frontend + + + + + ru.cg.webbpm.studio.application + build-plugin + ${webbpm-platform.version} + false + + ${wbp.overall-timeout} + + + + buildProject + + buildProject + + + + + + + + + prod + + distribution + frontend + + + + + ru.cg.webbpm.studio.application + build-plugin + ${webbpm-platform.version} + false + + ${wbp.overall-timeout} + + + + buildProject + + buildProject + + + + + + + + + unpack-studio + + + + + maven-dependency-plugin + + + unpack + process-resources + + unpack + + + + + + + ru.cg.webbpm.studio.application + launcher-full + install + zip + ${webbpm-platform.version} + true + ../ + + + + + + + + + + enable-version-in-url + + true + + + + diff --git a/project.md b/project.md new file mode 100644 index 00000000..eaef5b7b --- /dev/null +++ b/project.md @@ -0,0 +1,3 @@ +[TOC] + +TODO: здесь можно описать всё, что касается данного проекта. Например описание параметров. \ No newline at end of file diff --git a/resources/pom.xml b/resources/pom.xml new file mode 100644 index 00000000..97ce8e51 --- /dev/null +++ b/resources/pom.xml @@ -0,0 +1,101 @@ + + + 4.0.0 + + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + + + ervu_lkrp_ul.ervu_lkrp_ul + resources + + + + ru.cg.webbpm.modules.resources + resources-api + + + ru.cg.webbpm.modules.resources + resources-impl + + + + + + + src/main/generated-resources + + + src/main/resources + + **/*.page + **/*.component + **/*.beta-component + META-INF/components/** + META-INF/css-classes/** + META-INF/components-package.xml + META-INF/filtered/** + + + + src/main/resources + true + + META-INF/filtered/** + + + + + + com.alexnederlof + jasperreports-plugin + 2.8 + + + net.sf.jasperreports + jasperreports-functions + ${jasperreports.version} + + + joda-time + joda-time + ${joda-time.version} + + + + + process-sources + + jasper + + + + + + net.sf.jasperreports.engine.design.JRJdtCompiler + src/main/resources + src/main/resources + .jasper + true + false + 4 + true + org.codehaus.plexus.compiler.util.scan.StaleSourceScanner + + + + org.apache.maven.plugins + maven-clean-plugin + + + + src/main/generated-resources + + + + + + + + diff --git a/resources/src/main/resources/META-INF/components-package.xml b/resources/src/main/resources/META-INF/components-package.xml new file mode 100644 index 00000000..495665ac --- /dev/null +++ b/resources/src/main/resources/META-INF/components-package.xml @@ -0,0 +1,34 @@ + + + + + containers + 11000 + + + grids + 10000 + + + editable-grids + 9000 + + + buttons + 8000 + + + fields + 6000 + + + filters + 5000 + + + non-persist-fields + 4000 + + + META-INF/components/localization/default-components + \ No newline at end of file diff --git a/resources/src/main/resources/META-INF/filtered/resources.properties b/resources/src/main/resources/META-INF/filtered/resources.properties new file mode 100644 index 00000000..febc05ed --- /dev/null +++ b/resources/src/main/resources/META-INF/filtered/resources.properties @@ -0,0 +1,7 @@ +resources.groupId=${project.groupId} +resources.artifactId=${project.artifactId} +project.groupId=${parent.groupId} +project.artifactId=${parent.artifactId} +resources.version=${project.version} +build.number=${buildNumber} +resource.basedir=${project.basedir}/src/main diff --git a/resources/src/main/resources/business-model/.gitkeep b/resources/src/main/resources/business-model/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/resources/src/main/resources/business-model/Процессы/process-instance-list.page b/resources/src/main/resources/business-model/Процессы/process-instance-list.page new file mode 100644 index 00000000..c10fb213 --- /dev/null +++ b/resources/src/main/resources/business-model/Процессы/process-instance-list.page @@ -0,0 +1,127 @@ + + + process-instance-list + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + fe225a1a-1c03-485e-a069-18b92ab4f7f7 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + ProcessInstanceList + true + false + + + + + e24cd1b9-23e0-48dc-b0bf-60d2d1658494 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Текст + false + + + + + + + b42176d1-e538-45fb-aeb6-f51390228082 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Группа фильтров + false + + + + filterableComp + + null + + + + + + + + filterable + + {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + cc38963d-5d25-44f9-b3ff-6a308c811ce9 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Текст + false + + + + + + + 435a96a3-17b3-4f07-a5bf-f3b6270fc45b + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Статичный переключатель + false + + + + + + + + + + 5f560694-8ded-4d0c-b75c-b4c41c58d48c + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Вертикальный контейнер + false + + + + + 6443c41a-8c07-4ef7-98cf-0c2d76884dfd + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Горизонтальный контейнер + false + + + + + 61db7e91-9ace-418a-8a0d-d81877411d62 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Кнопка выбора + false + + + + 6c8d958f-4e3a-4606-be55-4ff9a6640cc7 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Кнопка выбора + false + + + + + + 3b06ffb8-18ef-4e69-8475-a105542a1737 + fe64cb47-c790-479c-92a3-d8cdaf101cdc + Таблица + false + + + + + + + + + diff --git a/resources/src/main/resources/business-model/Процессы/process-instance.page b/resources/src/main/resources/business-model/Процессы/process-instance.page new file mode 100644 index 00000000..9e4b0532 --- /dev/null +++ b/resources/src/main/resources/business-model/Процессы/process-instance.page @@ -0,0 +1,149 @@ + + + process-instance + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 2bb8a14d-6a69-43c5-9c0e-c301f982d26f + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + ProcessInstance + false + + + + + 3800a37f-56d0-4c92-9597-ec0a4c2e4e13 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + Text + false + + + + + + + + + fd2c1c62-f6f2-4460-b93a-bf737a0dfcb1 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + TabContainer + false + + + + + d6f9a5b1-6456-4961-a243-18e8a5b53fbf + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + TabItem + false + + + + + de8f0d04-844d-43c6-97be-afc06678d452 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + HBox + false + + + + + 415990b0-79a9-40c2-99c9-0fe30b3f8680 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + SelectButton + false + + + + 4f869d1a-4678-4869-a82d-6397d0f566dd + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + SelectButton + false + + + + + 8f7e43aa-831f-4b3e-a942-9b3edaa98ebc + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + Grid + false + + + + + + + + 41638fc1-45eb-4edb-b0a1-904869e3996a + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + TabItem + false + + + + + a5062a8d-c311-4250-a632-b87c766ef797 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + Флаг + false + + + + + + + 79275d69-0eac-4e16-842b-0cc4b8a8f455 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + TextArea + false + + + + + + + + b0f923b7-60c1-4246-b7ee-d244f65fe233 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + Обработка событий + false + + true + + + + + + 6b11ca6b-f757-481b-b4a6-46d1528464ca + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + TabItem + false + + + + + 37ac294e-b21f-4ec9-8fc2-ff9d137baf5b + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + ProcessInstanceDiagram + false + + + + + + + 9c9c7512-4ec6-459d-b173-cda11ca789c4 + 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b + Button + false + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page b/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page new file mode 100644 index 00000000..3e8008c7 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page @@ -0,0 +1,231 @@ + + + user-management-group-edit + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + ed47cfae-64da-4360-8f61-1087179ad78b + 1011fa6a-8730-41f1-836a-928dc32f1786 + GroupsEdit + true + false + + + + + a18909dd-64ee-433f-82b3-70e1917f1b8d + 1011fa6a-8730-41f1-836a-928dc32f1786 + Text + false + + + + + + + e2c223a4-377d-49e3-904f-375ca30a08d5 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Form + false + + + + + + c629e7bd-878a-4411-9e29-bb44f4c11ba7 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Горизонтальный контейнер + false + + + + + 075ead72-0b6f-411f-88b4-69f5ab4a4052 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Вертикальный контейнер + false + + + + + 389e2f20-104b-4136-aba0-3a0ccd45f96e + 1011fa6a-8730-41f1-836a-928dc32f1786 + Текст + false + + + + + + + d2a08a08-2807-4471-a2b5-f7a78fd1bb0d + 1011fa6a-8730-41f1-836a-928dc32f1786 + name + false + + + + + + + + 76cc68cf-575a-46a0-8ca2-31109c3963c4 + 1011fa6a-8730-41f1-836a-928dc32f1786 + created + false + + + + + + + + 0a47e758-c21e-4f8a-92bf-150c872b58ed + 1011fa6a-8730-41f1-836a-928dc32f1786 + updated + false + + + + + + + ae991562-f703-4403-8d49-a0e5e540bc6c + 1011fa6a-8730-41f1-836a-928dc32f1786 + access_level + false + + + + + + + + + 41774d7b-90c5-4bc0-a563-509d036206e3 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Вертикальный контейнер + false + + + + + 4eb50f01-cccc-4f3a-b66d-4d57dde0a212 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Text + false + + + + + + + 704d07af-1823-48d6-acad-83771428be38 + 1011fa6a-8730-41f1-836a-928dc32f1786 + HBox + false + + + + + 528504db-2727-4750-92a9-5f09dacc781d + 1011fa6a-8730-41f1-836a-928dc32f1786 + AvailableRecordsGrid + false + + + + + + + + + + e791675f-a1d1-402b-afe1-556b434b1248 + 1011fa6a-8730-41f1-836a-928dc32f1786 + Buttons + false + + + + +6731261c-f859-489e-9ca9-08b33aa77b58 +1011fa6a-8730-41f1-836a-928dc32f1786 +Add +false + + + + +639fa2da-bdb2-4d26-97db-4a2bef4cfb81 +1011fa6a-8730-41f1-836a-928dc32f1786 +AddAll +false + + + + +291de4f8-51a4-4331-b26c-5994e9de5697 +1011fa6a-8730-41f1-836a-928dc32f1786 +Remove +false + + + + +366c5745-c04f-4d11-a652-54abe1a5d4ca +1011fa6a-8730-41f1-836a-928dc32f1786 +RemoveAll +false + + + + + + 76735e43-2b8f-440a-abd1-80c556326763 + 1011fa6a-8730-41f1-836a-928dc32f1786 + LinkFieldDialog + false + + + + + + + + + + + + + fb5e15d6-c838-4fa7-b20d-714a2abd03a6 + 1011fa6a-8730-41f1-836a-928dc32f1786 + HBox + false + + + + + 3a2c64e6-edcf-4058-9a02-897b6dc9704e + 1011fa6a-8730-41f1-836a-928dc32f1786 + save-button + false + + + + 29e058b0-bc2a-45bb-8422-2922881db1be + 1011fa6a-8730-41f1-836a-928dc32f1786 + exit-button + false + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page b/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page new file mode 100644 index 00000000..47593e59 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page @@ -0,0 +1,231 @@ + + + user-management-group-create + + 3.93.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.93.0-WEBBPMNEXT-7023-SNAPSHOT + + + + + ca7390f1-1891-4161-b8ae-ef66de5776b7 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + GroupsCreate + true + false + + + + + fa5b05d3-871d-4be9-b8f5-8912dfb35d45 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Text + false + + + + + + + bcb8e5ad-b8e7-44b0-a145-13de809dbf33 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Form + false + + + + + + ff9f35ed-bf7f-42c0-8479-068abaa39911 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Горизонтальный контейнер + false + + + + + 624bdc70-52da-4c81-8033-316b3309260e + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Вертикальный контейнер + false + + + + + 4cde8573-92ae-4c4c-9428-d7d852e78c62 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Текст + false + + + + + + + 485b6e35-2b31-4d0e-8ce8-fe03980ea0d8 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + name + false + + + + + + + + 0233b718-9edb-4650-863d-298d21d16aee + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + created + false + + + + + + + + 5b38db22-58c4-4d64-b5ee-b252e7b0bd66 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + updated + false + + + + + + + 1aa93ca2-3ba3-4ac8-bcae-4307ceb4d3cf + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + access_level + false + + + + + + + + + 8e395fd7-a9b5-4eae-8c95-72e594ee3357 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Вертикальный контейнер + false + + + + + 91956fb3-8832-4572-9823-df2e83ab8922 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Text + false + + + + + + + 7d4e83a4-45d2-45a5-a778-40d0c0f4aa3a + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + HBox + false + + + + + ed5afd59-d3c6-42b1-8744-687909c3f2dc + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + AvailableRecordsGrid + false + + + + + + + + + + 2272444f-bb2b-4c87-a54e-7c44a5cdc67a + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + Buttons + false + + + + +b33d3f9b-74a1-4c30-a5a6-da14bf2b8c7d +deab5d8f-591d-41b4-8485-1c5d3ef48a16 +Add +false + + + + +bc429b81-de76-48e1-834f-7757ab4c97a1 +deab5d8f-591d-41b4-8485-1c5d3ef48a16 +AddAll +false + + + + +84165e8b-829a-4656-a2e9-4ca87cfd217e +deab5d8f-591d-41b4-8485-1c5d3ef48a16 +Remove +false + + + + +49906463-bdeb-424c-aa70-afec7bc4da20 +deab5d8f-591d-41b4-8485-1c5d3ef48a16 +RemoveAll +false + + + + + + ed375b71-5f95-43af-ae69-5a5eacb3f479 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + LinkFieldDialog + false + + + + + + + + + + + + + a65dbf74-aa81-4b28-b008-2df11395b9f8 + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + HBox + false + + + + + b9463b17-97c1-4c49-9fc7-e4ee9bb621dd + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + save-button + false + + + + 0b170e2b-a865-4aca-a9da-c7da77d9b0fd + deab5d8f-591d-41b4-8485-1c5d3ef48a16 + exit-button + false + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы.page b/resources/src/main/resources/business-model/Управление пользователями/Группы.page new file mode 100644 index 00000000..f3c4fe00 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Группы.page @@ -0,0 +1,172 @@ + + + user-management-groups + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 0f8d0a8b-8014-4367-8ff3-7f049c284978 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + Groups + true + false + + + + + 7a7ae21a-2c01-49ee-a2d4-22f933d9445c + edc984f0-039d-4fa6-93d2-df03bf6dc08c + Text + false + + + + + + + 9055eba3-0243-4746-9890-70b486c3fb8d + edc984f0-039d-4fa6-93d2-df03bf6dc08c + FilterGroup + false + + + + filterableComp + + null + + + + + + + + filterable + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + 9c81110c-d0d5-4d2a-afa8-e5b093ad47ba + edc984f0-039d-4fa6-93d2-df03bf6dc08c + search + false + + + + + + + + + + + 1ddc006e-75b2-4103-87e1-7991c9f3520d + edc984f0-039d-4fa6-93d2-df03bf6dc08c + Grid + false + + + + + + + 3ae192dd-d45b-4c23-bd8d-b386abda0273 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + HBox + false + + + + + 18b01c4c-1c1d-4436-870d-7541a72648b6 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + create-button + false + + + + + 5c8de2f4-6849-48bc-b8dd-36e649ad2540 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + edit-button + false + + + + + 4a9e9ed8-9936-428d-8ddd-4502e2a55700 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + delete-button + false + + + + + + 26d4430f-ddf1-4997-83c5-0009edf32719 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + ac-create + false + false + + true + + + + + 15964601-92db-4da1-a279-5664844a0bf5 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + ac-edit + false + false + + true + + + + + c4317a56-f9f6-4ea1-90bc-776c3bfaa8c0 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + ac-delete + false + false + + true + + + + + + 6c034de2-0633-4f45-9ba1-625a00421718 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + Roles + false + + + + + + + 3acecb3c-c1d3-4a1e-9873-1c6050ff74f0 + edc984f0-039d-4fa6-93d2-df03bf6dc08c + RolesGrid + false + false + + + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Организации.page b/resources/src/main/resources/business-model/Управление пользователями/Организации.page new file mode 100644 index 00000000..412a6661 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Организации.page @@ -0,0 +1,150 @@ + + + user-management-org-units + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 5cc0e63d-f697-47a8-a9dc-3170f1a99721 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Organizations + true + false + + + + + c262a5da-38cb-4739-9d59-3bb7fdf55e26 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Текст + false + + + + + + + 2c143f13-f25f-49e2-8615-aa76a1dac394 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Группа фильтров + false + + + + filterableComp + + null + + + + + + + + filterable + + {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"rpc","className":"TreeGridRpcService","type":"JAVA"} + + + + + + + + d64cc9e2-4e33-4a5d-9792-d4ac8f5a5754 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Фильтр по текстовому полю + false + + + + + + + + + + + 2db7e240-3978-4826-aa2d-4d031cb0e7a0 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Древовидная таблица + false + + + + + + e3ca31f5-4ec1-45a9-b195-94806048ba3f + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + Горизонтальный контейнер + false + + + + + 480a06a2-f4b1-46eb-bf3f-0e4097460719 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + create-button + false + + + + + 653b6b0c-072c-40d1-bcc0-41157a888fad + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + edit-button + false + + + + + e61b659b-d293-4005-a1c2-0d110d058c52 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + delete-button + false + + + + + + a01d154c-55fe-4a77-97b0-e2e90ce5e370 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + ac-create + false + false + + true + + + + + 8ec15acd-7973-4f09-8723-3c69ec829f78 + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + ac-edit + false + false + + true + + + + + 885a70ad-e6fd-4a17-a9ac-66c326c117fe + 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 + ac-delete + false + false + + true + + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page b/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page new file mode 100644 index 00000000..02121ab9 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page @@ -0,0 +1,126 @@ + + + user-management-org-unit + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 63022aff-e117-4b58-88ac-8e230b0e9b22 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + OrganizationEdit + true + false + + + + + 2b44d4d9-20e0-49be-8a98-993fd14f7be5 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Текст + false + + + + + + + ff113441-2a31-440c-9c81-a987176bff61 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Форма + false + + + + + + bd8deb9b-95ce-4849-b214-19cb36d94830 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Горизонтальный контейнер + false + + + + + b994094c-96bb-476f-8f92-f5fa3c2961bd + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Вертикальный контейнер + false + + + + + 51b5145b-92ca-42be-9aa4-9402abe670c7 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Выпадающий список (с возможностью сохранения) + false + + + + + + + + 64e9908e-1afc-4ae1-adb3-512576ea8ff4 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Текстовое поле (с возможностью сохранения) + false + + + + + + + + f8640cfc-d68c-4596-80a5-0ecb2c6ce5a4 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Текстовое поле (с возможностью сохранения) + false + + + + + + + + + 10165a7a-48db-42dc-882e-afcfad67717a + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Вертикальный контейнер + false + + + + + + + + 1bb8d3bb-5e09-49ba-8169-488e55f2285a + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + Горизонтальный контейнер + false + + + + + e426c18f-190b-4dac-be54-dad7a39d2000 + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + save-button + false + + + + 7ca91a23-0453-4875-9288-312d051defcd + 0e7f6825-534f-4eba-9ec6-c43cbad07636 + exit-button + false + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page new file mode 100644 index 00000000..2fb5884d --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page @@ -0,0 +1,419 @@ + + + user-management-user-edit + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + c4b48815-f449-48fe-9ae0-dec9b6f4c53c + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + UsersEdit + true + false + + + + + 10b97eb7-30d3-4af1-877c-7870d5178172 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Text + false + + + + + + + 9d2fca5f-4354-46fc-a743-2644fbb9699d + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Form + false + + + + + + + b538ab89-381a-4c01-b8f6-77cb61a2b3f6 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + HBox + false + + + + + 2f2b7ec7-dfd8-4789-b27b-5d72f509314c + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + 2837d2f5-2a60-400e-ab3f-68556cce3981 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Text + false + + + + + + + 51ad723f-1b70-49ca-96be-137e51e907bb + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + HBox + false + + + + + 2adc0c45-dd66-4398-b21b-27a008756228 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + + 80de32f7-e75d-44c4-9c5a-8fa9e9563ebf + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + + + c4ce09bf-b91d-4025-8715-e76925202713 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + last-name + false + + + + + + + + bc4815fd-2f8d-4545-b6f8-7a651beef2f6 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + first-name + false + + + + + + + + 778d3b64-d52f-48ff-b854-7df244f20d55 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + middleName + false + + + + + + + + a014b3b3-1cd2-46cd-b317-74fa0dbf5733 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + created + false + + + + + + + + 627b604f-8102-4df7-932a-ac88b410ed1b + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + updated + false + + + + + + + + b5373d18-ea29-428e-be37-62016f619693 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + 0507914c-bc97-4e76-8ef5-4617c868b50a + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Text + false + + + + + + + 749b6444-6ba3-4ca5-a6f7-eaef9641e644 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + HBox + false + + + + + 00688380-2458-43bc-96ca-6b3b775bcce0 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + + ed515db1-d2d0-495e-ab83-4a66431b311d + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + + + 77dc7647-69d5-4f7c-9f75-14eaa4609671 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + login + false + + + + + + + + bbb1fc4f-922e-46e4-8ceb-b911af24a32f + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + password + false + + + + + + + + + 84ef055e-dd0d-446e-87d4-9c25a3fc86e0 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + password-repeat + false + + + + + + + 04c23030-0c55-414a-9228-77ce8046deac + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + email + false + + + + + + + + 5486199d-c932-413c-8ab6-e674633898af + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + blocked + false + + + + + + + 3c84ea2f-68bb-4cba-a32a-da97a043e84c + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + password-changed + false + + + + + + + 7cde5b9a-404d-4654-ae17-f0c753c64518 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + password-expires + false + + + + + + + 42aed598-6fa4-47c7-84bc-5c0087bf6d50 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + org_unit_id + false + + + + + + + + + a9e6fbb2-4bb7-40af-966a-b22e6074e31c + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + password-validate + false + + + + + 2142f803-011b-44cb-834b-a71c16debb88 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + VBox + false + + + + + fe1ee732-1a3f-44ec-a6c4-caa6b0ee5151 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Text + false + + + + + + + dd4366b6-b12e-4426-8004-22b9d1cf5db8 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + HBox + false + + + + + db2236ac-ab9e-403c-bc96-3b4b6882ddf3 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + AvailableRecordsGrid + false + + + + + + + + + + 9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Buttons + false + + + + +6b850ea5-255b-418c-be2d-5ec96d31e2bd +77d9d4a8-d9a5-47a3-b614-4f4f66893c98 +Add +false + + + + +3b902822-cad9-4f06-9ddc-48d48378a06e +77d9d4a8-d9a5-47a3-b614-4f4f66893c98 +AddAll +false + + + + +35c8b7b8-4527-4c67-b0cb-2755cd40ee5a +77d9d4a8-d9a5-47a3-b614-4f4f66893c98 +Remove +false + + + + +0263acc1-f1e9-44a6-b175-f679838a5d4a +77d9d4a8-d9a5-47a3-b614-4f4f66893c98 +RemoveAll +false + + + + + + 05d0feb4-fd4a-49c4-bd75-54866a194c49 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + LinkFieldDialog for save + false + + + + + + + + + + + + c34de737-90e6-4db0-a417-186a7ee0b8ad + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + HBox + false + + + + + 41b7094b-17d2-46cc-b2c3-a2ab5823a01a + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + save-button + false + + + + f70c25d7-0dcf-4d00-bec4-44a059217558 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + cancel-button + false + + + + + + 94939abc-6c57-464e-b480-c86ea7a689e9 + 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 + Скрыть и сделать неактивным + false + + true + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page new file mode 100644 index 00000000..2586231b --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page @@ -0,0 +1,343 @@ + + + user-management-user-create + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 5f9c58f8-9ee1-4df3-b93c-e48534e798db + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + UsersCreate + true + false + + + + + e44fca88-2550-43a5-acc6-8b3d8a320f54 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Text + false + + + + + + + dd8d4f7a-d682-4ad5-b912-2f893c80286c + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Form + false + + + + + + 2d7ce830-8c41-45b4-ae68-65aa13bfd73d + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + HBox + false + + + + + 93142136-1c5f-48ee-bbed-735568f4dc5a + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + VBox + false + + + + + 262f4f43-1fce-4db7-a1e8-79cec29d193d + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Text + false + + + + + + + ef93e007-1dca-4b4b-9214-55e4206139f3 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + last-name + false + + + + + + + + 3267256f-78bd-46ca-ad92-e25f41660ec0 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + first-name + false + + + + + + + + f8710d37-2fb4-4a70-aae6-065e039c6456 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + middleName + false + + + + + + + + 47505972-bba3-481f-8c60-573a3060ff51 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + created + false + + + + + + + 38387d09-b753-4ca7-9916-6e2745a913b6 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + updated + false + + + + + + + + b8f86b7b-bbfb-453d-b5d2-85fb75b89ce7 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + VBox + false + + + + + 63ea4fcf-b2ea-493a-9127-7a4aa14b5a0b + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Text + false + + + + + + + 7d28a15a-bf1a-4dac-8637-a72b13595e78 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + login + false + + + + + + + + 4a616993-de8f-4b2f-b3e6-86f09cf6447c + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + password + false + + + + + + + + + 040f3580-a20b-449c-8587-c9e399b5e6a2 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + password-repeat + false + + + + + + + 7d626425-0b20-4e2f-a3b3-7452f1a5df9e + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + email + false + + + + + + + + 09c340df-f4bb-4cc6-9a9f-76b78dca7143 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + password-changed + false + + + + + + + 4d56ec4a-6df8-4a6c-8c44-d77c1a8099df + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + password-expires + false + + + + + + + 764d8c70-b243-4e9d-8ba0-59068607380e + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + org_unit_id + false + + + + + + + + + e1b037cb-0008-450f-8719-621422b6e155 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + password-validate + false + + + + + f414d74e-2247-4e41-8280-638063712186 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + VBox + false + + + + + 0b9b0cf3-55c1-4108-bea2-f70100ab92f2 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Text + false + + + + + + + d148dfe4-0c8a-4bb2-94da-336d4399a7c4 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + HBox + false + + + + + 7c06a3a6-1040-4bc0-bf3c-4760cd70335a + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + AvailableRecordsGrid + false + + + + + + + + + + 8bf9cb9b-edc5-4009-be41-c838c5d8e63d + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + Buttons + false + + + + +18cdf07c-f772-4be3-8eea-2ca5d3f651eb +42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 +Add +false + + + + +3074285f-453f-4ad2-8ae2-6cddaf5e8e0f +42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 +AddAll +false + + + + +1498ef4e-0a51-4dac-9b06-8d83263f03b4 +42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 +Remove +false + + + + +407e4d1d-7adf-415c-9ff6-19c4f2a8223f +42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 +RemoveAll +false + + + + + + 379fd159-d5a5-4b96-805b-0bae71b3f495 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + LinkFieldDialog for save + false + + + + + + + + + + + + 8766dbfa-3bf8-4e80-9662-c9a9865ad15c + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + HBox + false + + + + + 796756c2-02da-4f18-9ab0-cae55047227a + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + save-button + false + + + + 95e88b88-64d3-482b-bc59-de692c3a44f6 + 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 + cancel-button + false + + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page new file mode 100644 index 00000000..b8b7d26c --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page @@ -0,0 +1,448 @@ + + + user-management-users + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 0f470331-dfb0-4f10-b748-c9a7f33d31d9 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Users + true + false + + + + + ea5eba30-e9c2-4b22-a31e-1f96336aba5a + 245a43c7-6af2-45d7-ac76-9195075586a7 + Text + false + + + + + + + ce583acc-4291-4ca5-9b8c-d1830f568763 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Сворачиваемая панель + false + + + + + 91582081-f678-4d59-aa8c-4461b9cf9041 + 245a43c7-6af2-45d7-ac76-9195075586a7 + FilterGroup + false + + + + filterableComp + +null + + + + + + + + filterable + +{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + 40211a7d-fa00-4355-9840-c79db51c1266 + 245a43c7-6af2-45d7-ac76-9195075586a7 + HBox + false + + + + + 982ee732-78fb-4937-8049-802b92307e41 + 245a43c7-6af2-45d7-ac76-9195075586a7 + VBox + false + + + + + 5f640a94-630c-4b5d-93de-ca4693859901 + 245a43c7-6af2-45d7-ac76-9195075586a7 + last-name + false + + + + + + + + + + aa610427-b2e3-4f3f-a8df-ee1aded6fe37 + 245a43c7-6af2-45d7-ac76-9195075586a7 + first-name + false + + + + + + + + + + 1d7465e8-260a-4581-9e37-77d8a5158b8f + 245a43c7-6af2-45d7-ac76-9195075586a7 + middle-name + false + + + + + + + + + + + 9c945c9c-4b2d-408b-a525-0c0d35e73d40 + 245a43c7-6af2-45d7-ac76-9195075586a7 + VBox + false + + + + + bed574e8-73e4-45e3-857c-ce7cd7c8156b + 245a43c7-6af2-45d7-ac76-9195075586a7 + login + false + + + + + + + + + + 104b37e8-9b20-4738-a978-a1f890c0d986 + 245a43c7-6af2-45d7-ac76-9195075586a7 + org_unit_id + false + + + + + + + + + + ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb + 245a43c7-6af2-45d7-ac76-9195075586a7 + blocked + false + + + + + + + + + + + + + 4e5e921a-39ed-40e4-90a6-5087ae66c6c9 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Form + false + + + + + + 98868f0f-1d43-40a4-ad6d-ba2961e6cff4 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Горизонтальный контейнер + false + + + + + 959d104a-1e3f-4ac2-be5e-7d7b90f66a5f + 245a43c7-6af2-45d7-ac76-9195075586a7 + Вертикальный контейнер + false + + + + + e5be7900-dfec-4748-91da-c715fee6cac4 + 245a43c7-6af2-45d7-ac76-9195075586a7 + full-name + false + + + + + + + + 0c9190f0-0784-4f04-9859-4f0fbaf00f74 + 245a43c7-6af2-45d7-ac76-9195075586a7 + blocked + false + + + + + + + + 0c4e9e51-0ee4-479f-8f09-c7e46909ff44 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Вертикальный контейнер + false + + + + + 8b2e2c4f-6b66-4d6f-bd0c-a89e539356bb + 245a43c7-6af2-45d7-ac76-9195075586a7 + password-expires + false + + + + + + + d042fd93-60b2-4efe-86b0-f38023bb9a7f + 245a43c7-6af2-45d7-ac76-9195075586a7 + created + false + + + + + + + + + + 9e35c92d-2741-4d9d-867f-4c8b83166638 + 245a43c7-6af2-45d7-ac76-9195075586a7 + HBox + false + + + + + 66b422e9-0f90-4114-ba87-4a235cbf7648 + 245a43c7-6af2-45d7-ac76-9195075586a7 + VBox + false + + + + + d7266db0-3d4e-4e8c-9f63-19deb4c12ee3 + 245a43c7-6af2-45d7-ac76-9195075586a7 + Grid + false + + + + + + + + c7ac179d-9577-4703-8313-1c2c4c90ac36 + 245a43c7-6af2-45d7-ac76-9195075586a7 + VBox + false + + + + + d3f54b16-ae69-4685-a071-4f781c3f9b61 + 245a43c7-6af2-45d7-ac76-9195075586a7 + DependentGrid + false + + + + + + + + 4d7361c8-5071-4d62-b50e-e79ee636fa57 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-dependent-grid + false + false + + true + + + + + + + c4f7ba4d-03b3-4948-86ed-2ca4b8a6631b + 245a43c7-6af2-45d7-ac76-9195075586a7 + HBox + false + + + + + a034e0fd-82dd-40c8-bada-c3a0d6eebeb5 + 245a43c7-6af2-45d7-ac76-9195075586a7 + create-button + false + + + + + + d45bf7b0-dcab-48f6-a53b-26723524b371 + 245a43c7-6af2-45d7-ac76-9195075586a7 + edit-button + false + + + + + + 3d6e68c8-b745-49bb-a5d5-d27f5fdad72d + 245a43c7-6af2-45d7-ac76-9195075586a7 + delete-button + false + + + + + + + 98d7a384-bac4-4b95-9d8f-9245d91927c1 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ldap-sync-button + false + + + + + a72d531c-3c9f-4390-8b7a-1f6bb3fa0e9d + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-edit + false + false + + true + + + + + 250006ff-42d5-4c45-87f3-183857d7a13b + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-remove + false + false + + true + + + + + 696aaf8c-3075-4d6a-b58b-c7c79394affe + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-create-button-hide-if-kerberos-or-no-authority + false + + true + + + + + 8b27dfb0-9d38-492b-8ee2-100d6c5a58d7 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-edit-button-hide-if-kerberos-or-no-authority + false + + true + + + + + 6377bc60-5a59-42d9-b5f1-3ccefac4ffe4 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-edit-button-enabled-if-has-authority + false + + true + + + + + 7b63ea1b-1c51-4237-8946-14cc474d5eb0 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-delete-button-hide-if-kerberos-or-no-authority + false + + true + + + + + 7af3269d-369f-4a2a-85e7-8e4b621da324 + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-delete-button-enabled-if-has-authority + false + + true + + + + + 3f2cb52c-a805-4bbd-a893-48506a2ee1cf + 245a43c7-6af2-45d7-ac76-9195075586a7 + ac-ldap-sync-button + false + + true + + + + + e3ed2a20-be7f-4ee3-a85c-29bcffad04dc + 245a43c7-6af2-45d7-ac76-9195075586a7 + hide-if-kerberos + false + + true + + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page b/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page new file mode 100644 index 00000000..472172ac --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page @@ -0,0 +1,125 @@ + + + user-management-role + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + a6f1a48d-fc19-46fd-9cad-e7fe0d9f29c6 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + RolesEdit + true + false + + + + + 90fc7ebc-3819-4bc5-b2a4-b0dae9b151ea + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + Текст + false + + + + + + + 183f1b4b-6c93-4858-ad6e-1d3ac3d3d6f1 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + Form + false + + + + + + 61750ac1-fa74-4c35-9057-d0bead8241cc + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + Горизонтальный контейнер + false + + + + + 5047ac15-2114-48db-b457-3cca811df6f4 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + Вертикальный контейнер + false + + + + + b8514208-f422-488a-82ab-fc8eca271a82 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + name + false + + + + + + + + be586ede-3dcb-4ef9-a5ac-4ecdaff22d42 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + created + false + + + + + + + + 01a7320b-31b6-4809-bc2e-aafeefcc2bdb + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + updated + false + + + + + + + + 50797ba0-3422-4b3c-95d8-924cd5160d2f + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + Вертикальный контейнер + false + + + + + + + + 9a80540c-888a-46cf-94d0-6aa060704cdf + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + HBox + false + + + + + 0e3729c9-6ec2-4d22-8146-1e6c4f69e132 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + save-button + false + + + + 0bfe5e99-bdcd-475a-a524-17e0603b3845 + 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 + cancel-button + false + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Роли.page b/resources/src/main/resources/business-model/Управление пользователями/Роли.page new file mode 100644 index 00000000..a1f66a28 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Роли.page @@ -0,0 +1,171 @@ + + + user-management-roles + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + 38c2de2f-c5dd-413e-babf-ce54cb4e5279 + 3ada7790-8f63-4750-be1b-965cb607bc17 + Roles + true + false + + + + + 47e95cb8-ec90-4d23-bdbc-02a993cba433 + 3ada7790-8f63-4750-be1b-965cb607bc17 + Text + false + + + + + + + 5caea80b-ba43-4d5a-ae62-cf1aa1b5e8de + 3ada7790-8f63-4750-be1b-965cb607bc17 + FilterGroup + false + + + + filterableComp + + null + + + + + + + + filterable + + {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + 4c6be823-5f06-4a7c-b965-944a778f96b4 + 3ada7790-8f63-4750-be1b-965cb607bc17 + search + false + + + + + + + + + + + a56dd87e-02e2-4dd5-9dc7-ec94e3758511 + 3ada7790-8f63-4750-be1b-965cb607bc17 + Grid + false + + + + + + + 9a8e1a6b-5cd8-4b6e-b3ec-8da88c6018a2 + 3ada7790-8f63-4750-be1b-965cb607bc17 + HBox + false + + + + + d5af9dbe-a63f-4420-a109-dcd5d6894355 + 3ada7790-8f63-4750-be1b-965cb607bc17 + create-button + false + + + + + 29d2fdef-ff61-4689-bded-2c34bff0de72 + 3ada7790-8f63-4750-be1b-965cb607bc17 + edit-button + false + + + + + 7fbf947c-b03a-42f1-881d-0f0d449cb1d2 + 3ada7790-8f63-4750-be1b-965cb607bc17 + delete-button + false + + + + + + fca14225-0522-4cc8-ad0d-1126644cf028 + 3ada7790-8f63-4750-be1b-965cb607bc17 + ac-create + false + false + + true + + + + + b801dc2c-9067-4669-8bba-620bdde0be51 + 3ada7790-8f63-4750-be1b-965cb607bc17 + ac-edit + false + false + + true + + + + + eedf3b3b-c42c-4b81-94ce-3b5cc3c6bd07 + 3ada7790-8f63-4750-be1b-965cb607bc17 + ac-remove + false + false + + true + + + + + + 86bc12ae-bb9f-42d6-b111-63f7521fedb6 + 3ada7790-8f63-4750-be1b-965cb607bc17 + Groups + false + + + + + + + ab666d58-a9b4-417c-9da9-eab2e0b6a958 + 3ada7790-8f63-4750-be1b-965cb607bc17 + GroupsGrid + false + + + + + + + diff --git a/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page b/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page new file mode 100644 index 00000000..cfd6c889 --- /dev/null +++ b/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page @@ -0,0 +1,234 @@ + + + user-management-authorities + + 3.94.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.94.0-SNAPSHOT + + + + + a4d442cf-72a8-431e-815a-490959083787 + 44886585-d33e-4203-840a-e788653e923a + SecurityFeatures + true + false + + + + + 202de44d-f77d-43fb-88fd-2a3f36ced2f1 + 44886585-d33e-4203-840a-e788653e923a + Вертикальный контейнер + false + + + + + 2abf5d6a-d876-4fc5-bae1-d04e41cb7229 + 44886585-d33e-4203-840a-e788653e923a + authorities + false + + + + + + + d084be86-0037-4780-893d-959b975b9058 + 44886585-d33e-4203-840a-e788653e923a + Вертикальный контейнер + false + + + + + 753dd01d-822b-4533-b2aa-f086edb81702 + 44886585-d33e-4203-840a-e788653e923a + bound-roles + false + + + + + + + c0460450-a21e-42f2-b9f6-f29e63a909eb + 44886585-d33e-4203-840a-e788653e923a + Горизонтальный контейнер + false + + + + + 67f2e8a8-e32b-4bf0-940b-ab505be146f9 + 44886585-d33e-4203-840a-e788653e923a + delete + false + + + + + + c4751b6c-abb3-44e7-9f4d-7b1887d736d1 + 44886585-d33e-4203-840a-e788653e923a + Горизонтальный контейнер + false + + + + + d6b561b0-cf80-493f-8499-1c4646a12848 + 44886585-d33e-4203-840a-e788653e923a + show-dialog + false + + + + + 1704b964-7410-4909-81af-baa39019103c + 44886585-d33e-4203-840a-e788653e923a + Диалог + false + + + + + 2aecaba7-557f-4628-abf9-2ae64d9c136d + 44886585-d33e-4203-840a-e788653e923a + Вертикальный контейнер + false + + + + +a07d0119-b9d5-465f-a8e5-991fb0ae5dd3 +44886585-d33e-4203-840a-e788653e923a +Форма +false + + + + + + 5d81f881-411c-40b7-8eba-9ebb880ce4ab + 44886585-d33e-4203-840a-e788653e923a + authority-id + false + + + + + + + + a413592c-bd84-48e5-a6f0-af87cd075640 + 44886585-d33e-4203-840a-e788653e923a + Action controller + false + false + + true + + + + + 9e81c3a0-4b1c-46af-a28f-78510fac789f + 44886585-d33e-4203-840a-e788653e923a + role + false + + + + + + + + +2b2ae47e-ec3a-48bd-a4cf-77a3a817ebe6 +44886585-d33e-4203-840a-e788653e923a +Горизонтальный контейнер +false + + + + + 1f65aebc-3112-4336-8339-db6aae6574cf + 44886585-d33e-4203-840a-e788653e923a + save + false + + + + c3f258bb-9843-4f97-acbf-492ddd583a5b + 44886585-d33e-4203-840a-e788653e923a + cancel + false + + + + 5f3abfc2-545a-4e30-961b-e5ae5388a5d6 + 44886585-d33e-4203-840a-e788653e923a + show-action + false + false + + true + + + + + + + + 828a292b-3fd3-46da-b0af-22c7dbbffa4f + 44886585-d33e-4203-840a-e788653e923a + hide-on-cancel-action + false + false + + true + + + + + 1e99095a-60eb-4612-be43-e8dacad53e49 + 44886585-d33e-4203-840a-e788653e923a + on-save-action + false + false + + true + + + + + b5722d45-1042-4ea0-a94f-aed3ad0f11ea + 44886585-d33e-4203-840a-e788653e923a + ac-role-unbind + false + false + + true + + + + + 255d2278-be77-4af9-b599-48dba63695bf + 44886585-d33e-4203-840a-e788653e923a + ac-role-bind + false + false + + true + + + + + + + + diff --git a/resources/src/main/resources/config/jndi-resources.xml b/resources/src/main/resources/config/jndi-resources.xml new file mode 100644 index 00000000..b39445ab --- /dev/null +++ b/resources/src/main/resources/config/jndi-resources.xml @@ -0,0 +1,4 @@ + + + {"host":"host","port":1234,"login":"user","password":"password","from":"email_from","senderName":"sender_name","isSecured":true} + diff --git a/resources/src/main/resources/mail/confirmation.html b/resources/src/main/resources/mail/confirmation.html new file mode 100644 index 00000000..9acaa48a --- /dev/null +++ b/resources/src/main/resources/mail/confirmation.html @@ -0,0 +1,36 @@ + + + + Проверка адреса электронной почты + + + + +

Проверка адреса электронной почты

+

Привет, #username!
+ Для получения доступа ко всем возможностям приложения подтвердите адрес электронной почты.

+ +

С уважением,
служба технической поддержки

+ + diff --git a/resources/src/main/resources/mail/reset_password.html b/resources/src/main/resources/mail/reset_password.html new file mode 100644 index 00000000..8a023c7e --- /dev/null +++ b/resources/src/main/resources/mail/reset_password.html @@ -0,0 +1,36 @@ + + + + Восстановление пароля + + + + +

Восстановление пароля

+

Привет, #username!
+ Для восстановления пароля необходимо пройти по следующей ссылке и следовать дальнейшим инструкциям:

+ +

С уважением,
служба технической поддержки

+ + diff --git a/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override b/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override new file mode 100644 index 00000000..60aa87f3 --- /dev/null +++ b/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override @@ -0,0 +1,5492 @@ + + + 3c6b714c-9685-498d-9c61-f48fb34892c8 + Users + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 0f470331-dfb0-4f10-b748-c9a7f33d31d9 + Users + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + ea5eba30-e9c2-4b22-a31e-1f96336aba5a + Text + false + false + + + + cssClasses + + + + "title" + + + + + + + + initialValue + + "Администрирование пользователей" + + + + + + + + + false + + + + 42cf0137-dd0a-47f8-a604-cee8c43f104c + ce583acc-4291-4ca5-9b8c-d1830f568763 + Сворачиваемая панель + true + false + + + + cssClasses + + + + "task-panel" + + + + + + heading + + "Фильтр по пользователям" + + + + + + + + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 91582081-f678-4d59-aa8c-4461b9cf9041 + FilterGroup + true + false + + + + liveFilter + +true + + + + + + + + filterable + +{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 4e2a9f79-04a1-45e1-8260-206f0c66f43e + Text + false + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 40211a7d-fa00-4355-9840-c79db51c1266 + HBox + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 982ee732-78fb-4937-8049-802b92307e41 + VBox + true + false + + + + style + + + + padding + + "0 40px 0 0" + + + + width + + "60%" + + + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 5f640a94-630c-4b5d-93de-ca4693859901 + last-name + false + false + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Фамилия" + + + + + + + + operation + + "START_WITH" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "lastName" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + aa610427-b2e3-4f3f-a8df-ee1aded6fe37 + first-name + false + false + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Имя" + + + + + + + + operation + + "START_WITH" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "firstName" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 1d7465e8-260a-4581-9e37-77d8a5158b8f + middle-name + false + false + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Отчество" + + + + + + + + operation + + "START_WITH" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "middleName" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 9c945c9c-4b2d-408b-a525-0c0d35e73d40 + VBox + true + false + + + + style + + + + width + + "40%" + + + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + bed574e8-73e4-45e3-857c-ce7cd7c8156b + login + false + false + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Логин" + + + + + + + + operation + + "START_WITH" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "username" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 840e4e3e-c178-404e-815e-16429e0b484d + phone + false + false + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Телефон" + + + + + + + + operation + + "START_WITH" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "phone" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + f9a38417-9ad0-412a-9b5f-bbeb450dddd6 + 104b37e8-9b20-4738-a978-a1f890c0d986 + org_unit_id + false + false + + + + autocompleteService + + + OrgUnitAutocompleteService + ru.cg.webbpm.user_management.custom + + + + + + + + + cssClasses + + + + + "width-full" + + + + + "fixed-label" + + + + + + label + + "Организация" + + + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + +true +true +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "id" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "orgUnit" + + + + + + + FilterComponent + component.filter + +true +true + + + operation + + "EQUAL" + + + + + + + + +false + + + + 887d2044-9e34-46a5-852c-e9ce07b42f30 + ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb + locked + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + + + initialValue + + "false" + + + + label + + "Заблокирован" + + + + values + + + + + + hidden + +false + + + + label + +"Да" + + + + value + +"true" + + + + + StaticComboBoxModel + model + + + + + + + + hidden + +false + + + + label + +"Нет" + + + + value + +"false" + + + + + StaticComboBoxModel + model + + + + + + + + + + + operation + + "EQUAL" + + + + + +true + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true +true + + + column + + "locked" + + + + dataConverter + + + BooleanStringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + + + + be95ef58-ee04-413f-be0f-e8cd4af25faf + 4e5e921a-39ed-40e4-90a6-5087ae66c6c9 + Form + true + false + + true + + + true + + + + DependentForm + modules.user-management.component + + true + true + + + dependsOn + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + disabled + + false + + + + visible + + true + + + + + + + RestFormRpcService + ru.cg.webbpm.user_management + + true + true + + + formService + + +UserFormService +ru.cg.webbpm.user_management.custom + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9dd392ef-75c0-4a45-84d0-bc5beba17361 + Text + false + true + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + e5be7900-dfec-4748-91da-c715fee6cac4 + full-name + false + true + + + bce312bd-0c82-45e5-89dc-a1af90431c18 + 0c9190f0-0784-4f04-9859-4f0fbaf00f74 + locked + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 8b2e2c4f-6b66-4d6f-bd0c-a89e539356bb + password-expires + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + d042fd93-60b2-4efe-86b0-f38023bb9a7f + created + false + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 98868f0f-1d43-40a4-ad6d-ba2961e6cff4 + Горизонтальный контейнер + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 959d104a-1e3f-4ac2-be5e-7d7b90f66a5f + Вертикальный контейнер + true + false + + + +style + + + + padding + + "0 40px 0 0" + + + + width + + "60%" + + + + + + + + + + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + e5be7900-dfec-4748-91da-c715fee6cac4 + full-name + false + false + + + + cssClasses + + + + "width-full" + + + + + "fixed-label" + + + + + + disabled + + true + + + + label + + "Фамилия Имя Отчество" + + + + + + true + + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "fullName" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + bce312bd-0c82-45e5-89dc-a1af90431c18 + 0c9190f0-0784-4f04-9859-4f0fbaf00f74 + locked + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + + + disabled + + true + + + + label + + "Заблокирован" + + + + values + + + + + + hidden + + false + + + + label + + "Да" + + + + value + + "true" + + + + + StaticComboBoxModel + model + + + + + + + + hidden + + false + + + + label + + "Нет" + + + + value + + "false" + + + + + StaticComboBoxModel + model + + + + + + + visible + + false + + + + + + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "locked" + + + + dataConverter + + + BooleanStringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 0c4e9e51-0ee4-479f-8f09-c7e46909ff44 + Вертикальный контейнер + true + false + + + +style + + + + width + + "40%" + + + + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 8b2e2c4f-6b66-4d6f-bd0c-a89e539356bb + password-expires + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + + disabled + + true + + + + label + + "Логин истекает" + + + + visible + + false + + + + + + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "passwordExpires" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + d042fd93-60b2-4efe-86b0-f38023bb9a7f + created + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + + disabled + + true + + + + label + + "Логин создан" + + + + + + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "created" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9e35c92d-2741-4d9d-867f-4c8b83166638 + HBox + true + false + + + + cssClasses + + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 66b422e9-0f90-4114-ba87-4a235cbf7648 + VBox + true + false + + + + style + + + + padding + + "0 40px 0 0" + + + + width + + "60%" + + + + + + + + + + + + + 42cf0137-dd0a-47f8-a604-cee8c43f104c + ce583acc-4291-4ca5-9b8c-d1830f568763 + Сворачиваемая панель + true + true + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 91582081-f678-4d59-aa8c-4461b9cf9041 + FilterGroup + true + true + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + d7266db0-3d4e-4e8c-9f63-19deb4c12ee3 + Grid + false + false + + true + + + + +gridService + + + UserGridService + ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticColumnGrid + component + + true + true + + +autoStretchColumns + + true + + + +disabled + + false + + + +headerHeight + + 40.0 + + + +loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + +loadingOverlayType + + "TEXT_OVERLAY" + + + +multiselectable + + false + + + +noRowsOverlayMessage + + "Данные отсутствуют" + + + +rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + +rowHeight + + 40.0 + + + +style + + + + height + + "300px" + + + + width + + "100%" + + + + + + +visible + + true + + + + + + + StaticGridColumns + property.grid + + true + true + + +columns + + + + + + displayName + + "Фамилия" + + + + name + + "user$lastName" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 100 + + + + + + + + + + displayName + + "Имя" + + + + name + + "user$firstName" + + + + type + + "STRING" + + + + width + + 100 + + + + + + + + + + displayName + + "Отчество" + + + + name + + "user$middleName" + + + + type + + "STRING" + + + + width + + 100 + + + + + + + + + + displayName + + "Подразделение" + + + + name + + "orgUnit$name" + + + + type + + "STRING" + + + + width + + 700 + + + + + + + + + + displayName + + "Создан" + + + + name + + "user$created" + + + + type + + "DATE_TIME" + + + + width + + 100 + + + + + + + + + + displayName + + "Почтовый адрес" + + + + name + + "user$email" + + + + type + + "STRING" + + + + width + + 100 + + + + + + + + + + displayName + + "Телефон" + + + + name + + "user$phone" + + + + type + + "STRING" + + + + width + + 150 + + + + + + + + + + + + + + GridColumns + property.grid + + true + true + true + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c7ac179d-9577-4703-8313-1c2c4c90ac36 + VBox + true + false + + + + style + + + + width + + "40%" + + + + + + + + + + + + + 42cf0137-dd0a-47f8-a604-cee8c43f104c + cf994404-3b0b-4271-99e9-41c89dac78df + Сворачиваемая панель + true + true + + + be95ef58-ee04-413f-be0f-e8cd4af25faf + 4e5e921a-39ed-40e4-90a6-5087ae66c6c9 + Form + true + true + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + d3f54b16-ae69-4685-a071-4f781c3f9b61 + DependentGrid + false + false + + true + + + + +gridService + + + UserGroupGridService + ru.cg.webbpm.user_management.custom + + + + + + + true + + + true + + + + StaticColumnGrid + component + + true + true + + +autoStretchColumns + + true + + + +disabled + + false + + + +headerHeight + + 40.0 + + + +loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + +loadingOverlayType + + "TEXT_OVERLAY" + + + +multiselectable + + false + + + +noRowsOverlayMessage + + "Данные отсутствуют" + + + +parentControl + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + +rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + +rowHeight + + 40.0 + + + +style + + + + height + + "300px" + + + + + + +visible + + true + + + + + + + StaticGridColumns + property.grid + + true + true + + +columns + + + + + + displayName + + "Группа" + + + + name + + "group$name" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 400 + + + + + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + + CheckUserAuthority + modules.user-management.component + + true + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 4d7361c8-5071-4d62-b50e-e79ee636fa57 + ac-dependent-grid + false + false + + + +elseActions + + + + + + behavior + + {"objectId":"d3f54b16-ae69-4685-a071-4f781c3f9b61","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + +staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"d3f54b16-ae69-4685-a071-4f781c3f9b61","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "setVisible" + + + + value + + + +staticValue + + + boolean + + + false + + + + + + + + + + + +eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + +ifCondition + + + + conditions + + + + + +_isGroupSelected + + false + + + +one + + + + conditionFirstPart + + + + objectValue + + + + argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.BOUND_GROUPS.LIST" + + + + + + + behavior + + {"objectId":"d3f54b16-ae69-4685-a071-4f781c3f9b61","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + + method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + +boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + +thenActions + + + + + + behavior + + {"objectId":"d3f54b16-ae69-4685-a071-4f781c3f9b61","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + +staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"d3f54b16-ae69-4685-a071-4f781c3f9b61","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "setVisible" + + + + value + + + +staticValue + + + boolean + + + true + + + + + + + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 7792985e-2074-4214-bff5-515576022af2 + VBox + true + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + c4f7ba4d-03b3-4948-86ed-2ca4b8a6631b + HBox + true + false + + + + cssClasses + + + + + + style + + + + height + + "" + + + + width + + "" + + + + + + + + + + + + + + AuthMethodBehavior + scripts + + true + true + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + a034e0fd-82dd-40c8-bada-c3a0d6eebeb5 + create-button + false + false + + + + caption + +"Создать" + + + + cssClasses + + + + "btn-blue" + + + + + + route + +"/user-management/users/new" + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + AuthMethodBehavior + scripts + + true + true + + + + ea37a1ad-5fd4-4dcf-a641-e2046641f862 + d45bf7b0-dcab-48f6-a53b-26723524b371 + edit-button + false + false + + + + baseRoute + +"/user-management/users" + + + + caption + +"Редактировать" + + + + cssClasses + + + + "btn-yellow" + + + + + + disabled + +true + + + + selectableComponent + +{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + + + + AuthMethodBehavior + scripts + + true + true + + + + 9565de01-59ad-4dbd-a5a7-44c9f7f56fe1 + 3d6e68c8-b745-49bb-a5d5-d27f5fdad72d + delete-button + false + false + + + + confirmationText + +"Вы уверены, что хотите удалить пользователя?" + + + + cssClasses + + + + "btn-red" + + + + + + selectableGrid + +{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + + + + + deleteButtonService + + + UserDeleteButtonService + ru.cg.webbpm.user_management.custom + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + + + + AuthMethodBehavior + scripts + + true + true + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 98d7a384-bac4-4b95-9d8f-9245d91927c1 + ldap-sync-button + false + false + + true + + + + SyncLDAPButton + component + + true + true + + + caption + +"Синхронизировать с LDAP" + + + + disabled + +false + + + + usersGrid + +{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + visible + +false + + + + + + + AuthMethodBehavior + scripts + + true + true + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + dacfb992-f471-468a-b8bc-2fe3b916a2f7 + clear-security-cache-btn + false + false + + + ClearSecurityCacheBtn + component + + true + true + + + caption + +"Очистить кэш безопасности" + + + + disabled + +false + + + + tooltip + +"Очистить кэш безопасности" + + + + visible + +true + + + + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + true + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 72758401-49a1-433e-9bd9-5577b2ae60b7 + ac-create + false + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + a72d531c-3c9f-4390-8b7a-1f6bb3fa0e9d + ac-edit + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.READ" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.WRITE" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb","packageName":"component.field","className":"StaticComboBox","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "false" + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + "AND" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 250006ff-42d5-4c45-87f3-183857d7a13b + ac-remove + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.DELETE" + + + + + + +behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb","packageName":"component.field","className":"StaticComboBox","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "false" + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 696aaf8c-3075-4d6a-b58b-c7c79394affe + ac-create-button-hide-if-kerberos-or-no-authority + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"a034e0fd-82dd-40c8-bada-c3a0d6eebeb5","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + +method + + "isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.WRITE" + + + + + + +behavior + + {"objectId":"a034e0fd-82dd-40c8-bada-c3a0d6eebeb5","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + logicalOperation + + "OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"a034e0fd-82dd-40c8-bada-c3a0d6eebeb5","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 8b27dfb0-9d38-492b-8ee2-100d6c5a58d7 + ac-edit-button-hide-if-kerberos-or-no-authority + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.READ" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.WRITE" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + logicalOperation + + "OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 6377bc60-5a59-42d9-b5f1-3ccefac4ffe4 + ac-edit-button-enabled-if-has-authority + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.READ" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.WRITE" + + + + + + +behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb","packageName":"component.field","className":"StaticComboBox","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "false" + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"d45bf7b0-dcab-48f6-a53b-26723524b371","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 7b63ea1b-1c51-4237-8946-14cc474d5eb0 + ac-delete-button-hide-if-kerberos-or-no-authority + false + false + + + + elseActions + + + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + +method + + "isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.DELETE" + + + + + + +behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + "OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 7af3269d-369f-4a2a-85e7-8e4b621da324 + ac-delete-button-enabled-if-has-authority + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.USER.DELETE" + + + + + + +behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + null + + + + + + +behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + +method + + "isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb","packageName":"component.field","className":"StaticComboBox","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "false" + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"3d6e68c8-b745-49bb-a5d5-d27f5fdad72d","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 3f2cb52c-a805-4bbd-a893-48506a2ee1cf + ac-ldap-sync-button + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"98d7a384-bac4-4b95-9d8f-9245d91927c1","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + +method + + "isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"98d7a384-bac4-4b95-9d8f-9245d91927c1","packageName":"component","className":"SyncLDAPButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + af550f44-c563-4e73-9703-a8dfd73f4627 + ac-clear-security-cache-btn + false + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"dacfb992-f471-468a-b8bc-2fe3b916a2f7","packageName":"component","className":"ClearSecurityCacheBtn","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.SECURITY_CACHE.CLEAR" + + + + + + +behavior + + {"objectId":"dacfb992-f471-468a-b8bc-2fe3b916a2f7","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + false + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"dacfb992-f471-468a-b8bc-2fe3b916a2f7","packageName":"component","className":"ClearSecurityCacheBtn","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + e3ed2a20-be7f-4ee3-a85c-29bcffad04dc + hide-if-kerberos + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"c4f7ba4d-03b3-4948-86ed-2ca4b8a6631b","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + +method + + "isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"8b2e2c4f-6b66-4d6f-bd0c-a89e539356bb","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + + + + AuthMethodBehavior + scripts + + true + true + true + + + + + diff --git a/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override b/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override new file mode 100644 index 00000000..3fb7cfc1 --- /dev/null +++ b/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override @@ -0,0 +1,1739 @@ + + + f3caf12e-561c-4708-8913-cc3d54bf164f + Groups + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 0f8d0a8b-8014-4367-8ff3-7f049c284978 + Groups + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 7a7ae21a-2c01-49ee-a2d4-22f933d9445c + Text + false + false + + + + cssClasses + + + + "title" + + + + + + + + initialValue + + "Администрирование групп" + + + + + + + + + false + + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 9055eba3-0243-4746-9890-70b486c3fb8d + FilterGroup + true + false + + + + filterableComp + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + liveFilter + + true + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 9c81110c-d0d5-4d2a-afa8-e5b093ad47ba + search + false + false + + + + cssClasses + + + + "width-full " + + + + + "fixed-label" + + + + + + label + +"Поиск" + + + + + + + + operation + +"CONTAINS" + + + + + + true + + + + StaticFilterControl + ru.cg.webbpm.user_management + + true + true + + + column + +"name" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + +"group" + + + + + + + + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 1ddc006e-75b2-4103-87e1-7991c9f3520d + Grid + false + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9e4f1939-0dc7-43a2-b4ec-e425d6fdb93a + HBox + true + true + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 1ddc006e-75b2-4103-87e1-7991c9f3520d + Grid + false + false + false + + false + true + + + + + gridService + + +GroupGridService +ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Имя" + + + + name + + "group$name" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 700 + + + + + + + + + + displayName + + "Создана" + + + + name + + "group$created" + + + + type + + "DATE_TIME" + + + + width + + 200 + + + + + + + + + + displayName + + "Изменена" + + + + name + + "group$updated" + + + + type + + "DATE_TIME" + + + + width + + 200 + + + + + + + + + + + true + + + + InMemoryStaticColumnGrid + component + + true + true + + + autoStretchColumns + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + visible + + true + + + + + + + InMemoryGridLoader + component.grid + + true + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 3ae192dd-d45b-4c23-bd8d-b386abda0273 + HBox + true + false + + + + cssClasses + + + + + + + + + + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + 18b01c4c-1c1d-4436-870d-7541a72648b6 + create-button + false + false + + + + caption + +"Создать" + + + + cssClasses + + + + "btn-blue" + + + + + + route + +"/user-management/groups/new" + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + + + + ea37a1ad-5fd4-4dcf-a641-e2046641f862 + 5c8de2f4-6849-48bc-b8dd-36e649ad2540 + edit-button + false + false + + + + baseRoute + +"/user-management/groups" + + + + caption + +"Редактировать" + + + + cssClasses + + + + "btn-yellow" + + + + + + disabled + +true + + + + selectableComponent + +{"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + + + + 9565de01-59ad-4dbd-a5a7-44c9f7f56fe1 + 4a9e9ed8-9936-428d-8ddd-4502e2a55700 + delete-button + false + false + + + + confirmationText + +"Вы уверены, что хотите удалить группу?" + + + + cssClasses + + + + "btn-red" + + + + + + selectableGrid + +{"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + + + false + + + deleteButtonService + + + GroupDeleteButtonService + ru.cg.webbpm.user_management.custom + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 26d4430f-ddf1-4997-83c5-0009edf32719 + ac-create + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"18b01c4c-1c1d-4436-870d-7541a72648b6","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"18b01c4c-1c1d-4436-870d-7541a72648b6","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.GROUP.WRITE" + + + + + + +behavior + + {"objectId":"18b01c4c-1c1d-4436-870d-7541a72648b6","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"18b01c4c-1c1d-4436-870d-7541a72648b6","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"18b01c4c-1c1d-4436-870d-7541a72648b6","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 15964601-92db-4da1-a279-5664844a0bf5 + ac-edit + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + + behavior + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.GROUP.READ" + + + + + + +behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.GROUP.WRITE" + + + + + + +behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"5c8de2f4-6849-48bc-b8dd-36e649ad2540","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + c4317a56-f9f6-4ea1-90bc-776c3bfaa8c0 + ac-delete + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"4a9e9ed8-9936-428d-8ddd-4502e2a55700","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"4a9e9ed8-9936-428d-8ddd-4502e2a55700","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.GROUP.DELETE" + + + + + + +behavior + + {"objectId":"4a9e9ed8-9936-428d-8ddd-4502e2a55700","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"4a9e9ed8-9936-428d-8ddd-4502e2a55700","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"4a9e9ed8-9936-428d-8ddd-4502e2a55700","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 6c034de2-0633-4f45-9ba1-625a00421718 + Roles + false + false + + + + cssClasses + + + + "sub-header" + + + + + + inheritParent + + false + + + + initialValue + + "Роли" + + + + + + + + + false + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 3acecb3c-c1d3-4a1e-9873-1c6050ff74f0 + RolesGrid + false + false + false + + false + true + + + + + gridService + + +GroupRolesGridService +ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Имя" + + + + name + + "role$name" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 1100 + + + + + + + + + + + + + + InMemoryStaticColumnGrid + component + + true + true + + + autoStretchColumns + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + parentControl + + {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + visible + + true + + + + + + + InMemoryGridLoader + component.grid + + true + true + + + true + + + + diff --git a/resources/src/main/resources/overrides/16071adb-3bdf-4c33-b29b-886876016415.component.override b/resources/src/main/resources/overrides/16071adb-3bdf-4c33-b29b-886876016415.component.override new file mode 100644 index 00000000..ddb674b9 --- /dev/null +++ b/resources/src/main/resources/overrides/16071adb-3bdf-4c33-b29b-886876016415.component.override @@ -0,0 +1,182 @@ + + + 16692227-09f3-4a70-bcb1-f78a16afb622 + GridV2 + grids + META-INF/components/icons/grids/Grid.png + META-INF/components/localization/grids/grid + META-INF/components/docs/component/grids/Таблица.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 16071adb-3bdf-4c33-b29b-886876016415 + GridV2 + true + false + + + GridV2 + component.grid + + true + true + + + autoStretchColumns + + false + + + + disabled + + false + + + + fetchSize + + 20.0 + + + + headerHeight + + 40.0 + + + + loadOnInit + + true + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + pagination + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + rowModelType + + "INFINITE_LOAD" + + + + style + + + +height + + "" + + + +width + + "" + + + + + + + theme + + "BALHAM" + + + + visible + + true + + + + + + + GridRpcService + rpc + + true + true + + + gridService + + + +loadDao + + + DefaultLoadDao + database.dao + + + + + + GridV2ServiceImpl + service + + + + + + + + ColumnSorts + property.grid + + true + true + + + diff --git a/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override b/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override new file mode 100644 index 00000000..08f91892 --- /dev/null +++ b/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override @@ -0,0 +1,1730 @@ + + + f7edbc3d-3028-476e-a83b-691408c2718c + Roles + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 38c2de2f-c5dd-413e-babf-ce54cb4e5279 + Roles + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 47e95cb8-ec90-4d23-bdbc-02a993cba433 + Text + false + false + + + + cssClasses + + + + "title" + + + + + true + + + + initialValue + + "Администрирование ролей" + + + + + + + + + false + + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 5caea80b-ba43-4d5a-ae62-cf1aa1b5e8de + FilterGroup + true + false + + + + filterableComp + + {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + liveFilter + + true + + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 4c6be823-5f06-4a7c-b965-944a778f96b4 + search + false + false + + + + cssClasses + + + + "width-full " + + + + + "fixed-label" + + + + + + label + +"Поиск" + + + + type + +"TEXT" + + + + + + + + operation + +"CONTAINS" + + + + + + true + + + + StaticFilterControl + ru.cg.webbpm.user_management + + true + true + + + column + +"name" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + +"role" + + + + + + + + + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + a56dd87e-02e2-4dd5-9dc7-ec94e3758511 + Grid + false + false + false + + true + + + + + gridService + + +RoleGridService +ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Имя" + + + + name + + "role$name" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 700 + + + + + + + + + + displayName + + "Создана" + + + + name + + "role$created" + + + + type + + "DATE_TIME" + + + + width + + 200 + + + + + + + + + + displayName + + "Изменена" + + + + name + + "role$updated" + + + + type + + "DATE_TIME" + + + + width + + 200 + + + + + + + + + + + true + + + + InMemoryStaticColumnGrid + component + + true + true + + + autoStretchColumns + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + true + + + + visible + + true + + + + + + + InMemoryGridLoader + component.grid + + true + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9a8e1a6b-5cd8-4b6e-b3ec-8da88c6018a2 + HBox + true + false + + + + cssClasses + + + true + + + + + + + + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + d5af9dbe-a63f-4420-a109-dcd5d6894355 + create-button + false + false + + + + caption + +"Создать" + + + + cssClasses + + + + "btn-main" + + +true + + + + route + +"/user-management/roles/new" + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + ea37a1ad-5fd4-4dcf-a641-e2046641f862 + 29d2fdef-ff61-4689-bded-2c34bff0de72 + edit-button + false + false + + + + baseRoute + +"/user-management/roles" + + + + caption + +"Редактировать" + + + + cssClasses + + + + "btn-yellow" + + + + + + disabled + +true + + + + selectableComponent + +{"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + 9565de01-59ad-4dbd-a5a7-44c9f7f56fe1 + 7fbf947c-b03a-42f1-881d-0f0d449cb1d2 + delete-button + false + false + + + + confirmationText + +"Вы уверены, что хотите удалить роль?" + + + + cssClasses + + + + "btn-red" + + + + + + selectableGrid + +{"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + + + + + deleteButtonService + + + RoleDeleteButtonService + ru.cg.webbpm.user_management.custom + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + fca14225-0522-4cc8-ad0d-1126644cf028 + ac-create + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"d5af9dbe-a63f-4420-a109-dcd5d6894355","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"d5af9dbe-a63f-4420-a109-dcd5d6894355","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ROLE.WRITE" + + + + + + +behavior + + {"objectId":"d5af9dbe-a63f-4420-a109-dcd5d6894355","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"d5af9dbe-a63f-4420-a109-dcd5d6894355","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"d5af9dbe-a63f-4420-a109-dcd5d6894355","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + b801dc2c-9067-4669-8bba-620bdde0be51 + ac-edit + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + + + behavior + + {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ROLE.READ" + + + + + + +behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ROLE.WRITE" + + + + + + +behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + "AND" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"29d2fdef-ff61-4689-bded-2c34bff0de72","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + eedf3b3b-c42c-4b81-94ce-3b5cc3c6bd07 + ac-remove + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"7fbf947c-b03a-42f1-881d-0f0d449cb1d2","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"7fbf947c-b03a-42f1-881d-0f0d449cb1d2","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.GROUP.DELETE" + + + + + + +behavior + + {"objectId":"7fbf947c-b03a-42f1-881d-0f0d449cb1d2","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"7fbf947c-b03a-42f1-881d-0f0d449cb1d2","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"7fbf947c-b03a-42f1-881d-0f0d449cb1d2","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 86bc12ae-bb9f-42d6-b111-63f7521fedb6 + Groups + false + false + + + + cssClasses + + + + "sub-header" + + + + true + + + + initialValue + + "Группы" + + + + + + + + + false + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + ab666d58-a9b4-417c-9da9-eab2e0b6a958 + GroupsGrid + false + false + + false + true + + + + + gridService + + true + +GroupsByRolesGridService +ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Имя" + + + + name + + "group$name" + + + + sortOrder + + "ASC" + + + + type + + "STRING" + + + + width + + 700 + + + + true + + + + + + + + + InMemoryStaticColumnGrid + component + + true + true + + + autoStretchColumns + + true + + + + disabled + + false + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + parentControl + + {"objectId":"341e78e5-b55f-4922-890a-2fd52426c25d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + visible + + true + + + + + + + InMemoryGridLoader + component.grid + + true + true + + + true + + + + diff --git a/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override b/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override new file mode 100644 index 00000000..3c84beb7 --- /dev/null +++ b/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override @@ -0,0 +1,990 @@ + + + 87d658ab-553e-3c24-9bca-84ed41f89d4d + ManyToManyField + fields + META-INF/components/icons/fields/ManyToManyField.png + META-INF/components/localization/fields/many-to-many-field + META-INF/components/docs/component/fields/ManyToManyField.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 4e314e88-02d6-4b0e-b7a7-15a36bdeb682 + ManyToManyField + true + false + + + + cssClasses + + + +"many-to-many" + + + + + + + + + + + + 72ddc7d1-f8dd-449f-8956-39b9f93ad919 + 65b60ec7-e257-4ca8-8042-dd20a347e8f6 + Поле с множественным выбором + false + false + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 96b00b54-c78b-435d-a6d7-160fff654acd + Кнопка "Изменить" + false + false + + + Button + component.button + + + + caption + + "Изменить" + + + + + + + OpenDialog + component.complex.common + + true + true + + + dialog + + {"objectId":"5f581822-cc0f-4841-af5e-7f0732d68131","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + SetRowsFromField + component.complex.manytomany + + true + true + true + + + + SetRowsFromFieldForMTMField + component.complex.maytomanyfield + + true + true + + + from + + {"objectId":"65b60ec7-e257-4ca8-8042-dd20a347e8f6","packageName":"component.field","className":"MultiValueField","type":"TS"} + + + + grid + + {"objectId":"88141d81-9fb4-48a3-b86c-f68f12062606","packageName":"component","className":"Grid","type":"TS"} + + + + to + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + caption + + "..." + + + + + + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + 5f581822-cc0f-4841-af5e-7f0732d68131 + Диалог выбора + true + false + + + Dialog + component + + + + style + + + + width + + "800px" + + + + + + + title + + "Выбор записей" + + + + visible + + true + + + + + + + + style + + + + width + + "" + + + + + + + title + + "Выбор записей" + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + af91786e-d5dc-4c6a-a074-64f96ccd8a28 + Горизонтальный контейнер + true + false + + + HBox + component.container + + + + cssClasses + + + + "many-to-many-grids-panel" + + + + + + + + + + cssClasses + + + + "many-to-many-grids-panel" + + + + + + + + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 88141d81-9fb4-48a3-b86c-f68f12062606 + Таблица + false + false + false + + + Grid + component + + + +disabled + + false + + + +multiselectable + + false + + + +visible + + false + + + + + + + GridRpcService + rpc + + + +gridService + + + + loadDao + + + DefaultLoadDao + database.dao + + + + + + GridServiceImpl + service + + + + + + + + GridColumns + property.grid + + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + +button + + {"objectId":"a14e98a5-92a1-4016-bea3-7aa7b5662516","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + CopyGridConfigToLinkField + component.complex.manytomany + + true + true + + +linkField + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 02f8d01a-f705-4bed-ad92-2fcec0b222c1 + Вертикальный контейнер + true + false + + + VBox + component.container + + + +cssClasses + + + + "many-to-many-move-buttons" + + + + + + + + + +cssClasses + + + + "many-to-many-move-buttons" + + + + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + a14e98a5-92a1-4016-bea3-7aa7b5662516 + Кнопка "Добавить" + false + false + + +Button +component.button + + + + caption + + "\u003e" + + + + cssClasses + + + + + + disabled + + true + + + + + + +AddOneRow +component.complex.manytomany + + true + true + + + grid + + {"objectId":"88141d81-9fb4-48a3-b86c-f68f12062606","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + caption + + "\u003e" + + + + disabled + + true + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 8effd638-602f-47fd-b8cf-e37be4aa6336 + Кнопка "Добавить все" + false + false + + +Button +component.button + + + + caption + + "\u003e\u003e" + + + + cssClasses + + + + + + disabled + + false + + + + + + +AddAllRows +component.complex.manytomany + + true + true + + + grid + + {"objectId":"88141d81-9fb4-48a3-b86c-f68f12062606","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + caption + + "\u003e\u003e" + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 770f3102-c304-4637-9c02-096ea2265562 + Кнопка "Удалить" + false + false + + +Button +component.button + + + + caption + + "\u003c" + + + + cssClasses + + + + + + disabled + + true + + + + + + +RemoveOneRow +component.complex.manytomany + + true + true + + + grid + + {"objectId":"88141d81-9fb4-48a3-b86c-f68f12062606","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + caption + + "\u003c" + + + + disabled + + true + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + f5f25124-dd6c-43f5-966b-f8107a33e840 + Кнопка "Удалить все" + false + false + + +Button +component.button + + + + caption + + "\u003c\u003c" + + + + cssClasses + + + + + + disabled + + false + + + + + + +RemoveAllRows +component.complex.manytomany + + true + true + + + grid + + {"objectId":"88141d81-9fb4-48a3-b86c-f68f12062606","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + caption + + "\u003c\u003c" + + + + + + + + aac130d1-08bd-42eb-b0ac-b1a3cc0b3f2f + 31aa3c83-944f-4ddf-923b-23f5340188db + Диалог + false + false + false + + + LinkField + component.field + + + +collectible + + false + + + +disabled + + false + + + +multiselectable + + false + + + +required + + false + + + +visible + + false + + + + + + + LinkFieldRpcService + rpc.field + + true + true + + + + GridColumns + property.grid + + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + +button + + {"objectId":"770f3102-c304-4637-9c02-096ea2265562","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + LinkFieldCustomSaveLoadScript + component.field.persist + + true + + + + +headerHeight + + 40.0 + + + +rowHeight + + 40.0 + + + + + + + true + + + true + + + true + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + e4aed3a0-f64a-4016-9a40-8e54f7827b18 + Горизонтальный контейнер + true + false + + + HBox + component.container + + + + cssClasses + + + + "buttons-on-right" + + + + + + + + + + cssClasses + + + + "buttons-container" + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 71e4d6db-2cd6-4886-ac99-7fea06c91b22 + Горизонтальный контейнер + true + false + + + HBox + component.container + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 6b1f121f-9856-4bff-aa7b-b667bbbe2b15 + Кнопка "Ок" + false + false + + +Button +component.button + + + + caption + + "Ок" + + + + + + +SelectRecords +component.complex.manytomany + + true + true + true + + + +HideDialog +component.complex.common + + true + true + + + dialog + + {"objectId":"5f581822-cc0f-4841-af5e-7f0732d68131","packageName":"component","className":"Dialog","type":"TS"} + + + + + + +SetRowsToField +component.complex.manytomany + + true + true + true + + + +SetRowsFromField +component.complex.manytomany + + true + true + true + + + +SetRowsToField +component.complex.manytomany + + true + true + + + from + + {"objectId":"31aa3c83-944f-4ddf-923b-23f5340188db","packageName":"component.field","className":"LinkField","type":"TS"} + + + + to + + {"objectId":"65b60ec7-e257-4ca8-8042-dd20a347e8f6","packageName":"component.field","className":"MultiValueField","type":"TS"} + + + + + + + + caption + + "Ок" + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + ea093273-b62b-4bdc-a869-b1d5efb2b65d + Кнопка "Отмена" + false + false + + +Button +component.button + + + + caption + + "Отмена" + + + + + + +HideDialog +component.complex.common + + true + true + + + dialog + + {"objectId":"5f581822-cc0f-4841-af5e-7f0732d68131","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + + caption + + "Отмена" + + + + + + + + + + aac130d1-08bd-42eb-b0ac-b1a3cc0b3f2f + e1857494-8960-4943-a5d9-917fa53600c6 + Связанная таблица + false + true + + + diff --git a/resources/src/main/resources/overrides/57537dbd-c468-4c2d-99df-924b5ba018d6.component.override b/resources/src/main/resources/overrides/57537dbd-c468-4c2d-99df-924b5ba018d6.component.override new file mode 100644 index 00000000..068bff86 --- /dev/null +++ b/resources/src/main/resources/overrides/57537dbd-c468-4c2d-99df-924b5ba018d6.component.override @@ -0,0 +1,140 @@ + + + 0263d4c9-9901-3236-9c18-2386d89b3971 + TreeGrid + grids + META-INF/components/icons/grids/TreeGrid.png + META-INF/components/localization/grids/tree-grid + META-INF/components/docs/component/grids/Древовидная_таблица.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 57537dbd-c468-4c2d-99df-924b5ba018d6 + TreeGrid + false + false + false + + + TreeGrid + component + + true + true + + + disabled + + false + + + + headerHeight + + 40.0 + + + + hideChildCount + + true + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + showFilteredChildren + + false + + + + visible + + true + + + + + + + TreeGridRpcService + rpc + + true + true + + + treeGridService + + + +loadDao + + + TreeGridLoadDaoImpl + dao + + + + + + TreeGridServiceImpl + service + + + + + + + + GridColumns + property.grid + + true + true + + + diff --git a/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override b/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override new file mode 100644 index 00000000..b7f3e68f --- /dev/null +++ b/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override @@ -0,0 +1,1546 @@ + + + b1f98470-7f25-4a24-806e-2c316acfc2b8 + Organizations + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 5cc0e63d-f697-47a8-a9dc-3170f1a99721 + Organizations + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c262a5da-38cb-4739-9d59-3bb7fdf55e26 + Текст + false + false + + + + cssClasses + + + + "title" + + + + + true + + + + initialValue + + "Администрирование организаций" + + + + + + + + + false + + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 2c143f13-f25f-49e2-8615-aa76a1dac394 + Группа фильтров + true + false + + + + filterableComp + + {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + liveFilter + + true + + + + style + + true + + + + + + + + + service + + + + loadDao + + true + + + + true + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + d64cc9e2-4e33-4a5d-9792-d4ac8f5a5754 + Фильтр по текстовому полю + false + false + + + + cssClasses + + + + "width-full" + + + + + "fixed-label" + + + + + + label + +"Фильтр" + + + + + + + + operation + +"CONTAINS" + + + + + + true + + + + + StaticFilterControl + ru.cg.webbpm.user_management + + true + true + + + column + +"name" + + + + dataConverter + +true + + StringValueConverter + component.field.dataconvert + + + + + entity + +"orgUnit" + + + + + + + + + + + + 57537dbd-c468-4c2d-99df-924b5ba018d6 + 2db7e240-3978-4826-aa2d-4d031cb0e7a0 + Древовидная таблица + false + false + + true + + + + + treeGridService + + true + +OrgUnitTreeGridService +ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticColumnTreeGrid + component + + true + true + true + + + + StaticGridColumns + property.grid + + true + true + true + + + + GridColumns + property.grid + + true + true + true + + + + StaticColumnTreeGrid + component + + true + true + + + checkboxColumn + + false + + + + checkboxInMainColumn + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + showFilteredChildren + + false + + + + visible + + true + + + + + + + StaticGridColumns + property.grid + + true + true + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Наименование" + + + + name + + "name" + + + + type + + "STRING" + + + + width + + 250 + + + + true + + + + + + + displayName + + "Код" + + + + name + + "org_unit$code" + + + + type + + "STRING" + + + + true + + + true + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + e3ca31f5-4ec1-45a9-b195-94806048ba3f + Горизонтальный контейнер + true + false + + + + cssClasses + + + true + + + + + + + + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + 480a06a2-f4b1-46eb-bf3f-0e4097460719 + create-button + false + false + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + + caption + +"Создать" + + + + cssClasses + + + + "btn-main" + + +true + + + + route + +"/user-management/org-units/new" + + + + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + ea37a1ad-5fd4-4dcf-a641-e2046641f862 + 653b6b0c-072c-40d1-bcc0-41157a888fad + edit-button + false + false + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + + baseRoute + +"/user-management/org-units" + + + + caption + +"Редактировать" + + + + cssClasses + + + + "btn-yellow" + + + + + + disabled + +true + + + + selectableComponent + +{"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + 9565de01-59ad-4dbd-a5a7-44c9f7f56fe1 + e61b659b-d293-4005-a1c2-0d110d058c52 + delete-button + false + false + + + + confirmationText + +"Вы уверены, что хотите удалить организацию? Внимание: все дочерние организации также будут удалены!" + + + + cssClasses + + + + "btn-red" + + + + + + selectableGrid + +{"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + + + + + deleteButtonService + +true + + OrgUnitDeleteButtonService + ru.cg.webbpm.user_management.custom + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + a01d154c-55fe-4a77-97b0-e2e90ce5e370 + ac-create + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"480a06a2-f4b1-46eb-bf3f-0e4097460719","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"480a06a2-f4b1-46eb-bf3f-0e4097460719","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + propertyName + + "gridLoaded" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ORG_UNIT.WRITE" + + + + + + +behavior + + {"objectId":"480a06a2-f4b1-46eb-bf3f-0e4097460719","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"480a06a2-f4b1-46eb-bf3f-0e4097460719","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"480a06a2-f4b1-46eb-bf3f-0e4097460719","packageName":"modules.user-management.component","className":"StaticRouteNavigationButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 8ec15acd-7973-4f09-8723-3c69ec829f78 + ac-edit + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + + behavior + + {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ORG_UNIT.READ" + + + + + + +behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ORG_UNIT.WRITE" + + + + + + +behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"653b6b0c-072c-40d1-bcc0-41157a888fad","packageName":"modules.user-management.component","className":"StaticRouteSelectButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 885a70ad-e6fd-4a17-a9ac-66c326c117fe + ac-delete + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"e61b659b-d293-4005-a1c2-0d110d058c52","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + + behavior + + {"objectId":"e61b659b-d293-4005-a1c2-0d110d058c52","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.ORG_UNIT.DELETE" + + + + + + +behavior + + {"objectId":"e61b659b-d293-4005-a1c2-0d110d058c52","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + +method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"e61b659b-d293-4005-a1c2-0d110d058c52","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + behavior + + {"objectId":"e61b659b-d293-4005-a1c2-0d110d058c52","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + + + + + + + + + + diff --git a/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override b/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override new file mode 100644 index 00000000..1ea2af6b --- /dev/null +++ b/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override @@ -0,0 +1,1542 @@ + + + d7567f2d-defe-4afc-a5af-841ab87c547f + UsersCreate + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 5f9c58f8-9ee1-4df3-b93c-e48534e798db + UsersCreate + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + e44fca88-2550-43a5-acc6-8b3d8a320f54 + Text + false + false + + + + cssClasses + + + + + "title" + + + + + + + initialValue + + "Создание пользователей" + + + + + + + + + false + + + + 5a326846-16ae-42c1-bad7-cb8c89c5339f + dd8d4f7a-d682-4ad5-b912-2f893c80286c + Form + true + false + + + + cssClasses + + + + + + + + + + + + + 46800f73-0c20-46b2-b42f-1592cff4a229 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + HBox + true + false + + + + cssClasses + + + + + + + + + + + + 13f69814-e4d9-4e0a-9439-b32d6cdaac66 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + VBox + true + true + + + ece5190d-1485-4bce-9cfb-91f6d5c1efea + dd8d4f7a-d682-4ad5-b912-2f893c80286c + VBox + true + false + + + +cssClasses + + + + + +style + + + + padding + + "0 20px 0 0" + + + + width + + "25%" + + + + + + + + + + + + + 4cdd8f8f-7bca-4110-a99d-165ca3e663b0 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + + + + + + + + 50dcb56a-03ea-47b7-a41d-2b5bb90a63aa + dd8d4f7a-d682-4ad5-b912-2f893c80286c + HBox + true + true + + + 5b7bda09-e09e-41ed-99b5-31d3ef6a3ffa + dd8d4f7a-d682-4ad5-b912-2f893c80286c + last-name + false + false + + + + cssClasses + + + + "width-full" + + + + + + type + + "TEXT" + + + + + + + + + + + + a1706c0e-bff0-459e-ae99-7a7a304575fd + dd8d4f7a-d682-4ad5-b912-2f893c80286c + first-name + false + false + + + + cssClasses + + + + + "width-full" + + + + + + type + + "TEXT" + + + + + + + + + + + + 5bfd8063-6dfd-4e15-baac-c2285ddc12f1 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + middleName + false + false + + + + cssClasses + + + + + "width-full" + + + + + + type + + "TEXT" + + + + + + + + + + + + fff08a7a-f9a4-49bc-8423-f5255b769b27 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + phone + false + false + + + + + + + + + df424200-9b82-4d0a-be54-67ddcaf01b18 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + created + false + false + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 6fbd62ad-3ab5-45eb-81e1-79decdb30591 + ActionController created + false + true + + + 42343f77-fe31-470f-ad5c-245b8abb3703 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + updated + false + false + + + + + + + + + bfac29f4-f32e-4b18-b307-6f1c814b258b + dd8d4f7a-d682-4ad5-b912-2f893c80286c + VBox + true + true + + + f2c993f1-9ebf-43b8-8e90-58a702f5fe88 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + VBox + true + false + + + +cssClasses + + + + + +style + + + + padding + + "0 20px 0 0" + + + + width + + "30%" + + + + + + + + + + + + + cec4001b-c994-442e-8db2-8633667ad277 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + + + + + + + + + 729e2c6c-730c-4f73-894f-5c82f65a6e05 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + HBox + true + true + + + 87d53c7f-b2a6-4390-af4a-0f7e0ccb5d95 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + login + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + type + + "TEXT" + + + + + + + + + + + + c2beafbf-3be8-44cc-a832-3aed3256e1c8 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + password + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + required + + true + + + + + + + + + + + + + 722985df-b127-48c5-8081-8078c1e43994 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + password-repeat + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + required + + true + + + + + + + + + + + + da7d2474-8bee-4085-90c2-d8c062602410 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + email + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + + + + + + + + + 7e128e44-f98f-4cee-be88-0d9b2ad47955 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + locked + false + true + + + 5cf5556d-24ff-4f27-bd22-47b8a9f215a1 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + password-changed + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + + + + + + + + + 80502b7d-e636-458c-9b7d-4dab3eebc46d + dd8d4f7a-d682-4ad5-b912-2f893c80286c + password-expires + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + + + + + + + + + f9a38417-9ad0-412a-9b5f-bbeb450dddd6 + 764d8c70-b243-4e9d-8ba0-59068607380e + org_unit_id + false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + dad3e113-6fc0-4577-a730-a99af433b70b + org_unit_id + false + false + + + + label + + "Организация" + + + + required + + true + + + + + + + + comboBoxService + + + OrgUnitComboBoxServiceImpl + ru.cg.webbpm.user_management.custom + + + + + + + false + + + + + false + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "orgUnitId" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + 33f4f16e-7d84-4811-b6d5-b2d890e8f73d + dd8d4f7a-d682-4ad5-b912-2f893c80286c + password-validate + false + false + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f414d74e-2247-4e41-8280-638063712186 + VBox + true + false + + + +style + + + + width + + "45%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 0b9b0cf3-55c1-4108-bea2-f70100ab92f2 + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + label + + "Группы" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + d148dfe4-0c8a-4bb2-94da-336d4399a7c4 + HBox + true + false + + + + + + + 53faccc7-08f1-4806-adb2-ff9ef522f144 + 7c06a3a6-1040-4bc0-bf3c-4760cd70335a + AvailableRecordsGrid + false + false + false + + + + button + + {"objectId":"18cdf07c-f772-4be3-8eea-2ca5d3f651eb","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + + existingRowsField + + {"objectId":"379fd159-d5a5-4b96-805b-0bae71b3f495","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + +true + + +true + + +true + + + + + gridService + + + GroupGridService + ru.cg.webbpm.user_management.custom + + + + + + +true + + + + StaticGridColumns + property.grid + +true +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"group$name" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата изменения" + + + + formatter + + + DateFormatter + custom.grid.formatter + + + + + name + +"group$updated" + + + + type + +"DATE" + + + + + + + + + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true + + + column + + "userGroupId" + + + + dataConverter + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + + ListConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + InMemoryGridLoader + component.grid + +true +true + + + + InMemoryStaticColumnGrid + component + +true +true + + + autoStretchColumns + + true + + + + checkboxColumn + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + true + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + visible + + true + + + + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + f437b344-23a3-4957-aac6-0c301a43b178 + 8bf9cb9b-edc5-4009-be41-c838c5d8e63d + Buttons + true + false + + + + + + +6ae58cc0-2f33-41e3-89b3-022efcb81f51 +8bf9cb9b-edc5-4009-be41-c838c5d8e63d +Add +false +false + + + + + grid + + {"objectId":"7c06a3a6-1040-4bc0-bf3c-4760cd70335a","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"379fd159-d5a5-4b96-805b-0bae71b3f495","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +fa8cdc89-a074-4ac0-ae53-b948230b3f30 +8bf9cb9b-edc5-4009-be41-c838c5d8e63d +AddAll +false +false + + + + + grid + + {"objectId":"7c06a3a6-1040-4bc0-bf3c-4760cd70335a","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"379fd159-d5a5-4b96-805b-0bae71b3f495","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +c6b74d37-6e02-4fde-b636-e96fcdd68ede +8bf9cb9b-edc5-4009-be41-c838c5d8e63d +Remove +false +false + + + + + grid + + {"objectId":"7c06a3a6-1040-4bc0-bf3c-4760cd70335a","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"379fd159-d5a5-4b96-805b-0bae71b3f495","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +154adcc7-908c-4141-ab2f-6f728c62a51a +8bf9cb9b-edc5-4009-be41-c838c5d8e63d +RemoveAll +false +false + + + + + grid + + {"objectId":"7c06a3a6-1040-4bc0-bf3c-4760cd70335a","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"379fd159-d5a5-4b96-805b-0bae71b3f495","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + + + 7d5e764a-ce8e-4acc-9173-653718838aa4 + 379fd159-d5a5-4b96-805b-0bae71b3f495 + LinkFieldDialog for save + false + false + false + +true + + + + + button + + {"objectId":"1498ef4e-0a51-4dac-9b06-8d83263f03b4","packageName":"component.button","className":"Button","type":"TS"} + + + + + +true + + + + StaticGridColumns + property.grid + +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"group$name" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата и время добавления" + + + + formatter + + + DateTimeFormatter + custom.grid.formatter + + + + + name + +"link$created" + + + + type + +"DATE_TIME" + + + + + + + + + + + + StaticColumnLinkField + modules.user-management.component + +true +true + + + autoStretchColumns + + true + + + + collectible + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + required + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "" + + + + minWidth + + "" + + + + + + + visible + + true + + + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + AddAllRows + component.complex.manytomany + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + LinkFieldStaticColumnSaveLoadScript + ru.cg.webbpm.user_management + +true + + + linkedPkDataConverter + + + StringValueConverter + component.field.dataconvert + + + + + mainEntity + + "user" + + + + mainPkColumn + + "id" + + + + + + + LinkFieldRpcService + rpc.field + +true +true + + + linkFieldService + + + UserGroupGridService + ru.cg.webbpm.user_management.custom + + + + + + + + + + LinkFieldCurrentTimestampAsDefaultSetter + admin + +true +true + + + columnName + + "link$created" + + + + + + + 6e6817bb-6a55-45cf-9270-3bdd654a5784 + 835004dc-49a2-4bed-80be-d16504b3d6d9 + LinkField orig + false + true + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f414d74e-2247-4e41-8280-638063712186 + VBox + true + true + + + 013bed57-902a-4a5a-99df-97869fc0aa44 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + HBox + true + true + + + cbca6b02-8400-42c7-b0fb-a1371661a9d0 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + HBox + true + false + + + + cssClasses + + + + + + + + + + + + e8899b51-ba47-4898-abb2-b8a48866f680 + dd8d4f7a-d682-4ad5-b912-2f893c80286c + save-button + false + false + + + +cssClasses + + + + "btn-main" + + + + + + + + + 18275bb0-4449-4a9e-ade8-49253550a16d + dd8d4f7a-d682-4ad5-b912-2f893c80286c + cancel-button + false + false + + + +cssClasses + + + + "btn-red" + + + + + + + + + + + diff --git a/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override b/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override new file mode 100644 index 00000000..873cdbad --- /dev/null +++ b/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override @@ -0,0 +1,665 @@ + + + 041d8dc7-5d2e-38fd-98e6-bd03da125ce0 + ManyToMany + fields + META-INF/components/icons/fields/ManyToMany.png + META-INF/components/localization/fields/many-to-many + META-INF/components/docs/component/fields/ManyToMany.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 67605d63-1081-423b-b6b5-727ecfce2ca1 + ManyToMany + true + false + + + + cssClasses + + + +"many-to-many" + + + + + + + + + + + + aac130d1-08bd-42eb-b0ac-b1a3cc0b3f2f + 6e6817bb-6a55-45cf-9270-3bdd654a5784 + Связанная таблица + false + false + + + + + + true + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + dc7d3857-3c89-4245-b2d7-9b16504531ea + Кнопка "Изменить" + false + false + + + + caption + + "Изменить" + + + + + + + OpenDialog + component.complex.common + + true + true + + + dialog + + {"objectId":"c914b961-8766-4daa-a5a1-3c1c8a6d6c12","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + SetRowsFromField + component.complex.manytomany + + true + true + + + from + + {"objectId":"6e6817bb-6a55-45cf-9270-3bdd654a5784","packageName":"component.field","className":"LinkField","type":"TS"} + + + + grid + + {"objectId":"53faccc7-08f1-4806-adb2-ff9ef522f144","packageName":"component","className":"Grid","type":"TS"} + + + + to + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + c914b961-8766-4daa-a5a1-3c1c8a6d6c12 + Диалог + true + false + + + + style + + + + width + + "" + + + + + + + title + + "Выбор записей" + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 4b817c11-2ff9-4dcd-8caa-809cac503d03 + Горизонтальный контейнер + true + false + + + + cssClasses + + + + "many-to-many-grids-panel" + + + + + + + + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 53faccc7-08f1-4806-adb2-ff9ef522f144 + Таблица + false + false + + + +checkboxColumn + + true + + + +multiselectable + + true + + + + + + + +gridService + + + FilterableByPKGridService + component.complex + + + + + + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + +button + + {"objectId":"6ae58cc0-2f33-41e3-89b3-022efcb81f51","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + CopyGridConfigToLinkField + component.complex.manytomany + + true + true + + +linkField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + AvailableGridFilter + component.complex.manytomany + + true + true + + +existingRowsField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f437b344-23a3-4957-aac6-0c301a43b178 + Вертикальный контейнер + true + false + + + +cssClasses + + + + "many-to-many-move-buttons" + + + + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 6ae58cc0-2f33-41e3-89b3-022efcb81f51 + Кнопка "Добавить" + false + false + + + + caption + + "\u003e" + + + + disabled + + true + + + + + + +AddOneRow +component.complex.manytomany + + true + true + + + grid + + {"objectId":"53faccc7-08f1-4806-adb2-ff9ef522f144","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + fa8cdc89-a074-4ac0-ae53-b948230b3f30 + Кнопка "Добавить все" + false + false + + + + caption + + "\u003e\u003e" + + + + + + +AddAllRows +component.complex.manytomany + + true + true + + + grid + + {"objectId":"53faccc7-08f1-4806-adb2-ff9ef522f144","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + c6b74d37-6e02-4fde-b636-e96fcdd68ede + Кнопка "Удалить" + false + false + + + + caption + + "\u003c" + + + + disabled + + true + + + + + + +RemoveOneRow +component.complex.manytomany + + true + true + + + grid + + {"objectId":"53faccc7-08f1-4806-adb2-ff9ef522f144","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 154adcc7-908c-4141-ab2f-6f728c62a51a + Кнопка "Удалить все" + false + false + + + + caption + + "\u003c\u003c" + + + + + + +RemoveAllRows +component.complex.manytomany + + true + true + + + grid + + {"objectId":"53faccc7-08f1-4806-adb2-ff9ef522f144","packageName":"component","className":"Grid","type":"TS"} + + + + linkField + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + + aac130d1-08bd-42eb-b0ac-b1a3cc0b3f2f + 7d5e764a-ce8e-4acc-9173-653718838aa4 + Связанная таблица + false + false + false + + + +headerHeight + + 40.0 + + + +rowHeight + + 40.0 + + + + + + false + true + + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + +button + + {"objectId":"c6b74d37-6e02-4fde-b636-e96fcdd68ede","packageName":"component.button","className":"Button","type":"TS"} + + + + + + false + true + + + true + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 84678165-26c1-4b15-ac48-17fdef3092a6 + Горизонтальный контейнер + true + false + + + + cssClasses + + + + "buttons-container" + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 20fea21f-37e2-4f59-815a-14b79c4233ae + Горизонтальный контейнер + true + false + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 2059b4e7-02a5-48e6-b5ef-60646bc7a603 + Кнопка "Ок" + false + false + + + + caption + + "Ок" + + + + + + +SelectRecords +component.complex.manytomany + + true + true + true + + + +HideDialog +component.complex.common + + true + true + + + dialog + + {"objectId":"c914b961-8766-4daa-a5a1-3c1c8a6d6c12","packageName":"component","className":"Dialog","type":"TS"} + + + + + + +SetRowsToField +component.complex.manytomany + + true + true + true + + + +SetRowsFromField +component.complex.manytomany + + true + true + true + + + +SetRowsToField +component.complex.manytomany + + true + true + + + from + + {"objectId":"7d5e764a-ce8e-4acc-9173-653718838aa4","packageName":"component.field","className":"LinkField","type":"TS"} + + + + to + + {"objectId":"6e6817bb-6a55-45cf-9270-3bdd654a5784","packageName":"component.field","className":"LinkField","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 0069cefd-219e-4442-a696-012627b2a412 + Кнопка "Отмена" + false + false + + + + caption + + "Отмена" + + + + + + +HideDialog +component.complex.common + + true + true + + + dialog + + {"objectId":"c914b961-8766-4daa-a5a1-3c1c8a6d6c12","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + + + + diff --git a/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override b/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override new file mode 100644 index 00000000..e46fa683 --- /dev/null +++ b/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override @@ -0,0 +1,197 @@ + + + 739679d4-3421-42f0-84f5-e01710b0bb70 + EditableGrid + editable-grids + META-INF/components/icons/editable-grids/EditableGrid.png + META-INF/components/localization/editable-grids/editable-grid + META-INF/components/docs/component/editable-grids/EditableGrid.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 76e91ef4-d2ef-4662-96ad-84c0dae0ecff + EditableGrid + true + false + + + EditableGrid + component.editablegrid + + true + true + + + collectible + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + multiselectable + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowEditionType + + "DOUBLE_CLICK" + + + + rowHeight + + 40.0 + + + + visible + + true + + + + + + + EditableGrid + component.editablegrid + + true + true + + + service + + true + + EditableGridServiceImpl + service.editablegrid + + + + + + + + EditableGridRpcService + rpc.editablegrid + + true + + + + EditableGridValidator + component.editablegrid.validation + + true + + + + RequiredColumnValidator + component.editablegrid.validation.column + + true + true + + + message + + "Поле обязательно" + + + + + + + MinColumnValidator + component.editablegrid.validation.column + + true + true + + + message + + "Значение меньше минимального допустимого" + + + + + + + MaxColumnValidator + component.editablegrid.validation.column + + true + true + + + message + + "Значение превышает максимальное допустимое" + + + + + + + DefaultValueLoaderV2 + common.defaultvalue + + true + + + + DefaultValueLoaderRpcServiceV2 + rpc.loading + + true + + + service + + + DefaultValueLoaderServiceImpl + service.loading + + + + + + + + EditableGridDefaultValue + service.editablegrid.defaultloading + + true + + + diff --git a/resources/src/main/resources/overrides/7a57e082-99e3-4453-a2df-d5ffafa2c019.component.override b/resources/src/main/resources/overrides/7a57e082-99e3-4453-a2df-d5ffafa2c019.component.override new file mode 100644 index 00000000..a1166597 --- /dev/null +++ b/resources/src/main/resources/overrides/7a57e082-99e3-4453-a2df-d5ffafa2c019.component.override @@ -0,0 +1,175 @@ + + + ea5123ba-6e79-32d6-a08d-521073b63477 + Grid + grids + META-INF/components/icons/grids/Grid.png + META-INF/components/localization/grids/grid + META-INF/components/docs/component/grids/Таблица.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + Grid + false + false + + + Grid + component + + true + true + + + autoStretchColumns + + true + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + +height + + "" + + + +width + + "" + + + + + + + visible + + true + + + + + + + GridRpcService + rpc + + true + true + + + gridService + + + +loadDao + + + DefaultLoadDao + database.dao + + + + + + GridServiceImpl + service + + + + + + + + GridColumns + property.grid + + true + true + + + + GridInfiniteScrollLoader + component.grid + + true + true + + + gridLoadingOptions + + + +fetchSize + + 20.0 + + + + + + + + + diff --git a/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override b/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override new file mode 100644 index 00000000..d0ef319d --- /dev/null +++ b/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override @@ -0,0 +1,481 @@ + + + 1e6cedc2-82df-4bae-a4eb-32882ca3fe0b + EditableOneToMany + fields + META-INF/components/icons/fields/EditableOnetoMany.png + META-INF/components/localization/fields/editable-one-to-many + META-INF/components/docs/component/fields/EditableOneToMany.html + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8e1d9023-42c0-4960-9c59-02f4f0c2e4dd + EditableOneToMany + true + false + + + + + + + + EditableOneToManyFieldDefaultValue + component.field.loading + + true + true + true + + + + EditableOneToManyFieldValueByEvent + component.field.loading + + true + true + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + b0dafafd-d841-4ffd-8015-f3d6a26dd35a + Горизонтальный контейнер + true + false + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 76f41ce9-b1b6-4836-bc25-329798bc52bb + Кнопка "Создать" + false + false + + + + caption + +"Создать" + + + + + + + OpenDialog + component.complex.common + + true + true + + + dialog + +{"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + CreateRow + component.complex.editableonetomany + + true + true + + + dialog + +{"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + dialogTitle + +"Создание записи" + + + + form + +{"objectId":"409769e2-d898-47fc-a347-344ef4171e66","packageName":"component.complex.editableonetomany","className":"EditableOneToManyFieldForm","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + ed5e59c0-15cb-4525-b140-3f2a90d298b8 + Кнопка "Рекдактировать" + false + false + + + + caption + +"Редактировать" + + + + disabled + +true + + + + + + + OpenDialog + component.complex.common + + true + true + + + dialog + +{"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + EditRow + component.complex.editableonetomany + + true + true + + + dialog + +{"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + dialogTitle + +"Редактирование записи" + + + + field + +{"objectId":"d69f5bca-83ff-40d8-bdcd-3b811f4b2a25","packageName":"component.complex.editableonetomany","className":"EditableOneToManyField","type":"TS"} + + + + form + +{"objectId":"409769e2-d898-47fc-a347-344ef4171e66","packageName":"component.complex.editableonetomany","className":"EditableOneToManyFieldForm","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 2a544d0d-3c31-4404-a956-e05dc4195201 + Кнопка "Удалить" + false + false + + + + caption + +"Удалить" + + + + confirmationText + +"Вы действительно хотите удалить запись?" + + + + disabled + +true + + + + + + + RemoveRow + component.complex.editableonetomany + + true + true + + + field + +{"objectId":"d69f5bca-83ff-40d8-bdcd-3b811f4b2a25","packageName":"component.complex.editableonetomany","className":"EditableOneToManyField","type":"TS"} + + + + + + + + f7e68bb8-4be2-40fc-9b04-c733cc2dd2ff + d69f5bca-83ff-40d8-bdcd-3b811f4b2a25 + Редактируемая таблица + false + false + false + + + + form + + {"objectId":"409769e2-d898-47fc-a347-344ef4171e66","packageName":"component.complex.editableonetomany","className":"EditableOneToManyFieldForm","type":"TS"} + + + + headerHeight + + 40.0 + + + + rowHeight + + 40.0 + + + + + + + + + + service + + + + dao + + + EditableOneToManyDaoImpl + dao.complex.editableonetomany + + + + + + + + + + + EditableOneToManyFieldDataConverter + component.field.dataconvert.complex.editableonetomany + + true + true + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + + button + + {"objectId":"ed5e59c0-15cb-4525-b140-3f2a90d298b8","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + EnableButtonWhenSelected + component.complex.common + + true + true + + + button + + {"objectId":"2a544d0d-3c31-4404-a956-e05dc4195201","packageName":"component.button","className":"Button","type":"TS"} + + + + + + + + loadType + + "BY_SERVICE" + + + + service + + +EditableOneToManyDefaultValueServiceImpl +service.field + + + + + + + + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + a5848add-1dcf-45d2-8918-12d2aaf7f827 + Диалог + true + false + + + + + + + e7ce7145-85ad-4e82-9723-a5427c02596a + 409769e2-d898-47fc-a347-344ef4171e66 + Form + true + false + + + + dialog + +{"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + editableOneToManyField + +{"objectId":"d69f5bca-83ff-40d8-bdcd-3b811f4b2a25","packageName":"component.complex.editableonetomany","className":"EditableOneToManyField","type":"TS"} + + + + + + + + formService + + + EditableOneToManyFormService + service.complex.editableonetomany + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 2a3c6be1-0c3e-49b1-bb67-fb2e3e505bdc + Панель кнопок + true + false + + + + + + + 9e5db033-bf13-4a8b-b89f-98cc01b28e45 + f3a28c50-0f5e-48e4-9c2b-4f5d68c24d3b + Кнопка сохранения + false + false + + + +caption + + "Ок" + + + +form + + {"objectId":"409769e2-d898-47fc-a347-344ef4171e66","packageName":"component.complex.editableonetomany","className":"EditableOneToManyFieldForm","type":"TS"} + + + + + + + HideDialog + component.complex.common + + true + true + true + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + d24af1ab-01a0-42ca-a70b-08d812e2f122 + Кнопка отмены + false + false + + + +caption + + "Отмена" + + + + + + + HideDialog + component.complex.common + + true + true + + +dialog + + {"objectId":"a5848add-1dcf-45d2-8918-12d2aaf7f827","packageName":"component","className":"Dialog","type":"TS"} + + + + + + + + + diff --git a/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override b/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override new file mode 100644 index 00000000..27b2e4ba --- /dev/null +++ b/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override @@ -0,0 +1,1654 @@ + + + af6b4d52-03a4-48d7-a87b-cf84773e5c5e + SecurityFeatures + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + a4d442cf-72a8-431e-815a-490959083787 + SecurityFeatures + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 202de44d-f77d-43fb-88fd-2a3f36ced2f1 + Вертикальный контейнер + true + false + + + + + + + 57537dbd-c468-4c2d-99df-924b5ba018d6 + 2abf5d6a-d876-4fc5-bae1-d04e41cb7229 + authorities + false + false + + true + + + + + treeGridService + + + AuthorityTreeGridService + ru.cg.webbpm.user_management.custom + + + + + + + true + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Имя" + + + + name + + "name" + + + + type + + "STRING" + + + + width + + 700 + + + + + + + + + + + + StaticColumnTreeGrid + component + + true + true + + + disabled + +false + + + + headerHeight + +40.0 + + + + loadingOverlayMessage + +"Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + +"TEXT_OVERLAY" + + + + multiselectable + +false + + + + noRowsOverlayMessage + +"Данные отсутствуют" + + + + rowClickSelectionType + +"SINGLE_SELECT_CLICK" + + + + rowHeight + +40.0 + + + + showFilteredChildren + +false + + + + style + + + + height + + "550px" + + + + width + + "400px" + + + + + + + visible + +true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + d084be86-0037-4780-893d-959b975b9058 + Вертикальный контейнер + true + false + + + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 753dd01d-822b-4533-b2aa-f086edb81702 + bound-roles + false + false + false + + true + + + + + gridService + + + AuthorityRoleGridService + ru.cg.webbpm.user_management.custom + + + + + + + true + + + true + + + + StaticColumnGrid + component + + true + true + + + disabled + +false + + + + headerHeight + +40.0 + + + + loadingOverlayMessage + +"Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + +"TEXT_OVERLAY" + + + + multiselectable + +false + + + + noRowsOverlayMessage + +"Данные отсутствуют" + + + + parentControl + +{"objectId":"2abf5d6a-d876-4fc5-bae1-d04e41cb7229","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + rowClickSelectionType + +"SINGLE_SELECT_CLICK" + + + + rowHeight + +40.0 + + + + style + + + + height + + "550px" + + + + width + + "500px" + + + + + + + visible + +true + + + + + + + StaticGridColumns + property.grid + + true + true + + + columns + + + + + + displayName + + "Роль" + + + + name + + "role$name" + + + + width + + 400 + + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + c0460450-a21e-42f2-b9f6-f29e63a909eb + Горизонтальный контейнер + true + false + + + + + + + 9565de01-59ad-4dbd-a5a7-44c9f7f56fe1 + 67f2e8a8-e32b-4bf0-940b-ab505be146f9 + delete + false + false + + + +caption + + "Запретить" + + + +confirmationText + + "Вы уверены, что хотите запретить действие для роли?" + + + +selectableGrid + + {"objectId":"753dd01d-822b-4533-b2aa-f086edb81702","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + + + + +deleteButtonService + + + AuthorityRoleDeleteButtonService + ru.cg.webbpm.user_management.custom + + + + + + + + AuthorizationCheck + modules.user-management.component + + true + true + true + + + + CheckUserAuthority + modules.user-management.component + + true + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + c4751b6c-abb3-44e7-9f4d-7b1887d736d1 + Горизонтальный контейнер + true + false + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + d6b561b0-cf80-493f-8499-1c4646a12848 + show-dialog + false + false + + + + caption + + "Разрешить для роли" + + + + cssClasses + + + + "btn-main" + + + + + + disabled + + true + + + + + + +AuthorizationCheck +modules.user-management.component + + true + true + true + + + +CheckUserAuthority +modules.user-management.component + + true + + + + 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a + 1704b964-7410-4909-81af-baa39019103c + Диалог + true + false + + + + title + + "Разрешить для роли" + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2aecaba7-557f-4628-abf9-2ae64d9c136d + Вертикальный контейнер + true + false + + + + + + +be95ef58-ee04-413f-be0f-e8cd4af25faf +a07d0119-b9d5-465f-a8e5-991fb0ae5dd3 +Форма +true +false + + true + + + true + + + + RestForm + modules.user-management.component + + true + true + + + addCurrentUrlIdToRoute + + false + + + + disabled + + false + + + + visible + + true + + + + + + + RestFormRpcService + ru.cg.webbpm.user_management + + true + true + + + formService + + + AuthorityRoleFormService + ru.cg.webbpm.user_management.custom + + + + + + + + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + 5d81f881-411c-40b7-8eba-9ebb880ce4ab + authority-id + false + false + + + + required + + true + + + + visible + + false + + + + + + true + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + + true + true + + + column + + "id" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "authority" + + + + + + + CopyValueOnChange + custom + + true + true + true + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + a413592c-bd84-48e5-a6f0-af87cd075640 + Action controller + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"2abf5d6a-d876-4fc5-bae1-d04e41cb7229","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"5d81f881-411c-40b7-8eba-9ebb880ce4ab","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + behavior + +{"objectId":"2abf5d6a-d876-4fc5-bae1-d04e41cb7229","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + method + +"getSelectedRowId" + + + + + + + + + + + + + + + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 9e81c3a0-4b1c-46af-a28f-78510fac789f + role + false + false + + + + required + + true + + + + + + + + comboBoxService + + + AuthorityRoleBindComboBoxService + ru.cg.webbpm.user_management.custom + + + + + + + true + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + + true + true + + + column + + "id" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "role" + + + + + + + + + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +2b2ae47e-ec3a-48bd-a4cf-77a3a817ebe6 +Горизонтальный контейнер +true +false + + + + + + + 9e5db033-bf13-4a8b-b89f-98cc01b28e45 + 1f65aebc-3112-4336-8339-db6aae6574cf + save + false + false + + + + caption + + "Разрешить" + + + + form + + {"objectId":"a07d0119-b9d5-465f-a8e5-991fb0ae5dd3","packageName":"modules.user-management.component","className":"RestForm","type":"TS"} + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + c3f258bb-9843-4f97-acbf-492ddd583a5b + cancel + false + false + + + + caption + + "Отмена" + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 5f3abfc2-545a-4e30-961b-e5ae5388a5d6 + show-action + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "clickEvent" + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"1704b964-7410-4909-81af-baa39019103c","packageName":"component","className":"Dialog","type":"TS"} + + + + method + + "show" + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 828a292b-3fd3-46da-b0af-22c7dbbffa4f + hide-on-cancel-action + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c3f258bb-9843-4f97-acbf-492ddd583a5b","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "clickEvent" + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"1704b964-7410-4909-81af-baa39019103c","packageName":"component","className":"Dialog","type":"TS"} + + + + method + + "hide" + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 1e99095a-60eb-4612-be43-e8dacad53e49 + on-save-action + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"a07d0119-b9d5-465f-a8e5-991fb0ae5dd3","packageName":"modules.user-management.component","className":"RestForm","type":"TS"} + + + + propertyName + + "saveSucceededEvent" + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"1704b964-7410-4909-81af-baa39019103c","packageName":"component","className":"Dialog","type":"TS"} + + + + method + + "hide" + + + + + + + + + + behavior + + {"objectId":"753dd01d-822b-4533-b2aa-f086edb81702","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "reload" + + + + value + + + + objectValue + + + + behavior + + {"objectId":"753dd01d-822b-4533-b2aa-f086edb81702","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + method + + "getFilters" + + + + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + b5722d45-1042-4ea0-a94f-aed3ad0f11ea + ac-role-unbind + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"67f2e8a8-e32b-4bf0-940b-ab505be146f9","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"67f2e8a8-e32b-4bf0-940b-ab505be146f9","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"753dd01d-822b-4533-b2aa-f086edb81702","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.AUTHORITY.BOUND_ROLE.UNBIND" + + + + + + + behavior + + {"objectId":"67f2e8a8-e32b-4bf0-940b-ab505be146f9","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + + method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + +true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"67f2e8a8-e32b-4bf0-940b-ab505be146f9","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"67f2e8a8-e32b-4bf0-940b-ab505be146f9","packageName":"component.button","className":"DeleteButton","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 255d2278-be77-4af9-b599-48dba63695bf + ac-role-bind + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"component.button","className":"Button","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"component.button","className":"Button","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"2abf5d6a-d876-4fc5-bae1-d04e41cb7229","packageName":"component","className":"StaticColumnTreeGrid","type":"TS"} + + + + propertyName + + "selectionChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + argument + + + + staticValue + + + string + + + "USER_MANAGEMENT.AUTHORITY.BOUND_ROLE.BIND" + + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"modules.user-management.component","className":"CheckUserAuthority","type":"TS"} + + + + method + + "hasAuthority" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + +true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + + + thenActions + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"component.button","className":"Button","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + behavior + + {"objectId":"d6b561b0-cf80-493f-8499-1c4646a12848","packageName":"component.button","className":"Button","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + + + + + diff --git a/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override b/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override new file mode 100644 index 00000000..0fa87d9c --- /dev/null +++ b/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override @@ -0,0 +1,2196 @@ + + + 26bf0980-24f7-4b15-9dde-376ea7f1f4e7 + UsersEdit + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c4b48815-f449-48fe-9ae0-dec9b6f4c53c + UsersEdit + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 10b97eb7-30d3-4af1-877c-7870d5178172 + Text + false + false + + + + cssClasses + + + + "title" + + + + + + + + initialValue + + "Редактирование пользователей" + + + + + + + + + false + + + + 5a326846-16ae-42c1-bad7-cb8c89c5339f + 9d2fca5f-4354-46fc-a743-2644fbb9699d + Form + true + false + + + + cssClasses + + + + + + + + + + + + + + AuthMethodBehavior + scripts + + true + true + + + 46800f73-0c20-46b2-b42f-1592cff4a229 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + HBox + true + false + + + + cssClasses + + + + + + + + + + + + ece5190d-1485-4bce-9cfb-91f6d5c1efea + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + +cssClasses + + + + + +style + + + + padding + + "0 20px 0 0" + + + + width + + "25%" + + + + + + + + + + + + + 4cdd8f8f-7bca-4110-a99d-165ca3e663b0 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + + + + + + + + 50dcb56a-03ea-47b7-a41d-2b5bb90a63aa + 9d2fca5f-4354-46fc-a743-2644fbb9699d + HBox + true + false + + + + + + + bd4c6fce-953a-4616-aab0-9357a0617970 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + + + + + + c18f1972-161b-4522-b356-0f0b90ab1418 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + + + + + + + 5b7bda09-e09e-41ed-99b5-31d3ef6a3ffa + 9d2fca5f-4354-46fc-a743-2644fbb9699d + last-name + false + false + + + + cssClasses + + + + "width-full" + + + + + + + + + + + + + + a1706c0e-bff0-459e-ae99-7a7a304575fd + 9d2fca5f-4354-46fc-a743-2644fbb9699d + first-name + false + false + + + + cssClasses + + + + + "width-full" + + + + + + + + + + + + + + 5bfd8063-6dfd-4e15-baac-c2285ddc12f1 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + middleName + false + false + + + + cssClasses + + + + + "width-full" + + + + + + + + + + + + + + fff08a7a-f9a4-49bc-8423-f5255b769b27 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + phone + false + false + + + + + + + + + df424200-9b82-4d0a-be54-67ddcaf01b18 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + created + false + false + + + + + +DateTimeUtil +util + + true + true + + + + + + + 42343f77-fe31-470f-ad5c-245b8abb3703 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + updated + false + false + + + + + + + + + f2c993f1-9ebf-43b8-8e90-58a702f5fe88 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + +cssClasses + + + + + +style + + + + padding + + "0 20px 0 0" + + + + width + + "30%" + + + + + + + + + + + + + cec4001b-c994-442e-8db2-8633667ad277 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + + + + + + + + + 729e2c6c-730c-4f73-894f-5c82f65a6e05 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + HBox + true + false + + + + + + + 43668404-c368-4002-8469-29fba2cd05b8 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + + + + + + 18aca111-7f4e-45aa-b73a-fb8cfd266cff + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + false + + + + + + + + + 87d53c7f-b2a6-4390-af4a-0f7e0ccb5d95 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + login + false + false + + + + collectible + + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + disabled + + true + + + + required + + false + + + + + + + + + + + + c2beafbf-3be8-44cc-a832-3aed3256e1c8 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + password + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + + + + + + + + + + 722985df-b127-48c5-8081-8078c1e43994 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + password-repeat + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + + + + + + + + + da7d2474-8bee-4085-90c2-d8c062602410 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + email + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + "width-full" + + + + + + + + + + + + + + 7e128e44-f98f-4cee-be88-0d9b2ad47955 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + locked + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + + disabled + + true + + + + required + + false + + + + values + + + + + + hidden + + false + + + + + + + + + + hidden + + false + + + + + + + + + + + + + + + + 5cf5556d-24ff-4f27-bd22-47b8a9f215a1 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + password-changed + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + + + + + + + + + 80502b7d-e636-458c-9b7d-4dab3eebc46d + 9d2fca5f-4354-46fc-a743-2644fbb9699d + password-expires + false + false + + + + cssClasses + + + + "fixed-label-small" + + + + + + + + + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ad491899-f407-4067-a0fe-d59e528b7470 + org_unit_id + false + false + + + + label + + "Организация" + + + + required + + true + + + + + + + + comboBoxService + + + OrgUnitComboBoxServiceImpl + ru.cg.webbpm.user_management.custom + + + + + + + + + + false + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + + + column + + "orgUnitId" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "user" + + + + + + + f9a38417-9ad0-412a-9b5f-bbeb450dddd6 + 42aed598-6fa4-47c7-84bc-5c0087bf6d50 + org_unit_id + false + true + + + 33f4f16e-7d84-4811-b6d5-b2d890e8f73d + 9d2fca5f-4354-46fc-a743-2644fbb9699d + password-validate + false + false + + + + + + 13f69814-e4d9-4e0a-9439-b32d6cdaac66 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + true + + + 4e314e88-02d6-4b0e-b7a7-15a36bdeb682 + debbe563-239e-494b-beb1-a6f204dd2fc0 + ManyToManyField + true + true + + + bfac29f4-f32e-4b18-b307-6f1c814b258b + 9d2fca5f-4354-46fc-a743-2644fbb9699d + VBox + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2142f803-011b-44cb-834b-a71c16debb88 + VBox + true + false + + + +style + + + + width + + "45%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + fe1ee732-1a3f-44ec-a6c4-caa6b0ee5151 + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + label + + "Группы" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + dd4366b6-b12e-4426-8004-22b9d1cf5db8 + HBox + true + false + + + + + + + 53faccc7-08f1-4806-adb2-ff9ef522f144 + db2236ac-ab9e-403c-bc96-3b4b6882ddf3 + AvailableRecordsGrid + false + false + +false + + + button + + {"objectId":"6b850ea5-255b-418c-be2d-5ec96d31e2bd","packageName":"component.button","className":"Button","type":"TS"} + + + + + +false + + + existingRowsField + + {"objectId":"05d0feb4-fd4a-49c4-bd75-54866a194c49","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + +true + + +true + + +true + + +false + + + gridService + + + GroupGridService + ru.cg.webbpm.user_management.custom + + + + + + +true + + + + StaticGridColumns + property.grid + +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"group$name" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата изменения" + + + + formatter + + + DateFormatter + custom.grid.formatter + + + + + name + +"group$updated" + + + + type + +"DATE" + + + + + + + + + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true + + + column + + "userGroupId" + + + + dataConverter + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + + ListConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + InMemoryStaticColumnGrid + component + +true + + + autoStretchColumns + + true + + + + checkboxColumn + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + true + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + visible + + true + + + + + + + InMemoryGridLoader + component.grid + +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + f437b344-23a3-4957-aac6-0c301a43b178 + 9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c + Buttons + true + false + + + + + + +6ae58cc0-2f33-41e3-89b3-022efcb81f51 +9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c +Add +false +false + + + + + grid + + {"objectId":"db2236ac-ab9e-403c-bc96-3b4b6882ddf3","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"05d0feb4-fd4a-49c4-bd75-54866a194c49","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +fa8cdc89-a074-4ac0-ae53-b948230b3f30 +9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c +AddAll +false +false + + + + + grid + + {"objectId":"db2236ac-ab9e-403c-bc96-3b4b6882ddf3","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"05d0feb4-fd4a-49c4-bd75-54866a194c49","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +c6b74d37-6e02-4fde-b636-e96fcdd68ede +9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c +Remove +false +false + + + + + grid + + {"objectId":"db2236ac-ab9e-403c-bc96-3b4b6882ddf3","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"05d0feb4-fd4a-49c4-bd75-54866a194c49","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +154adcc7-908c-4141-ab2f-6f728c62a51a +9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c +RemoveAll +false +false + + + + + grid + + {"objectId":"db2236ac-ab9e-403c-bc96-3b4b6882ddf3","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"05d0feb4-fd4a-49c4-bd75-54866a194c49","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + + + 7d5e764a-ce8e-4acc-9173-653718838aa4 + 05d0feb4-fd4a-49c4-bd75-54866a194c49 + LinkFieldDialog for save + false + false + false + +true + + +false + + + button + + {"objectId":"35c8b7b8-4527-4c67-b0cb-2755cd40ee5a","packageName":"component.button","className":"Button","type":"TS"} + + + + + +true + + + + StaticGridColumns + property.grid + +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"group$name" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата и время добавления" + + + + formatter + + + DateTimeFormatter + custom.grid.formatter + + + + + name + +"link$created" + + + + type + +"DATE_TIME" + + + + + + + + + + + + StaticColumnLinkField + modules.user-management.component + +true + + + autoStretchColumns + + true + + + + collectible + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + required + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "" + + + + minWidth + + "" + + + + + + + visible + + true + + + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + AddAllRows + component.complex.manytomany + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + LinkFieldStaticColumnSaveLoadScript + ru.cg.webbpm.user_management + +true + + + linkedPkDataConverter + + + StringValueConverter + component.field.dataconvert + + + + + mainEntity + + "user" + + + + mainPkColumn + + "id" + + + + + + + LinkFieldRpcService + rpc.field + +true +true + + + linkFieldService + + + UserGroupGridService + ru.cg.webbpm.user_management.custom + + + + + + + + + loadType + + null + + + + + + + + LinkFieldCurrentTimestampAsDefaultSetter + admin + +true +true + + + columnName + + "link$created" + + + + + + + 6e6817bb-6a55-45cf-9270-3bdd654a5784 + f6c652c8-ff36-4f13-b5b0-0728d57a17a1 + LinkField orig + false + true + + + + + + 67605d63-1081-423b-b6b5-727ecfce2ca1 + d0a7b366-a7bc-43a8-97c5-8c7241e28146 + ManyToMany + true + true + + + 67605d63-1081-423b-b6b5-727ecfce2ca1 + 3f632f07-e650-4c96-b01d-55d5c1dbe34a + ManyToMany + true + true + + + 67605d63-1081-423b-b6b5-727ecfce2ca1 + 7d125877-e959-413a-945b-8eeda0bde512 + ManyToMany + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2142f803-011b-44cb-834b-a71c16debb88 + VBox + true + true + + + 013bed57-902a-4a5a-99df-97869fc0aa44 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + HBox + true + false + + + + cssClasses + + + + + + + + + + + + cbca6b02-8400-42c7-b0fb-a1371661a9d0 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + HBox + true + true + + + e8899b51-ba47-4898-abb2-b8a48866f680 + 9d2fca5f-4354-46fc-a743-2644fbb9699d + save-button + false + false + + + +cssClasses + + + + "btn-main" + + + + + + + + + SetRowsFromField + component.complex.manytomany + + true + true + true + + + + 18275bb0-4449-4a9e-ade8-49253550a16d + 9d2fca5f-4354-46fc-a743-2644fbb9699d + cancel-button + false + false + + + +cssClasses + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 94939abc-6c57-464e-b480-c86ea7a689e9 + Скрыть и сделать неактивным + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"9d2fca5f-4354-46fc-a743-2644fbb9699d","packageName":"modules.user-management.component","className":"RestForm","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + +{"objectId":"9d2fca5f-4354-46fc-a743-2644fbb9699d","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + + method + +"isKerberosAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + +{"objectId":"9d2fca5f-4354-46fc-a743-2644fbb9699d","packageName":"scripts","className":"AuthMethodBehavior","type":"TS"} + + + + method + +"isCertificateAuth" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + logicalOperation + + "OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"c4ce09bf-b91d-4025-8715-e76925202713","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"bc4815fd-2f8d-4545-b6f8-7a651beef2f6","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"778d3b64-d52f-48ff-b854-7df244f20d55","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"bbb1fc4f-922e-46e4-8ceb-b911af24a32f","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"84ef055e-dd0d-446e-87d4-9c25a3fc86e0","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"04c23030-0c55-414a-9228-77ce8046deac","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setEnabled" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"5486199d-c932-413c-8ab6-e674633898af","packageName":"component.field","className":"StaticComboBox","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"3c84ea2f-68bb-4cba-a32a-da97a043e84c","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + behavior + + {"objectId":"7cde5b9a-404d-4654-ae17-f0c753c64518","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + +boolean + + + false + + + + + + + + + + + + + + + + diff --git a/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override b/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override new file mode 100644 index 00000000..a1892d57 --- /dev/null +++ b/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override @@ -0,0 +1,1456 @@ + + + bdd5b1af-e4ea-42eb-bbed-2ab08399dfcd + GroupsCreate + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + ca7390f1-1891-4161-b8ae-ef66de5776b7 + GroupsCreate + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + fa5b05d3-871d-4be9-b8f5-8912dfb35d45 + Text + false + false + + + + cssClasses + + + + "title" + + + + + + + + initialValue + + "Администрирование групп" + + + + + + + + + false + + + + be95ef58-ee04-413f-be0f-e8cd4af25faf + bcb8e5ad-b8e7-44b0-a145-13de809dbf33 + Form + true + false + + true + + + true + + + + RestForm + modules.user-management.component + + true + true + + + addCurrentUrlIdToRoute + + false + + + + disabled + + false + + + + routeAfterSave + + "/user-management/groups" + + + + visible + + true + + + + + + + RestFormRpcService + ru.cg.webbpm.user_management + + true + + + formService + + +GroupFormService +ru.cg.webbpm.user_management.custom + + + + + + + + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + 485b6e35-2b31-4d0e-8ce8-fe03980ea0d8 + name + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 0233b718-9edb-4650-863d-298d21d16aee + created + false + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 8f472ae4-c695-4e3e-931a-3012d0821312 + ActionController created + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 5b38db22-58c4-4d64-b5ee-b252e7b0bd66 + updated + false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2779e1cf-eb56-4027-9d1d-78ddc90cc73e + VBox + true + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + ff9f35ed-bf7f-42c0-8479-068abaa39911 + Горизонтальный контейнер + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 624bdc70-52da-4c81-8033-316b3309260e + Вертикальный контейнер + true + false + + + +style + + + + padding + + "0 40px 0 0" + + + + width + + "40%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 4cde8573-92ae-4c4c-9428-d7d852e78c62 + Текст + false + false + + + + cssClasses + + + + "sub-title" + + + + + + initialValue + + "Группы" + + + + + + + + + false + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + 485b6e35-2b31-4d0e-8ce8-fe03980ea0d8 + name + false + false + + + + cssClasses + + + + "fixed-label" + + + + + "width-full " + + + + + + label + + "Наименование группы" + + + + required + + true + + + + + + true + + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "name" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 0233b718-9edb-4650-863d-298d21d16aee + created + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + disabled + + true + + + + label + + "Дата создания" + + + + + + true + + + +SetCurrentDate +custom + + true + true + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "created" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + +DateTimeUtil +util + + true + true + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 8f472ae4-c695-4e3e-931a-3012d0821312 + ActionController created + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 5b38db22-58c4-4d64-b5ee-b252e7b0bd66 + updated + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + disabled + + true + + + + label + + "Дата и время последнего изменения" + + + + + + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "updated" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 1aa93ca2-3ba3-4ac8-bcae-4307ceb4d3cf + access_level + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + label + + "Уровень доступа" + + + + required + + true + + + + + + + + comboBoxService + + + AccessLevelComboBoxServiceImpl + ru.cg.webbpm.user_management.custom + + + + + + + true + + + + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "access_level" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8e395fd7-a9b5-4eae-8c95-72e594ee3357 + Вертикальный контейнер + true + false + + + +style + + + + width + + "60%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 91956fb3-8832-4572-9823-df2e83ab8922 + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + label + + "Привязка ролей" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 7d4e83a4-45d2-45a5-a778-40d0c0f4aa3a + HBox + true + false + + + + + + + 53faccc7-08f1-4806-adb2-ff9ef522f144 + ed5afd59-d3c6-42b1-8744-687909c3f2dc + AvailableRecordsGrid + false + false + false + +false + + + button + + {"objectId":"b33d3f9b-74a1-4c30-a5a6-da14bf2b8c7d","packageName":"component.button","className":"Button","type":"TS"} + + + + + +false + + + existingRowsField + + {"objectId":"ed375b71-5f95-43af-ae69-5a5eacb3f479","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + +true + + +true + + +false +false +true + + +false + + + gridService + + + RoleGridService + ru.cg.webbpm.user_management.custom + + + + + + +true + + + + StaticGridColumns + property.grid + +true +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"role$name" + + + + sortOrder + +"ASC" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата изменения" + + + + formatter + + + DateFormatter + custom.grid.formatter + + + + + name + +"role$updated" + + + + type + +"DATE" + + + + + + + + + + + + InMemoryGridLoader + component.grid + +true + + + + InMemoryStaticColumnGrid + component + +true +true + + + autoStretchColumns + + true + + + + checkboxColumn + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + true + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "400px" + + + + minWidth + + "200px" + + + + + + + visible + + true + + + + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true + + + column + + "userRoleId" + + + + dataConverter + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + + ListConverter + component.field.dataconvert + + + + + entity + + "role" + + + + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + f437b344-23a3-4957-aac6-0c301a43b178 + 2272444f-bb2b-4c87-a54e-7c44a5cdc67a + Buttons + true + false + + + + + + +6ae58cc0-2f33-41e3-89b3-022efcb81f51 +2272444f-bb2b-4c87-a54e-7c44a5cdc67a +Add +false +false + + + + + grid + + {"objectId":"ed5afd59-d3c6-42b1-8744-687909c3f2dc","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"ed375b71-5f95-43af-ae69-5a5eacb3f479","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +fa8cdc89-a074-4ac0-ae53-b948230b3f30 +2272444f-bb2b-4c87-a54e-7c44a5cdc67a +AddAll +false +false + + + + + grid + + {"objectId":"ed5afd59-d3c6-42b1-8744-687909c3f2dc","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"ed375b71-5f95-43af-ae69-5a5eacb3f479","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +c6b74d37-6e02-4fde-b636-e96fcdd68ede +2272444f-bb2b-4c87-a54e-7c44a5cdc67a +Remove +false +false + + + + + grid + + {"objectId":"ed5afd59-d3c6-42b1-8744-687909c3f2dc","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"ed375b71-5f95-43af-ae69-5a5eacb3f479","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +154adcc7-908c-4141-ab2f-6f728c62a51a +2272444f-bb2b-4c87-a54e-7c44a5cdc67a +RemoveAll +false +false + + + + + grid + + {"objectId":"ed5afd59-d3c6-42b1-8744-687909c3f2dc","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"ed375b71-5f95-43af-ae69-5a5eacb3f479","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + + + 7d5e764a-ce8e-4acc-9173-653718838aa4 + ed375b71-5f95-43af-ae69-5a5eacb3f479 + LinkFieldDialog + false + false + false + +true + + +false + + + button + + {"objectId":"84165e8b-829a-4656-a2e9-4ca87cfd217e","packageName":"component.button","className":"Button","type":"TS"} + + + + + +true + + + + StaticGridColumns + property.grid + +true +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"role$name" + + + + sortOrder + +"ASC" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата и время добавления" + + + + formatter + + + DateTimeExportFormatter + custom.grid.formatter + + + + + name + +"link$created" + + + + type + +"DATE_TIME" + + + + + + + + + + + + StaticColumnLinkField + modules.user-management.component + +true + + + autoStretchColumns + + true + + + + collectible + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + required + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "400px" + + + + minWidth + + "200px" + + + + + + + visible + + true + + + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + AddAllRows + component.complex.manytomany + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + LinkFieldStaticColumnSaveLoadScript + ru.cg.webbpm.user_management + +true + + + linkedPkDataConverter + + + StringValueConverter + component.field.dataconvert + + + + + mainEntity + + "group" + + + + mainPkColumn + + "id" + + + + + + + LinkFieldRpcService + rpc.field + +true + + + linkFieldService + + + GroupRolesGridService + ru.cg.webbpm.user_management.custom + + + + + + + + + + LinkFieldCurrentTimestampAsDefaultSetter + admin + +true +true + + + columnName + + "link$created" + + + + + + + 6e6817bb-6a55-45cf-9270-3bdd654a5784 + e175b7b1-63ab-4080-a6b5-3cc3f65edbf5 + LinkField orig + false + true + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + a65dbf74-aa81-4b28-b008-2df11395b9f8 + HBox + true + false + + + + cssClasses + + + + + + + + + + + + 9e5db033-bf13-4a8b-b89f-98cc01b28e45 + b9463b17-97c1-4c49-9fc7-e4ee9bb621dd + save-button + false + false + + + + cssClasses + + + + "btn-main" + + + + + + form + +{"objectId":"bcb8e5ad-b8e7-44b0-a145-13de809dbf33","packageName":"modules.user-management.component","className":"RestForm","type":"TS"} + + + + + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + 0b170e2b-a865-4aca-a9da-c7da77d9b0fd + exit-button + false + false + + + + caption + +"Отменить" + + + + confirmationText + +"Вы уверены, что хотите выйти без сохранения?" + + + + cssClasses + + + + "btn-red" + + + + + + route + +"/user-management/groups" + + + + + + + + diff --git a/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override b/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override new file mode 100644 index 00000000..2ac71b9c --- /dev/null +++ b/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override @@ -0,0 +1,1465 @@ + + + f8097477-033d-4369-9824-20b04d4ae3f6 + GroupsEdit + false + + 3.156.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.156.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + ed47cfae-64da-4360-8f61-1087179ad78b + GroupsEdit + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + a18909dd-64ee-433f-82b3-70e1917f1b8d + Text + false + false + + + + cssClasses + + + + "title" + + + + + + + + initialValue + + "Администрирование групп" + + + + + + + + + false + + + + be95ef58-ee04-413f-be0f-e8cd4af25faf + e2c223a4-377d-49e3-904f-375ca30a08d5 + Form + true + false + + true + + + true + + + + RestForm + modules.user-management.component + + true + true + + + addCurrentUrlIdToRoute + + false + + + + disabled + + false + + + + routeAfterSave + + "/user-management/groups" + + + + visible + + true + + + + + + + RestFormRpcService + ru.cg.webbpm.user_management + + true + + + formService + + +GroupFormService +ru.cg.webbpm.user_management.custom + + + + + + + + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + d2a08a08-2807-4471-a2b5-f7a78fd1bb0d + name + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 76cc68cf-575a-46a0-8ca2-31109c3963c4 + created + false + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + b2ad89da-7548-4015-8922-2b46c6257a33 + ActionController created + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 0a47e758-c21e-4f8a-92bf-150c872b58ed + updated + false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 77ff6cc1-16e7-4cc8-9c0b-5ba4cc603140 + VBox + true + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + c629e7bd-878a-4411-9e29-bb44f4c11ba7 + Горизонтальный контейнер + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 075ead72-0b6f-411f-88b4-69f5ab4a4052 + Вертикальный контейнер + true + false + + + +style + + + + padding + + "0 40px 0 0" + + + + width + + "40%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 389e2f20-104b-4136-aba0-3a0ccd45f96e + Текст + false + false + + + + cssClasses + + + + "sub-title" + + + + + + initialValue + + "Группы" + + + + + + + + + false + + + + 133ca212-09a6-413a-ac66-e2f6ce188f1f + d2a08a08-2807-4471-a2b5-f7a78fd1bb0d + name + false + false + + + + cssClasses + + + + "fixed-label" + + + + + "width-full " + + + + + + label + + "Наименование группы" + + + + required + + true + + + + + + true + + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "name" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 76cc68cf-575a-46a0-8ca2-31109c3963c4 + created + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + disabled + + true + + + + label + + "Дата создания" + + + + + + true + + + +SetCurrentDate +custom + + true + true + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "created" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + +DateTimeUtil +util + + true + true + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + b2ad89da-7548-4015-8922-2b46c6257a33 + ActionController created + false + true + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 0a47e758-c21e-4f8a-92bf-150c872b58ed + updated + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + disabled + + true + + + + label + + "Дата и время последнего изменения" + + + + + + true + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "updated" + + + + dataConverter + + + DateValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ae991562-f703-4403-8d49-a0e5e540bc6c + access_level + false + false + + + + cssClasses + + + + "fixed-label" + + + + + + label + + "Уровень доступа" + + + + required + + true + + + + + + + + comboBoxService + + + AccessLevelComboBoxServiceImpl + ru.cg.webbpm.user_management.custom + + + + + + + true + + + + + + +ComponentWithStaticColumn +ru.cg.webbpm.user_management + + true + true + + + column + + "access_level" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + + "group" + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 41774d7b-90c5-4bc0-a563-509d036206e3 + Вертикальный контейнер + true + false + + + +style + + + + width + + "60%" + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 4eb50f01-cccc-4f3a-b66d-4d57dde0a212 + Text + false + false + + + + cssClasses + + + + "sub-title" + + + + + + label + + "Привязка ролей" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 704d07af-1823-48d6-acad-83771428be38 + HBox + true + false + + + + + + + 53faccc7-08f1-4806-adb2-ff9ef522f144 + 528504db-2727-4750-92a9-5f09dacc781d + AvailableRecordsGrid + false + false + false + +false + + + button + + {"objectId":"6731261c-f859-489e-9ca9-08b33aa77b58","packageName":"component.button","className":"Button","type":"TS"} + + + + + +false + + + existingRowsField + + {"objectId":"76735e43-2b8f-440a-abd1-80c556326763","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + +true + + +true + + +false +false +true + + +false + + + gridService + + + RoleGridService + ru.cg.webbpm.user_management.custom + + + + + + +true + + + + StaticGridColumns + property.grid + +true +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"role$name" + + + + sortOrder + +"ASC" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата изменения" + + + + formatter + + + DateFormatter + custom.grid.formatter + + + + + name + +"role$updated" + + + + type + +"DATE" + + + + + + + + + + + + InMemoryGridLoader + component.grid + +true + + + + InMemoryStaticColumnGrid + component + +true +true + + + autoStretchColumns + + true + + + + checkboxColumn + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + true + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "400px" + + + + minWidth + + "200px" + + + + + + + visible + + true + + + + + + + StaticFilterControl + ru.cg.webbpm.user_management + +true + + + column + + "userRoleId" + + + + dataConverter + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + + ListConverter + component.field.dataconvert + + + + + entity + + "role" + + + + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + f437b344-23a3-4957-aac6-0c301a43b178 + e791675f-a1d1-402b-afe1-556b434b1248 + Buttons + true + false + + + + + + +6ae58cc0-2f33-41e3-89b3-022efcb81f51 +e791675f-a1d1-402b-afe1-556b434b1248 +Add +false +false + + + + + grid + + {"objectId":"528504db-2727-4750-92a9-5f09dacc781d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"76735e43-2b8f-440a-abd1-80c556326763","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +fa8cdc89-a074-4ac0-ae53-b948230b3f30 +e791675f-a1d1-402b-afe1-556b434b1248 +AddAll +false +false + + + + + grid + + {"objectId":"528504db-2727-4750-92a9-5f09dacc781d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"76735e43-2b8f-440a-abd1-80c556326763","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +c6b74d37-6e02-4fde-b636-e96fcdd68ede +e791675f-a1d1-402b-afe1-556b434b1248 +Remove +false +false + + + + + grid + + {"objectId":"528504db-2727-4750-92a9-5f09dacc781d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"76735e43-2b8f-440a-abd1-80c556326763","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + +154adcc7-908c-4141-ab2f-6f728c62a51a +e791675f-a1d1-402b-afe1-556b434b1248 +RemoveAll +false +false + + + + + grid + + {"objectId":"528504db-2727-4750-92a9-5f09dacc781d","packageName":"component","className":"InMemoryStaticColumnGrid","type":"TS"} + + + + linkField + + {"objectId":"76735e43-2b8f-440a-abd1-80c556326763","packageName":"modules.user-management.component","className":"StaticColumnLinkField","type":"TS"} + + + + + + + + 7d5e764a-ce8e-4acc-9173-653718838aa4 + 76735e43-2b8f-440a-abd1-80c556326763 + LinkFieldDialog + false + false + false + +true + + +false + + + button + + {"objectId":"291de4f8-51a4-4331-b26c-5994e9de5697","packageName":"component.button","className":"Button","type":"TS"} + + + + + +true + + + + StaticGridColumns + property.grid + +true +true + + + columns + + + + + + displayName + +"Название" + + + + name + +"role$name" + + + + sortOrder + +"ASC" + + + + type + +"STRING" + + + + + + + + + + displayName + +"Дата и время добавления" + + + + formatter + + + DateTimeFormatter + custom.grid.formatter + + + + + name + +"link$created" + + + + type + +"DATE_TIME" + + + + + + + + + + + + StaticColumnLinkField + modules.user-management.component + +true + + + autoStretchColumns + + true + + + + collectible + + true + + + + cssClasses + + + + "grid-mtm" + + + + + + disabled + + false + + + + headerHeight + + 40.0 + + + + loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + + loadingOverlayType + + "TEXT_OVERLAY" + + + + multiselectable + + false + + + + noRowsOverlayMessage + + "Данные отсутствуют" + + + + required + + false + + + + rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + + rowHeight + + 40.0 + + + + style + + + + maxWidth + + "400px" + + + + minWidth + + "200px" + + + + + + + visible + + true + + + + + + + ComponentWithStaticColumn + ru.cg.webbpm.user_management + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + AddAllRows + component.complex.manytomany + +true +true +true + + + + LinkFieldRpcService + rpc.field + +true +true +true + + + + LinkFieldStaticColumnSaveLoadScript + ru.cg.webbpm.user_management + +true + + + linkedPkDataConverter + + + StringValueConverter + component.field.dataconvert + + + + + mainEntity + + "group" + + + + mainPkColumn + + "id" + + + + + + + LinkFieldRpcService + rpc.field + +true + + + linkFieldService + + + GroupRolesGridService + ru.cg.webbpm.user_management.custom + + + + + + + + + loadType + + null + + + + + + + + LinkFieldCurrentTimestampAsDefaultSetter + admin + +true +true + + + columnName + + "link$created" + + + + + + + 6e6817bb-6a55-45cf-9270-3bdd654a5784 + d389450f-90fc-4c02-8363-65091027bb40 + LinkField orig + false + true + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + fb5e15d6-c838-4fa7-b20d-714a2abd03a6 + HBox + true + false + + + + cssClasses + + + + + + + + + + + + 9e5db033-bf13-4a8b-b89f-98cc01b28e45 + 3a2c64e6-edcf-4058-9a02-897b6dc9704e + save-button + false + false + + + + cssClasses + + + + "btn-main" + + + + + + form + +{"objectId":"e2c223a4-377d-49e3-904f-375ca30a08d5","packageName":"modules.user-management.component","className":"RestForm","type":"TS"} + + + + + + + ce37a121-f8ef-4e1e-b4dc-7fda6719a096 + 29e058b0-bc2a-45bb-8422-2922881db1be + exit-button + false + false + + + + caption + +"Отменить" + + + + confirmationText + +"Вы уверены, что хотите выйти без сохранения?" + + + + cssClasses + + + + "btn-red" + + + + + + route + +"/user-management/groups" + + + + + + + + diff --git a/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override b/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override new file mode 100644 index 00000000..cc258477 --- /dev/null +++ b/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override @@ -0,0 +1,848 @@ + + + f030e9ba-8e54-48a0-be23-964d6b483dd2 + ProcessInstanceList + false + + 3.152.0-SNAPSHOT + + + ru.cg.webbpm.packages.base.resources + 3.152.0-SNAPSHOT + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + fe225a1a-1c03-485e-a069-18b92ab4f7f7 + ProcessInstanceList + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + e24cd1b9-23e0-48dc-b0bf-60d2d1658494 + Текст + false + false + + + + cssClasses + + + + "title" + + + + + + initialValue + + "Процессы" + + + + + + + + + false + + + + 27912fc5-0be7-4d4c-ae46-a82979253599 + b42176d1-e538-45fb-aeb6-f51390228082 + Группа фильтров + true + false + + + + cssClasses + + + + "filter-panel" + + + true + + + + filterableComp + + {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + liveFilter + + true + + + + + + + + + + + f7504fc9-f501-43fe-a678-5c6ba756ba5c + 787db39e-3249-45bf-b735-ffff5cc433f9 + Группа полей + true + true + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + cc38963d-5d25-44f9-b3ff-6a308c811ce9 + Текст + false + false + + + + cssClasses + + +true + + + + initialValue + +"Фильтр" + + + + label + +"" + + + + visible + +false + + + + + + + + + false + + + + abfdde4b-b67e-4e2d-9888-df89896b699c + 435a96a3-17b3-4f07-a5bf-f3b6270fc45b + Статичный переключатель + false + false + + + + initialValue + +"ACTIVE" + + + + label + +"" + + + + values + + + + + + code + + "ACTIVE" + + + + disabled + + false + + + + name + + "Активные" + + + + + StaticRadioButtonModel + model + + + + + + + + code + + "COMPLETE" + + + + disabled + + false + + + + name + + "Завершенные" + + + + + StaticRadioButtonModel + model + + + + + + + + code + + "ABORTED" + + + + disabled + + false + + + + name + + "Прерванные" + + + + + StaticRadioButtonModel + model + + + +true + + + + + + + ProcessStateRpcService + bpmn.admin + + true + true + true + + + + BpmnProcessStateChanger + bpmn.admin + + true + true + true + + + + FilterComponent + component.filter + + true + true + + + operation + +"EQUAL" + + + + + + + ProcessStateFieldHandler + bpmn.admin.component + + true + true + + + stopButton + +{"objectId":"6c8d958f-4e3a-4606-be55-4ff9a6640cc7","packageName":"bpmn.admin.component","className":"AbortButton","type":"TS"} + + + + + + + StaticFilterControl + ru.cg.webbpm.user_management + + true + true + + + column + +"state" + + + + dataConverter + + + StringValueConverter + component.field.dataconvert + + + + + entity + +"process" + + + + + + + + + false + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 5f560694-8ded-4d0c-b75c-b4c41c58d48c + Вертикальный контейнер + true + false + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 6443c41a-8c07-4ef7-98cf-0c2d76884dfd + Горизонтальный контейнер + true + false + + + +cssClasses + + + + "buttons" + + + + + + + + + + + + 30b980e0-6d49-45fb-b53f-bef67351530d + 61db7e91-9ace-418a-8a0d-d81877411d62 + Кнопка выбора + false + false + + true + + + true + + + +SelectBtn +bpmn.admin.component + + true + true + + + caption + + "Просмотреть" + + + + cssClasses + + + + "btn-view" + + + + + + disabled + + false + + + + selectableComponent + + {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + visible + + true + + + + + + + 30b980e0-6d49-45fb-b53f-bef67351530d + 6c8d958f-4e3a-4606-be55-4ff9a6640cc7 + Кнопка выбора + false + false + + true + + + true + + + +AbortButton +bpmn.admin.component + + true + true + + + caption + + "Прервать" + + + + confirmationText + + "Вы действительно хотите прервать процесс?" + + + + cssClasses + + + + "btn-stop" + + + + + + disabled + + false + + + + selectableComponent + + {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"component","className":"StaticColumnGrid","type":"TS"} + + + + visible + + true + + + + + + +AbortProcessService +bpmn.admin + + true + true + + + + + 7a57e082-99e3-4453-a2df-d5ffafa2c019 + 3b06ffb8-18ef-4e69-8475-a105542a1737 + Таблица + false + false + + true + + + true + + + true + + + + StaticGridColumns + property.grid + + true + true + true + + + + GridWithStaticColumns + component + + true + true + true + + + + GridRpcService + rpc + + true + true + true + + + + BpmnProcessGrid + bpmn.admin + + true + true + true + + + + BpmnProcessGridRpcService + bpmn.admin + + true + true + true + + + + BpmProcessGridColumns + bpmn.admin + + true + true + true + + + + GridRpcService + rpc + + true + true + + +gridService + + + BpmProcessGridServiceImpl + bpmn.admin + + + + + + + + StaticGridColumns + property.grid + + true + true + + +columns + + + + + + displayName + + "Дата запуска" + + + + name + + "process$start" + + + + sortOrder + + "DESC" + + + + type + + "DATE_TIME" + + + + width + + 200 + + + + + + + + + + displayName + + "Наименование" + + + + name + + "process$processName" + + + + type + + "STRING" + + + + width + + 200 + + + + + + + + + + displayName + + "Описание" + + + + name + + "process$processInstanceDescription" + + + + type + + "STRING" + + + + width + + 200 + + + + + + + + + + displayName + + "Версия" + + + + name + + "process$processVersion" + + + + type + + "NUMBER" + + + + width + + 200 + + + + + + + + + + + + StaticColumnGrid + bpmn.admin + + true + true + true + + + + StaticColumnGrid + component + + true + true + + +disabled + + false + + + +headerHeight + + 40.0 + + + +loadingOverlayMessage + + "Загрузка данных, пожалуйста, подождите." + + + +loadingOverlayType + + "TEXT_OVERLAY" + + + +multiselectable + + false + + + +noRowsOverlayMessage + + "Данные отсутствуют" + + + +rowClickSelectionType + + "SINGLE_SELECT_CLICK" + + + +rowHeight + + 40.0 + + + +style + + + + height + + "500px" + + + + maxHeight + + "" + + + + minWidth + + "" + + + + width + + "800px" + + + + + + +visible + + true + + + + + + + + + + diff --git a/system-requirements.md b/system-requirements.md new file mode 100644 index 00000000..5faed1e0 --- /dev/null +++ b/system-requirements.md @@ -0,0 +1,117 @@ +# Системные требования + +## Рабочее место аналитика + +* ОС: Windows/Linux/MasOS. +* Процессор: 4 ядра или более. +* Оперативная память: 16 Гб или более. +* Жесткий диск: 20 Гб или более. +* Рекомендуемый браузер: последняя версия Chrome +* Сеть + * исходящее соединение по сети интернет на порты: HTTP:80 (Nexus), HTTP:4000 (package-repository), + * исходящее соединение по локальной сети на порт JDBC:5432 (СУБД) + +## Общее + +### Типовая конфигурация сервера приложений + +* Рекомендуемая ОС: Linux. +* Процессор: 8 ядра или более. +* Оперативная память: 16 Гб или более. +* Жесткий диск: 20 Гб или более. +* Java JDK 17.х. +* Сервер приложений. +* Только для демонстрационного и тестового стенда: открытый debug порт (по умолчанию 8787) +* Сеть + * входящее соединение по локальной сети: HTTP:8080 + * только для демонстрационного и тестового стенда: входящее соединение по локальной сети debug порт HTTP:8787 + * исходящее соединение по локальной сети на порт JDBC:5432 (СУБД) + +### Типовая конфигурация сервера БД + +* Рекомендуемая ОС: Linux. +* Процессор: 4 ядра или более. +* Оперативная память: 16 Гб или более. +* Жесткий диск: + * тип - SSD/NVME SSD + * 20 Гб или более для системы + * 50 Гб и более для данных +* Средство анализа логов pgBadger +* PostgreSQL 15 или выше, с включением логирования запросов (необходимо для pgBadger) +* Сеть + * входящее соединение по локальной сети на порт JDBC:5432 +* Для обеспечения отказоустойчивости необходимо создать более 1 узла. Отказоустойчивость обеспечивается посредством patroni. + +## Демонстрационный стенд + +### Сервер приложений + +* см. типовую конфигурацию сервера приложений + +### Сервер БД + +* см. типовую конфигурацию сервера БД + +## Тестовый стенд/боевой стенд + +### Балансировщик + +* Рекомендуемая ОС: Linux. +* Процессор: 2 ядра или более. +* Оперативная память: 4 Гб или более. +* Жесткий диск: 20 Гб или более. +* Задача - распределение нагрузки между серверами статики и серверами приложений +* Nginx +* Сеть + * входящее соединение по локальной сети на порт HTTP:80 + * исходящее соединение по локальной сети на порт HTTP:80 (серверы статики) + * исходящее соединение по локальной сети на порт HTTP:8080 (серверы приложений) + +### Сервер статики + +* Рекомендуемая ОС: Linux. +* Процессор: 2 ядра или более. +* Оперативная память: 4 Гб или более. +* Жесткий диск: 20 Гб или более. +* Задача - выдача frontend части приложения +* Для обеспечения отказоустойчивости необходимо создать более 1 узла +* Nginx +* Сеть + * входящее соединение по локальной сети на порт HTTP:80 + +### Сервер приложений + +* см. типовую конфигурацию сервера приложений +* Для обеспечения отказоустойчивости необходимо создать более 1 узла + +### Сервер БД + +* см. типовую конфигурацию сервера БД +* Для обеспечения отказоустойчивости необходимо создать более 1 узла + +### Сервер мониторинга + +* Рекомендуемая ОС: Linux. +* Процессор: 2 ядра или более. +* Оперативная память: 4 Гб или более. +* Жесткий диск: 20 Гб или более. +* Задачи + * Сбор общей информации (процессор, оперативная память, диск, сеть) со узлов стенда + * Сбор информации о приложении + * метрики приложения + * загрузка пулов соединений БД на сервере приложений + * загрузка оперативной памяти сервера приложений +* Сеть + * входящее соединение по локальной сети на порт HTTP:80 + * входящее соединение по локальной сети от агента мониторинга + +### Сервер сбора логов + +* Рекомендуемая ОС: Linux. +* Процессор: 2 ядра или более. +* Оперативная память: 4 Гб или более. +* Жесткий диск: 50 Гб или более. +* Задача - сбор access и server логов с серверов приложений +* Сеть + * входящее соединение по локальной сети на порт HTTP:80 + * входящее соединение по локальной сети от агента сбора логов diff --git a/test/pom.xml b/test/pom.xml new file mode 100644 index 00000000..688ee07e --- /dev/null +++ b/test/pom.xml @@ -0,0 +1,201 @@ + + + 4.0.0 + + ervu_lkrp_ul + ervu_lkrp_ul + 1.0.0-SNAPSHOT + + + ervu_lkrp_ul.ervu_lkrp_ul + test + + + http://localhost:8080/test + http://127.0.0.1:4444/wd/hub + + + + + + com.google.guava + guava + 31.0.1-jre + + + + + + + ru.cg.webbpm + web-tests-core + + + org.apache.httpcomponents + httpcore + test + + + com.google.code.gson + gson + + + org.postgresql + postgresql + + + ru.micord.fias + client + + + + + org.springframework.security + spring-security-jwt + + + org.springframework.security + spring-security-core + + + io.jsonwebtoken + jjwt-api + + + io.jsonwebtoken + jjwt-impl + runtime + + + io.jsonwebtoken + jjwt-jackson + + + ru.cg.webbpm.modules.database + database-impl + + + ru.cg.webbpm.modules.security + security-api + + + org.slf4j + slf4j-simple + test + + + org.junit.jupiter + junit-jupiter + + + org.junit.platform + junit-platform-suite-engine + + + org.junit.jupiter + junit-jupiter-params + + + org.seleniumhq.selenium + selenium-java + + + com.google.guava + guava + + + commons-lang + commons-lang + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + true + + false + + ${application.url} + ${selenium.grid.url} + + true + + + + + + + + + + chrome + + true + + + chrome + + + + all-browsers + + all + + + + + integration-tests-admin + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + SuiteAdmin.java + + -Xmx4g -XX:+HeapDumpOnOutOfMemoryError + -XX:HeapDumpPath=/tmp/integration-tests-admin-dump.hprof + + + ${browsers} + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.22.2 + + + integration-tests-admin + + failsafe-report-only + + + + + + + + + + diff --git a/test/src/test/java/SuiteAdmin.java b/test/src/test/java/SuiteAdmin.java new file mode 100644 index 00000000..5b15cd9f --- /dev/null +++ b/test/src/test/java/SuiteAdmin.java @@ -0,0 +1,27 @@ +import old.*; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +import tests.AuthoritiesIT; +import tests.LoginIT; +import tests.OrganizationsIT; +import tests.ProcessesIT; + +/** + * @author gulnaz + */ +@Suite +@SelectClasses({ + AuthoritiesIT.class, + LoginIT.class, + OrganizationsIT.class, + ProcessesIT.class, + AdminGroupIT.class, + AdminRoleIT.class, + AdminUserIT.class, + JWTokensIT.class +}) + +public class SuiteAdmin { + SuiteAdmin() { + } +} diff --git a/test/src/test/java/old/AdminGroupIT.java b/test/src/test/java/old/AdminGroupIT.java new file mode 100644 index 00000000..6323d497 --- /dev/null +++ b/test/src/test/java/old/AdminGroupIT.java @@ -0,0 +1,332 @@ +package old; + +import com.google.common.collect.Comparators; +import old.core.Browser; +import old.core.BrowserArgumentProvider; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; + +import old.page.AdminGroupPage; +import old.page.AdminUserPage; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * @author kote + */ +public class AdminGroupIT extends BaseComponentIT { + + private static final String GROUP_ACCESS_LEVEL = "user access level"; + private static final String ROLE = "BPMN User"; + private static final String ROLE_2 = "BPMN Admin"; + private static final String ROLE_3 = "BPMN Superuser"; + private static final String COL_ID = "group$name"; + private static final String COL_ID_CREATED = "group$created"; + private static final String COL_ID_UPDATED = "group$updated"; + private static final String BPMN_ADMIN_ROLE_ID = "aa14ba1d-0b61-4e33-8474-7c2d98944b12"; + private static final String BPMN_USER_ROLE_ID = "767ae8cf-af01-44d4-86ef-fcb143373407"; + private static final String BPMN_SUPERUSER_ROLE_ID = "2569ba58-1f8f-43ea-8b2c-0d373cf501fe"; + + private AdminGroupPage adminGroupPage; + private String oldName; + private String groupId; + private String roleId; + + public AdminGroupIT() { + super(); + } + + @AfterEach + public void afterEachTest(TestInfo testInfo) { + String testName = testInfo.getTestMethod().toString(); + + if (testName.contains("User")) { + EXECUTION_MANAGER.deleteTestUser(name); + } + + if (testName.contains("edit")) { + EXECUTION_MANAGER.deleteTestGroup(oldName); + } + + if (testName.contains("linked")) { + EXECUTION_MANAGER.deleteUserGroupRole(name, groupId, roleId); + } + + if (testName.contains("Sorting")) { + String groupIdToDelete = EXECUTION_MANAGER.getGroupIdByName(name); + EXECUTION_MANAGER.deleteLinkedRolesFromGroup(groupIdToDelete); + } + + EXECUTION_MANAGER.deleteTestGroup(name); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void createGroup(Browser browser) { + openBrowserAndAdminPage(browser); + adminGroupPage.clickCreateButton(); + + adminGroupPage.waitForPageLoad(); + adminGroupPage.waitForVisibilityOf(adminGroupPage.nameField); + adminGroupPage.typeText(adminGroupPage.nameField, name); + adminGroupPage.typeAndSelectLevel(GROUP_ACCESS_LEVEL); + adminGroupPage.addRole(ROLE, false); + adminGroupPage.clickSaveButton(); + String dateOfCreation = adminGroupPage.getLocalDate(); + + adminGroupPage.waitForPageLoad(); + adminGroupPage.searchGroup(name); + assertEquals(1, adminGroupPage.getListOfGroupsNamesFromTable(name).size()); + assertTrue(adminGroupPage.getActionTime(COL_ID, name, COL_ID_CREATED).getText().contains(dateOfCreation)); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void searchGroup(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestGroup(name, ACCESS_LEVEL_ID); + adminGroupPage.searchGroup(name); + + adminGroupPage.waitForPageLoad(); + assertEquals(1, adminGroupPage.getListOfGroupsNamesFromTable(name).size()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void editGroup(Browser browser) { + openBrowserAndAdminPage(browser); + oldName = "old" + name; + EXECUTION_MANAGER.createTestGroup(oldName, ACCESS_LEVEL_ID); + + adminGroupPage.chooseGroup(oldName); + adminGroupPage.clickEditButton(); + adminGroupPage.waitForVisibilityOf(adminGroupPage.nameField); + adminGroupPage.typeText(adminGroupPage.nameField, name); + adminGroupPage.addRole(ROLE, false); + adminGroupPage.clickSaveButton(); + adminGroupPage.searchGroup(oldName); + assertEquals(0, adminGroupPage.getListOfGroupsNamesFromTable(oldName).size()); + + adminGroupPage.chooseGroup(name); + assertEquals(1, adminGroupPage.getListOfGroupsNamesFromTable(name).size()); + String timeOfCreate = adminGroupPage.getActionTime(COL_ID, name, COL_ID_CREATED).getText(); + String timeOfUpdate = adminGroupPage.getActionTime(COL_ID, name, COL_ID_UPDATED).getText(); + assertNotEquals(timeOfCreate, timeOfUpdate); + + adminGroupPage.clickEditButton(); + assertTrue(adminGroupPage.hasRolesInTable(AdminGroupPage.GroupPageGrids.ADDED_ROLES_GRID, ROLE)); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void deleteGroup(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestGroup(name, ACCESS_LEVEL_ID); + + adminGroupPage.chooseGroup(name); + adminGroupPage.deleteGroup(); + assertTrue(adminGroupPage.isGridEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void linkedRolesTable(Browser browser) { + openBrowserAndAdminPage(browser); + roleId = EXECUTION_MANAGER.generateId(); + groupId = EXECUTION_MANAGER.generateId(); + EXECUTION_MANAGER.createBindGroupRole(name, groupId, ACCESS_LEVEL_ID, roleId); + + adminGroupPage.chooseGroup(name); + assertEquals(1, adminGroupPage.getListOfRolesFromLinkedTable().size()); + assertEquals(name, adminGroupPage.getListOfRolesFromLinkedTable().get(0).getText()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void attachRemoveRoleToGroup(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestGroup(name, ACCESS_LEVEL_ID); + adminGroupPage.chooseGroup(name); + assertTrue(adminGroupPage.getListOfRolesFromLinkedTable().isEmpty()); + + adminGroupPage.clickEditButton(); + assertFalse(adminGroupPage.getListOfRolesToAdd().isEmpty()); + assertTrue(adminGroupPage.getListOfAddedRoles().isEmpty()); + + adminGroupPage.addRole(ROLE, false); + assertFalse(adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()).contains(ROLE)); + assertTrue(adminGroupPage.getWebElementTexts(adminGroupPage.getListOfAddedRoles()).contains(ROLE)); + assertEquals(1, adminGroupPage.getListOfAddedRoles().size()); + + adminGroupPage.clickSaveButton(); + adminGroupPage.chooseGroup(name); + assertEquals(1, adminGroupPage.getListOfRolesFromLinkedTable().size()); + assertTrue(adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesFromLinkedTable()).contains(ROLE)); + + adminGroupPage.clickEditButton(); + adminGroupPage.removeRole(ROLE); + assertTrue(adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()).contains(ROLE)); + assertTrue(adminGroupPage.getListOfAddedRoles().isEmpty()); + + adminGroupPage.clickSaveButton(); + adminGroupPage.chooseGroup(name); + assertTrue(adminGroupPage.getListOfRolesFromLinkedTable().isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void attachRemoveAllRolesToGroup(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestGroup(name, ACCESS_LEVEL_ID); + List roleNames = EXECUTION_MANAGER.getRoleNamesFromUserRole(); + List expectedRoles = Arrays.asList(ROLE, ROLE_2, ROLE_3); + + adminGroupPage.chooseGroup(name); + adminGroupPage.clickEditButton(); + assertFalse(adminGroupPage.getListOfRolesToAdd().isEmpty()); + assertTrue(adminGroupPage.getListOfAddedRoles().isEmpty()); + + adminGroupPage.addAllRoles(); + assertTrue(adminGroupPage.isAvailableGridEmpty(roleNames)); + assertFalse(adminGroupPage.getListOfAddedRoles().isEmpty()); + /* + Нет возможности проверить сохранение привязки всех ролей к группе из-за создания/удаление ролей + параллельными тестами. + */ + + adminGroupPage.removeAllRoles(); + assertFalse(adminGroupPage.getListOfRolesToAdd().isEmpty()); + assertTrue(adminGroupPage.getListOfAddedRoles().isEmpty()); + + adminGroupPage.addRole(ROLE, false); + adminGroupPage.addRole(ROLE_2, false); + adminGroupPage.addRole(ROLE_3, false); + adminGroupPage.clickSaveButton(); + adminGroupPage.chooseGroup(name); + assertEquals(expectedRoles.size(), adminGroupPage.getListOfRolesFromLinkedTable().size()); + assertTrue(adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesFromLinkedTable()) + .containsAll(expectedRoles)); + + adminGroupPage.clickEditButton(); + adminGroupPage.removeAllRoles(); + adminGroupPage.clickSaveButton(); + adminGroupPage.chooseGroup(name); + assertTrue(adminGroupPage.getListOfRolesFromLinkedTable().isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void addNewGroupToUser(Browser browser) { + openBrowserAndAdminPage(browser); + String userName = name; + EXECUTION_MANAGER.createUser(userName, ORGANIZATION_ID); + adminGroupPage.clickCreateButton(); + + adminGroupPage.waitForPageLoad(); + adminGroupPage.waitForVisibilityOf(adminGroupPage.nameField); + adminGroupPage.typeText(adminGroupPage.nameField, name); + adminGroupPage.typeAndSelectLevel(GROUP_ACCESS_LEVEL); + adminGroupPage.clickSaveButton(); + + AdminUserPage adminUserPage = inboxPage.startAdminUser(); + adminUserPage.searchUser(userName); + adminUserPage.clickOnUserInTable(userName); + adminUserPage.clickEditButton(); + adminUserPage.fillPassAndEmail(userName, userName + "@test.ru"); + adminUserPage.bindGroup(name); + assertTrue(adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()).contains(name)); + + adminUserPage.clickSaveButton(); + adminUserPage.searchUser(userName); + adminUserPage.clickOnUserInTable(userName); + assertEquals(1, adminUserPage.getListOfGroupsFromTable().size()); + assertEquals(name, adminUserPage.getListOfGroupsFromTable().get(0).getText()); + } + + @Disabled("dev WEBBPMNEXT-7837") + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void groupRolesGridsSorting(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createGroupBindRoles(name, ACCESS_LEVEL_ID, BPMN_ADMIN_ROLE_ID, + BPMN_USER_ROLE_ID, BPMN_SUPERUSER_ROLE_ID); + + //main group page sorting + List groupNamesNatural = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfGroupNames()); + assertTrue(Comparators.isInOrder(groupNamesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.GROUP_NAMES_GRID); + List groupNamesReverse = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfGroupNames()); + assertTrue(Comparators.isInOrder(groupNamesReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + adminGroupPage.chooseGroup(name); + List linkedRolesNatural = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesFromLinkedTable()); + assertTrue(Comparators.isInOrder(linkedRolesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.LINKED_ROLES_GRID); + List linkedRolesReverse = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesFromLinkedTable()); + assertTrue(Comparators.isInOrder(linkedRolesReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + //edit group page sorting + adminGroupPage.clickEditButton(); + List availableToAddRolesNatural = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()); + assertTrue(Comparators.isInOrder(availableToAddRolesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.ROLES_TO_ADD_GRID); + List availableToAddRolesReverse = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()); + assertTrue(Comparators.isInOrder(availableToAddRolesReverse, + String.CASE_INSENSITIVE_ORDER.reversed()), "Grid wasn't sorted"); + + adminGroupPage.removeAllRoles(); + List addedRolesNatural = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfAddedRoles()); + assertTrue(Comparators.isInOrder(addedRolesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.ADDED_ROLES_GRID); + List addedRolesReverse = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfAddedRoles()); + assertTrue(Comparators.isInOrder(addedRolesReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + //create group page sorting + adminGroupPage.cancelAction(); + adminGroupPage.clickCreateButton(); + List rolesToAddNatural = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()); + assertTrue(Comparators.isInOrder(rolesToAddNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.ROLES_TO_ADD_GRID); + List rolesToAddReverse = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfRolesToAdd()); + assertTrue(Comparators.isInOrder(rolesToAddReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + adminGroupPage.removeAllRoles(); + List addedRolesNaturalSort = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfAddedRoles()); + assertTrue(Comparators.isInOrder(addedRolesNaturalSort, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminGroupPage.changeGroupPageGridSort(AdminGroupPage.GroupPageGrids.ADDED_ROLES_GRID); + List addedRolesReverseSort = adminGroupPage.getWebElementTexts(adminGroupPage.getListOfAddedRoles()); + assertTrue(Comparators.isInOrder(addedRolesReverseSort, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + } + + private void openBrowserAndAdminPage(Browser browser) { + openBrowserAndLoginForAdmin(browser); + initAdminName(); + adminGroupPage = inboxPage.startAdminGroup(); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/AdminRoleIT.java b/test/src/test/java/old/AdminRoleIT.java new file mode 100644 index 00000000..6fd2678e --- /dev/null +++ b/test/src/test/java/old/AdminRoleIT.java @@ -0,0 +1,184 @@ +package old; + +import com.google.common.collect.Comparators; +import old.core.Browser; +import old.core.BrowserArgumentProvider; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import org.openqa.selenium.WebElement; +import old.page.AdminGroupPage; +import old.page.AdminRolePage; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * @author kote + */ +public class AdminRoleIT extends BaseComponentIT { + + private static final String COL_ID = "role$name"; + private static final String COL_ID_CREATED = "role$created"; + private static final String COL_ID_UPDATED = "role$updated"; + + private AdminRolePage adminRolePage; + private String oldName; + + public AdminRoleIT() { + super(); + } + + @AfterEach + public void afterEachTest(TestInfo testInfo) { + String testName = testInfo.getTestMethod().toString(); + + if (testName.contains("Group")) { + EXECUTION_MANAGER.deleteTestGroup(name); + } + + if (testName.contains("edit")) { + EXECUTION_MANAGER.deleteTestRole(oldName); + } + + if (testName.contains("Sorting")) { + String roleId = EXECUTION_MANAGER.getRoleIdByName(name); + EXECUTION_MANAGER.deleteLinkedGroupsFromRole(roleId); + } + + EXECUTION_MANAGER.deleteTestRole(name); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void createRole(Browser browser) { + openBrowserAndAdminPage(browser); + adminRolePage.clickCreateButton(); + adminRolePage.typeText(adminRolePage.nameField, name); + adminRolePage.clickSaveButton(); + String dateOfCreation = adminRolePage.getLocalDate(); + adminRolePage.searchRole(name); + assertEquals(1, adminRolePage.getListOfRolesNamesFromTable(name).size()); + assertTrue(adminRolePage.getActionTime(COL_ID, name, COL_ID_CREATED).getText().contains(dateOfCreation)); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void searchRole(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestRole(name); + + adminRolePage.searchRole(name); + assertEquals(1, adminRolePage.getListOfRolesNamesFromTable(name).size()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void editRole(Browser browser) { + openBrowserAndAdminPage(browser); + oldName = "old" + name; + EXECUTION_MANAGER.createTestRole(oldName); + + adminRolePage.chooseRole(oldName); + adminRolePage.clickEditButton(); + adminRolePage.typeText(adminRolePage.nameField, name); + adminRolePage.clickSaveButton(); + adminRolePage.searchRole(oldName); + assertEquals(0, adminRolePage.getListOfRolesNamesFromTable(oldName).size()); + + adminRolePage.searchRole(name); + assertEquals(1, adminRolePage.getListOfRolesNamesFromTable(name).size()); + + String timeOfCreate = adminRolePage.getActionTime(COL_ID, name, COL_ID_CREATED).getText(); + String timeOfUpdate = adminRolePage.getActionTime(COL_ID, name, COL_ID_UPDATED).getText(); + assertNotEquals(timeOfCreate, timeOfUpdate); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void deleteRole(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestRole(name); + + adminRolePage.waitForPageLoad(); + adminRolePage.chooseRole(name); + adminRolePage.deleteRole(); + assertEquals(0, adminRolePage.getListOfRolesNamesFromTable(name).size()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void roleGroupGridContainsAttachedGroup(Browser browser) { + openBrowserAndAdminPage(browser); + String roleId = EXECUTION_MANAGER.generateId(); + String groupId = EXECUTION_MANAGER.generateId(); + EXECUTION_MANAGER.createBindGroupRole(name, groupId, ACCESS_LEVEL_ID, roleId); + + adminRolePage.chooseRole(name); + WebElement gridLinkedGroup = adminRolePage.getListOfRoleLinkedGroups().get(0); + adminRolePage.waitForTextToBePresentInElement(gridLinkedGroup, name); + assertEquals(1, adminRolePage.getListOfRoleLinkedGroups().size()); + assertEquals(adminRolePage.getListOfRoleLinkedGroups().get(0).getText(), name); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void addNewRoleToGroup(Browser browser) { + openBrowserAndAdminPage(browser); + String groupName = name; + EXECUTION_MANAGER.createTestGroup(groupName, ACCESS_LEVEL_ID); + + adminRolePage.clickCreateButton(); + adminRolePage.typeText(adminRolePage.nameField, name); + adminRolePage.clickSaveButton(); + + AdminGroupPage adminGroupPage = inboxPage.startAdminGroup(); + adminGroupPage.chooseGroup(groupName); + adminGroupPage.clickEditButton(); + adminGroupPage.bindRole(name); + assertTrue(adminGroupPage.hasRolesInTable(AdminGroupPage.GroupPageGrids.ADDED_ROLES_GRID, name)); + + adminGroupPage.clickSaveButton(); + adminGroupPage.chooseGroup(groupName); + adminGroupPage.clickEditButton(); + assertTrue(adminGroupPage.hasRolesInTable(AdminGroupPage.GroupPageGrids.ADDED_ROLES_GRID, name)); + } + + @Disabled("dev WEBBPMNEXT-7837") + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void roleGroupsGridSorting(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createRoleBindGroups(name, BPMN_ADMIN_GROUP_ID, BPMN_USER_GROUP_ID, BPMN_SUPERUSER_GROUP_ID); + + List roleNamesNatural = adminRolePage.getWebElementTexts(adminRolePage.getListOfRoles()); + assertTrue(Comparators.isInOrder(roleNamesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminRolePage.changeRolePageGridSort(AdminRolePage.RolePageGrids.ROLE_NAMES_GRID); + List roleNamesReverse = adminRolePage.getWebElementTexts(adminRolePage.getListOfRoles()); + assertTrue(Comparators.isInOrder(roleNamesReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + adminRolePage.chooseRole(name); + List linkedGroupsNatural = adminRolePage.getWebElementTexts(adminRolePage.getListOfRoleLinkedGroups()); + assertTrue(Comparators.isInOrder(linkedGroupsNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminRolePage.changeRolePageGridSort(AdminRolePage.RolePageGrids.GROUP_NAMES_GRID); + List linkedGroupsReverse = adminRolePage.getWebElementTexts(adminRolePage.getListOfRoleLinkedGroups()); + assertTrue(Comparators.isInOrder(linkedGroupsReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + } + + private void openBrowserAndAdminPage(Browser browser) { + openBrowserAndLoginForAdmin(browser); + initAdminName(); + adminRolePage = inboxPage.startAdminRole(); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/AdminUserIT.java b/test/src/test/java/old/AdminUserIT.java new file mode 100644 index 00000000..02b60207 --- /dev/null +++ b/test/src/test/java/old/AdminUserIT.java @@ -0,0 +1,370 @@ +package old; + +import com.google.common.collect.Comparators; +import old.core.Browser; +import old.core.BrowserArgumentProvider; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import old.page.AdminUserPage; + +import java.util.Arrays; +import java.util.List; + +import static org.apache.commons.lang.StringUtils.containsIgnoreCase; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * @author kote + */ +public class AdminUserIT extends BaseComponentIT { + + private AdminUserPage adminUserPage; + private String oldName; + private String email; + + private static final String USER_PASSWORD = "test"; + private static final String USER_PASSWORD_2 = "test2"; + private static final String ORGANIZATION = "Default"; + private static final String FULL_ORGANIZATION_NAME = "Default Organization"; + private static final String BPMN_ADMIN_GROUP = "BPMN Admin"; + private static final String BPMN_USER_GROUP = "BPMN User"; + private static final String BPMN_SUPERUSER_GROUP = "BPMN Superuser"; + + private static final String SECURITY_GROUP = "Security Admin"; + + public AdminUserIT() { + super(); + } + + @AfterEach + public void afterEachTest(TestInfo testInfo) { + String testName = testInfo.getTestMethod().toString(); + + if (testName.contains("edit")) { + EXECUTION_MANAGER.deleteTestUser(oldName); + } + + if (containsIgnoreCase(testName, "sorting")) { + String userAccId = EXECUTION_MANAGER.getUserAccountIdByName(name); + EXECUTION_MANAGER.deleteUserLinkedGroups(userAccId); + } + + if (containsIgnoreCase(testName, "visibility")) { + String userAccountId = EXECUTION_MANAGER.getUserAccountIdByName(name); + EXECUTION_MANAGER.deleteUserLinkedGroups(userAccountId); + } + + EXECUTION_MANAGER.deleteTestUser(name); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void createUser(Browser browser) { + openBrowserAndAdminPage(browser); + adminUserPage.clickCreateButton(); + adminUserPage.waitForVisibilityOf(adminUserPage.lastNameField); + adminUserPage.fillUserFullName(name); + email = randomEmail(); + adminUserPage.fillUserCredentials(name, USER_PASSWORD, email, ORGANIZATION, FULL_ORGANIZATION_NAME); + adminUserPage.addGroup(BPMN_ADMIN_GROUP); + adminUserPage.clickSaveButton(); + assertTrue(EXECUTION_MANAGER.hasUserByData(name, email)); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertEquals(1, adminUserPage.getListOfGroupsFromTable().size()); + assertEquals(BPMN_ADMIN_GROUP, adminUserPage.getListOfGroupsFromTable().get(0).getText()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void searchUser(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + + adminUserPage.searchUser(name); + assertEquals(1, adminUserPage.getListOfLastNamesFromTable().size()); + assertEquals(1, adminUserPage.getListOfFirstNamesFromTable().size()); + assertEquals(1, adminUserPage.getListOfMiddleNamesFromTable().size()); + + assertEquals(name, adminUserPage.getListOfLastNamesFromTable().get(0).getText()); + assertEquals(name, adminUserPage.getListOfFirstNamesFromTable().get(0).getText()); + assertEquals(name, adminUserPage.getListOfMiddleNamesFromTable().get(0).getText()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void editUser(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + adminUserPage.clickEditButton(); + adminUserPage.waitForVisibilityOf(adminUserPage.lastNameField); + oldName = name; + name = name + "_edited"; + adminUserPage.fillUserFullName(name); + email = randomEmail(); + adminUserPage.fillPassAndEmail(USER_PASSWORD_2, email); + adminUserPage.addGroup(BPMN_USER_GROUP); + adminUserPage.clickSaveButton(); + adminUserPage.waitForVisibilityOf(adminUserPage.filterPanel); + adminUserPage.searchUser(name); + assertEquals(1, adminUserPage.getListOfLastNamesFromTable().size()); + assertEquals(1, adminUserPage.getListOfFirstNamesFromTable().size()); + assertEquals(1, adminUserPage.getListOfMiddleNamesFromTable().size()); + + assertNotEquals(oldName, adminUserPage.getListOfLastNamesFromTable().get(0).getText()); + assertNotEquals(oldName, adminUserPage.getListOfFirstNamesFromTable().get(0).getText()); + assertNotEquals(oldName, adminUserPage.getListOfMiddleNamesFromTable().get(0).getText()); + + assertTrue(EXECUTION_MANAGER.hasUserByData(name, email)); + + adminUserPage.clickOnUserInTable(name); + assertEquals(1, adminUserPage.getListOfGroupsFromTable().size()); + assertEquals(BPMN_USER_GROUP, adminUserPage.getListOfGroupsFromTable().get(0).getText()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void deleteUser(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + adminUserPage.deleteUser(); + + assertTrue(adminUserPage.getListOfLastNamesFromTable().isEmpty()); + assertTrue(adminUserPage.getListOfFirstNamesFromTable().isEmpty()); + assertTrue(adminUserPage.getListOfMiddleNamesFromTable().isEmpty()); + } + + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void attachRemoveGroup(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertTrue(adminUserPage.getListOfGroupsFromTable().isEmpty()); + + adminUserPage.clickEditButton(); + assertFalse(adminUserPage.getListOfAvailableGroupsToAdd().isEmpty()); + assertTrue(adminUserPage.getListOfAddedGroups().isEmpty()); + + adminUserPage.addGroup(BPMN_ADMIN_GROUP); + assertFalse(adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()).contains(BPMN_ADMIN_GROUP)); + assertEquals(BPMN_ADMIN_GROUP, adminUserPage.getListOfAddedGroups().get(0).getText()); + assertEquals(1, adminUserPage.getListOfAddedGroups().size()); + + adminUserPage.clickSaveButton(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertEquals(1, adminUserPage.getListOfGroupsFromTable().size()); + assertEquals(BPMN_ADMIN_GROUP, adminUserPage.getListOfGroupsFromTable().get(0).getText()); + + adminUserPage.clickEditButton(); + adminUserPage.removeGroup(BPMN_ADMIN_GROUP); + assertTrue(adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()).contains(BPMN_ADMIN_GROUP)); + assertTrue(adminUserPage.getListOfAddedGroups().isEmpty()); + + adminUserPage.clickSaveButton(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertTrue(adminUserPage.getListOfGroupsFromTable().isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void attachRemoveAllGroups(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + List groupNamesFromTable = EXECUTION_MANAGER.getGroupNamesFromUserGroup(); + List expectedGroups = Arrays.asList(BPMN_ADMIN_GROUP, BPMN_USER_GROUP, + BPMN_SUPERUSER_GROUP); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertTrue(adminUserPage.getListOfGroupsFromTable().isEmpty()); + + adminUserPage.clickEditButton(); + assertFalse(adminUserPage.getListOfAvailableGroupsToAdd().isEmpty()); + assertTrue(adminUserPage.getListOfAddedGroups().isEmpty()); + + adminUserPage.addAllGroups(); + assertTrue(adminUserPage.isAvailableGridEmpty(groupNamesFromTable)); + assertFalse(adminUserPage.getListOfAddedGroups().isEmpty()); + + adminUserPage.removeAllGroups(); + assertFalse(adminUserPage.getListOfAvailableGroupsToAdd().isEmpty()); + assertTrue(adminUserPage.getListOfAddedGroups().isEmpty()); + + adminUserPage.addGroup(BPMN_ADMIN_GROUP); + adminUserPage.addGroup(BPMN_USER_GROUP); + adminUserPage.addGroup(BPMN_SUPERUSER_GROUP); + adminUserPage.clickSaveButton(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertEquals(3, adminUserPage.getListOfGroupsFromTable().size()); + assertTrue(adminUserPage.getWebElementTexts(adminUserPage.getListOfGroupsFromTable()).containsAll(expectedGroups)); + + adminUserPage.clickEditButton(); + adminUserPage.removeAllGroups(); + adminUserPage.clickSaveButton(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertTrue(adminUserPage.getListOfGroupsFromTable().isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void accessLevelGroupVisibility(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUserBindGroups(name, ORGANIZATION_ID, SECURITY_ADMIN_GROUP_ID); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertTrue(adminUserPage.getWebElementTexts(adminUserPage.getListOfGroupsFromTable()).contains(SECURITY_GROUP)); + + adminUserPage.clickEditButton(); + assertFalse(adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()).contains(SECURITY_GROUP)); + assertTrue(adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()).contains(SECURITY_GROUP)); + + adminUserPage.logout(); + initQaAdminCredentials(); + login(login, password); + adminUserPage = inboxPage.startAdminUser(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + assertFalse(adminUserPage.getWebElementTexts(adminUserPage.getListOfGroupsFromTable()).contains(SECURITY_GROUP)); + + adminUserPage.clickEditButton(); + assertFalse(adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()).contains(SECURITY_GROUP)); + assertFalse(adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()).contains(SECURITY_GROUP)); + } + + @Disabled("dev WEBBPMNEXT-7837") + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void userAdminPageGroupsGridSorting(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createUserBindGroups(name, ORGANIZATION_ID, BPMN_ADMIN_GROUP_ID, + BPMN_USER_GROUP_ID, BPMN_SUPERUSER_GROUP_ID); + + //User page sorting + List lastNamesNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfLastNamesFromTable()); + assertTrue(Comparators.isInOrder(lastNamesNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.USERS_GRID); + List lastNamesReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfLastNamesFromTable()); + assertTrue(Comparators.isInOrder(lastNamesReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + List userLinkedGroupsNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfGroupsFromTable()); + assertTrue(Comparators.isInOrder(userLinkedGroupsNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.LINKED_GROUPS_GRID); + List userLinkedGroupsReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfGroupsFromTable()); + assertTrue(Comparators.isInOrder(userLinkedGroupsReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + //Edit user page sorting + adminUserPage.clickEditButton(); + List availableToAddGroupsNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()); + assertTrue(Comparators.isInOrder(availableToAddGroupsNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.GROUPS_TO_ADD_GRID); + List availableGroupsToAddReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()); + assertTrue(Comparators.isInOrder(availableGroupsToAddReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + List addedGroupsNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()); + assertTrue(Comparators.isInOrder(addedGroupsNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.ADDED_GROUPS_GRID); + List addedGroupsReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()); + assertTrue(Comparators.isInOrder(addedGroupsReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + //Create user page sorting + adminUserPage.cancelAction(); + adminUserPage.clickCreateButton(); + List groupsToAddNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()); + assertTrue(Comparators.isInOrder(groupsToAddNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.GROUPS_TO_ADD_GRID); + List groupsToAddReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfAvailableGroupsToAdd()); + assertTrue(Comparators.isInOrder(groupsToAddReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + + adminUserPage.addAllGroups(); + List addedGroupsInCreateFormNatural = adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()); + assertTrue(Comparators.isInOrder(addedGroupsInCreateFormNatural, String.CASE_INSENSITIVE_ORDER), + "Grid wasn't sorted"); + + adminUserPage.changeUserPageGridsSort(AdminUserPage.UsersPageGrids.ADDED_GROUPS_GRID); + List addedGroupsInCreatedFormReverse = adminUserPage.getWebElementTexts(adminUserPage.getListOfAddedGroups()); + assertTrue(Comparators.isInOrder(addedGroupsInCreatedFormReverse, String.CASE_INSENSITIVE_ORDER.reversed()), + "Grid wasn't sorted"); + } + + private void openBrowserAndAdminPage(Browser browser) { + openBrowserAndLoginForAdmin(browser); + initAdminName(); + adminUserPage = inboxPage.startAdminUser(); + } + + private String randomEmail() { + String random1 = String.valueOf(20000 + (int) (Math.random() * 20000)); + String random2 = String.valueOf(20000 + (int) (Math.random() * 20000)); + return random1 + "@" + random2 + ".ru"; + } + + /*@ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void addNewOrgToUser(Browser browser) { + openBrowserAndAdminPage(browser); + EXECUTION_MANAGER.createTestOrg(name); + EXECUTION_MANAGER.createUser(name, ORGANIZATION_ID); + + organizationPage.clickCreateButton(); + organizationPage.waitOrgEditingPageLoading(); + organizationPage.fillOrgNameAndCode(name2); + organizationPage.chooseParentOrg(DEFAULT_ORG); + organizationPage.clickSaveButton(); + AdminUserPage adminUserPage = inboxPage.startAdminUser(); + adminUserPage.searchUser(name); + adminUserPage.clickOnUserInTable(name); + adminUserPage.clickEditButton(); + adminUserPage.chooseUserOrganization(name2); + adminUserPage.fillPass(name); + adminUserPage.clickSaveButton(); + } + + private void openBrowserAndAdminPage(Browser browser) { + openBrowserAndLoginForAdmin(browser); + initAdminName(); + name2 = name.substring(0, 3) + "2" + name.substring(3); + name3 = name.substring(0, 3) + "3" + name.substring(3); + organizationPage = inboxPage.startAdminOrganization(); + assertFalse(isElementEnabled(DELETE_BUTTON)); + }*/ +} \ No newline at end of file diff --git a/test/src/test/java/old/BaseComponentIT.java b/test/src/test/java/old/BaseComponentIT.java new file mode 100644 index 00000000..ae589e84 --- /dev/null +++ b/test/src/test/java/old/BaseComponentIT.java @@ -0,0 +1,141 @@ +package old; + +import old.core.BaseTest; +import old.core.Browser; + +import org.junit.jupiter.api.AfterEach; +import org.openqa.selenium.By; +import org.openqa.selenium.TimeoutException; +import org.openqa.selenium.support.PageFactory; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import old.page.InboxPage; +import old.page.LoginPage; +import old.page.ProcessesPage; + +import old.util.ExecutionManager; +import old.util.PropertyManager; + +import java.io.IOException; +import java.util.Properties; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static old.page.BaseComponentPage.getLoginHeaderBy; +import static old.page.BaseComponentPage.getProgressBar; +import static old.util.DataUtil.BASE_PART_FOR_USER; + +/** + * @author gulnaz + */ +public abstract class BaseComponentIT extends BaseTest { + + protected static final String ACCESS_LEVEL_ID = "a6bf4b31-6648-4095-b269-2a950b548a10"; + protected static final String ORGANIZATION_ID = "3516544f-64c5-4883-9047-28bcce74d1be"; + protected static final String SECURITY_ADMIN_GROUP_ID = "84c5c1e2-081e-45e1-a874-d6bb232e57ad"; + protected static final String BPMN_ADMIN_GROUP_ID = "ddfdc772-7aee-492f-be7d-7e95ea2f45b3"; + protected static final String BPMN_USER_GROUP_ID = "62cd890b-99f7-47a8-be60-e330186b17a0"; + protected static final String BPMN_SUPERUSER_GROUP_ID = "273d8bbd-0e82-4064-a548-850e9aa61756"; + + protected static ExecutionManager EXECUTION_MANAGER = new ExecutionManager(); + + protected InboxPage inboxPage; + protected ProcessesPage processPage; + protected String login; + protected String password; + protected String name; + private Properties config; + final Logger logger = LoggerFactory.getLogger(getClass()); + + + BaseComponentIT() { + super(); + initCredentialsConfig(); + initCredentials(); + } + + @AfterEach + public void exit() { + if (processPage != null) { + assertTrue(processPage.thereIsNoError()); + } + } + + public void openBrowserAndLoginForAdmin(Browser browser) { + initDriver(browser); + initDemoCredentials(); + login(login, password); + } + + public void openBrowserAndLoginForJbpm(Browser browser) { + initDriver(browser); + initQaAdminCredentials(); + login(login, password); + } + + private void initCredentialsConfig() { + try { + config = PropertyManager.getProperties(); + } + catch (IOException e) { + throw new RuntimeException("Failed to get properties. " + e); + } + } + + protected void initCredentials() { + login = config.getProperty("login"); + password = config.getProperty("password"); + } + + protected void initDemoCredentials() { + login = config.getProperty("demo_login"); + password = config.getProperty("demo_password"); + } + + protected void initQaAdminCredentials() { + login = config.getProperty("qa_admin_login"); + password = config.getProperty("qa_admin_password"); + } + + void login(String login, String password) { + WebDriverWait wait = getExplicitWait(getDefaultTimeout()); + wait.until(ExpectedConditions.invisibilityOfElementLocated(getProgressBar())); + wait.until(ExpectedConditions.visibilityOfElementLocated(getLoginHeaderBy())); + LoginPage loginPage = PageFactory.initElements(driver, LoginPage.class); + + try { + inboxPage = loginPage.login(login, password); + } + catch (TimeoutException e) { + throw new RuntimeException("Failed to login", e); + } + } + + void initAdminName() { + initName(BASE_PART_FOR_USER); + } + + void initName(String basePart) { + String random = String.valueOf(20000 + (int) (Math.random() * 20000)); + name = basePart + "-" + random; + logger.info(name + " record has been initialized"); + } + + protected boolean isElementEnabled (String xpath){ + return driver.findElement(By.xpath(String.format(xpath))).isEnabled(); + } + + protected LoginPage getLoginPage() { + return PageFactory.initElements(driver, LoginPage.class); + } + + public void openBrowserAndLogin(Browser browser) { + initDriver(browser); + login(login, password); + } + + protected InboxPage getInboxPage() { + return PageFactory.initElements(driver, InboxPage.class); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/JWTokensIT.java b/test/src/test/java/old/JWTokensIT.java new file mode 100644 index 00000000..1011b922 --- /dev/null +++ b/test/src/test/java/old/JWTokensIT.java @@ -0,0 +1,322 @@ +package old; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.*; +import javax.crypto.SecretKey; + +import old.core.Browser; +import old.core.BrowserArgumentProvider; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import org.openqa.selenium.Cookie; +import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebDriverException; +import org.openqa.selenium.remote.Augmenter; +import org.openqa.selenium.remote.RemoteWebDriver; +import org.openqa.selenium.support.PageFactory; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import old.page.InboxPage; +import old.util.PropertyManager; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static old.page.BaseComponentPage.getLoginHeaderBy; + +/** + * @author gulnaz + */ +public class JWTokensIT extends BaseComponentIT { + + private static final String SURNAME = "demo"; + private static final String SECRET_KEY = "ZjE5ZjMxNmYtODViZC00ZTQ5LWIxZmYtOGEzYzE3Yjc1MDVk}"; + private static final SecretKey SIGNING_KEY; + private static final String ACCESS_TOKEN = "Access-token"; + private static final String DEMO_GROUP_ID = "22ee608b-dd9d-4633-906d-7c4efca231a0"; + private static final String PROCESS_NAME = "test_process"; + private static final Logger LOGGER = LoggerFactory.getLogger(JWTokensIT.class); + + private static PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(11); + private Properties config; + private WebDriver newDriver; + private Set cookies; + + static { + byte[] encodedKey = Base64.getMimeDecoder().decode(SECRET_KEY); + SIGNING_KEY = Keys.hmacShaKeyFor(encodedKey); + } + + public JWTokensIT() throws IOException { + super(); + config = PropertyManager.getProperties(); + } + + @AfterEach + public void afterEachTest() { + if (newDriver != null) { + newDriver.close(); + } + + EXECUTION_MANAGER.deleteTestUser(login); + } + + @Override + protected void initCredentials() { + initAdminName(); + login = name; + password = login; + String encodedPassword = passwordEncoder.encode(password); + EXECUTION_MANAGER.insertUser(login, encodedPassword, login + "@test.ru", ORGANIZATION_ID, + DEMO_GROUP_ID + ); + } + + private void pasteDeadAccessToken() { + String deadAccessToken = createDeadAccessToken(config.getProperty("login")); + Cookie cookie = driver.manage().getCookieNamed(ACCESS_TOKEN); + driver.manage().deleteCookie(cookie); + addCookie(driver, cookie, deadAccessToken); + } + + private void addCookie(WebDriver driver, Cookie cookie, String value) { + driver.manage().addCookie( + new Cookie.Builder(cookie.getName(), value) + .expiresOn(cookie.getExpiry()) + .path(cookie.getPath()) + .build() + ); + } + + private String createDeadAccessToken(String username) { + return Jwts.builder() + .setSubject(username) + .setIssuer("ru.cg.webbpm.components") + .setIssuedAt(new Date(System.currentTimeMillis())) + .setExpiration( + new Date(System.currentTimeMillis() - 3600 * 1000) + ) + .signWith(SIGNING_KEY) + .compact(); + } + + private void reopenApp() throws MalformedURLException { + int attempts = 0; + while (attempts++ < 5) { + + try { + newDriver = new Augmenter().augment(new RemoteWebDriver(getGridURL(), options)); + break; + } + catch (WebDriverException ignored) { + LOGGER.info("The driver did not start on " + attempts + " attempt"); + } + } + newDriver.get(applicationUrl); + cookies.forEach(cookie -> addCookie(newDriver, cookie, cookie.getValue())); + newDriver.get(applicationUrl); // reopen app again + inboxPage = PageFactory.initElements(newDriver, InboxPage.class); + inboxPage.waitForPageLoad(); + } + + private void initDriverAndLogin(Browser browser) { + initDriver(browser); + login(login, password); + inboxPage.waitForVisibilityOf(inboxPage.adminList); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void refreshPageWithAliveAccessToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.refreshPage(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void goToPageWithAliveAccessToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.startAdminUser(); + inboxPage.waitForPageLoad(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void filterWithAliveAccessToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.startAdminUser(); + inboxPage.waitForPageLoad(); + + inboxPage.waitProgressBarNotVisible(); + inboxPage.searchUser(SURNAME); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void refreshPageWithDeadAccessToken(Browser browser) { + initDriverAndLogin(browser); + + pasteDeadAccessToken(); + inboxPage.refreshPage(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void goToPageWithDeadAccessToken(Browser browser) { + initDriverAndLogin(browser); + + pasteDeadAccessToken(); + inboxPage.startAdminUser(); + inboxPage.waitForPageLoad(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @Disabled("qa WEBBPMNEXT-9052") + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void filterWithDeadAccessToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.startAdminUser(); + inboxPage.waitProgressBarNotVisible(); + pasteDeadAccessToken(); + inboxPage.searchUser(SURNAME); + inboxPage.waitForPageLoad(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void refreshPageWithDeadRefreshToken(Browser browser) { + initDriverAndLogin(browser); + + driver.manage().deleteAllCookies(); + inboxPage.refreshPage(); + assertFalse(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void goToPageWithDeadRefreshToken(Browser browser) { + initDriverAndLogin(browser); + + processPage = inboxPage.startProcess(PROCESS_NAME); + processPage.waitForInitializationOf(processPage.exitButton); + driver.manage().deleteAllCookies(); + processPage.exitButton.click(); + inboxPage.waitForPageLoad(); + assertFalse(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void filterWithDeadRefreshToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.startAdminUser(); + inboxPage.waitProgressBarNotVisible(); + driver.manage().deleteAllCookies(); + inboxPage.waitForPageLoad(); + inboxPage.searchUser(SURNAME); + inboxPage.waitForPageLoad(); + assertFalse(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @Disabled("dev WEBBPMNEXT-9052") //включить после решения задачи + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkTwoAuthorizedUsersCase(Browser browser) { + initDriverAndLogin(browser); + + String firstTab = driver.getWindowHandle(); + cookies = driver.manage().getCookies(); + inboxPage.exitApp(); + getExplicitWait(getDefaultTimeout()).until( + ExpectedConditions.visibilityOfElementLocated(getLoginHeaderBy())); + + ((JavascriptExecutor) driver).executeScript("window.open();"); + List windowHandles = new ArrayList<>(driver.getWindowHandles()); + driver.switchTo().window(windowHandles.get(1)); + driver.get(applicationUrl); + login(login, password); + + driver.switchTo().window(firstTab); + driver.get(applicationUrl); + cookies.forEach(cookie -> addCookie(driver, cookie, cookie.getValue())); + pasteDeadAccessToken(); + inboxPage.refreshPage(); + inboxPage.waitEmailInput(); + assertFalse(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void filterWithNoAccessToken(Browser browser) { + initDriverAndLogin(browser); + + inboxPage.startAdminUser(); + inboxPage.waitProgressBarNotVisible(); + driver.manage().deleteCookieNamed(ACCESS_TOKEN); + inboxPage.searchUser(SURNAME); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void reopenWithAliveAccessToken(Browser browser) throws MalformedURLException { + initDriverAndLogin(browser); + + //don't close browser in the end, we'll do that explicitly + setCloseBrowser(false); + + cookies = driver.manage().getCookies(); + driver.close(); + driver = null; + + reopenApp(); + assertTrue(inboxPage.getEmailInputsFrom(newDriver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void reopenWithDeadAccessToken(Browser browser) throws MalformedURLException { + initDriverAndLogin(browser); + + //don't close browser in the end, we'll do that explicitly + setCloseBrowser(false); + + pasteDeadAccessToken(); + cookies = driver.manage().getCookies(); + driver.close(); + driver = null; + + reopenApp(); + assertTrue(inboxPage.getEmailInputsFrom(newDriver).isEmpty()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void refreshWithNoSession(Browser browser) { + initDriverAndLogin(browser); + + ((JavascriptExecutor) driver).executeScript( + String.format("window.localStorage.clear();")); //clear localStorage + inboxPage.refreshPage(); + assertTrue(inboxPage.getEmailInputsFrom(driver).isEmpty()); + } +} diff --git a/test/src/test/java/old/core/BasePage.java b/test/src/test/java/old/core/BasePage.java new file mode 100644 index 00000000..53cb790d --- /dev/null +++ b/test/src/test/java/old/core/BasePage.java @@ -0,0 +1,404 @@ +package old.core; + +import java.time.Duration; +import java.util.List; +import java.util.function.Supplier; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.remote.RemoteWebDriver; +import org.openqa.selenium.support.PageFactory; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; + +/** + * @author evgeny + */ +@SuppressWarnings("UnusedDeclaration") +public abstract class BasePage { + private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20); + private static final int PROGRESS_VISIBILITY_TIMEOUT_MS = 700; + private static final By ERROR = By.xpath("//div[contains(@class, 'toast-error')]"); + private static final By INPUT_IS_ACTIVE = By.xpath("//div[contains(@class, 'input-active')]"); + protected static final By PROGRESS_BAR = By.xpath("//div[@class='progress']"); + + protected final WebDriver driver; + protected final String uri; + + public BasePage(WebDriver driver, String uri) { + this.driver = driver; + this.uri = uri; + + // Check that we're on the right page. + if (!isAtUri(uri)) + throw new IllegalStateException("This is not the '" + uri + "' page"); + + PageFactory.initElements(driver, this); + } + + protected Duration getDefaultTimeout() { + return DEFAULT_TIMEOUT; + } + + public static By getProgressBar() { + return PROGRESS_BAR; + } + + public static By getErrorBy() { + return ERROR; + } + + public boolean isAtUri(String uri) { + if (((RemoteWebDriver) driver).getCapabilities().getBrowserName().equalsIgnoreCase("internet explorer")) { + return true; + } + else { + return waitForCorrectUrl(uri, getDefaultTimeout()); + } + } + + /** + * Ожидание того, что URL текущей страницы содержит определенный текст. + * + * @param uri адрес текущей страницы + * @param timeout timeout ожидания + * @return true при корректном url + */ + private boolean waitForCorrectUrl(String uri, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.urlContains(uri)); + } + + /** + * Ожидание видимости элемента, присутствующего в DOM. + * Видимость означает не только то, что элемент отобразился, но и то, что высота и ширина элемента больше 0. + * + * @param webElement элемент, который присутствует в DOM + * @param timeout timeout ожидания + * @return веб-элемент, как только он видим + */ + public WebElement waitForVisibilityOf(WebElement webElement, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.visibilityOf(webElement)); + } + + /** + * Ожидание видимости элемента, присутствующего в DOM. + * Видимость означает не только то, что элемент отобразился, но и то, что высота и ширина элемента больше 0. + * + * @param webElement элемент, который присутствует в DOM + * @return веб-элемент, как только он видим + */ + public WebElement waitForVisibilityOf(WebElement webElement) { + return waitForVisibilityOf(webElement, getDefaultTimeout()); + } + + /** + * Ожидание появления элемента в DOM и его видимости. + * Видимость означает не только то, что элемент отобразился, но и то, что высота и ширина элемента больше 0. + * + * @param locator локатор, по которому находится элемент + * @param timeout timeout ожидания + * @return веб-элемент, как только он найден и видим + */ + public WebElement waitForVisibilityOfElementLocated(By locator, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.visibilityOfElementLocated(locator)); + } + + /** + * Ожидание появления элемента в DOM и его видимости. + * Видимость означает не только то, что элемент отобразился, но и то, что высота и ширина элемента больше 0. + * + * @param locator локатор, по которому находится элемент + * @return веб-элемент, как только он найден и видим + */ + public WebElement waitForVisibilityOfElementLocated(By locator) { + return waitForVisibilityOfElementLocated(locator, getDefaultTimeout()); + } + + /** + * Ожидание появления элемента в DOM и его видимости. + * Видимость означает не только то, что элемент отобразился, но и то, что высота и ширина элемента больше 0. + * + * @param locator локатор, по которому находится элемент + * @param timeout timeout ожидания + * @param sleep длительность между опросами + * @return веб-элемент, как только он найден и видим + */ + public WebElement waitForVisibilityOfElementLocated(By locator, Duration timeout, Duration sleep) { + return new WebDriverWait(driver, timeout, sleep).until(ExpectedConditions.visibilityOfElementLocated(locator)); + } + + /** + * Ожидание того, что элемент невидим или не представлен в DOM. + * + * @param locator локатор, по которому находится элемент + * @param timeout timeout ожидания + * @return true, когда элемент невидим или не найден в DOM + */ + public boolean waitForInvisibilityOfElementLocated(By locator, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.invisibilityOfElementLocated(locator)); + } + + /** + * Ожидание того, что элемент невидим или не представлен в DOM. + * + * @param locator локатор, по которому находится элемент + * @return true, когда элемент невидим или не найден в DOM + */ + public boolean waitForInvisibilityOfElementLocated(By locator) { + return waitForInvisibilityOfElementLocated(locator, getDefaultTimeout()); + } + + /** + * Ожидание того, что элемент больше не прикреплен к DOM + * + * @param webElement проверяемый элемент + * @param timeout timeout ожидания + * @return true, когда элемент больше не прикреплен к DOM + */ + public boolean waitForStalenessOf(WebElement webElement, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.stalenessOf(webElement)); + } + + /** + * Ожидание того, что элемент больше не прикреплен к DOM + * + * @param webElement проверяемый элемент + * @return true, когда элемент больше не прикреплен к DOM + */ + public boolean waitForStalenessOf(WebElement webElement) { + return waitForStalenessOf(webElement, getDefaultTimeout()); + } + + /** + * Ожидание наличия текста в элементе, соответствующем указанному локатору. + * + * @param locator локатор, по которому находится элемент + * @param text проверяемый текст + * @param timeout timeout ожидания + * @return true при наличии текста в элементе + */ + public boolean waitForTextToBePresentInElementLocated(By locator, String text, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.textToBePresentInElementLocated(locator, text)); + } + + /** + * Ожидание наличия текста в элементе, соответствующем указанному локатору. + * + * @param locator локатор, по которому находится элемент + * @param text проверяемый текст + * @return true при наличии текста в элементе + */ + public boolean waitForTextToBePresentInElementLocated(By locator, String text) { + return waitForTextToBePresentInElementLocated(locator, text, getDefaultTimeout()); + } + + /** + * Ожидание наличия текста в определенном элементе + * + * @param webElement проверяемый элемент + * @param text проверяемый текст + * @param timeout timeout ожидания + * @return true при наличии текста в элементе + */ + public boolean waitForTextToBePresentInElement(WebElement webElement, String text, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.textToBePresentInElement(webElement, text)); + } + + /** + * Ожидание наличия текста в определенном элементе + * + * @param webElement проверяемый элемент + * @param text проверяемый текст + * @return true при наличии текста в элементе + */ + public boolean waitForTextToBePresentInElement(WebElement webElement, String text) { + return waitForTextToBePresentInElement(webElement, text, getDefaultTimeout()); + } + + /** + * Ожидание видимости и доступности присутствующего в DOM элемента для нажатия. + * + * @param webElement проверяемый элемент + * @param timeout timeout ожидания + * @return веб-элемент, как только он доступен для нажатия + */ + public WebElement waitForElementToBeClickable(WebElement webElement, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.elementToBeClickable(webElement)); + } + + /** + * Ожидание видимости и доступности присутствующего в DOM элемента для нажатия. + * + * @param webElement проверяемый элемент + * @return веб-элемент, как только он доступен для нажатия + */ + public WebElement waitForElementToBeClickable(WebElement webElement) { + return waitForElementToBeClickable(webElement, getDefaultTimeout()); + } + + /** + * Ожидание появления элемента в DOM, видимости и доступности элемента для нажатия. + * + * @param locator локатор, по которому находится элемент + * @param timeout timeout ожидания + * @return веб-элемент, как только он доступен для нажатия + */ + public WebElement waitForElementToBeClickable(By locator, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.elementToBeClickable(locator)); + } + + /** + * Ожидание появления элемента в DOM, видимости и доступности элемента для нажатия. + * + * @param locator локатор, по которому находится элемент + * @return веб-элемент, как только он доступен для нажатия + */ + public WebElement waitForElementToBeClickable(By locator) { + return waitForElementToBeClickable(locator, getDefaultTimeout()); + } + + /** + * Ожидание определенного количества элементов с указанным локатором. + * + * @param locator локатор, по которому находится элемент + * @param number ожидаемое число элементов + * @param timeout timeout ожидания + * @return список элементов с определенным количеством + */ + public List waitForNumberOfElementsToBe(By locator, int number, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.numberOfElementsToBe(locator, number)); + } + + /** + * Ожидание определенного количества элементов с указанным локатором. + * + * @param locator локатор, по которому находится элемент + * @param number ожидаемое число элементов + * @return список элементов с определенным количеством + */ + public List waitForNumberOfElementsToBe(By locator, int number) { + return waitForNumberOfElementsToBe(locator, number, getDefaultTimeout()); + } + + /** + * Ожидание того, что как минимум один элемент с указанным локатором представлен на странице. + * Полезно, когда нужно подождать динамический элемент. + * + * @param locator локатор, по которому находится элемент + * @param timeout timeout ожидания + * @return список элементов с указанным локатором + */ + public List waitForPresenceOfAllElementsLocatedBy(By locator, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.presenceOfAllElementsLocatedBy(locator)); + } + + /** + * Ожидание того, что как минимум один элемент с указанным локатором представлен на странице. + * Полезно, когда нужно подождать динамический элемент. + * + * @param locator локатор, по которому находится элемент + * @return список элементов с указанным локатором + */ + public List waitForPresenceOfAllElementsLocatedBy(By locator) { + return waitForPresenceOfAllElementsLocatedBy(locator, getDefaultTimeout()); + } + + /** + * Ожидание того, что указзнный элемент содержит атрибут с определенным значением + * + * @param webElement проверяемый элемент + * @param attribute проверяемый атрибут + * @param value проверяемое значение + * @param timeout timeout ожидания + * @return true при наличии значения в атрибуте + */ + public boolean waitForAttributeContains(WebElement webElement, String attribute, String value, Duration timeout) { + return new WebDriverWait(driver, timeout).until(ExpectedConditions.attributeContains(webElement, attribute, value)); + } + + /** + * Ожидание того, что указзнный элемент содержит атрибут с определенным значением + * + * @param webElement проверяемый элемент + * @param attribute проверяемый атрибут + * @param value проверяемое значение + * @return true при наличии значения в атрибуте + */ + public boolean waitForAttributeContains(WebElement webElement, String attribute, String value) { + return waitForAttributeContains(webElement, attribute, value, getDefaultTimeout()); + } + + public void sleep(long millis) { + BaseTest.sleep(millis); + } + + private void waitForCondition(Supplier condition, long timeOutInMillis) { + long startTime = System.currentTimeMillis(); + while (!condition.get()) { + if (System.currentTimeMillis() - startTime >= timeOutInMillis) { + break; + } + sleep(100); + } + } + + private void waitProgressBarVisible(long timeOutInMillis) { + waitForCondition( + () -> driver.findElements(PROGRESS_BAR).size() > 0, + timeOutInMillis + ); + } + + //ожидается, что последний инпут, по которому был клик, выбран + public void waitForInputFieldSelected() { + waitForNumberOfElementsToBe(INPUT_IS_ACTIVE, 1); + } + + //ожидается пока пропадет прогресс бар + public void waitProgressBarNotVisible(Duration timeout) { + waitForInvisibilityOfElementLocated(PROGRESS_BAR, timeout); + } + + //ожидается пока пропадет прогресс бар с таймаутом по умолчанию + public void waitProgressBarNotVisible() { + waitForInvisibilityOfElementLocated(PROGRESS_BAR, getDefaultTimeout()); + } + + //проверяется отсутствие ошибок + public boolean thereIsNoError() { + return getErrors().isEmpty(); + } + + //получить первую ошибку + public WebElement getError() { + return getErrors().get(0); + } + + //получить все ошибки + public List getErrors() { + waitForCondition( + () -> driver.findElements(ERROR).size() > 0, + 500 + ); + return driver.findElements(ERROR); + } + + //переключиться на другую вкладку + public void goToAnotherTab(String tab) { + waitProgressBarNotVisible(Duration.ofSeconds(10)); + driver.switchTo().window(tab); + } + + //обновить страницу + public void refreshPage() { + driver.navigate().refresh(); + waitProgressBarNotVisible(); + } + + public void waitForPageLoad() { + waitProgressBarNotVisible(); + waitProgressBarVisible(PROGRESS_VISIBILITY_TIMEOUT_MS); + waitProgressBarNotVisible(); + } +} diff --git a/test/src/test/java/old/core/BaseTest.java b/test/src/test/java/old/core/BaseTest.java new file mode 100644 index 00000000..8d385fca --- /dev/null +++ b/test/src/test/java/old/core/BaseTest.java @@ -0,0 +1,273 @@ +package old.core; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Optional; +import java.util.TimeZone; +import java.util.logging.Level; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.extension.AfterTestExecutionCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.openqa.selenium.OutputType; +import org.openqa.selenium.TakesScreenshot; +import org.openqa.selenium.TimeoutException; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebDriverException; +import org.openqa.selenium.logging.LogEntry; +import org.openqa.selenium.logging.LogType; +import org.openqa.selenium.logging.LoggingPreferences; +import org.openqa.selenium.remote.AbstractDriverOptions; +import org.openqa.selenium.remote.LocalFileDetector; +import org.openqa.selenium.remote.RemoteWebDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; + +import static old.core.BasePage.getErrorBy; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author gulnaz + */ +public abstract class BaseTest { + protected static final String gridUrl; + protected static final String applicationUrl; + + private static final Logger LOGGER = LoggerFactory.getLogger(BaseTest.class); + private static final String UNDERSCORE = "_"; + private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20); + private static final Duration TIMEOUT = Duration.ofSeconds(3); + private static final int WINDOW_WIDTH = 945; + + @RegisterExtension + protected ScreenWatcher screenWatcher = new ScreenWatcher(); + protected WebDriver driver; + protected AbstractDriverOptions options; + + private boolean closeBrowser = true; + private TestInfo testInfo; + + static { + gridUrl = System.getProperty("selenium.grid.url"); + applicationUrl = System.getProperty("application.url"); + LOGGER.info("application.url: {}", applicationUrl); + LOGGER.info("grid.url: {}", gridUrl); + } + + @BeforeEach + void beforeEach(TestInfo testInfo) { + this.testInfo = testInfo; + } + + @AfterEach + void tearDown() { + if (closeBrowser && driver != null) { + driver.quit(); + } + } + + public static void sleep(long millis) { + try { + Thread.sleep(millis); + } + catch (InterruptedException e) { + throw new RuntimeException("Something went wrong...", e); + } + } + + public URL getGridURL() throws MalformedURLException { + return new URL(gridUrl); + } + + protected void initDriver(Browser browser) { + + System.setProperty("webdriver.http.factory", "jdk-http-client"); + try { + options = browser.getOptions().newInstance(); + } + catch (InstantiationException | IllegalAccessException e) { + throw new RuntimeException("Failed to create capabilities", e); + } + + options.setCapability("selenoid:options", new HashMap() { + { + put("enableLog", Boolean.valueOf(System.getProperty("enableLog"))); + put("enableVNC", Boolean.valueOf(System.getProperty("enableVNC"))); + put("enableVideo", Boolean.valueOf(System.getProperty("enableVideo"))); + put("sessionTimeout", "3m"); + put("logName", getFileName(testInfo.getTestClass(), testInfo.getTestMethod(), testInfo.getDisplayName() + ".log")); + put("videoName", getFileName(testInfo.getTestClass(), testInfo.getTestMethod(), testInfo.getDisplayName() + ".mp4")); + } + }); + + if (System.getProperty("enableLog") != null && browser == Browser.CHROME) { + LoggingPreferences logPrefs = new LoggingPreferences(); + logPrefs.enable(LogType.BROWSER, Level.ALL); + logPrefs.enable(LogType.CLIENT, Level.ALL); + logPrefs.enable(LogType.DRIVER, Level.ALL); + logPrefs.enable(LogType.PERFORMANCE, Level.ALL); + logPrefs.enable(LogType.PROFILER, Level.ALL); + logPrefs.enable(LogType.SERVER, Level.ALL); + + options.setCapability("goog:loggingPrefs", logPrefs); + } + + LOGGER.info("try to create RemoteWebDriver, " + testInfo.getDisplayName()); + + int attempts = 0; + while (attempts++ < 5) { + + try { + URL gridUrl = getGridURL(); + driver = new RemoteWebDriver(gridUrl, options); + break; + } + catch (WebDriverException ignored) { + LOGGER.info("The driver did not start on " + attempts + " attempt"); + } + catch (MalformedURLException e) { + throw new RuntimeException("Invalid grid URL", e); + } + } + + if (driver == null) { + throw new RuntimeException("Failed to create driver for " + testInfo.getDisplayName()); + } + + LOGGER.info("RemoteWebDriver created, " + testInfo.getDisplayName()); + + // Configure to upload local files to remote Selenium instance + ((RemoteWebDriver) driver).setFileDetector(new LocalFileDetector()); + + driver.manage().window().maximize(); + //TODO после обновления selenium (4.9.0 <) необходимо перепроверить maximize() + if (getWindowWidth(driver) < WINDOW_WIDTH) { //.maximize() не срабатывает с первого раза + driver.manage().window().maximize(); + } + driver.manage().window().maximize(); + driver.get(applicationUrl); + assertTrue(waitForCorrectWindowWidth(), + String.format("browser window size is less than and not equal to as expected: expected - %dpx, actual - %dpx", + WINDOW_WIDTH, driver.manage().window().getSize().getWidth())); + assertTrue(getExplicitWait(TIMEOUT) + .until(ExpectedConditions.invisibilityOfElementLocated(getErrorBy())), + "an error occurred while opening application"); + } + + private int getWindowWidth(WebDriver webDriver) { + return webDriver.manage().window().getSize().getWidth(); + } + + protected Duration getDefaultTimeout() { + return DEFAULT_TIMEOUT; + } + + protected WebDriverWait getExplicitWait(Duration timeout) { + return new WebDriverWait(driver, timeout); + } + + protected void setCloseBrowser(boolean closeBrowser) { + this.closeBrowser = closeBrowser; + } + + private boolean waitForCorrectWindowWidth() { + try { + return getExplicitWait(TIMEOUT) + .until(webDriver -> webDriver.manage().window().getSize().getWidth() >= WINDOW_WIDTH); + } + catch (TimeoutException ignored) { + return false; + } + } + + private String getFileName(Optional> testClass, Optional testMethod, String displayName) { + String fileName = ""; + if (testClass.isPresent()) { + fileName = testClass.get().getSimpleName() + UNDERSCORE; + } + + if (testMethod.isPresent()) { + fileName += testMethod.get().getName() + UNDERSCORE; + } + + fileName += displayName; + + return fileName; + } + + private String getFileName(ExtensionContext context) { + return getFileName(context.getTestClass(), context.getTestMethod(), context.getDisplayName()); + } + + public class ScreenWatcher implements AfterTestExecutionCallback { + private static final String PATH = "target"; + private static final String EXTENSION = "jpg"; + + private File scrFile; + + @Override + public void afterTestExecution(ExtensionContext context) throws Exception { + LOGGER.info("afterTestExecution"); + boolean failed = context.getExecutionException().isPresent(); + + if (!failed) { + if (scrFile != null) + scrFile.delete(); + } + else { + LOGGER.info("test failed"); + if (driver == null) + return; + saveScreen(getFileName(context)); + + for (String type : driver.manage().logs().getAvailableLogTypes()) { + List logEntries = driver.manage().logs().get(type).getAll(); + + if (logEntries.isEmpty()) { + continue; + } + + LOGGER.info("Logging browser messages for type: " + type); + for (LogEntry entry : logEntries) { + LocalDateTime localdateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(entry.getTimestamp()), TimeZone.getDefault().toZoneId()); + String dateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(localdateTime); + LOGGER.warn(dateTime + " " + entry.getLevel() + " " + entry.getMessage()); + } + LOGGER.info("Logged browser messages for type: " + type); + } + } + } + + public void saveScreen(String fileName) { + try { + TakesScreenshot takesScreenshot = (TakesScreenshot) driver; + scrFile = takesScreenshot.getScreenshotAs(OutputType.FILE); + Path destFile = Paths.get("", PATH, fileName + "." + EXTENSION); + Files.copy(scrFile.toPath(), destFile, StandardCopyOption.REPLACE_EXISTING); + } + catch (IOException e) { + throw new RuntimeException("Failed to capture screen", e); + } + } + } +} diff --git a/test/src/test/java/old/core/Browser.java b/test/src/test/java/old/core/Browser.java new file mode 100644 index 00000000..7cb82ea2 --- /dev/null +++ b/test/src/test/java/old/core/Browser.java @@ -0,0 +1,28 @@ +package old.core; + +import org.openqa.selenium.remote.AbstractDriverOptions; +import org.openqa.selenium.chrome.ChromeOptions; +import org.openqa.selenium.firefox.FirefoxOptions; + +/** + * @author gulnaz + */ +public enum Browser { + CHROME(ChromeOptions.class), + FIREFOX(FirefoxOptions.class); + + private final Class options; + + Browser(Class options) { + this.options = options; + } + + public Class getOptions() { + return options; + } + + @Override + public String toString() { + return name().toLowerCase(); + } +} diff --git a/test/src/test/java/old/core/BrowserArgumentProvider.java b/test/src/test/java/old/core/BrowserArgumentProvider.java new file mode 100644 index 00000000..f3494ce1 --- /dev/null +++ b/test/src/test/java/old/core/BrowserArgumentProvider.java @@ -0,0 +1,24 @@ +package old.core; + +import java.util.stream.Stream; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.ArgumentsProvider; + +public class BrowserArgumentProvider implements ArgumentsProvider { + + @Override + public Stream provideArguments(ExtensionContext context) { + String browsers = System.getProperty("browsers"); + + if ("all".equals(browsers)) { + return Stream.of( + Arguments.of(Browser.CHROME), + Arguments.of(Browser.FIREFOX)); + } + + return Stream.of( + Arguments.of(Browser.CHROME)); + } +} diff --git a/test/src/test/java/old/page/AdminGroupPage.java b/test/src/test/java/old/page/AdminGroupPage.java new file mode 100644 index 00000000..b9d49dee --- /dev/null +++ b/test/src/test/java/old/page/AdminGroupPage.java @@ -0,0 +1,199 @@ +package old.page; + +import org.openqa.selenium.*; + +import java.util.List; +import java.util.stream.Collectors; +import java.time.Duration; + +/** + * @author kote + */ +public class AdminGroupPage extends BaseComponentPage { + + private static final String AVAILABLE_TO_ADD_TABLE = "//*[@object-name='AvailableRecordsGrid']"; + private static final String ADDED_TABLE = "//*[@object-name='LinkFieldDialog']"; + private static final String LINKED_ROLE_TABLE = "//*[@object-name='RolesGrid']"; + private static final String GROUP_NAMES_TABLE = "//*[@object-name='Grid']"; + private static final String ROW_BY_NAME = "//div[@role='row']//div[contains(.,'%s')]"; + private static final String CELL_WITH_GROUP_NAME = "//div[@col-id='group$name']//span[contains(text(),'%s')]"; + private static final String ROLE_TO_ADD_BY_NAME = AVAILABLE_TO_ADD_TABLE + ROW_BY_NAME; + + private static final By LINKED_ROLES_GRID = By.xpath( + LINKED_ROLE_TABLE + "//div[@col-id='role$name']" + EXCLUDE_HEADER); + private static final By ROLES_AVAILABLE_TO_ADD_GRID = By.xpath( + AVAILABLE_TO_ADD_TABLE + "//div[@col-id='role$name']" + EXCLUDE_HEADER); + private static final By ADDED_ROLES_GRID = By.xpath( + ADDED_TABLE + "//div[@role='gridcell']" + EXCLUDE_HEADER + "[@col-id='role$name']"); + private static final By GROUP_NAMES_GRID = By.xpath( + GROUP_NAMES_TABLE + "//div[@col-id='role$name']" + EXCLUDE_HEADER); + private static final By GRID_BODY = By.xpath( + "//div[@class='ag-center-cols-container']" + "[//div[@role='row']" + EXCLUDE_HEADER + "]"); + private static final By ROLE_TO_ADD_TABLE_HEADER = By.xpath( + AVAILABLE_TO_ADD_TABLE + "//div[@col-id='role$name']" + AG_HEADER); + private static final By ADDED_ROLES_TABLE_HEADER = By.xpath( + ADDED_TABLE + "//div[@col-id='role$name']" + AG_HEADER); + private static final By GROUP_NAMES_TABLE_HEADER = By.xpath( + GROUP_NAMES_TABLE + "//div[@col-id='role$name']" + AG_HEADER); + private static final By LINKED_ROLES_TABLE_HEADER = By.xpath( + LINKED_ROLE_TABLE + "//div[@col-id='role$name']" + AG_HEADER); + + public AdminGroupPage(WebDriver browser) { + super(browser, "/#/"); + } + + public void searchGroup(String groupName) { + waitProgressBarNotVisible(); + waitForVisibilityOf(searchField); + typeTextOnAdminFilter(searchField, groupName); + waitForInvisibilityGridDownloader(); + } + + public void chooseGroup(String groupName) { + searchGroup(groupName); + getListOfGroupsNamesFromTable(groupName).get(0).click(); + waitProgressBarNotVisible(); + waitForPageLoad(); + } + + public void deleteGroup() { + waitProgressBarNotVisible(); + clickDeleteButton(); + clickConfirmButton(); + } + + public List getListOfGroupsNamesFromTable(String name) { + return driver.findElements(By.xpath(String.format(CELL_WITH_GROUP_NAME, name))); + } + + public List getListOfRolesFromLinkedTable() { + return driver.findElements(LINKED_ROLES_GRID); + } + + public List getListOfRolesToAdd() { + return driver.findElements(ROLES_AVAILABLE_TO_ADD_GRID); + } + + public boolean isGridEmpty() { + try { + waitForInvisibilityOfElementLocated(GRID_BODY, Duration.ofSeconds(5)); + return true; + } + catch (TimeoutException t) { + return false; + } + } + + /** + * Method to avoid parallel test conflicts. + *

+ * If the list of roles available to adding is not empty, checks if the list contains only newly + * created roles. + *

+ * + * @param roleNames list retrieved from the database before the parallel test created a role. + * @return value of {@link Boolean} type. + *

+ * True - if list of roles available for adding is empty, or contains only newly created roles + * from parallel tests. + *

+ *

+ * False - if list of roles available for adding contains values from roleNames list. + *

+ */ + public boolean isAvailableGridEmpty(List roleNames) { + List possibleParallelAddedRole = getListOfRolesToAdd() + .stream() + .map(WebElement::getText) + .collect(Collectors.toList()); + + if (possibleParallelAddedRole.isEmpty()) { + return true; + } + else { + return roleNames + .stream() + .noneMatch(possibleParallelAddedRole::contains); + } + } + + public void addRole(String roleName, boolean needSort) { + if (needSort) { + waitForVisibilityOfElementLocated(ROLE_TO_ADD_TABLE_HEADER).click(); + } + By cell = By.xpath(String.format(ROLE_TO_ADD_BY_NAME, roleName)); + waitForVisibilityOfElementLocated(By.xpath(String.format(ROLE_TO_ADD_BY_NAME, roleName))).click(); + waitForPageLoad(); + clickAddButton(); + waitProgressBarNotVisible(); + } + + public void removeRole(String roleName) { + waitForVisibilityOfElementLocated(By.xpath(String.format(ADDED_TABLE + ROW_BY_NAME, roleName))).click(); + clickRemoveButton(); + waitProgressBarNotVisible(); + } + + public void addAllRoles() { + clickAddAllButton(); + waitProgressBarNotVisible(); + } + + public void removeAllRoles() { + clickRemoveAllButton(); + waitProgressBarNotVisible(); + } + + public boolean hasRolesInTable(GroupPageGrids tableName, String... roleNames) { + String table = tableName == GroupPageGrids.ADDED_ROLES_GRID ? ADDED_TABLE : + AVAILABLE_TO_ADD_TABLE; + for (String roleName : roleNames) { + List roles = driver.findElements(By.xpath(table + String.format(ROW_BY_NAME, roleName))); + if (roles.isEmpty()) { + return false; + } + } + return true; + } + + public List getListOfAddedRoles() { + return driver.findElements(ADDED_ROLES_GRID); + } + + public List getListOfGroupNames() { + return driver.findElements(GROUP_NAMES_GRID); + } + + public void bindRole(String roleName) { + waitForVisibilityOf(addButton); + addRole(roleName, false); + waitProgressBarNotVisible(); + } + + public void typeAndSelectLevel(String level) { + typeTextAndSelectOption("access_level", level, level); + } + + public void changeGroupPageGridSort(GroupPageGrids value) { + switch (value) { + case ROLES_TO_ADD_GRID: + driver.findElement(ROLE_TO_ADD_TABLE_HEADER).click(); + break; + case LINKED_ROLES_GRID: + driver.findElement(LINKED_ROLES_TABLE_HEADER).click(); + break; + case ADDED_ROLES_GRID: + driver.findElement(ADDED_ROLES_TABLE_HEADER).click(); + case GROUP_NAMES_GRID: + driver.findElement(GROUP_NAMES_TABLE_HEADER).click(); + } + waitForPageLoad(); + } + + public enum GroupPageGrids { + ADDED_ROLES_GRID, + ROLES_TO_ADD_GRID, + LINKED_ROLES_GRID, + GROUP_NAMES_GRID + } +} diff --git a/test/src/test/java/old/page/AdminOrgPage.java b/test/src/test/java/old/page/AdminOrgPage.java new file mode 100644 index 00000000..3d5d9eac --- /dev/null +++ b/test/src/test/java/old/page/AdminOrgPage.java @@ -0,0 +1,92 @@ +package old.page; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +import java.util.List; +import java.time.Duration; + +/** + * @author kote + */ +public class AdminOrgPage extends BaseComponentPage { + + private static final By CELL_WITH_NAME = By.xpath( + "//*[@object-name='Древовидная таблица']//div[@col-id='name'][not(contains(@class,'ag-header'))]//span[@class='ag-group-value']"); + private static final By GRID_BODY = + By.xpath("//div[@class='ag-center-cols-container'][//div[@role='row'][not(contains(@class,'ag-header'))]]"); + private static final String PLUS_IN_CELL_WITH_NAME = + "//div[@col-id='name'][//span[contains(text(), '%s')]]//span[@ref='eContracted']"; + private static final String CHECKBOX_BY_NAME = + "//div[@col-id='name'][.//span[contains(text(), '%s')]]//div[contains(@class,'ag-selection-checkbox')]"; + + //Organization Editing Page + @FindBy(xpath = "//*[@object-name='Группа фильтров']//input") + private WebElement searchField; + @FindBy(xpath = "//div[label[span[contains(.,'Наименование')]]]//input") + public WebElement nameField; + @FindBy(xpath = "//div[label[span[contains(.,'Код')]]]//input") + private WebElement codeField; + + public AdminOrgPage(WebDriver browser) { + super(browser, "/#/"); + } + + public void fillOrgNameAndCode(String name) { + typeText(nameField, name); + typeText(codeField, name); + } + + public void chooseParentOrg(String parentOrgName) { + typeTextAndSelectOption("Выпадающий список (с возможностью сохранения)", parentOrgName, parentOrgName); + } + + public void searchOrg(String name) { + typeTextOnAdminFilter(searchField, name); + waitForInvisibilityGridDownloader(); + } + + public List getListOfOrganizationsFromTable() { + return driver.findElements(CELL_WITH_NAME); + } + + public void clickOnPlusSign(String orgName) { + waitForVisibilityOfElementLocated(By.xpath(String.format(PLUS_IN_CELL_WITH_NAME, orgName))).click(); + waitProgressBarNotVisible(); + } + + public void searchAndClickOnOrg(String name) { + if (driver.findElements(By.xpath(String.format(CHECKBOX_BY_NAME, name))).isEmpty()) { + searchOrg(name); + } + waitForVisibilityOfElementLocated(By.xpath(String.format(CHECKBOX_BY_NAME, name))).click(); + waitForPageLoad(); + } + + public void deleteOrg() { + clickDeleteButton(); + confirmAction(); + } + + public void cancelEditingOrg() { + clickCancelButton(); + confirmAction(); + } + + private void confirmAction() { + clickConfirmButton(); + waitProgressBarNotVisible(); + waitForPageLoad(); + } + + public void waitGridEmpty() { + waitForInvisibilityOfElementLocated(GRID_BODY, Duration.ofSeconds(60)); + } + + public void waitOrgEditingPageLoading() { + waitForPageLoad(); + waitForVisibilityOf(nameField); + } +} diff --git a/test/src/test/java/old/page/AdminProcessPage.java b/test/src/test/java/old/page/AdminProcessPage.java new file mode 100644 index 00000000..fc0c94f1 --- /dev/null +++ b/test/src/test/java/old/page/AdminProcessPage.java @@ -0,0 +1,73 @@ +package old.page; + +import java.util.List; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +public class AdminProcessPage extends BaseComponentPage { + + private static final By modalMessage = By.xpath("//div[contains(@class, 'modal-body')][contains(., 'Вы действительно хотите')]"); + + @FindBy(css = "div[col-id = 'process$start_date']") + private List dates; + + private static final String PROCESS_XPATH = "//div[@row-id='%s'][.//div[contains(.,'%s')]]"; + + public AdminProcessPage(WebDriver browser) { + super(browser, "/#/process/instance"); + } + + private By getProcessBy(String processId, String processName) { + return By.xpath(String.format(PROCESS_XPATH, processId, processName)); + } + + public WebElement getProcessFromProcessInstanceTable(String processName, String processId) { + By processLocator = (getProcessBy(processId, processName)); + return waitForVisibilityOfElementLocated(processLocator); + } + + public boolean isNoProcessFound(String processName, String processId) { + By processLocator = (getProcessBy(processId, processName)); + + if (!driver.findElements(FIRST_ROW_BY).isEmpty()) { + } + + return driver.findElements(processLocator).isEmpty(); + } + + //прервать процесс + public void stopProcess(String processName, String processId) { + getProcessFromProcessInstanceTable(processName, processId).click(); + clickStopButton(); + waitForVisibilityOfElementLocated(modalMessage); + clickConfirmButton(); + waitForInvisibilityOfElementLocated(modalMessage); + } + + //переключиться между вкладками с помощью радиобатона + public void changeRadioTab(String radioButtonTab) { + waitProgressBarNotVisible(); + WebElement radioTab = driver.findElement(By.xpath("//label[.//span[contains(.,'" + radioButtonTab + "')]]//input")); + radioTab.click(); + waitProgressBarNotVisible(); + } + + //переключится на вкладку завершенных процессов + public void goToFinishedTab() { + changeRadioTab("Завершенные"); + waitForPageLoad(); + } + + //переключится на вкладку прерванных процессов + public void goToStopedTab() { + changeRadioTab("Прерванные"); + waitForPageLoad(); + } + + public String getDateStringByRowNumber(Integer rowNumber) { + return dates.get(rowNumber).getText(); + } +} diff --git a/test/src/test/java/old/page/AdminRolePage.java b/test/src/test/java/old/page/AdminRolePage.java new file mode 100644 index 00000000..a68764db --- /dev/null +++ b/test/src/test/java/old/page/AdminRolePage.java @@ -0,0 +1,76 @@ +package old.page; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +import java.util.List; + +/** + * @author kote + */ +public class AdminRolePage extends BaseComponentPage { + + private static final String CELL_WITH_ROLE_NAME = "//div[@col-id='role$name']//span[contains(text(),'%s')]"; + private static final String LINK_GROUP_TABLE = "//*[@object-name='GroupsGrid']"; + private static final String ROLE_NAME_TABLE = "//*[@object-name='Grid']"; + + private static final By LINKED_GROUP_GRID = By.xpath(LINK_GROUP_TABLE + "//div[@col-id='group$name']" + EXCLUDE_HEADER); + private static final By ROLE_NAMES_GRID = By.xpath(ROLE_NAME_TABLE + "//div[@col-id='role$name']" + EXCLUDE_HEADER); + private static final By LINKED_GROUP_GRID_HEADER = By.xpath(LINK_GROUP_TABLE + "//div[@col-id='group$name']" + AG_HEADER); + private static final By ROLE_NAMES_GRID_HEADER = By.xpath(ROLE_NAME_TABLE + "//div[@col-id='role$name']" + AG_HEADER); + + public AdminRolePage(WebDriver browser) { + super(browser, "/#/"); + } + + public void searchRole(String roleName) { + waitProgressBarNotVisible(); + waitForVisibilityOf(searchField); + typeTextOnAdminFilter(searchField, roleName); + waitForInvisibilityGridDownloader(); + waitForPageLoad(); + } + + public void chooseRole(String roleName) { + searchRole(roleName); + getListOfRolesNamesFromTable(roleName).get(0).click(); + waitForInvisibilityGridDownloader(); + } + + public void deleteRole() { + waitProgressBarNotVisible(); + clickDeleteButton(); + clickConfirmButton(); + waitProgressBarNotVisible(); + } + + public List getListOfRolesNamesFromTable(String name) { + return driver.findElements(By.xpath(String.format(CELL_WITH_ROLE_NAME, name))); + } + + public List getListOfRoleLinkedGroups() { + return driver.findElements(LINKED_GROUP_GRID); + } + + public List getListOfRoles() { + return driver.findElements(ROLE_NAMES_GRID); + } + + public void changeRolePageGridSort(RolePageGrids value) { + switch (value) { + case GROUP_NAMES_GRID: + driver.findElement(LINKED_GROUP_GRID_HEADER).click(); + break; + case ROLE_NAMES_GRID: + driver.findElement(ROLE_NAMES_GRID_HEADER).click(); + break; + } + waitForPageLoad(); + } + + public enum RolePageGrids { + ROLE_NAMES_GRID, + GROUP_NAMES_GRID + } +} \ No newline at end of file diff --git a/test/src/test/java/old/page/AdminUserPage.java b/test/src/test/java/old/page/AdminUserPage.java new file mode 100644 index 00000000..e70354f0 --- /dev/null +++ b/test/src/test/java/old/page/AdminUserPage.java @@ -0,0 +1,246 @@ +package old.page; + +import org.openqa.selenium.By; +import org.openqa.selenium.Keys; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.support.FindBy; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author kote + */ +public class AdminUserPage extends BaseComponentPage { + + private static final String TABLE_TO_ADD = "//*[@object-name='AvailableRecordsGrid']"; + private static final String TABLE_ADDED = "//*[@object-name='LinkFieldDialog for save']"; + private static final String USER_TABLE = "//*[@object-name='Grid']"; + private static final String LINK_GROUP_TABLE = "//*[@object-name='DependentGrid']"; + private static final String ROW_BY_NAME = "//div[@role='row']//div[contains(.,'%s')]"; + + private static final By CELL_WITH_LAST_NAME = By.xpath(USER_TABLE + "//div[@col-id='user$lastName']" + EXCLUDE_HEADER); + private static final By CELL_WITH_FIRST_NAME = By.xpath(USER_TABLE + "//div[@col-id='user$firstName']" + EXCLUDE_HEADER); + private static final By CELL_WITH_MIDDLE_NAME = By.xpath(USER_TABLE + "//div[@col-id='user$middleName']" + EXCLUDE_HEADER); + private static final By GROUP_IN_TABLE = By.xpath(LINK_GROUP_TABLE + "//div[@col-id='group$name']" + EXCLUDE_HEADER); + private static final By CELL_WITH_LAST_NAME_HEADER = By.xpath(USER_TABLE + "//div[@col-id='user$lastName']" + AG_HEADER); + private static final By GROUP_IN_TABLE_HEADER = By.xpath(LINK_GROUP_TABLE + "//div[@col-id='group$name']" + AG_HEADER); + private static final By GROUP_TO_ADD_HEADER = By.xpath(TABLE_TO_ADD + "//div[@col-id='group$name']" + AG_HEADER); + private static final By ADDED_GROUPS_HEADER = By.xpath(TABLE_ADDED + "//div[@col-id='group$name']" + AG_HEADER); + private static final By GROUP_TO_ADD = By.xpath(TABLE_TO_ADD + "//div[@col-id='group$name']" + EXCLUDE_HEADER); + private static final By ADDED_GROUPS = By.xpath(TABLE_ADDED + "//div[@role='gridcell']" + EXCLUDE_HEADER + "[@col-id='group$name']"); + private static final By LOGOUT_BUTTON = By.xpath("//div[@class ='fa fa-power-off']"); + + + //User Administration Page + @FindBy(xpath = "//*[contains(text(),'Фильтр по пользователям')]") + public WebElement filterPanel; + + //User Editing Page + @FindBy(xpath = "//*[@object-name='last-name']//input") + public WebElement lastNameField; + @FindBy(xpath = "//div[@class='logout']//button[contains(@class,'nav-link')]") + public WebElement userMenuButton; + @FindBy(xpath = "//button[contains(.,'Выход')]") + public WebElement exitButton; + + @FindBy(xpath = "//*[@object-name='first-name']//input") + private WebElement firstNameField; + @FindBy(xpath = "//*[@object-name='middleName']//input") + private WebElement middleNameField; + @FindBy(xpath = "//*[@object-name='login']//input") + private WebElement loginField; + @FindBy(xpath = "//*[@object-name='last-name']//input") + private WebElement surNameField; + @FindBy(xpath = "//*[@object-name='password']//input") + private WebElement passwordField; + @FindBy(xpath = "//*[@object-name='password-repeat']//input") + private WebElement passwordRepeatField; + @FindBy(xpath = "//*[@object-name='email']//input") + private WebElement emailField; + @FindBy(xpath = "//div[@row-index='0']//div[@col-id='checkbox_uid']") + private List listGroupsToAdd; + + public AdminUserPage(WebDriver browser) { + super(browser, "/#/"); + } + + public void fillUserFullName(String userName) { + typeText(lastNameField, userName); + typeText(firstNameField, userName); + typeText(middleNameField, userName); + } + + public void fillUserCredentials(String userName, String userPassword, String userEmail, + String userOrganization, String fullOrganizationName) { + typeText(loginField, userName); + fillPassAndEmail(userPassword, userEmail); + chooseUserOrganization(userOrganization, fullOrganizationName); + } + + public void chooseUserOrganization(String userOrganization, String fullOrganizationName) { + typeTextAndSelectOption("org_unit_id", userOrganization, fullOrganizationName); + } + + public void chooseUserOrganization(String userOrganization) { + typeTextAndSelectOption("org_unit_id", userOrganization, userOrganization); + } + + public void fillPassAndEmail(String userPassword, String userEmail) { + fillPass(userPassword); + typeText(emailField, userEmail); + } + + public void fillPass(String userPassword) { + typeText(passwordField, userPassword); + typeText(passwordRepeatField, userPassword); + } + + public void searchUser(String userSurName) { + filterPanel.click(); + waitForPageLoad(); + typeTextOnAdminFilter(surNameField, userSurName); + waitForInvisibilityGridDownloader(); + } + + public void deleteUser() { + waitProgressBarNotVisible(); + clickDeleteButton(); + clickConfirmButton(); + waitProgressBarNotVisible(); + } + + public List getListOfLastNamesFromTable() { + return driver.findElements(CELL_WITH_LAST_NAME); + } + + public List getListOfFirstNamesFromTable() { + return driver.findElements(CELL_WITH_FIRST_NAME); + } + + public List getListOfMiddleNamesFromTable() { + return driver.findElements(CELL_WITH_MIDDLE_NAME); + } + + public List getListOfGroupsFromTable() { + return driver.findElements(GROUP_IN_TABLE); + } + + public List getListOfAddedGroups() { + return driver.findElements(ADDED_GROUPS); + } + + public List getListOfAvailableGroupsToAdd() { + return driver.findElements(GROUP_TO_ADD); + } + + public void clickOnUserInTable(String userName) { + driver.findElement(By.xpath(String.format(USER_TABLE + ROW_BY_NAME, userName))).click(); + waitForPageLoad(); + } + + public void addGroup(String groupName) { + waitForVisibilityOfElementLocated(By.xpath(String.format(TABLE_TO_ADD + ROW_BY_NAME, groupName))).click(); + clickAddButton(); + waitProgressBarNotVisible(); + } + + public void removeGroup(String groupName) { + waitForVisibilityOfElementLocated(By.xpath(String.format(TABLE_ADDED + ROW_BY_NAME, groupName))).click(); + clickRemoveButton(); + waitForInvisibilityGridDownloader(); + } + + public void addAllGroups() { + clickAddAllButton(); + waitProgressBarNotVisible(); + } + + public void removeAllGroups() { + clickRemoveAllButton(); + waitProgressBarNotVisible(); + } + + /** + * Method to avoid parallel test conflicts. + *

+ * If the list of groups available for adding is not empty, checks if the list contains only newly created groups. + *

+ * + * @param groupNames list retrieved from the database before the parallel test created a new group. + * Instance of {@link List} type. + * + * @return value of {@link Boolean} type. + *

+ * True - if list of groups available for adding is empty, or contains only newly created groups from parallel tests. + *

+ *

+ * False - if list of groups available for adding contains values from groupNames list. + *

+ */ + public boolean isAvailableGridEmpty(List groupNames) { + List possibleParallelAddedGroups = getListOfAvailableGroupsToAdd() + .stream() + .map(WebElement::getText) + .collect(Collectors.toList()); + + if (possibleParallelAddedGroups.isEmpty()) { + return true; + } + else { + return groupNames + .stream() + .noneMatch(possibleParallelAddedGroups::contains); + } + } + + public void bindGroup(String roleName) { + changeUserPageGridsSort(UsersPageGrids.GROUPS_TO_ADD_GRID); + + //проходим вниз все группы пока не найдем нужную + listGroupsToAdd.get(0).click(); + Actions actions = new Actions(driver); + int numberOfScrolls = 10; + while (driver.findElements(By.xpath(String.format(TABLE_TO_ADD + ROW_BY_NAME, roleName))) + .isEmpty() && numberOfScrolls != 0) { + actions.sendKeys(Keys.PAGE_DOWN).perform(); + numberOfScrolls--; + } + + waitProgressBarNotVisible(); + addGroup(roleName); + waitProgressBarNotVisible(); + } + + public void logout() { + waitProgressBarNotVisible(); + userMenuButton.click(); + exitButton.click(); + } + + public void changeUserPageGridsSort(UsersPageGrids value) { + switch (value) { + case USERS_GRID: + driver.findElement(CELL_WITH_LAST_NAME_HEADER).click(); + break; + case LINKED_GROUPS_GRID: + driver.findElement(GROUP_IN_TABLE_HEADER).click(); + break; + case GROUPS_TO_ADD_GRID: + driver.findElement(GROUP_TO_ADD_HEADER).click(); + case ADDED_GROUPS_GRID: + driver.findElement(ADDED_GROUPS_HEADER).click(); + break; + } + waitForPageLoad(); + } + + public enum UsersPageGrids { + USERS_GRID, + LINKED_GROUPS_GRID, + GROUPS_TO_ADD_GRID, + ADDED_GROUPS_GRID + } +} \ No newline at end of file diff --git a/test/src/test/java/old/page/BaseComponentPage.java b/test/src/test/java/old/page/BaseComponentPage.java new file mode 100644 index 00000000..42a0815e --- /dev/null +++ b/test/src/test/java/old/page/BaseComponentPage.java @@ -0,0 +1,287 @@ +package old.page; + +import org.openqa.selenium.By; +import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.Keys; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.TimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import old.core.BasePage; +import old.util.ExecutionManager; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.stream.Collectors; +import java.time.Duration; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public abstract class BaseComponentPage extends BasePage { + + private static final By PROGRESS_BAR = By.xpath("//img[contains(@src, 'progress.gif')]"); + private static final By NGB_MODAL_WINDOW = By.xpath("//ngb-modal-window"); + private static final By LOGIN_HEADER_BY = By.xpath("//h2[contains(.,'Вход')]"); + private static final String SELECTIZE_BY_OBJECT_NAME = "//*[@object-name='%s']"; + private static final By INPUT_IS_ACTIVE = By.xpath("//div[contains(@class, 'input-active')]"); + private static final String DATE_TIME_CREATE_OR_UPDATE = + "//div[@col-id='%s']//span[contains(text(),'%s')]/parent::span/parent::div/parent::div/following-sibling::div[@col-id='%s']//span"; + private static final By GRID_PROGRESS_BAR = By.xpath( + "//span[contains(text(), 'Загрузка данных, пожалуйста, подождите.')]"); + protected static final By EMAIL_INPUT_BY = By.name("username"); + protected static final By FIRST_ROW_BY = By.cssSelector(".ag-center-cols-container [row-index='0']"); + protected static final By MODAL_DIALOG_FIRST_ROW_BY = By.cssSelector( + ".modal-dialog .ag-center-cols-container [row-index='0']"); + protected static final String SELECTIZE_INPUT_BY_OBJECT_NAME = SELECTIZE_BY_OBJECT_NAME + "//input"; + protected static final String INPUT_WITH_SELECTED_OPTION = SELECTIZE_BY_OBJECT_NAME + "//div[contains(.,'%s')]"; + protected static final String OPTION_TO_SELECT = SELECTIZE_BY_OBJECT_NAME + "//div[@data-selectable][contains(.,'%s')]"; + protected static final String SELECTIZE_FULL = SELECTIZE_BY_OBJECT_NAME + "//div[contains(@class, 'full has-items')]"; + protected static final String EXCLUDE_HEADER = "[not(contains(@class,'ag-header'))]"; + protected static final String AG_HEADER = "[contains(@class,'ag-header')]"; + private static final String PAGE_HEADER = "//*[contains(text(),'%s')]"; + + //Administration Page + @FindBy(xpath = "//*[contains(text(),'Фильтр по пользователям')]") + public WebElement filterPanel; + @FindBy(xpath = "//*[@object-name='last-name']//input") + public WebElement surNameField; + @FindBy(xpath = "//*[@object-name='search']//input") + protected WebElement searchField; + @FindBy(xpath = "//*[@object-name='create-button']//button['Создать']") + protected WebElement createButton; + @FindBy(xpath = "//*[@object-name='edit-button']//button['Редактировать']") + protected WebElement editButton; + @FindBy(xpath = "//*[@object-name='delete-button']//button['Удалить']") + protected WebElement deleteButton; + @FindBy(xpath = "//div[@class='modal-dialog']//button[@test-id='yes-btn']") + protected WebElement confirmButton; + @FindBy(xpath = "//button[contains(.,'Отменить')]") + public WebElement cancelButton; + + //Editing/Creating Pages + @FindBy(xpath = "//*[@object-name='name']//input") + public WebElement nameField; + @FindBy(xpath = "//button[contains(.,'Сохранить')]") + public WebElement saveButton; + @FindBy(xpath = "//*[@object-name='Add']//button[text()='>']") + protected WebElement addButton; + @FindBy(xpath = "//*[@object-name='Remove']//button[text()='<']") + protected WebElement removeButton; + @FindBy(xpath = "//*[@object-name='AddAll']//button[text()='>>']") + protected WebElement addAllButton; + @FindBy(xpath = "//*[@object-name='RemoveAll']//button[text()='<<']") + protected WebElement removeAllButton; + @FindBy(xpath = "//button[contains(.,'Прервать')]") + private WebElement stopButton; + + final Logger logger = LoggerFactory.getLogger(getClass()); + protected static ExecutionManager EXECUTION_MANAGER = new ExecutionManager(); + + public BaseComponentPage(WebDriver browser, String uri) { + super(browser, uri); + } + + @Override + public void waitForPageLoad() { + super.waitForPageLoad(); + assertTrue(thereIsNoError()); + waitForInvisibilityOfElementLocated(NGB_MODAL_WINDOW); + } + + @Override + public void refreshPage() { + driver.navigate().refresh(); + waitForPageLoad(); + } + + public void waitForPageLoadWithoutCheckingForError() { + super.waitForPageLoad(); + waitForInvisibilityOfElementLocated(NGB_MODAL_WINDOW); + } + + public void doubleClick(WebElement element) { + Actions action = new Actions(driver); + action.doubleClick(element).perform(); + } + + public void typeText(WebElement input, String text) { + waitForVisibilityOf(input); + input.clear(); + input.sendKeys(text); + waitProgressBarNotVisible(); + } + + protected void typeTextFromJS(WebElement input, String text) { + input.click(); + input.clear(); + ((JavascriptExecutor) driver).executeScript("arguments[0].value='" + text + "';", input); + } + + public void typeTextOnAdminFilter(WebElement input, String text) { + typeTextFromJS(input, text); + input.sendKeys(" "); + input.sendKeys(Keys.ENTER); + blur(input); + } + + protected String getErrorText(By locator) { + WebElement errorMessage = waitForVisibilityOfElementLocated(locator); + return errorMessage.getText(); + } + + public String getErrorTextFromPage() { + return getErrorText(getErrorBy()); + } + + protected void typeTextAndSelectOption(String objectName, String inputText, String optionText) { + WebElement selectize = findElement( + By.xpath(String.format(SELECTIZE_BY_OBJECT_NAME, objectName))); + waitForElementToBeClickable(selectize).click(); + WebElement input = findElement( + By.xpath(String.format(SELECTIZE_INPUT_BY_OBJECT_NAME, objectName))); + input.sendKeys(Keys.BACK_SPACE); + typeText(input, inputText); + By optionToSelectBy = By.xpath(String.format(OPTION_TO_SELECT, objectName, optionText)); + waitForVisibilityOfElementLocated(optionToSelectBy).click(); + waitForInvisibilityOfElementLocated(optionToSelectBy); + waitForVisibilityOfElementLocated(By.xpath(String.format(SELECTIZE_FULL, objectName))); + waitForVisibilityOfElementLocated(By.xpath(String.format(INPUT_WITH_SELECTED_OPTION, objectName, optionText))); + } + + public String getLocalDate() { + return LocalDateTime.now().minusHours(3).format(DateTimeFormatter.ofPattern("dd.MM.yyyy")); + } + + public WebElement getActionTime(String colId, String name, String сolIdAction) { + return waitForVisibilityOfElementLocated(By.xpath(String.format + (DATE_TIME_CREATE_OR_UPDATE, colId, name, сolIdAction))); + } + + public void waitForInitializationOf(WebElement... elements) { + long pageLoadStart = System.currentTimeMillis(); + waitForPageLoad(); + logger.info("page loaded in " + (System.currentTimeMillis() - pageLoadStart) + " ms"); + for (WebElement element : elements) { + long elementVisibilityStart = System.currentTimeMillis(); + waitForVisibilityOf(element); + logger.info(element + " became visible in " + (System.currentTimeMillis() - elementVisibilityStart) + " ms"); + } + } + + // ожидается, что последний инпут, по котрому был клик, выбран + public void waitForInputFieldSelected() { + waitForNumberOfElementsToBe(INPUT_IS_ACTIVE, 1); + } + + public static By getProgressBar() { + return PROGRESS_BAR; + } + + public static By getLoginHeaderBy() { + return LOGIN_HEADER_BY; + } + + public List getWebElementTexts(List elements) { + return elements.stream() + .map(WebElement::getText) + .collect(Collectors.toList()); + } + + protected WebElement findElement(By by) { + return driver.findElement(by); + } + + protected List findElements(By by) { + return driver.findElements(by); + } + + public void waitForInvisibilityGridDownloader() { + try { + waitForVisibilityOfElementLocated(GRID_PROGRESS_BAR, Duration.ofMillis(1000)); + waitForInvisibilityOfElementLocated(GRID_PROGRESS_BAR); + } + catch (TimeoutException ignored) { + logger.info("progress bar not visible"); + } + } + + protected void blur(WebElement input) { + ((JavascriptExecutor) driver).executeScript("arguments[0].blur()", input); + ((JavascriptExecutor) driver).executeScript("document.body.click()"); + } + + public void cancelAction() { + waitForElementToBeClickable(cancelButton).click(); + waitForPageLoad(); + clickConfirmButton(); + } + + public void clickSaveButton() { + waitForElementToBeClickable(saveButton).click(); + waitProgressBarNotVisible(); + waitForPageLoad(); + } + + public void clickEditButton() { + waitForElementToBeClickable(editButton).click(); + waitForPageLoad(); + } + + public void clickCreateButton() { + waitForElementToBeClickable(createButton).click(); + waitForPageLoad(); + } + + public void clickDeleteButton() { + waitForElementToBeClickable(deleteButton).click(); + waitProgressBarNotVisible(); + } + + public void clickConfirmButton() { + waitForElementToBeClickable(confirmButton).click(); + waitProgressBarNotVisible(); + } + + public void clickAddButton() { + waitForElementToBeClickable(addButton).click(); + waitForPageLoad(); + } + + public void clickRemoveButton() { + waitForElementToBeClickable(removeButton).click(); + waitForPageLoad(); + } + + public void clickAddAllButton() { + waitForElementToBeClickable(addAllButton).click(); + waitForPageLoad(); + } + public void clickRemoveAllButton() { + waitForElementToBeClickable(removeAllButton).click(); + waitForPageLoad(); + } + + public void clickCancelButton() { + waitForElementToBeClickable(cancelButton).click(); + } + + public void clickStopButton() { + waitForElementToBeClickable(stopButton).click(); + waitProgressBarNotVisible(); + } + + public void searchUser(String userSurName) { + filterPanel.click(); + waitForPageLoad(); + typeTextOnAdminFilter(surNameField, userSurName); + waitForInvisibilityGridDownloader(); + } + + public void checkTitle(String labelName) { + waitForVisibilityOfElementLocated(By.xpath(String.format(PAGE_HEADER, labelName))); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/page/InboxPage.java b/test/src/test/java/old/page/InboxPage.java new file mode 100644 index 00000000..851337cd --- /dev/null +++ b/test/src/test/java/old/page/InboxPage.java @@ -0,0 +1,128 @@ +package old.page; + +import java.time.Duration; +import java.util.List; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class InboxPage extends BaseComponentPage { + + private static final String XPATH_FOR_MENU_ITEM = "//button[@class='dropdown-item'][contains(.,'%s')]"; + private static final By PROCESS_LIST_BY = By.xpath("//div[@id='process-instance-list']"); + private static final By PROCESS_DATE_BY = By.xpath("//span[contains(.,'Дата запуска')]"); + private static final By MENU_ADMINISTRATION = By.xpath("//button[contains(.,'Администрирование')]"); + private static final By START_PAGE = By.xpath("//div[@class='logo']"); + + @FindBy(xpath = "//button[@id='adminDropdownMenu']") + public WebElement adminList; + @FindBy(xpath = "//div[@class='logout']//button[contains(@class,'nav-link')]") + public WebElement userMenuButton; + @FindBy(xpath = "//button[contains(.,'Выход')]") + public WebElement exitButton; + @FindBy(xpath = "//button[@id='startProcessDropdownMenu']") + private WebElement startButton; + @FindBy(xpath = "//button[@routerlink='/user-management/groups']") + private WebElement groupPage; + @FindBy(xpath = "//button[@routerlink='/user-management/roles']") + private WebElement rolePage; + @FindBy(xpath = "//button[@routerlink='/user-management/users']") + private WebElement userPage; + @FindBy(xpath = "//button[@routerlink='/user-management/org-units']") + private WebElement orgPage; + @FindBy(xpath = "//button[@routerlink='/user-management/authorities']") + private WebElement authoritiesPage; + @FindBy(xpath = "//button[@routerlink='/process/instance']") + private WebElement processPage; + @FindBy(xpath = "//div[@class='user-info']//div[@class='user-fio']") + private WebElement userFIO; + + public InboxPage(WebDriver browser) { + super(browser, "/#/"); + } + + //выход из приложения + public void exitApp() { + waitProgressBarNotVisible(); + userMenuButton.click(); + exitButton.click(); + assertTrue(thereIsNoError()); + } + + //открыть Экземпляры процессов + public AdminProcessPage openAdminProcessPage() { + waitForPageLoad(); + adminList.click(); + waitForElementToBeClickable(processPage, Duration.ofSeconds(10)); + processPage.click(); + waitForPageLoad(); + waitForVisibilityOfElementLocated(PROCESS_LIST_BY); + waitForVisibilityOfElementLocated(PROCESS_DATE_BY); + return PageFactory.initElements(driver, AdminProcessPage.class); + } + + //начать процесс + public ProcessesPage startProcess(String processName) { + waitForPageLoad(); + startButton.click(); + By menuItem = By.xpath(String.format(XPATH_FOR_MENU_ITEM, processName)); + WebElement process = waitForVisibilityOfElementLocated(menuItem); + process.click(); + waitForPageLoad(); + return PageFactory.initElements(driver, ProcessesPage.class); + } + + public AdminUserPage startAdminUser() { + adminList.click(); + userPage.click(); + waitForPageLoad(); + return PageFactory.initElements(driver, AdminUserPage.class); + } + + public AdminGroupPage startAdminGroup() { + adminList.click(); + groupPage.click(); + waitForPageLoad(); + return PageFactory.initElements(driver, AdminGroupPage.class); + } + + public AdminRolePage startAdminRole() { + adminList.click(); + rolePage.click(); + waitForPageLoad(); + return PageFactory.initElements(driver, AdminRolePage.class); + } + + public AdminOrgPage startAdminOrganization() { + adminList.click(); + orgPage.click(); + waitForPageLoad(); + return PageFactory.initElements(driver, AdminOrgPage.class); + } + + public List getListOfAdminPanels() { + return findElements(MENU_ADMINISTRATION); + } + + public String getUserFIOFromPage() { + return userFIO.getText(); + } + + public List getEmailInputsFrom(WebDriver element) { + return element.findElements(EMAIL_INPUT_BY); + } + + public void waitEmailInput() { + waitForVisibilityOfElementLocated(EMAIL_INPUT_BY); + } + + public boolean startPageDisplay() { + waitForPageLoad(); + return waitForVisibilityOfElementLocated(START_PAGE).isDisplayed(); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/page/LoginPage.java b/test/src/test/java/old/page/LoginPage.java new file mode 100644 index 00000000..bea128cb --- /dev/null +++ b/test/src/test/java/old/page/LoginPage.java @@ -0,0 +1,78 @@ +package old.page; + +import java.time.Duration; + +import org.openqa.selenium.By; +import org.openqa.selenium.TimeoutException; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class LoginPage extends BaseComponentPage { + private static final By ERROR_LOGIN = By.xpath("//div[@class='form-signin']//div[contains(@class,'alert-danger')]"); + private static final By TEXT_ERROR_DEPLOY_MESSAGE = By.xpath("//*[contains(., 'Приложение стартует')]"); + private static final By LOGIN_PAGE_HEADER = By.xpath("//*[contains(text(), 'Вход')]"); + + @FindBy(name = "username") + private WebElement emailInput; + @FindBy(name = "password") + private WebElement passwordInput; + @FindBy(css = "button[class='btn btn-primary']") + private WebElement enterButton; + @FindBy(xpath = "//*[contains(text(), 'Забыли пароль?')]") + private WebElement resetPasswordLink; + @FindBy(xpath = "//*[contains(text(), 'Зарегистрироваться')]") + private WebElement registrationLink; + + + public LoginPage(WebDriver browser) { + super(browser, "/#/login"); + } + + public void typeLoginPasswordAndEnter(String login, String password) { + waitForVisibilityOfElementLocated(EMAIL_INPUT_BY); + passwordInput.clear(); + passwordInput.sendKeys(password); + emailInput.clear(); + emailInput.sendKeys(login); + enterButton.click(); + } + + public InboxPage login(String login, String password) { + typeLoginPasswordAndEnter(login, password); + assertTrue(hasNoErrorOnLoginPage(TEXT_ERROR_DEPLOY_MESSAGE), "Failed to deploy backend"); + assertTrue(hasNoErrorOnLoginPage(ERROR_LOGIN), "Failed to login"); + waitProgressBarNotVisible(); + + assertTrue(thereIsNoError()); + return PageFactory.initElements(driver, InboxPage.class); + } + + private boolean hasNoErrorOnLoginPage(By locator) { + try { + waitForInvisibilityOfElementLocated(locator, Duration.ofSeconds(5)); + } + catch (TimeoutException ignored) { + logger.error(getErrorText(locator)); + return false; + } + return true; + } + + public String getErrorTextFromLoginForm() { + return getErrorText(ERROR_LOGIN); + } + + public void goToResetPage() { + waitForVisibilityOfElementLocated(LOGIN_PAGE_HEADER); + resetPasswordLink.click(); + } + + public void goToRegistPage(){ + waitForPageLoad(); + registrationLink.click(); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/page/ProcessesPage.java b/test/src/test/java/old/page/ProcessesPage.java new file mode 100644 index 00000000..756dbd36 --- /dev/null +++ b/test/src/test/java/old/page/ProcessesPage.java @@ -0,0 +1,43 @@ +package old.page; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class ProcessesPage extends BaseComponentPage { + + private static final String TEXT = "//div[@class='form-group']//*[text()='%s']"; + + @FindBy(xpath = "//navigation-button[@object-name='NavigationButton']//button[contains(.,'Завершить')]") + public WebElement exitButton; + + @FindBy(xpath = "//div[@id='page']") + public WebElement pageID; + + public ProcessesPage(WebDriver browser) { + super(browser, "/#/process/"); + } + + public String getTestProcessText() { + return getWebElementTexts(driver.findElements(By.xpath(String.format(TEXT, "Тестовая страница")))).get(0); + } + + //----- different + public String getProcessId() { + String str = driver.getCurrentUrl(); + Pattern p = Pattern.compile("process\\/(\\d+)"); + Matcher m = p.matcher(str); + m.find(); + return m.group(1); + } + + public void exitProcess() { + waitForElementToBeClickable(exitButton); + exitButton.click(); + waitForPageLoadWithoutCheckingForError(); + } +} \ No newline at end of file diff --git a/test/src/test/java/old/util/DataUtil.java b/test/src/test/java/old/util/DataUtil.java new file mode 100644 index 00000000..49f7a1dc --- /dev/null +++ b/test/src/test/java/old/util/DataUtil.java @@ -0,0 +1,11 @@ +package old.util; + +/** + * @author gulnaz + */ +public final class DataUtil { + + private DataUtil() { + } + public static final String BASE_PART_FOR_USER = "qa"; +} diff --git a/test/src/test/java/old/util/ExecutionManager.java b/test/src/test/java/old/util/ExecutionManager.java new file mode 100644 index 00000000..3beb7763 --- /dev/null +++ b/test/src/test/java/old/util/ExecutionManager.java @@ -0,0 +1,508 @@ +package old.util; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import com.zaxxer.hikari.HikariDataSource; +import org.jooq.DSLContext; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.Record; +import org.jooq.conf.RenderNameCase; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ru.cg.webbpm.modules.database.bean.config.Datasource; +import ru.cg.webbpm.modules.database.impl.data_source.HikariDataSourceFactory; + +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.LINK_USER_ACCOUNT_USER_GROUP; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.LINK_USER_GROUP_USER_ROLE; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.LINK_USER_ROLE_AUTHORITY; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.ORG_UNIT; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.SIMPLE_CREDENTIALS; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.USER_ACCOUNT; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.USER_ACCOUNT_VERIFICATION; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.USER_GROUP; +import static ru.cg.webbpm.modules.security.api.impl.bean.Tables.USER_ROLE; + +/** + * @author gulnaz + */ +public class ExecutionManager { + private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionManager.class); + private static final int POOL_SIZE = 2; + + private HikariDataSource testDataSource; + public HikariDataSource securityDataSource; + private DSLContext dslContext; + private Settings settings; + + public ExecutionManager() { + LOGGER.info("Execution manager creation"); + HikariDataSourceFactory hikariDataSourceFactory = new HikariDataSourceFactory(POOL_SIZE); + + testDataSource = hikariDataSourceFactory.createDataSource(getDataSource(DataSourceName.TEST)); + + securityDataSource = hikariDataSourceFactory.createDataSource(getDataSource(DataSourceName.SECURITY)); + securityDataSource.setLeakDetectionThreshold(60000); + + settings = new Settings(); + settings.setRenderNameCase(RenderNameCase.LOWER); + + //TODO enable and change wrong port to right +// jbpmDataSource = hikariDataSourceFactory.createDataSource(getDataSource(DataSourceName.JBPM)); +// jbpmDataSource.setMaximumPoolSize(5); + } + + public enum DataSourceName { + JBPM, + SECURITY, + TEST + } + + public String generateId() { + return UUID.randomUUID().toString(); + } + + private Datasource getDataSource(DataSourceName dataSourceName) { + String host = System.getenv("HOSTNAME"); + String databaseName; + String user; + String password; + Datasource datasource = new Datasource(); + + switch (dataSourceName) { + case JBPM: + databaseName = System.getenv("DB_JBPM_NAME"); + user = System.getenv("DB_JBPM_USERNAME"); + password = System.getenv("DB_JBPM_PASSWORD"); + break; + case SECURITY: + host = System.getenv("DB_SEC_HOST"); + databaseName = System.getenv("DB_SEC_NAME"); + user = System.getenv("DB_SEC_USERNAME"); + password = System.getenv("DB_SEC_PASSWORD"); + break; + case TEST: + host = System.getenv("DB_APP_HOST"); + databaseName = System.getenv("DB_APP_NAME"); + user = System.getenv("DB_APP_USERNAME"); + password = System.getenv("DB_APP_PASSWORD"); + break; + default: + throw new IllegalStateException("Unexpected value: " + dataSourceName); + } + + datasource.setUrl(String.format("jdbc:postgresql://%s:%s/%s", + host, + System.getenv("DB_PORT"), + databaseName)); + datasource.setUser(user); + datasource.setPassword(password); + datasource.setDriverClassName("org.postgresql.Driver"); + + return datasource; + } + + public int countTableRows(Table table) { + try (Connection connection = testDataSource.getConnection()) { + dslContext = DSL.using(connection); + return dslContext.selectCount() + .from(table) + .fetchOne(0, int.class); + } + catch (SQLException e) { + throw new RuntimeException("Failed to count rows", e); + } + } + + public List getGroupNamesFromUserGroup() { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_GROUP) + .fetch() + .getValues(USER_GROUP.NAME); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get group names from user group table", e); + } + } + + public String getTokenByUserId(String id) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_ACCOUNT_VERIFICATION) + .where(USER_ACCOUNT_VERIFICATION.USER_ACCOUNT_ID.eq(id)) + .fetch() + .getValue(0, USER_ACCOUNT_VERIFICATION.TOKEN); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get token from user_account_verification", e); + } + } + + public List getRoleNamesFromUserRole() { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_ROLE) + .fetch() + .getValues(USER_ROLE.NAME); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get roles from user_role table", e); + } + } + + public String getUserAccountIdByName(String userName) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_ACCOUNT) + .where(USER_ACCOUNT.FIRST_NAME.eq(userName)) + .fetch() + .getValue(0, USER_ACCOUNT.USER_ACCOUNT_ID); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get user_account_id from user_account table", e); + } + } + + public String getRoleIdByName(String roleName) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_ROLE) + .where(USER_ROLE.NAME.eq(roleName)) + .fetch() + .getValue(0, USER_ROLE.USER_ROLE_ID); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get user_role_id from user_role table", e); + } + } + + public String getGroupIdByName(String groupName) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + + return dslContext.select() + .from(USER_GROUP) + .where(USER_GROUP.NAME.eq(groupName)) + .fetch() + .getValue(0, USER_GROUP.USER_GROUP_ID); + } + catch (SQLException e) { + throw new RuntimeException("Failed to get user_group_id from user_group table", e); + } + } + + /* + Queries with security datasource + */ + private void insertSecurityRecord(Table table, + TableField field1, TableField field2, TableField field3, + String value1, String value2, String value3) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.insertInto(table, field1, field2, field3) + .values(value1, value2, value3) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete record", e); + } + } + + private void deleteSecurityRecord(Table table, TableField field, String value) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.delete(table) + .where(field.eq(value)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete record", e); + } + } + + public void insertUser(String username, String password, String email, String orgId, String groupId) { + //TODO SUPPORT-3761 + try (Connection connection = securityDataSource.getConnection()) { + String userId = generateId(); + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext + .insertInto(USER_ACCOUNT, + USER_ACCOUNT.USER_ACCOUNT_ID, USER_ACCOUNT.USERNAME, USER_ACCOUNT.EMAIL, + USER_ACCOUNT.FIRST_NAME, USER_ACCOUNT.LAST_NAME, USER_ACCOUNT.ORG_UNIT_ID) + .values(userId, username, email, username, username, orgId), + dslContext + .insertInto(SIMPLE_CREDENTIALS, + SIMPLE_CREDENTIALS.USER_ACCOUNT_ID, SIMPLE_CREDENTIALS.PASSWORD) + .values(userId, password), + dslContext.insertInto(LINK_USER_ACCOUNT_USER_GROUP, LINK_USER_ACCOUNT_USER_GROUP.LINK_USER_ACCOUNT_USER_GROUP_ID, + LINK_USER_ACCOUNT_USER_GROUP.USER_ACCOUNT_ID, LINK_USER_ACCOUNT_USER_GROUP.USER_GROUP_ID) + .values(generateId(), userId, groupId)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to insert user", e); + } + } + + public void deleteTestOrg(String orgName) { + deleteSecurityRecord(ORG_UNIT, ORG_UNIT.NAME, orgName); + } + + public void createTestOrg(String orgName) { + insertSecurityRecord(ORG_UNIT, ORG_UNIT.ID, ORG_UNIT.NAME, ORG_UNIT.CODE, generateId(), orgName, orgName); + } + + public void createParentAndChildOrgs(String orgName1, String orgName2) { + try (Connection connection = securityDataSource.getConnection()) { + String parentOrgId = generateId(); + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext.insertInto(ORG_UNIT, ORG_UNIT.ID, ORG_UNIT.NAME, ORG_UNIT.CODE) + .values(parentOrgId, orgName1, orgName1), + dslContext.insertInto(ORG_UNIT, ORG_UNIT.ID, ORG_UNIT.NAME, ORG_UNIT.CODE, ORG_UNIT.PARENT_ID) + .values(generateId(), orgName2, orgName2, parentOrgId)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create organizations", e); + } + } + + public void deleteTestUser(String userName) { + deleteSecurityRecord(USER_ACCOUNT, USER_ACCOUNT.FIRST_NAME, userName); + } + + public void createUser(String username, String organizationID) { + String userAccountId = generateId(); + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext + .insertInto(USER_ACCOUNT, + USER_ACCOUNT.USER_ACCOUNT_ID, USER_ACCOUNT.USERNAME, USER_ACCOUNT.EMAIL, + USER_ACCOUNT.FIRST_NAME, USER_ACCOUNT.LAST_NAME, USER_ACCOUNT.MIDDLE_NAME, + USER_ACCOUNT.ORG_UNIT_ID) + .values(userAccountId, username, username + "@test.com", username, username, username, organizationID), + dslContext + .insertInto(SIMPLE_CREDENTIALS, + SIMPLE_CREDENTIALS.USER_ACCOUNT_ID, SIMPLE_CREDENTIALS.PASSWORD) + .values(userAccountId, username)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create user", e); + } + } + + public void createGroupBindRoles(String groupName, String accessLevel, String... roles) { + String groupId = generateId(); + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.insertInto(USER_GROUP, USER_GROUP.NAME, USER_GROUP.USER_GROUP_ID, USER_GROUP.ACCESS_LEVEL_ID) + .values(groupName, groupId, accessLevel) + .execute(); + + Arrays.asList(roles).forEach(role -> bindRoleToGroup(role, groupId)); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create Group"); + } + } + + public void createRoleBindGroups(String roleName, String... groupIds) { + String userRoleId = generateId(); + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.insertInto(USER_ROLE, USER_ROLE.NAME, USER_ROLE.USER_ROLE_ID) + .values(roleName, userRoleId) + .execute(); + + Arrays.asList(groupIds).forEach(groupId -> bindRoleToGroup(userRoleId, groupId)); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create role"); + } + } + + public void createUserBindGroups(String userName, String organizationID, String... groupIDs) { + String userAccountId = generateId(); + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext.insertInto(USER_ACCOUNT, USER_ACCOUNT.USER_ACCOUNT_ID, USER_ACCOUNT.EMAIL, + USER_ACCOUNT.FIRST_NAME, + USER_ACCOUNT.LAST_NAME, USER_ACCOUNT.MIDDLE_NAME, USER_ACCOUNT.ORG_UNIT_ID, + USER_ACCOUNT.USERNAME) + .values(userAccountId, userName + "@test.com", userName, userName, userName, + organizationID, userName), + dslContext.insertInto(SIMPLE_CREDENTIALS, SIMPLE_CREDENTIALS.USER_ACCOUNT_ID, + SIMPLE_CREDENTIALS.PASSWORD) + .values(userAccountId, userName)) + .execute(); + + Arrays.asList(groupIDs).forEach(group -> bindGroupToUser(group, userAccountId)); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create user", e); + } + } + + private void bindRoleToGroup(String roleId, String groupId) { + String linkUserGroupUserRoleId = generateId(); + dslContext.insertInto(LINK_USER_GROUP_USER_ROLE, + LINK_USER_GROUP_USER_ROLE.LINK_USER_GROUP_USER_ROLE_ID, + LINK_USER_GROUP_USER_ROLE.USER_GROUP_ID, LINK_USER_GROUP_USER_ROLE.USER_ROLE_ID) + .values(linkUserGroupUserRoleId, groupId, roleId) + .execute(); + } + + private void bindGroupToUser(String groupId, String userAccountId) { + String linkUserAccountUserGroupId = generateId(); + + dslContext.insertInto(LINK_USER_ACCOUNT_USER_GROUP, + LINK_USER_ACCOUNT_USER_GROUP.LINK_USER_ACCOUNT_USER_GROUP_ID, + LINK_USER_ACCOUNT_USER_GROUP.USER_ACCOUNT_ID, + LINK_USER_ACCOUNT_USER_GROUP.USER_GROUP_ID) + .values(linkUserAccountUserGroupId, userAccountId, groupId) + .execute(); + } + + public void deleteLinkedRolesFromGroup(String groupId) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.delete(LINK_USER_GROUP_USER_ROLE) + .where(LINK_USER_GROUP_USER_ROLE.USER_ROLE_ID.eq(groupId)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete linked group roles", e); + } + } + + public void deleteLinkedGroupsFromRole(String roleId) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.delete(LINK_USER_GROUP_USER_ROLE) + .where(LINK_USER_GROUP_USER_ROLE.USER_ROLE_ID.eq(roleId)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete linked role groups", e); + } + } + + public void deleteUserLinkedGroups(String userAccountID) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.delete(LINK_USER_ACCOUNT_USER_GROUP) + .where(LINK_USER_ACCOUNT_USER_GROUP.USER_ACCOUNT_ID.eq(userAccountID)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete linked user groups", e); + } + } + + public void deleteTestGroup(String groupName) { + deleteSecurityRecord(USER_GROUP, USER_GROUP.NAME, groupName); + } + + public void createTestGroup(String groupName, String accessLevelId) { + insertSecurityRecord(USER_GROUP, USER_GROUP.USER_GROUP_ID, USER_GROUP.NAME, USER_GROUP.ACCESS_LEVEL_ID, + generateId(), groupName, accessLevelId); + } + + public void createBindGroupRole(String name, String groupId, String accessLevelId, String roleId) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext.insertInto(USER_GROUP, USER_GROUP.USER_GROUP_ID, USER_GROUP.NAME, USER_GROUP.ACCESS_LEVEL_ID) + .values(groupId, name, accessLevelId), + dslContext.insertInto(USER_ROLE, USER_ROLE.USER_ROLE_ID, USER_ROLE.NAME) + .values(roleId, name), + dslContext.insertInto(LINK_USER_GROUP_USER_ROLE, LINK_USER_GROUP_USER_ROLE.LINK_USER_GROUP_USER_ROLE_ID, + LINK_USER_GROUP_USER_ROLE.USER_GROUP_ID, LINK_USER_GROUP_USER_ROLE.USER_ROLE_ID) + .values(generateId(), groupId, roleId)) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create and bind group with role", e); + } + } + + public void deleteUserGroupRole(String name, String groupId, String roleId) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.batch( + dslContext.delete(USER_ACCOUNT) + .where(USER_ACCOUNT.FIRST_NAME.eq(name)), + dslContext.delete(USER_GROUP) + .where(USER_GROUP.USER_GROUP_ID.eq(groupId)), + dslContext.delete(USER_ROLE) + .where(USER_ROLE.USER_ROLE_ID.eq(roleId))) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to delete user, group, role", e); + } + } + + public void linkRoleToAuthority(String roleId, String authorityId) { + insertSecurityRecord(LINK_USER_ROLE_AUTHORITY, LINK_USER_ROLE_AUTHORITY.USER_ROLE_AUTHORITY_ID, + LINK_USER_ROLE_AUTHORITY.USER_ROLE_ID, LINK_USER_ROLE_AUTHORITY.AUTHORITY_ID, + generateId(), roleId, authorityId); + } + + public void deleteTestRole(String roleName) { + deleteSecurityRecord(USER_ROLE, USER_ROLE.NAME, roleName); + } + + public void createTestRole(String roleName) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + dslContext.insertInto(USER_ROLE, USER_ROLE.USER_ROLE_ID, USER_ROLE.NAME) + .values(generateId(), roleName) + .execute(); + } + catch (SQLException e) { + throw new RuntimeException("Failed to create role", e); + } + } + + public boolean hasUserByData(String username, String email) { + try (Connection connection = securityDataSource.getConnection()) { + dslContext = DSL.using(connection, settings); + int count = dslContext.selectCount() + .from(USER_ACCOUNT) + .where(USER_ACCOUNT.EMAIL.eq(email)) + .and(USER_ACCOUNT.FIRST_NAME.eq(username)) + .and(USER_ACCOUNT.LAST_NAME.eq(username)) + .and(USER_ACCOUNT.MIDDLE_NAME.eq(username)) + .execute(); + + return count == 1; + } + catch (SQLException e) { + throw new RuntimeException("Failed to fetch user count", e); + } + } +} diff --git a/test/src/test/java/old/util/PropertyManager.java b/test/src/test/java/old/util/PropertyManager.java new file mode 100644 index 00000000..4d220ccc --- /dev/null +++ b/test/src/test/java/old/util/PropertyManager.java @@ -0,0 +1,21 @@ +package old.util; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +/** + * @author: besedin + */ +public final class PropertyManager { + + private static final Properties property = new Properties(); + private static final String propFileName = "test.properties"; + + private PropertyManager() { + } + + public static Properties getProperties() throws IOException { + InputStream inputStream = PropertyManager.class.getClassLoader().getResourceAsStream(propFileName); + property.load(inputStream); + return property; + } +} diff --git a/test/src/test/java/pages/AuthoritiesPage.java b/test/src/test/java/pages/AuthoritiesPage.java new file mode 100644 index 00000000..349892cc --- /dev/null +++ b/test/src/test/java/pages/AuthoritiesPage.java @@ -0,0 +1,61 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; + +import java.util.Arrays; + +/** + * @author kote + */ +public class AuthoritiesPage extends BasePage { + + private static final String ARROW_BY_SIBLING_LABEL = + "//span[contains(@class,'ag-row-group')][span[contains(.,'%s')]]//span[contains(@class,'closed')]"; + private static final String ACTION_BY_NAME = "//static-column-tree-grid//*[text()='%s']"; + private static final String BUTTON_BY_NAME = "//button[contains(.,'%s')]"; + private static final String BUTTON_ON_DIALOG_BY_NAME = "//div[@class='modal-body']//button[contains(.,'%s')]"; + private static final String MODAL_TITLE_BY_NAME = "//*[@class='modal-title'][contains(.,'%s')]"; + private static final String ROLE_BY_NAME = "//static-column-grid//div[@class='ag-cell-wrapper']//span[contains(.,'%s')]"; + + private static final By COMBOBOX_INPUT = By.xpath( + "//combo-box//div[contains(@class,'selectize-input')]//input"); + + public AuthoritiesPage(WebDriver browser) { + super(browser, "/#/user-management/authorities"); + } + + public void openActionTree(String... actions) { + Arrays.asList(actions) + .forEach(action -> waitForElementToBeClickable(getBy(ARROW_BY_SIBLING_LABEL, action)).click()); + } + + public void clickOnAction(String action) { + waitForElementToBeClickable(getBy(ACTION_BY_NAME, action)).click(); + } + + public void clickOnButton(String name) { + waitForElementToBeClickable(getBy(BUTTON_BY_NAME, name)).click(); + } + + public void clickOnButtonOnDialog(String name) { + waitForElementToBeClickable(getBy(BUTTON_ON_DIALOG_BY_NAME, name)).click(); + } + + public boolean isDialogOpened(String title) { + return isPresent(getBy(MODAL_TITLE_BY_NAME, title)); + } + + public void selectRole(String value) { + typeAndSelectValue(COMBOBOX_INPUT, value); + } + + public void clickOnRole(String role) { + waitForElementToBeClickable(getBy(ROLE_BY_NAME, role)).click(); + } + + public boolean isRoleOnTheList(String role) { + return isPresent(getBy(ROLE_BY_NAME, role)); + } +} \ No newline at end of file diff --git a/test/src/test/java/pages/OrganizationsPage.java b/test/src/test/java/pages/OrganizationsPage.java new file mode 100644 index 00000000..1b8bd684 --- /dev/null +++ b/test/src/test/java/pages/OrganizationsPage.java @@ -0,0 +1,65 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +/** + * @author kote + */ +public class OrganizationsPage extends BasePage { + + private static final String TEXT_ON_PAGE = "//text//div[contains(.,'%s')]"; + private static final String BUTTON_BY_NAME = "//button[contains(.,'%s')]"; + private static final String ROW_BY_TEXTS = "//div[@role='row'][.//span[contains(.,'%s')]][.//span[contains(.,'%s')]]"; + private static final String ARROW_IN_ROW = ROW_BY_TEXTS + "//span[@ref='eContracted']"; + private static final String MODAL_TITLE_BY_NAME = "//*[@class='modal-title'][contains(.,'%s')]"; + + @FindBy(xpath = "//div[label[span[contains(.,'Наименование')]]]//input") + private WebElement orgName; + @FindBy(xpath = "//div[label[span[contains(.,'Код')]]]//input") + private WebElement orgCode; + @FindBy(xpath = "//combo-box//div[contains(@class,'selectize-input')]") + private WebElement parentOrg; + + public OrganizationsPage(WebDriver browser) { + super(browser, "/#/user-management/org-units"); + } + + public boolean isTitleVisible(String title) { + return isPresent(getBy(TEXT_ON_PAGE, title)); + } + + public boolean isOrganizationVisible(String name, String code) { + return isPresent(getBy(ROW_BY_TEXTS, name, code)); + } + + public void clickOnButton(String name) { + waitForElementToBeClickable(getBy(BUTTON_BY_NAME, name)).click(); + } + + public void clickOnOrganization(String name, String code) { + waitForElementToBeClickable(getBy(ROW_BY_TEXTS, name, code)).click(); + } + + public void clickOnArrowInParentOrganization(String name, String code) { + waitForElementToBeClickable(getBy(ARROW_IN_ROW, name, code)).click(); + } + + public void editOrgName(String value) { + editField(orgName, value); + } + + public void editOrgCode(String value) { + editField(orgCode, value); + } + + public void selectParentOrg(String value) { + clickAndSelectValue(parentOrg, value); + } + + public boolean isDialogOpened(String title) { + return isPresent(getBy(MODAL_TITLE_BY_NAME, title)); + } +} diff --git a/test/src/test/java/pages/ProcessesPage.java b/test/src/test/java/pages/ProcessesPage.java new file mode 100644 index 00000000..fb1ad546 --- /dev/null +++ b/test/src/test/java/pages/ProcessesPage.java @@ -0,0 +1,51 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.WebDriver; + +public class ProcessesPage extends BasePage { + + private static final String SELECTED_TAB = "//div[@class='radio-content'][@title='%s']"; + private static final String TEXT_ON_PAGE = "//text//div[contains(.,'%s')]"; + private static final String TAB_INPUT_BY_NAME = "//label[.//span[contains(.,'%s')]]//input"; + private static final String BUTTON_BY_NAME = "//button[contains(.,'%s')]"; + private static final String LINK_BY_NAME = "//a[@class='nav-link'][contains(.,'%s')]"; + private static final String MODAL_TITLE_BY_NAME = "//*[@class='modal-title'][contains(.,'%s')]"; + private static final String PROCESS_IN_GRID_BY_ID = "//static-column-grid//div[@row-id='%s']"; + + public ProcessesPage(WebDriver browser) { + super(browser, "/#/process/instance"); + } + + public void clickOnButton(String name) { + waitForElementToBeClickable(getBy(BUTTON_BY_NAME, name)).click(); + } + + public void clickOnLink(String name) { + waitForElementToBeClickable(getBy(LINK_BY_NAME, name)).click(); + } + + public void clickOnTab(String name) { + waitForElementToBeClickable(getBy(TAB_INPUT_BY_NAME, name)).click(); + } + + public boolean isTabSelected(String name) { + return isPresent(getBy(SELECTED_TAB, name)); + } + + public boolean isTitleVisible(String title) { + return isPresent(getBy(TEXT_ON_PAGE, title)); + } + + public boolean isProcessVisibleInGrid(String processId) { + return isPresent(getBy(PROCESS_IN_GRID_BY_ID, processId)); + } + + public void clickOnProcessInGrid(String processId) { + waitForElementToBeClickable(getBy(PROCESS_IN_GRID_BY_ID, processId)).click(); + } + + public boolean isDialogOpened(String title) { + return isPresent(getBy(MODAL_TITLE_BY_NAME, title)); + } +} diff --git a/test/src/test/java/pages/RegistrationPage.java b/test/src/test/java/pages/RegistrationPage.java new file mode 100644 index 00000000..3c70b6a2 --- /dev/null +++ b/test/src/test/java/pages/RegistrationPage.java @@ -0,0 +1,96 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +/** + * @author kote + */ +public class RegistrationPage extends BasePage { + + private static final By HEADER = By.xpath("//h2[contains(.,'Регистрация')]"); + private static final By PASSWORD_AS_TEXT = By.xpath("//input[@name='password'][@type='text']"); + private static final By PASSWORD_AS_SYMBOLS = By.xpath( + "//input[@name='password'][@type='password']"); + private static final By REGISTRATION_BUTTON = By.xpath( + "//div[@class='register-btn-box']//button"); + private static final By REGISTRATION_ERROR = By.xpath( + "//div[@class='form-register']//div[contains(@class,'alert-danger')]"); + + private static final String COUNTRY_BY_NAME = "//span[@class='country-name'][contains(.,'%s')]"; + + @FindBy(xpath = "//a[contains(text(), 'Войти')]") + private WebElement loginLink; + @FindBy(xpath = "//span[@class='arrow-down']") + private WebElement selectCountryArrowButton; + @FindBy(xpath = "//div[@class='input-group-append'][.//i[contains(@class,'eye')]]") + private WebElement passwordEyeButton; + @FindBy(xpath = "//div//input[@name='username']") + private WebElement usernameInput; + @FindBy(xpath = "//div//input[@name='email']") + private WebElement emailInput; + @FindBy(xpath = "//div[contains(label,'Номер телефона')]//input") + private WebElement phoneInput; + @FindBy(xpath = "//div//input[@name='password']") + private WebElement passwordInput; + + public RegistrationPage(WebDriver browser) { + super(browser, "/#/registration"); + } + + public boolean isHeaderVisible() { + return isPresent(HEADER); + } + + public void loginLinkClick() { + loginLink.click(); + } + + public String getMaskForPhone() { + return phoneInput.getAttribute("value"); + } + + public void selectCountry(String countryName) { + selectCountryArrowButton.click(); + waitForVisibilityOfElementLocated(getBy(COUNTRY_BY_NAME, countryName)).click(); + } + + public void passwordEyeButtonClick() { + passwordEyeButton.click(); + } + + public boolean isPasswordDisplayedAsText() { + return isPresent(PASSWORD_AS_TEXT); + } + + public boolean isPasswordDisplayedAsSymbols() { + return isPresent(PASSWORD_AS_SYMBOLS); + } + + public void editUsername(String value) { + editField(usernameInput, value); + } + + public void editEmail(String value) { + editField(emailInput, value); + } + + public void editPhone(String value) { + editField(phoneInput, value); + } + + public void editPassword(String value) { + editField(passwordInput, value); + } + + public void registerButtonClick() { + waitForElementToBeClickable(REGISTRATION_BUTTON).click(); + } + + public String getRegistrationErrorText() { + return waitForVisibilityOfElementLocated(REGISTRATION_ERROR).getText(); + } +} \ No newline at end of file diff --git a/test/src/test/java/pages/ResetPasswordPage.java b/test/src/test/java/pages/ResetPasswordPage.java new file mode 100644 index 00000000..24f4657e --- /dev/null +++ b/test/src/test/java/pages/ResetPasswordPage.java @@ -0,0 +1,58 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +/** + * @author kote + */ +public class ResetPasswordPage extends BasePage { + + private static final By HEADER = By.xpath("//p[contains(.,'Вспомнили пароль?')]"); + private static final By RESET_BUTTON = By.xpath("//div[@class='reset-password-btn-box']//button"); + private static final By CHANGE_BUTTON = By.xpath("//button[contains(.,'Изменить пароль')]"); + + @FindBy(xpath = "//a[contains(text(), 'Войти')]") + private WebElement loginLink; + @FindBy(xpath = "//div//input[@name='email']") + private WebElement emailInput; + @FindBy(xpath = "//div//input[@name='password']") + private WebElement passwordInput; + @FindBy(xpath = "//div//input[@name='confirmPassword']") + private WebElement confirmPasswordInput; + + public ResetPasswordPage(WebDriver browser) { + super(browser, "/#/reset-password"); + } + + public boolean isHeaderVisible() { + return isPresent(HEADER); + } + + public void loginLinkClick() { + loginLink.click(); + } + + public void resetButtonClick() { + waitForElementToBeClickable(RESET_BUTTON).click(); + } + + public void changeButtonClick() { + waitForElementToBeClickable(CHANGE_BUTTON).click(); + } + + public void editEmail(String value) { + editField(emailInput, value); + } + + public void editPassword(String value) { + editField(passwordInput, value); + } + + public void editConfirmPassword(String value) { + editField(confirmPasswordInput, value); + } +} diff --git a/test/src/test/java/pages/TestProcessPage.java b/test/src/test/java/pages/TestProcessPage.java new file mode 100644 index 00000000..9f069e04 --- /dev/null +++ b/test/src/test/java/pages/TestProcessPage.java @@ -0,0 +1,33 @@ +package pages; + +import core.BasePage; +import org.openqa.selenium.WebDriver; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class TestProcessPage extends BasePage { + + private static final String PAGE_TITLE_BY_TEXT = "//div[@class='form-group']//*[text()='%s']"; + private static final String BUTTON_BY_NAME = "//button[contains(.,'%s')]"; + + public TestProcessPage(WebDriver browser) { + super(browser, "/#/process/"); + } + + public boolean isPageTitleVisible(String title) { + return isPresent(getBy(PAGE_TITLE_BY_TEXT, title)); + } + + public String getProcessId() { + String currentUrl = driver.getCurrentUrl(); + Pattern pattern = Pattern.compile("process\\/(\\d+)"); + Matcher matcher = pattern.matcher(currentUrl); + matcher.find(); + return matcher.group(1); + } + + public void clickOnButton(String name) { + waitForElementToBeClickable(getBy(BUTTON_BY_NAME, name)).click(); + } +} \ No newline at end of file diff --git a/test/src/test/java/tests/AuthoritiesIT.java b/test/src/test/java/tests/AuthoritiesIT.java new file mode 100644 index 00000000..7bd74471 --- /dev/null +++ b/test/src/test/java/tests/AuthoritiesIT.java @@ -0,0 +1,119 @@ +package tests; + +import core.BaseTest; +import core.Browser; +import core.BrowserArgumentProvider; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import pages.AuthoritiesPage; +import pages.InboxPage; +import pages.LoginPage; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.support.PageFactory.initElements; + +/** + * @author kote + */ +public class AuthoritiesIT extends BaseTest { + + private static final String ADMINISTRATION = "Администрирование"; + private static final String AUTHORITIES = "Безопасность действий"; + private static final String ALLOW_FOR_ROLE = "Разрешить для роли"; + private static final String BPMN_ACTION = "BPMN"; + private static final String ADMIN_ACTION = "ADMIN"; + private static final String PROCESS_INSTANCE_ACTION = "PROCESS_INSTANCE"; + private static final String LIST_ACTION = "LIST"; + + private static final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(11); + private static String generatedName; + + public AuthoritiesIT() { + super(); + } + + @BeforeAll + public static void beforeAll() { + generatedName = generateName("userForAuthorities"); + String encodedPassword = passwordEncoder.encode(generatedName); + String groupId = EXECUTION_MANAGER.insertGroupAndLinkedRole(generatedName); + String userAccountId = EXECUTION_MANAGER.insertUser(generatedName, generatedName + "@test.ru", encodedPassword); + EXECUTION_MANAGER.linkGroupToUser(userAccountId, groupId); + } + + @AfterAll + public static void afterAll() { + EXECUTION_MANAGER.deleteUserByEmail(generatedName); + EXECUTION_MANAGER.deleteGroupByName(generatedName); + EXECUTION_MANAGER.deleteRoleByName(generatedName); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkPermissionsForRole(Browser browser) { + //check action allowed for a role: + InboxPage inboxPage = loginInAppByAdmin(browser); + assertTrue(inboxPage.pageLoadSuccessfully()); + + inboxPage.clickOnMenu(ADMINISTRATION); + inboxPage.clickOnSubMenu(AUTHORITIES); + AuthoritiesPage authoritiesPage = initElements(driver, AuthoritiesPage.class); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + + authoritiesPage.openActionTree(BPMN_ACTION, ADMIN_ACTION, PROCESS_INSTANCE_ACTION); + authoritiesPage.clickOnAction(LIST_ACTION); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + + authoritiesPage.clickOnButton(ALLOW_FOR_ROLE); + assertTrue(authoritiesPage.isDialogOpened(ALLOW_FOR_ROLE)); + + authoritiesPage.selectRole(generatedName); + authoritiesPage.clickOnButtonOnDialog("Разрешить"); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + assertTrue(authoritiesPage.isRoleOnTheList(generatedName)); + + logout(inboxPage); + LoginPage loginPage = initElements(driver, LoginPage.class); + assertTrue(loginPage.pageLoadSuccessfully()); + + loginPage.typeLoginPasswordAndEnter(generatedName, generatedName); + assertTrue(inboxPage.pageLoadSuccessfully()); + + inboxPage.clickOnMenu(ADMINISTRATION); + assertTrue(inboxPage.isSubMenuVisible("Экземпляры процессов")); + + //check action prohibited for a role: + logout(inboxPage); + reloginInAppByAdmin(); + assertTrue(inboxPage.pageLoadSuccessfully()); + + inboxPage.clickOnMenu(ADMINISTRATION); + inboxPage.clickOnSubMenu(AUTHORITIES); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + + authoritiesPage.openActionTree(BPMN_ACTION, ADMIN_ACTION, PROCESS_INSTANCE_ACTION); + authoritiesPage.clickOnAction(LIST_ACTION); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + + authoritiesPage.clickOnRole(generatedName); + authoritiesPage.clickOnButton("Запретить"); + assertTrue(authoritiesPage.isDialogOpened("Подтверждение действия")); + + authoritiesPage.clickOnButton("Да"); + assertTrue(authoritiesPage.pageLoadSuccessfully()); + assertFalse(authoritiesPage.isRoleOnTheList(generatedName)); + + //todo dev WEBBPMNEXT-9095 + /*logout(inboxPage); + assertTrue(loginPage.pageLoadSuccessfully()); + + loginPage.typeLoginPasswordAndEnter(generatedName, generatedName); + assertTrue(inboxPage.pageLoadSuccessfully()); + assertFalse(inboxPage.isMenuVisible(ADMINISTRATION));*/ + } +} \ No newline at end of file diff --git a/test/src/test/java/tests/LoginIT.java b/test/src/test/java/tests/LoginIT.java new file mode 100644 index 00000000..95d177a7 --- /dev/null +++ b/test/src/test/java/tests/LoginIT.java @@ -0,0 +1,168 @@ +package tests; + +import core.BaseTest; +import core.Browser; +import core.BrowserArgumentProvider; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import pages.InboxPage; +import pages.LoginPage; +import pages.RegistrationPage; +import pages.ResetPasswordPage; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.support.PageFactory.initElements; + +/** + * @author kote + */ +public class LoginIT extends BaseTest { + + private static final String PART_FOR_NAME = "userForLogin"; + private static final String REG_EMAIL = "qa_new_account@mail.ru"; + private static final String RESET_EMAIL = "password_recovery_account@mail.ru"; + + public LoginIT() { + super(); + } + + @AfterAll + public static void afterAll() { + EXECUTION_MANAGER.deleteUserByEmail(REG_EMAIL); + EXECUTION_MANAGER.deleteUserByEmail(RESET_EMAIL); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkLoginWithWrongData(Browser browser) { + LoginPage loginPage = openApp(browser); + assertTrue(loginPage.pageLoadSuccessfully()); + + String wrongData = "wrong_test"; + loginPage.typeLoginPasswordAndEnter(wrongData, wrongData); + assertEquals("Неправильный логин или пароль", loginPage.getLoginErrorText()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkDisplayUserFio(Browser browser) { + InboxPage inboxPage = loginInApp(browser); + assertTrue(inboxPage.pageLoadSuccessfully()); + + inboxPage.clickOnMenu("Пользователь"); + assertEquals("Основной-Тестовый Пользователь", inboxPage.getUserFIO()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkTransitionsBetweenForms(Browser browser) { + LoginPage loginPage = openApp(browser); + assertTrue(loginPage.pageLoadSuccessfully()); + + //check transition to registration page: + loginPage.registrationLinkClick(); + RegistrationPage registrationPage = initElements(driver, RegistrationPage.class); + assertTrue(registrationPage.pageLoadSuccessfully()); + assertTrue(registrationPage.isHeaderVisible()); + + //check phone mask: + assertEquals("+7 ", registrationPage.getMaskForPhone()); + registrationPage.selectCountry("Albania"); + assertEquals("+355 ", registrationPage.getMaskForPhone()); + + //check password view: + assertTrue(registrationPage.isPasswordDisplayedAsSymbols()); + registrationPage.passwordEyeButtonClick(); + assertTrue(registrationPage.isPasswordDisplayedAsText()); + + //check transition to login page from registration page: + registrationPage.loginLinkClick(); + assertTrue(loginPage.pageLoadSuccessfully()); + assertTrue(loginPage.isHeaderVisible()); + + //check transition to password recovery page: + loginPage.resetPasswordLinkClick(); + ResetPasswordPage resetPasswordPage = initElements(driver, ResetPasswordPage.class); + assertTrue(resetPasswordPage.pageLoadSuccessfully()); + assertTrue(resetPasswordPage.isHeaderVisible()); + + //check transition to login page from password recovery page: + resetPasswordPage.loginLinkClick(); + assertTrue(loginPage.pageLoadSuccessfully()); + assertTrue(loginPage.isHeaderVisible()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkRegistration(Browser browser) { + LoginPage loginPage = openApp(browser); + assertTrue(loginPage.pageLoadSuccessfully()); + + loginPage.registrationLinkClick(); + RegistrationPage registrationPage = initElements(driver, RegistrationPage.class); + assertTrue(registrationPage.pageLoadSuccessfully()); + + String logPas = generateName(PART_FOR_NAME); + registrationPage.editUsername(logPas); + registrationPage.editEmail("qa_test@micord.ru"); + registrationPage.editPhone("+79999999999"); + registrationPage.editPassword(logPas); + registrationPage.registerButtonClick(); + registrationPage.waitForPageToLoad(); + assertEquals("Пользователь с данным почтовым адресом уже существует", + registrationPage.getRegistrationErrorText()); + + registrationPage.editEmail(REG_EMAIL); + registrationPage.registerButtonClick(); + assertTrue(registrationPage.pageLoadSuccessfully()); + + String id = EXECUTION_MANAGER.getUserAccountIdByLogin(logPas); + String token = EXECUTION_MANAGER.getTokenByUserAccountId(id); + String link = applicationUrl + "#confirm?link=" + token; + driver.get(link); + + registrationPage.loginLinkClick(); + assertTrue(loginPage.pageLoadSuccessfully()); + + loginPage.typeLoginPasswordAndEnter(logPas, logPas); + InboxPage inboxPage = initElements(driver, InboxPage.class); + assertTrue(inboxPage.pageLoadSuccessfully()); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkPasswordRecovery(Browser browser) { + LoginPage loginPage = openApp(browser); + assertTrue(loginPage.pageLoadSuccessfully()); + + String logPas = generateName(PART_FOR_NAME); + EXECUTION_MANAGER.insertUser(logPas, RESET_EMAIL, logPas); + //здесь создаем пользователя с незакодированным паролем, тк нам не нужно будет по нему логиниться + + loginPage.resetPasswordLinkClick(); + ResetPasswordPage resetPasswordPage = initElements(driver, ResetPasswordPage.class); + assertTrue(resetPasswordPage.pageLoadSuccessfully()); + + resetPasswordPage.editEmail(RESET_EMAIL); + resetPasswordPage.resetButtonClick(); + assertTrue(resetPasswordPage.pageLoadSuccessfully()); + + String id = EXECUTION_MANAGER.getUserAccountIdByLogin(logPas); + String token = EXECUTION_MANAGER.getTokenByUserAccountId(id); + String link = applicationUrl + "#new-password?token=" + token; + driver.get(link); + + String newPass = generateName("NewPass"); + resetPasswordPage.editPassword(newPass); + resetPasswordPage.editConfirmPassword(newPass); + resetPasswordPage.changeButtonClick(); + assertTrue(resetPasswordPage.pageLoadSuccessfully()); + + resetPasswordPage.loginLinkClick(); + loginPage.typeLoginPasswordAndEnter(RESET_EMAIL, newPass); + InboxPage inboxPage = initElements(driver, InboxPage.class); + assertTrue(inboxPage.pageLoadSuccessfully()); + } +} \ No newline at end of file diff --git a/test/src/test/java/tests/OrganizationsIT.java b/test/src/test/java/tests/OrganizationsIT.java new file mode 100644 index 00000000..14536871 --- /dev/null +++ b/test/src/test/java/tests/OrganizationsIT.java @@ -0,0 +1,122 @@ +package tests; + +import core.BaseTest; +import core.Browser; +import core.BrowserArgumentProvider; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import pages.InboxPage; +import pages.OrganizationsPage; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.openqa.selenium.support.PageFactory.initElements; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * @author kote + */ +public class OrganizationsIT extends BaseTest { + + private static final String CREATE = "Создать"; + private static final String EDIT = "Редактировать"; + private static final String SAVE = "Сохранить"; + private static final String PARENT_ORG_NAME = "Управление ЗАГС г. Казани"; + private static final String SUBSIDIARY_ORG_NAME = "ЗАГС Советского р-на"; + private static final String PART_FOR_CODE = "org_code_"; + + public OrganizationsIT() { + super(); + } + + @AfterAll + public static void afterAll() { + EXECUTION_MANAGER.deleteOrganizationByName(PARENT_ORG_NAME); + EXECUTION_MANAGER.deleteOrganizationByName(SUBSIDIARY_ORG_NAME); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void crudOrganizationAndSubsidiary(Browser browser) { + InboxPage inboxPage = loginInAppByAdmin(browser); + assertTrue(inboxPage.pageLoadSuccessfully()); + + inboxPage.clickOnMenu("Администрирование"); + inboxPage.clickOnSubMenu("Организации"); + OrganizationsPage organizationsPage = initElements(driver, OrganizationsPage.class); + assertTrue(organizationsPage.pageLoadSuccessfully()); + assertTrue(organizationsPage.isTitleVisible("Администрирование организаций")); + + //check create organization: + organizationsPage.clickOnButton(CREATE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + organizationsPage.editOrgName(PARENT_ORG_NAME); + String parentOrgCode = generateName(PART_FOR_CODE); + organizationsPage.editOrgCode(parentOrgCode); + organizationsPage.clickOnButton(SAVE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + assertTrue(organizationsPage.isOrganizationVisible(PARENT_ORG_NAME, parentOrgCode)); + + //check create subsidiary: + organizationsPage.clickOnButton(CREATE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + organizationsPage.editOrgName(SUBSIDIARY_ORG_NAME); + String subsidiaryOrgCode = generateName(PART_FOR_CODE); + organizationsPage.editOrgCode(subsidiaryOrgCode); + organizationsPage.selectParentOrg(PARENT_ORG_NAME); + organizationsPage.clickOnButton(SAVE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + organizationsPage.clickOnArrowInParentOrganization(PARENT_ORG_NAME, parentOrgCode); + assertTrue(organizationsPage.isOrganizationVisible(SUBSIDIARY_ORG_NAME, subsidiaryOrgCode)); + + //check that a subsidiary cannot be the same as an organization: + organizationsPage.clickOnOrganization(SUBSIDIARY_ORG_NAME, subsidiaryOrgCode); + organizationsPage.clickOnButton(EDIT); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + organizationsPage.selectParentOrg(SUBSIDIARY_ORG_NAME); + organizationsPage.clickOnButton(SAVE); + organizationsPage.waitForPageToLoad(); + assertFalse(organizationsPage.thereIsNoError()); + assertTrue(organizationsPage.getErrorText().contains("Обнаружен цикл при попытке сменить родителя")); + + //check edit subsidiary: + organizationsPage.selectParentOrg(PARENT_ORG_NAME); + String newSubsidiaryOrgCode = generateName(PART_FOR_CODE); + organizationsPage.editOrgCode(newSubsidiaryOrgCode); + organizationsPage.clickOnButton(SAVE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + organizationsPage.clickOnArrowInParentOrganization(PARENT_ORG_NAME, parentOrgCode); + assertTrue(organizationsPage.isOrganizationVisible(SUBSIDIARY_ORG_NAME, newSubsidiaryOrgCode)); + assertFalse(organizationsPage.isOrganizationVisible(PARENT_ORG_NAME, subsidiaryOrgCode)); + + //check edit parent organization: + organizationsPage.clickOnOrganization(PARENT_ORG_NAME, parentOrgCode); + organizationsPage.clickOnButton(EDIT); + assertTrue(organizationsPage.pageLoadSuccessfully()); + + String newParentOrgCode = generateName(PART_FOR_CODE); + organizationsPage.editOrgCode(newParentOrgCode); + organizationsPage.clickOnButton(SAVE); + assertTrue(organizationsPage.pageLoadSuccessfully()); + assertTrue(organizationsPage.isOrganizationVisible(PARENT_ORG_NAME, newParentOrgCode)); + assertFalse(organizationsPage.isOrganizationVisible(PARENT_ORG_NAME, parentOrgCode)); + + organizationsPage.clickOnArrowInParentOrganization(PARENT_ORG_NAME, newParentOrgCode); + assertTrue(organizationsPage.isOrganizationVisible(SUBSIDIARY_ORG_NAME, newSubsidiaryOrgCode)); + + //check delete parent organization: + organizationsPage.clickOnOrganization(PARENT_ORG_NAME, newParentOrgCode); + organizationsPage.clickOnButton("Удалить"); + assertTrue(organizationsPage.isDialogOpened("Подтверждение действия")); + + organizationsPage.clickOnButton("Да"); + assertTrue(organizationsPage.pageLoadSuccessfully()); + assertFalse(organizationsPage.isOrganizationVisible(PARENT_ORG_NAME, newParentOrgCode)); + assertFalse(organizationsPage.isOrganizationVisible(SUBSIDIARY_ORG_NAME, newSubsidiaryOrgCode)); + } +} diff --git a/test/src/test/java/tests/ProcessesIT.java b/test/src/test/java/tests/ProcessesIT.java new file mode 100644 index 00000000..c0b5adc8 --- /dev/null +++ b/test/src/test/java/tests/ProcessesIT.java @@ -0,0 +1,104 @@ +package tests; + +import core.BaseTest; +import core.Browser; +import core.BrowserArgumentProvider; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ArgumentsSource; +import pages.InboxPage; +import pages.ProcessesPage; +import pages.TestProcessPage; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.support.PageFactory.initElements; + +/** + * @author kote + */ +public class ProcessesIT extends BaseTest { + + private static final String ADMINISTRATION = "Администрирование"; + private static final String PROCESSES_INSTANCES = "Экземпляры процессов"; + private static final String COMPLETED = "Завершенные"; + private static final String ABORTED = "Прерванные"; + private static final String TEST_PROCESS = "test_process"; + private static final String TEST_PAGE_TITLE = "Тестовая страница"; + + public ProcessesIT() { + super(); + } + + @ParameterizedTest + @ArgumentsSource(BrowserArgumentProvider.class) + public void checkActionsWithProcessesInstances(Browser browser) { + InboxPage inboxPage = loginInAppByAdmin(browser); + assertTrue(inboxPage.pageLoadSuccessfully()); + + //check start process: + inboxPage.startProcess(TEST_PROCESS); + TestProcessPage testProcessPage = initElements(driver, TestProcessPage.class); + assertTrue(testProcessPage.pageLoadSuccessfully()); + assertTrue(testProcessPage.isPageTitleVisible(TEST_PAGE_TITLE)); + + String processId = testProcessPage.getProcessId(); + + //check active processes: + inboxPage.clickOnMenu(ADMINISTRATION); + inboxPage.clickOnSubMenu(PROCESSES_INSTANCES); + ProcessesPage processesPage = initElements(driver, ProcessesPage.class); + assertTrue(processesPage.pageLoadSuccessfully()); + assertTrue(processesPage.isTitleVisible("Процессы")); + assertTrue(processesPage.isTabSelected("Активные")); + assertTrue(processesPage.isProcessVisibleInGrid(processId)); + + //check view process instance: + processesPage.clickOnProcessInGrid(processId); + processesPage.clickOnButton("Просмотреть"); + assertTrue(processesPage.pageLoadSuccessfully()); + assertTrue(processesPage.isTitleVisible("Экземпляр процесса")); + + processesPage.clickOnLink("Текст"); + assertTrue(processesPage.thereIsNoError()); + + processesPage.clickOnLink("Изображение"); + assertTrue(processesPage.thereIsNoError()); + + processesPage.clickOnButton("Закрыть"); + assertTrue(processesPage.pageLoadSuccessfully()); + + //check aborted processes: + processesPage.clickOnProcessInGrid(processId); + processesPage.clickOnButton("Прервать"); + assertTrue(processesPage.isDialogOpened("Подтверждение действия")); + + processesPage.clickOnButton("Да"); + assertTrue(processesPage.pageLoadSuccessfully()); + assertFalse(processesPage.isProcessVisibleInGrid(processId)); + + processesPage.clickOnTab(ABORTED); + assertTrue(processesPage.pageLoadSuccessfully()); + assertTrue(processesPage.isTabSelected(ABORTED)); + assertTrue(processesPage.isProcessVisibleInGrid(processId)); + + //check complete process: + inboxPage.startProcess(TEST_PROCESS); + assertTrue(testProcessPage.pageLoadSuccessfully()); + + String newProcessId = testProcessPage.getProcessId(); + testProcessPage.clickOnButton("Завершить"); + assertTrue(inboxPage.pageLoadSuccessfully()); + assertFalse(testProcessPage.isPageTitleVisible(TEST_PAGE_TITLE)); + + //check completed processes: + inboxPage.clickOnMenu(ADMINISTRATION); + inboxPage.clickOnSubMenu(PROCESSES_INSTANCES); + assertTrue(processesPage.pageLoadSuccessfully()); + assertFalse(processesPage.isProcessVisibleInGrid(newProcessId)); + + processesPage.clickOnTab(COMPLETED); + assertTrue(processesPage.pageLoadSuccessfully()); + assertTrue(processesPage.isTabSelected(COMPLETED)); + assertTrue(processesPage.isProcessVisibleInGrid(newProcessId)); + } +} \ No newline at end of file diff --git a/test/src/test/resources/junit-platform.properties b/test/src/test/resources/junit-platform.properties new file mode 100644 index 00000000..ecd09831 --- /dev/null +++ b/test/src/test/resources/junit-platform.properties @@ -0,0 +1,29 @@ +# параметр включения/выключения параллельного выполнения тестов. +junit.jupiter.execution.parallel.enabled = true +# протестирована стратегия параллельности fixed и dynamic (оба режима на параллельность запуска тестов не повлияли). +junit.jupiter.execution.parallel.config.strategy = dynamic +# параметр желаемого параллелизма (проверено с разными значениями (1-10), на параллельность запуска тестов не повлияло). +# junit.jupiter.execution.parallel.config.dynamic.factor = 1.0 +# параметр максимального размера пула (проверено с разными значениями (1-10), на параллельность запуска тестов не повлияло). +junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor = 6.0 +# параллель внутри класса (настроено последовательно, т.к. параллельно создаётся очередь и падает ошибка Failed to create driver). +junit.jupiter.execution.parallel.mode.default = concurrent +# параллель внутри сьюта +#junit.jupiter.execution.parallel.mode.classes.default = concurrent + +# возможные стратегии параллельности dynamic, fixed и custom: +# dynamic - вычисляет желаемый параллелизм на основе количества доступных процессоров / ядер, умноженного на коэф-т dynamic.factor. Настраиваемые значения: +# junit.jupiter.execution.parallel.config.dynamic.factor параметр конфигурации (по умолчанию имеет значение 1) - положительное десятичное число +# junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor параметр конфигурации можно использовать для ограничения максимального количества потоков +# (по умолчанию 256 + значение junit.jupiter.execution.parallel.config.dynamic.factor, умноженное на количество доступных процессоров / ядер) - положительное десятичное число, должно быть больше или равно 1.0 +# fixed - устанавливает закрепленное значение параллелизма с помощью коэф-тов: +# junit.jupiter.execution.parallel.config.fixed.parallelism желаемый параллелизм для fixed стратегии (нет значения по умолчанию) - положительное целое число +# junit.jupiter.execution.parallel.config.fixed.max-pool-size желаемый максимальный размер пула (256 + значение junit.jupiter.execution.parallel.config.fixed.parallelism) - положительное целое число, +# должно быть больше или равно junit.jupiter.execution.parallel.config.fixed.parallelism +# custom - пользовательская реализацию с помощью обязательного junit.jupiter.execution.parallel.config.custom.class. +# Пример класса кастомной настройки: https://github.com/sormuras/junit5-1858-fixed-parallelism/commit/1fb2646711c6d59ad68241822e1a609db417c938#diff-d74841653c5af688ce3524c83cc4cf62bad536c64493e888c208ee2a750b6b88 +# +# параметр junit.jupiter.execution.parallel.mode.default настраивает параллельность внутри класса (тесты) +# параметр junit.jupiter.execution.parallel.mode.classes.default настраивает параллельность внутри сьюта (IT классы) +# concurrent - паралльный запуск +# same_thread - последовательный запуск diff --git a/test/src/test/resources/logback.xml b/test/src/test/resources/logback.xml new file mode 100644 index 00000000..78b6e3ab --- /dev/null +++ b/test/src/test/resources/logback.xml @@ -0,0 +1,18 @@ + + + + + [%-4level] %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/src/test/resources/test.properties b/test/src/test/resources/test.properties new file mode 100644 index 00000000..2625ecce --- /dev/null +++ b/test/src/test/resources/test.properties @@ -0,0 +1,15 @@ +login = qa_test +password = qa_test + +demo_login = demo@example.com +demo_password = demo + +qa_admin_login = qa_admin +qa_admin_password = qa_admin + +tt_kerberos_url = http://desktop-k0nottv.asd.center.cg:8082/task-tracker + +security_ldap_sync_db_url = jdbc:postgresql://185.171.13.99:5432/sec_db_task_tracker_ldap_sync +security_ldap_sync_db_user = sec_user_tt +security_ldap_sync_db_password = sec_user_tt +database_driver = org.postgresql.Driver