From 7a7a0d507096305036fd8a74be79f552bc838e14 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Thu, 21 Nov 2024 13:57:16 +0300 Subject: [PATCH] SUPPORT-8737 rename sources --- backend/pom.xml | 8 +- .../EnumColumnFormatter.java | 14 +- .../PasswordField.java | 2 +- .../db_beans/DefaultCatalog.java | 0 .../db_beans/public_/Keys.java | 0 .../db_beans/public_/Public.java | 0 .../db_beans/public_/Routines.java | 0 .../db_beans/public_/Sequences.java | 0 .../db_beans/public_/Tables.java | 0 .../public_/routines/UuidGenerateV1.java | 0 .../public_/routines/UuidGenerateV1mc.java | 0 .../public_/routines/UuidGenerateV3.java | 0 .../public_/routines/UuidGenerateV4.java | 0 .../public_/routines/UuidGenerateV5.java | 0 .../db_beans/public_/routines/UuidNil.java | 0 .../db_beans/public_/routines/UuidNsDns.java | 0 .../db_beans/public_/routines/UuidNsOid.java | 0 .../db_beans/public_/routines/UuidNsUrl.java | 0 .../db_beans/public_/routines/UuidNsX500.java | 0 .../db_beans/public_/tables/JobPosition.java | 0 .../tables/LinkUserApplicationUserGroup.java | 0 .../db_beans/public_/tables/Recruitment.java | 0 .../tables/UserApplicationDocument.java | 0 .../public_/tables/UserApplicationList.java | 0 .../tables/records/JobPositionRecord.java | 0 .../LinkUserApplicationUserGroupRecord.java | 0 .../tables/records/RecruitmentRecord.java | 0 .../UserApplicationDocumentRecord.java | 0 .../records/UserApplicationListRecord.java | 0 .../db_beans/security/Keys.java | 0 .../db_beans/security/Security.java | 0 .../db_beans/security/Tables.java | 0 .../db_beans/security/tables/AccessLevel.java | 0 .../db_beans/security/tables/Authority.java | 0 .../security/tables/Databasechangelog.java | 0 .../tables/Databasechangeloglock.java | 0 .../db_beans/security/tables/EsiaUser.java | 0 .../tables/LinkUserAccountUserGroup.java | 0 .../tables/LinkUserGroupUserRole.java | 0 .../tables/LinkUserRoleAuthority.java | 0 .../db_beans/security/tables/OrgUnit.java | 0 .../tables/OrgUnitAdditionalInfo.java | 0 .../security/tables/SimpleCredentials.java | 0 .../db_beans/security/tables/UserAccount.java | 0 .../tables/UserAccountAdditionInfo.java | 0 .../tables/UserAccountRefreshToken.java | 0 .../tables/UserAccountVerification.java | 0 .../db_beans/security/tables/UserGroup.java | 0 .../db_beans/security/tables/UserRole.java | 0 .../tables/records/AccessLevelRecord.java | 0 .../tables/records/AuthorityRecord.java | 0 .../records/DatabasechangelogRecord.java | 0 .../records/DatabasechangeloglockRecord.java | 0 .../tables/records/EsiaUserRecord.java | 0 .../LinkUserAccountUserGroupRecord.java | 0 .../records/LinkUserGroupUserRoleRecord.java | 0 .../records/LinkUserRoleAuthorityRecord.java | 0 .../records/OrgUnitAdditionalInfoRecord.java | 0 .../tables/records/OrgUnitRecord.java | 0 .../records/SimpleCredentialsRecord.java | 0 .../UserAccountAdditionInfoRecord.java | 0 .../tables/records/UserAccountRecord.java | 0 .../UserAccountRefreshTokenRecord.java | 0 .../UserAccountVerificationRecord.java | 0 .../tables/records/UserGroupRecord.java | 0 .../tables/records/UserRoleRecord.java | 0 .../service/UserAuthorityFormService.java | 2 +- config/Dockerfile | 2 +- config/db.env | 6 +- config/dev/standalone.xml | 2 +- config/initdb.d/01_createdb.sql | 4 +- ...tority.sql => 02_account_applications.sql} | 5 +- config/micord.env | 4 +- distribution/pom.xml | 14 +- frontend/index.html | 4 +- frontend/index.webpack.html | 4 +- frontend/package-lock.json | 994 +++++++++--------- frontend/package.json | 2 +- frontend/pom.xml | 6 +- frontend/preview.html | 2 +- frontend/src/resources/app-config.json | 2 +- .../src/resources/css/components-autority.css | 110 +- frontend/src/resources/css/inbox-autority.css | 74 +- .../component/container/VBoxLoadValues.html | 0 .../component/container/VBoxLoadValues.ts | 2 +- .../scripts/SetCurrentUserIdAsDefValue.ts | 0 frontend/src/ts/modules/app/app.module.ts | 2 +- pom.xml | 13 +- resources/pom.xml | 6 +- .../business-model/user_accounts.jrxml | 10 +- .../Обработка заявки на добавление пользователя.page | 2 +- .../Создание заявки на добавление пользователя.page | 4 +- .../Создать заявку на блокировку.page | 4 +- .../Создать заявку на изменение.page | 4 +- .../Список заявок.page | 14 +- .../main/resources/database/datasource.xml | 6 +- test/pom.xml | 197 ---- test/src/test/java/SuiteAdmin.java | 30 - test/src/test/java/pages/AuthoritiesPage.java | 51 - test/src/test/java/pages/GroupsPage.java | 112 -- .../test/java/pages/OrganizationsPage.java | 55 - test/src/test/java/pages/ProcessesPage.java | 41 - .../src/test/java/pages/RegistrationPage.java | 96 -- .../test/java/pages/ResetPasswordPage.java | 58 - test/src/test/java/pages/RolesPage.java | 76 -- test/src/test/java/pages/TestProcessPage.java | 28 - test/src/test/java/pages/UsersPage.java | 128 --- test/src/test/java/tests/AuthoritiesIT.java | 116 -- test/src/test/java/tests/GroupsIT.java | 213 ---- test/src/test/java/tests/LoginIT.java | 163 --- test/src/test/java/tests/OrganizationsIT.java | 118 --- test/src/test/java/tests/ProcessesIT.java | 100 -- test/src/test/java/tests/RolesIT.java | 137 --- test/src/test/java/tests/TokensIT.java | 114 -- test/src/test/java/tests/UsersIT.java | 240 ----- .../test/resources/junit-platform.properties | 29 - test/src/test/resources/logback.xml | 18 - test/src/test/resources/test.properties | 15 - 118 files changed, 650 insertions(+), 2813 deletions(-) rename backend/src/main/java/{ervu_usr_autority => ru/micord/ervu/account_applications}/EnumColumnFormatter.java (72%) rename backend/src/main/java/ru/micord/ervu/{user_authority => account_applications}/PasswordField.java (90%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/DefaultCatalog.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/Keys.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/Public.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/Routines.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/Sequences.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/Tables.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidGenerateV1.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidGenerateV1mc.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidGenerateV3.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidGenerateV4.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidGenerateV5.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidNil.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidNsDns.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidNsOid.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidNsUrl.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/routines/UuidNsX500.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/JobPosition.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/LinkUserApplicationUserGroup.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/Recruitment.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/UserApplicationDocument.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/UserApplicationList.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/records/JobPositionRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/records/LinkUserApplicationUserGroupRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/records/RecruitmentRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/records/UserApplicationDocumentRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/public_/tables/records/UserApplicationListRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/Keys.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/Security.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/Tables.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/AccessLevel.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/Authority.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/Databasechangelog.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/Databasechangeloglock.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/EsiaUser.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/LinkUserAccountUserGroup.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/LinkUserGroupUserRole.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/LinkUserRoleAuthority.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/OrgUnit.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/OrgUnitAdditionalInfo.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/SimpleCredentials.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserAccount.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserAccountAdditionInfo.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserAccountRefreshToken.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserAccountVerification.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserGroup.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/UserRole.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/AccessLevelRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/AuthorityRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/DatabasechangelogRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/DatabasechangeloglockRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/EsiaUserRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/LinkUserAccountUserGroupRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/LinkUserGroupUserRoleRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/LinkUserRoleAuthorityRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/OrgUnitAdditionalInfoRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/OrgUnitRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/SimpleCredentialsRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserAccountRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserAccountRefreshTokenRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserAccountVerificationRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserGroupRecord.java (100%) rename backend/src/main/java/{ervu_usr_autority/ervu_usr_autority => ru/micord/ervu/account_applications}/db_beans/security/tables/records/UserRoleRecord.java (100%) rename backend/src/main/java/ru/micord/ervu/{user_authority => account_applications}/service/UserAuthorityFormService.java (96%) rename config/initdb.d/{02_ervu_usr_autority.sql => 02_account_applications.sql} (99%) rename frontend/src/resources/template/{ervu-usr-autority => account_applications}/component/container/VBoxLoadValues.html (100%) rename frontend/src/ts/{ervu-usr-autority => account_applications}/component/container/VBoxLoadValues.ts (86%) rename frontend/src/ts/{ervu-usr-autority => account_applications}/scripts/SetCurrentUserIdAsDefValue.ts (100%) delete mode 100644 test/pom.xml delete mode 100644 test/src/test/java/SuiteAdmin.java delete mode 100644 test/src/test/java/pages/AuthoritiesPage.java delete mode 100644 test/src/test/java/pages/GroupsPage.java delete mode 100644 test/src/test/java/pages/OrganizationsPage.java delete mode 100644 test/src/test/java/pages/ProcessesPage.java delete mode 100644 test/src/test/java/pages/RegistrationPage.java delete mode 100644 test/src/test/java/pages/ResetPasswordPage.java delete mode 100644 test/src/test/java/pages/RolesPage.java delete mode 100644 test/src/test/java/pages/TestProcessPage.java delete mode 100644 test/src/test/java/pages/UsersPage.java delete mode 100644 test/src/test/java/tests/AuthoritiesIT.java delete mode 100644 test/src/test/java/tests/GroupsIT.java delete mode 100644 test/src/test/java/tests/LoginIT.java delete mode 100644 test/src/test/java/tests/OrganizationsIT.java delete mode 100644 test/src/test/java/tests/ProcessesIT.java delete mode 100644 test/src/test/java/tests/RolesIT.java delete mode 100644 test/src/test/java/tests/TokensIT.java delete mode 100644 test/src/test/java/tests/UsersIT.java delete mode 100644 test/src/test/resources/junit-platform.properties delete mode 100644 test/src/test/resources/logback.xml delete mode 100644 test/src/test/resources/test.properties diff --git a/backend/pom.xml b/backend/pom.xml index 0924e54f..c3edc36b 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ervu_usr_autority - ervu_usr_autority + ru.micord.ervu + account-applications 1.0.0-SNAPSHOT - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications backend war @@ -25,7 +25,7 @@ runtime - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications resources runtime diff --git a/backend/src/main/java/ervu_usr_autority/EnumColumnFormatter.java b/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java similarity index 72% rename from backend/src/main/java/ervu_usr_autority/EnumColumnFormatter.java rename to backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java index 0a5d732f..e8971601 100644 --- a/backend/src/main/java/ervu_usr_autority/EnumColumnFormatter.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java @@ -1,4 +1,4 @@ -package ervu_usr_autority; +package ru.micord.ervu.account_applications; import java.util.HashMap; import java.util.Map; @@ -14,20 +14,20 @@ public class EnumColumnFormatter implements Formatter { static { strObjectToStringMapping.put("CREATED", "Новая"); - strObjectToStringMapping.put("AGREED", "Согласована"); + strObjectToStringMapping.put("AGREED", "Согласована"); strObjectToStringMapping.put("ACCEPTED", "Выполнена"); - strObjectToStringMapping.put("UNLOADED", "Выгружена"); - strObjectToStringMapping.put("IN_PROGRESS", "В работе"); - strObjectToStringMapping.put("LOGIN_PASSWORD_ISSUED", "Выдан логин и пароль"); + strObjectToStringMapping.put("UNLOADED", "Выгружена"); + strObjectToStringMapping.put("IN_PROGRESS", "В работе"); + strObjectToStringMapping.put("LOGIN_PASSWORD_ISSUED", "Выдан логин и пароль"); strObjectToStringMapping.put("CANCEL_BY_CREATOR", "Отклонена"); strObjectToStringMapping.put("CANCEL_BY_PROCESSOR", "Отклонена"); - strObjectToStringMapping.put("CANCEL_BY_AGREEER", "Отклонена"); + strObjectToStringMapping.put("CANCEL_BY_AGREEER", "Отклонена"); strObjectToStringMapping.put("CREATE_USER", "Создание пользователя"); strObjectToStringMapping.put("EDIT_USER", "Изменение пользователя"); strObjectToStringMapping.put("BLOCK_USER", "Блокировка пользователя"); strObjectToStringMapping.put("MALE", "Мужской"); strObjectToStringMapping.put("FEMALE", "Женский"); - + } @Override diff --git a/backend/src/main/java/ru/micord/ervu/user_authority/PasswordField.java b/backend/src/main/java/ru/micord/ervu/account_applications/PasswordField.java similarity index 90% rename from backend/src/main/java/ru/micord/ervu/user_authority/PasswordField.java rename to backend/src/main/java/ru/micord/ervu/account_applications/PasswordField.java index fa307f9b..9c5a7be3 100644 --- a/backend/src/main/java/ru/micord/ervu/user_authority/PasswordField.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/PasswordField.java @@ -1,4 +1,4 @@ -package ru.micord.ervu.user_authority; +package ru.micord.ervu.account_applications; import component.field.persist.TextField; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/DefaultCatalog.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/DefaultCatalog.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/DefaultCatalog.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/DefaultCatalog.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Keys.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Keys.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Public.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Public.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Routines.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Routines.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Routines.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Routines.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Sequences.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Sequences.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Sequences.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Sequences.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Tables.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/Tables.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV1.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV1.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV1.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV1.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV1mc.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV1mc.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV1mc.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV1mc.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV3.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV3.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV3.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV3.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV4.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV4.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV4.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV4.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV5.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV5.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidGenerateV5.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidGenerateV5.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNil.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNil.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNil.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNil.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsDns.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsDns.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsDns.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsDns.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsOid.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsOid.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsOid.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsOid.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsUrl.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsUrl.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsUrl.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsUrl.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsX500.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsX500.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/routines/UuidNsX500.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/routines/UuidNsX500.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/JobPosition.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/JobPosition.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/JobPosition.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/JobPosition.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/LinkUserApplicationUserGroup.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/LinkUserApplicationUserGroup.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/LinkUserApplicationUserGroup.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/LinkUserApplicationUserGroup.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/Recruitment.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Recruitment.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/Recruitment.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Recruitment.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/UserApplicationDocument.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationDocument.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/UserApplicationDocument.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationDocument.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/UserApplicationList.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationList.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/UserApplicationList.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationList.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/JobPositionRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/JobPositionRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/JobPositionRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/JobPositionRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/LinkUserApplicationUserGroupRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/LinkUserApplicationUserGroupRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/LinkUserApplicationUserGroupRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/LinkUserApplicationUserGroupRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/RecruitmentRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/RecruitmentRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/RecruitmentRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/RecruitmentRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/UserApplicationDocumentRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationDocumentRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/UserApplicationDocumentRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationDocumentRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/UserApplicationListRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationListRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/public_/tables/records/UserApplicationListRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationListRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Keys.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Keys.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Keys.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Keys.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Security.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Security.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Security.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Security.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Tables.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Tables.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/Tables.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Tables.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/AccessLevel.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/AccessLevel.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/AccessLevel.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/AccessLevel.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Authority.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Authority.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Authority.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Authority.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Databasechangelog.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Databasechangelog.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Databasechangelog.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Databasechangelog.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Databasechangeloglock.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Databasechangeloglock.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/Databasechangeloglock.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/Databasechangeloglock.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/EsiaUser.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/EsiaUser.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/EsiaUser.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/EsiaUser.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserAccountUserGroup.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserAccountUserGroup.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserAccountUserGroup.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserAccountUserGroup.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserGroupUserRole.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserGroupUserRole.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserGroupUserRole.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserGroupUserRole.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserRoleAuthority.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserRoleAuthority.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/LinkUserRoleAuthority.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserRoleAuthority.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/OrgUnit.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/OrgUnit.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/OrgUnit.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/OrgUnit.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/OrgUnitAdditionalInfo.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/OrgUnitAdditionalInfo.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/OrgUnitAdditionalInfo.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/OrgUnitAdditionalInfo.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/SimpleCredentials.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/SimpleCredentials.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/SimpleCredentials.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/SimpleCredentials.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccount.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccount.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccount.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccount.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountAdditionInfo.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountAdditionInfo.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountAdditionInfo.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountAdditionInfo.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountRefreshToken.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountRefreshToken.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountRefreshToken.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountRefreshToken.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountVerification.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountVerification.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserAccountVerification.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountVerification.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserGroup.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserGroup.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserGroup.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserGroup.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserRole.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserRole.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/UserRole.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserRole.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/AccessLevelRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/AccessLevelRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/AccessLevelRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/AccessLevelRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/AuthorityRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/AuthorityRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/AuthorityRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/AuthorityRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/DatabasechangelogRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/DatabasechangelogRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/DatabasechangelogRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/DatabasechangelogRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/DatabasechangeloglockRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/DatabasechangeloglockRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/DatabasechangeloglockRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/DatabasechangeloglockRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/EsiaUserRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/EsiaUserRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/EsiaUserRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/EsiaUserRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserAccountUserGroupRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserAccountUserGroupRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserAccountUserGroupRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserAccountUserGroupRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserGroupUserRoleRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserGroupUserRoleRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserGroupUserRoleRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserGroupUserRoleRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserRoleAuthorityRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserRoleAuthorityRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/LinkUserRoleAuthorityRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/LinkUserRoleAuthorityRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/OrgUnitAdditionalInfoRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/OrgUnitAdditionalInfoRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/OrgUnitAdditionalInfoRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/OrgUnitAdditionalInfoRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/OrgUnitRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/OrgUnitRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/OrgUnitRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/OrgUnitRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/SimpleCredentialsRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/SimpleCredentialsRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/SimpleCredentialsRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/SimpleCredentialsRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountRefreshTokenRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountRefreshTokenRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountRefreshTokenRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountRefreshTokenRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountVerificationRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountVerificationRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserAccountVerificationRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountVerificationRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserGroupRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserGroupRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserGroupRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserGroupRecord.java diff --git a/backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserRoleRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserRoleRecord.java similarity index 100% rename from backend/src/main/java/ervu_usr_autority/ervu_usr_autority/db_beans/security/tables/records/UserRoleRecord.java rename to backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserRoleRecord.java diff --git a/backend/src/main/java/ru/micord/ervu/user_authority/service/UserAuthorityFormService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/UserAuthorityFormService.java similarity index 96% rename from backend/src/main/java/ru/micord/ervu/user_authority/service/UserAuthorityFormService.java rename to backend/src/main/java/ru/micord/ervu/account_applications/service/UserAuthorityFormService.java index 393e6fdc..bf1dfc12 100644 --- a/backend/src/main/java/ru/micord/ervu/user_authority/service/UserAuthorityFormService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/UserAuthorityFormService.java @@ -1,4 +1,4 @@ -package ru.micord.ervu.user_authority.service; +package ru.micord.ervu.account_applications.service; import model.BpmnVariableForSave; import model.FieldData; diff --git a/config/Dockerfile b/config/Dockerfile index 142795b5..77c12bbc 100644 --- a/config/Dockerfile +++ b/config/Dockerfile @@ -39,4 +39,4 @@ RUN chmod -R +x 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/ervu_usr_autority/version || exit 1 +HEALTHCHECK --timeout=3s --start-period=3600s CMD curl --fail 127.0.0.1:8080/account_applications/version || exit 1 diff --git a/config/db.env b/config/db.env index adfbc1d2..f86d56c4 100644 --- a/config/db.env +++ b/config/db.env @@ -3,18 +3,18 @@ DB_APP_USERNAME=ervu DB_APP_PASSWORD=ervu_password DB_APP_HOST=db DB_APP_PORT=5432 -DB_APP_NAME=ervu_usr_autority +DB_APP_NAME=account_applications # Security datasource DB_SEC_USERNAME=ervu DB_SEC_PASSWORD=ervu_password DB_SEC_HOST=db DB_SEC_PORT=5432 -DB_SEC_NAME=ervu_usr_autority +DB_SEC_NAME=account_applications # jBPM datasorce DB_JBPM_USERNAME=ervu_jbpm DB_JBPM_PASSWORD=ervu_jbpm_password DB_JBPM_HOST=db DB_JBPM_PORT=5432 -DB_JBPM_NAME=ervu_usr_autority_jbpm +DB_JBPM_NAME=account_applications_jbpm diff --git a/config/dev/standalone.xml b/config/dev/standalone.xml index 20a30f60..6e0d6fdd 100644 --- a/config/dev/standalone.xml +++ b/config/dev/standalone.xml @@ -161,7 +161,7 @@ - jdbc:postgresql://10.10.31.118:5432/ervu_usr_autority + jdbc:postgresql://10.10.31.118:5432/account_applications postgres ervu diff --git a/config/initdb.d/01_createdb.sql b/config/initdb.d/01_createdb.sql index 3d637d6b..97594b21 100644 --- a/config/initdb.d/01_createdb.sql +++ b/config/initdb.d/01_createdb.sql @@ -17,10 +17,10 @@ CREATE ROLE "ervu_jbpm" WITH PASSWORD 'ervu_jbpm_password'; -CREATE DATABASE "ervu_usr_autority" +CREATE DATABASE "account_applications" WITH OWNER = "ervu"; -CREATE DATABASE "ervu_usr_autority_jbpm" +CREATE DATABASE "account_applications" WITH OWNER = "ervu_jbpm"; diff --git a/config/initdb.d/02_ervu_usr_autority.sql b/config/initdb.d/02_account_applications.sql similarity index 99% rename from config/initdb.d/02_ervu_usr_autority.sql rename to config/initdb.d/02_account_applications.sql index b07b9d7a..210dedee 100644 --- a/config/initdb.d/02_ervu_usr_autority.sql +++ b/config/initdb.d/02_account_applications.sql @@ -1,4 +1,4 @@ -\c "ervu_usr_autority"; +\c "account_applications"; -- -- PostgreSQL database dump @@ -35,7 +35,7 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA public; -- --- Name: EXTENSION "uuid-ossp"; Type: COMMENT; Schema: -; Owner: +-- Name: EXTENSION "uuid-ossp"; Type: COMMENT; Schema: -; Owner: -- COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; @@ -2023,4 +2023,3 @@ ALTER TABLE ONLY security.user_account -- -- PostgreSQL database dump complete -- - diff --git a/config/micord.env b/config/micord.env index 4ce9aceb..039b2acb 100644 --- a/config/micord.env +++ b/config/micord.env @@ -3,11 +3,11 @@ DB_APP_USERNAME=ervu DB_APP_PASSWORD=ervu DB_APP_HOST=10.10.31.118 DB_APP_PORT=5432 -DB_APP_NAME=ervu_usr_autority +DB_APP_NAME=account_applications # Security datasource DB_SEC_USERNAME=ervu DB_SEC_PASSWORD=ervu DB_SEC_HOST=10.10.31.118 DB_SEC_PORT=5432 -DB_SEC_NAME=ervu_usr_autority +DB_SEC_NAME=account_applications diff --git a/distribution/pom.xml b/distribution/pom.xml index a05df2b2..154d9d97 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - ervu_usr_autority - ervu_usr_autority + ru.micord.ervu + account-applications 1.0.0-SNAPSHOT - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications distribution ear @@ -17,12 +17,12 @@ - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications backend war - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications frontend war @@ -37,13 +37,13 @@ - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications frontend / frontend.war - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications backend ${backendContext} ${project.parent.artifactId}.war diff --git a/frontend/index.html b/frontend/index.html index f84e4067..1af251c7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,7 +1,7 @@ - ervu_usr_autority + account_applications @@ -17,7 +17,7 @@ }); - +
diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index 23b9a406..8478bd04 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -1,11 +1,11 @@ - ervu_usr_autority + account_applications - +
diff --git a/frontend/package-lock.json b/frontend/package-lock.json index be331c9b..dce06f05 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ervu_usr_autority", + "name": "account-applications", "version": "1.0.0", "lockfileVersion": 1, "requires": true, @@ -268,19 +268,20 @@ } }, "@babel/code-frame": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/code-frame/-/code-frame-7.25.7.tgz", - "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "version": "7.26.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "requires": { - "@babel/highlight": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" } }, "@babel/compat-data": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/compat-data/-/compat-data-7.25.7.tgz", - "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==", + "version": "7.26.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", "dev": true }, "@babel/core": { @@ -336,44 +337,45 @@ } }, "@babel/generator": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/generator/-/generator-7.25.7.tgz", - "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "version": "7.26.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "dev": true, "requires": { - "@babel/types": "^7.25.7", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" } }, "@babel/helper-annotate-as-pure": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", - "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "requires": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.25.9" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz", - "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", + "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", "dev": true, "requires": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-compilation-targets": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", - "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.25.7", - "@babel/helper-validator-option": "^7.25.7", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -388,17 +390,17 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz", - "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.25.7", - "@babel/helper-member-expression-to-functions": "^7.25.7", - "@babel/helper-optimise-call-expression": "^7.25.7", - "@babel/helper-replace-supers": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", - "@babel/traverse": "^7.25.7", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", "semver": "^6.3.1" }, "dependencies": { @@ -411,12 +413,12 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz", - "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", + "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-annotate-as-pure": "^7.25.9", "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, @@ -476,172 +478,159 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz", - "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "requires": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-module-imports": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", - "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "requires": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-module-transforms": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", - "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", + "version": "7.26.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-simple-access": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-optimise-call-expression": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz", - "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "requires": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.25.9" } }, "@babel/helper-plugin-utils": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", - "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "dev": true }, "@babel/helper-remap-async-to-generator": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz", - "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.25.7", - "@babel/helper-wrap-function": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-replace-supers": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz", - "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", + "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.25.7", - "@babel/helper-optimise-call-expression": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-simple-access": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", - "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", + "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", "dev": true, "requires": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz", - "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "requires": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-string-parser": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", - "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", - "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true }, "@babel/helper-validator-option": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", - "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true }, "@babel/helper-wrap-function": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz", - "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "requires": { - "@babel/template": "^7.25.7", - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helpers": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helpers/-/helpers-7.25.7.tgz", - "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", + "version": "7.26.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "dev": true, "requires": { - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7" - } - }, - "@babel/highlight": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/highlight/-/highlight-7.25.7.tgz", - "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.25.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" } }, "@babel/parser": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/parser/-/parser-7.25.7.tgz", - "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", + "version": "7.26.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "dev": true, "requires": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.26.0" } }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz", - "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz", - "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", - "@babel/plugin-transform-optional-chaining": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" } }, "@babel/plugin-proposal-async-generator-functions": { @@ -849,12 +838,12 @@ } }, "@babel/plugin-syntax-import-assertions": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz", - "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==", + "version": "7.26.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz", + "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-syntax-json-strings": { @@ -939,327 +928,326 @@ } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz", - "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz", - "integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-remap-async-to-generator": "^7.25.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz", - "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", + "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz", - "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-classes": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz", - "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.25.7", - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-replace-supers": "^7.25.7", - "@babel/traverse": "^7.25.7", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz", - "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/template": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" } }, "@babel/plugin-transform-destructuring": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz", - "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz", - "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz", - "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz", - "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", + "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-for-of": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz", - "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-function-name": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz", - "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "requires": { - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-transform-literals": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz", - "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz", - "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz", - "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz", - "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", + "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-simple-access": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz", - "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz", - "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz", - "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-new-target": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz", - "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-object-super": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz", - "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-replace-supers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" } }, "@babel/plugin-transform-optional-chaining": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.7.tgz", - "integrity": "sha512-h39agClImgPWg4H8mYVAbD1qP9vClFbEjqoJmt87Zen8pjqK8FTPUwrOXAvqu5soytwxrLMd2fx2KSCp2CHcNg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-parameters": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz", - "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-property-literals": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz", - "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-regenerator": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz", - "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.9", "regenerator-transform": "^0.15.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz", - "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz", - "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-spread": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz", - "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz", - "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-template-literals": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz", - "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", + "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz", - "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", + "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz", - "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz", - "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/preset-env": { @@ -1367,36 +1355,36 @@ } }, "@babel/runtime": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/runtime/-/runtime-7.25.7.tgz", - "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "version": "7.26.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dev": true, "requires": { "regenerator-runtime": "^0.14.0" } }, "@babel/template": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/template/-/template-7.25.7.tgz", - "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "requires": { - "@babel/code-frame": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/traverse": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/traverse/-/traverse-7.25.7.tgz", - "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "version": "7.25.9", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "requires": { - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1419,14 +1407,13 @@ } }, "@babel/types": { - "version": "7.25.7", - "resolved": "https://repo.micord.ru/repository/npm-all/@babel/types/-/types-7.25.7.tgz", - "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", + "version": "7.26.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" } }, "@discoveryjs/json-ext": { @@ -1504,9 +1491,9 @@ "dev": true }, "@scarf/scarf": { - "version": "1.3.0", - "resolved": "https://repo.micord.ru/repository/npm-all/@scarf/scarf/-/scarf-1.3.0.tgz", - "integrity": "sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew==" + "version": "1.4.0", + "resolved": "https://repo.micord.ru/repository/npm-all/@scarf/scarf/-/scarf-1.4.0.tgz", + "integrity": "sha512-xxeapPiUXdZAE3che6f3xogoJPeZgig6omHEy1rIY5WVsB3H2BHNnZH+gHG6x91SCWyQCzWGsuL2Hh3ClO5/qQ==" }, "@schematics/angular": { "version": "7.3.9", @@ -1633,148 +1620,148 @@ "dev": true }, "@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -1784,13 +1771,6 @@ "integrity": "sha512-8pb1hMxjiHrOPCXhWoycSJqb7LT2ldSeWnHJmS8FD53ZRJqErcYj50Nj5Yz2lcoye0OVmhFtSv/YNyRVTQX6yw==", "requires": { "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } } }, "@webpack-cli/configtest": { @@ -1850,9 +1830,9 @@ } }, "acorn": { - "version": "8.12.1", - "resolved": "https://repo.micord.ru/repository/npm-all/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://repo.micord.ru/repository/npm-all/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true }, "acorn-import-assertions": { @@ -1879,9 +1859,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" } } }, @@ -2842,15 +2822,15 @@ } }, "browserslist": { - "version": "4.24.0", - "resolved": "https://repo.micord.ru/repository/npm-all/browserslist/-/browserslist-4.24.0.tgz", - "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", + "version": "4.24.2", + "resolved": "https://repo.micord.ru/repository/npm-all/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001663", - "electron-to-chromium": "^1.5.28", + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "update-browserslist-db": "^1.1.1" } }, "bs-recipes": { @@ -2954,9 +2934,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -2968,9 +2948,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001667", - "resolved": "https://repo.micord.ru/repository/npm-all/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", - "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", + "version": "1.0.30001680", + "resolved": "https://repo.micord.ru/repository/npm-all/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "dev": true }, "canonical-path": { @@ -3285,9 +3265,9 @@ "dev": true }, "cookie": { - "version": "0.4.2", - "resolved": "https://repo.micord.ru/repository/npm-all/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://repo.micord.ru/repository/npm-all/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true }, "copy-concurrently": { @@ -3469,12 +3449,12 @@ "integrity": "sha512-W4Zkayb9VI4zr+s7ReDSgTTaV9KWB4L997i8/mkOV2kY1c7QGNj91k8X0zcr8Tl24oYF6kiBomCDSYO4BvQQdQ==" }, "core-js-compat": { - "version": "3.38.1", - "resolved": "https://repo.micord.ru/repository/npm-all/core-js-compat/-/core-js-compat-3.38.1.tgz", - "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", + "version": "3.39.0", + "resolved": "https://repo.micord.ru/repository/npm-all/core-js-compat/-/core-js-compat-3.39.0.tgz", + "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==", "dev": true, "requires": { - "browserslist": "^4.23.3" + "browserslist": "^4.24.2" } }, "core-util-is": { @@ -3503,9 +3483,9 @@ }, "dependencies": { "cross-spawn": { - "version": "6.0.5", - "resolved": "https://repo.micord.ru/repository/npm-all/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://repo.micord.ru/repository/npm-all/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, "requires": { "nice-try": "^1.0.4", @@ -3830,9 +3810,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -3936,9 +3916,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.5.32", - "resolved": "https://repo.micord.ru/repository/npm-all/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz", - "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==", + "version": "1.5.63", + "resolved": "https://repo.micord.ru/repository/npm-all/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz", + "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==", "dev": true }, "emoji-regex": { @@ -3978,9 +3958,9 @@ } }, "engine.io": { - "version": "6.6.1", - "resolved": "https://repo.micord.ru/repository/npm-all/engine.io/-/engine.io-6.6.1.tgz", - "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==", + "version": "6.6.2", + "resolved": "https://repo.micord.ru/repository/npm-all/engine.io/-/engine.io-6.6.2.tgz", + "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==", "dev": true, "requires": { "@types/cookie": "^0.4.1", @@ -3988,7 +3968,7 @@ "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "~0.4.1", + "cookie": "~0.7.2", "cors": "~2.8.5", "debug": "~4.3.1", "engine.io-parser": "~5.2.1", @@ -3996,12 +3976,12 @@ }, "dependencies": { "@types/node": { - "version": "22.7.4", - "resolved": "https://repo.micord.ru/repository/npm-all/@types/node/-/node-22.7.4.tgz", - "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==", + "version": "22.9.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@types/node/-/node-22.9.1.tgz", + "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==", "dev": true, "requires": { - "undici-types": "~6.19.2" + "undici-types": "~6.19.8" } }, "debug": { @@ -4022,9 +4002,9 @@ } }, "engine.io-client": { - "version": "6.6.1", - "resolved": "https://repo.micord.ru/repository/npm-all/engine.io-client/-/engine.io-client-6.6.1.tgz", - "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==", + "version": "6.6.2", + "resolved": "https://repo.micord.ru/repository/npm-all/engine.io-client/-/engine.io-client-6.6.2.tgz", + "integrity": "sha512-TAr+NKeoVTjEVW8P3iHguO1LO6RlUz9O5Y8o7EY0fU+gY1NYqas7NN3slpFtbXEsLMHk0h90fJMfKjRkQ0qUIw==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", @@ -4387,9 +4367,9 @@ "dev": true }, "fast-uri": { - "version": "3.0.2", - "resolved": "https://repo.micord.ru/repository/npm-all/fast-uri/-/fast-uri-3.0.2.tgz", - "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==", + "version": "3.0.3", + "resolved": "https://repo.micord.ru/repository/npm-all/fast-uri/-/fast-uri-3.0.3.tgz", + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", "dev": true }, "fastest-levenshtein": { @@ -5683,9 +5663,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -5974,9 +5954,9 @@ "dev": true }, "nan": { - "version": "2.20.0", - "resolved": "https://repo.micord.ru/repository/npm-all/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://repo.micord.ru/repository/npm-all/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "dev": true, "optional": true }, @@ -6052,9 +6032,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -6427,9 +6407,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -6460,9 +6440,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true } } @@ -6519,9 +6499,9 @@ } }, "picocolors": { - "version": "1.1.0", - "resolved": "https://repo.micord.ru/repository/npm-all/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://repo.micord.ru/repository/npm-all/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true }, "picomatch": { @@ -6638,13 +6618,13 @@ "dev": true }, "postcss": { - "version": "8.4.47", - "resolved": "https://repo.micord.ru/repository/npm-all/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "version": "8.4.49", + "resolved": "https://repo.micord.ru/repository/npm-all/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "dev": true, "requires": { "nanoid": "^3.3.7", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, @@ -6655,23 +6635,23 @@ "dev": true }, "postcss-modules-local-by-default": { - "version": "4.0.5", - "resolved": "https://repo.micord.ru/repository/npm-all/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", - "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "version": "4.1.0", + "resolved": "https://repo.micord.ru/repository/npm-all/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz", + "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==", "dev": true, "requires": { "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", + "postcss-selector-parser": "^7.0.0", "postcss-value-parser": "^4.1.0" } }, "postcss-modules-scope": { - "version": "3.2.0", - "resolved": "https://repo.micord.ru/repository/npm-all/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", - "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "version": "3.2.1", + "resolved": "https://repo.micord.ru/repository/npm-all/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz", + "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==", "dev": true, "requires": { - "postcss-selector-parser": "^6.0.4" + "postcss-selector-parser": "^7.0.0" } }, "postcss-modules-values": { @@ -6684,9 +6664,9 @@ } }, "postcss-selector-parser": { - "version": "6.1.2", - "resolved": "https://repo.micord.ru/repository/npm-all/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "version": "7.0.0", + "resolved": "https://repo.micord.ru/repository/npm-all/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz", + "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -7015,9 +6995,9 @@ "dev": true }, "regjsparser": { - "version": "0.11.1", - "resolved": "https://repo.micord.ru/repository/npm-all/regjsparser/-/regjsparser-0.11.1.tgz", - "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==", + "version": "0.11.2", + "resolved": "https://repo.micord.ru/repository/npm-all/regjsparser/-/regjsparser-0.11.2.tgz", + "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==", "dev": true, "requires": { "jsesc": "~3.0.2" @@ -7623,9 +7603,9 @@ } }, "socket.io": { - "version": "4.8.0", - "resolved": "https://repo.micord.ru/repository/npm-all/socket.io/-/socket.io-4.8.0.tgz", - "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==", + "version": "4.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/socket.io/-/socket.io-4.8.1.tgz", + "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==", "dev": true, "requires": { "accepts": "~1.3.4", @@ -7682,9 +7662,9 @@ } }, "socket.io-client": { - "version": "4.8.0", - "resolved": "https://repo.micord.ru/repository/npm-all/socket.io-client/-/socket.io-client-4.8.0.tgz", - "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==", + "version": "4.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/socket.io-client/-/socket.io-client-4.8.1.tgz", + "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", @@ -8073,9 +8053,9 @@ } }, "terser": { - "version": "5.34.1", - "resolved": "https://repo.micord.ru/repository/npm-all/terser/-/terser-5.34.1.tgz", - "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==", + "version": "5.36.0", + "resolved": "https://repo.micord.ru/repository/npm-all/terser/-/terser-5.36.0.tgz", + "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.3", @@ -8168,12 +8148,6 @@ "os-tmpdir": "~1.0.2" } }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://repo.micord.ru/repository/npm-all/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, "to-object-path": { "version": "0.3.0", "resolved": "https://repo.micord.ru/repository/npm-all/to-object-path/-/to-object-path-0.3.0.tgz", @@ -8666,9 +8640,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://repo.micord.ru/repository/npm-all/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://repo.micord.ru/repository/npm-all/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -8849,9 +8823,9 @@ "dev": true }, "xmlhttprequest-ssl": { - "version": "2.1.1", - "resolved": "https://repo.micord.ru/repository/npm-all/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz", - "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==", + "version": "2.1.2", + "resolved": "https://repo.micord.ru/repository/npm-all/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", + "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", "dev": true }, "xtend": { @@ -8919,9 +8893,9 @@ }, "dependencies": { "tslib": { - "version": "2.7.0", - "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" + "version": "2.8.1", + "resolved": "https://repo.micord.ru/repository/npm-all/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" } } } diff --git a/frontend/package.json b/frontend/package.json index d0eb61df..1ebd0733 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "ervu_usr_autority", + "name": "account-applications", "version": "1.0.0", "scripts": { "lite": "node ./node_modules/lite-server/bin/lite-server", diff --git a/frontend/pom.xml b/frontend/pom.xml index 10a574fe..be7838db 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - ervu_usr_autority - ervu_usr_autority + ru.micord.ervu + account-applications 1.0.0-SNAPSHOT - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications frontend war diff --git a/frontend/preview.html b/frontend/preview.html index eb364332..e59c8090 100644 --- a/frontend/preview.html +++ b/frontend/preview.html @@ -17,7 +17,7 @@ }); - +
diff --git a/frontend/src/resources/app-config.json b/frontend/src/resources/app-config.json index 88191b6d..b96610ca 100644 --- a/frontend/src/resources/app-config.json +++ b/frontend/src/resources/app-config.json @@ -5,7 +5,7 @@ "filter_cleanup_check_period_minutes": 30, "auth_method": "form", "enable.version.in.url": "%enable.version.in.url%", - "backend.context": "ervu_usr_autority", + "backend.context": "account-applications", "guard.confirm_exit": false, "message_service_error_timeout": "", "message_service_warning_timeout": "", diff --git a/frontend/src/resources/css/components-autority.css b/frontend/src/resources/css/components-autority.css index 396a9f8f..fec1dccd 100644 --- a/frontend/src/resources/css/components-autority.css +++ b/frontend/src/resources/css/components-autority.css @@ -1,33 +1,33 @@ -.webbpm.ervu_usr_autority .container-inside > div > div > [page-object] { +.webbpm.account_applications .container-inside > div > div > [page-object] { display: flex; } -.webbpm.ervu_usr_autority [page-home] { +.webbpm.account_applications [page-home] { display: flex; align-items: center; background-color: var(--bg-light); } -.webbpm.ervu_usr_autority #home { +.webbpm.account_applications #home { flex: 1; } -.webbpm.ervu_usr_autority .title { +.webbpm.account_applications .title { font-size: var(--size-text-title); font-family: 'InterSB'; padding-top: 0; padding-bottom: var(--indent-small); } -.webbpm.ervu_usr_autority .title .form-group { +.webbpm.account_applications .title .form-group { display: block; margin-bottom: 0; } -.webbpm.ervu_usr_autority .font-bold { +.webbpm.account_applications .font-bold { font-family: 'InterSB'; } -.webbpm.ervu_usr_autority .btn { +.webbpm.account_applications .btn { font-size: var(--size-text-secondary); - font-family: 'Inter'; + font-family: 'Inter'; color: var(--color-link); padding: 13px 39px; border: 1px solid var(--color-link); @@ -35,35 +35,35 @@ background-color: transparent; box-shadow: none; } -.webbpm.ervu_usr_autority .btn:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus) { +.webbpm.account_applications .btn:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus) { color: var(--color-link-hover); border-color: var(--color-link-hover); background-color: transparent; } -.webbpm.ervu_usr_autority .btn-main:not(.info):not(.link) .btn, -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm, .confirmation) .btn-primary { - color: var(--white); +.webbpm.account_applications .btn-main:not(.info):not(.link) .btn, +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm, .confirmation) .btn-primary { + color: var(--white); border: 1px solid var(--color-link); background: var(--color-link); } -.webbpm.ervu_usr_autority .btn-main .btn:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus), -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm, .confirmation) .btn-primary:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus) { +.webbpm.account_applications .btn-main .btn:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus), +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm, .confirmation) .btn-primary:is(:not(:disabled):not(.disabled):hover, :not(:disabled):not(.disabled):active, :not(:disabled):not(.disabled):focus) { color: var(--white); border-color: var(--color-link-hover); background-color: var(--color-link-hover); } -.webbpm.ervu_usr_autority .btn:is(:disabled, .disabled) { +.webbpm.account_applications .btn:is(:disabled, .disabled) { color: var(--color-text-secondary); border-color: var(--border-light); } -.webbpm.ervu_usr_autority .btn-big-group > div { +.webbpm.account_applications .btn-big-group > div { justify-content: center; align-items: center; } -.webbpm.ervu_usr_autority .btn-big-group .btn { +.webbpm.account_applications .btn-big-group .btn { font-family: 'Inter'; color: var(--color-text-primary); min-width: 300px; @@ -73,110 +73,110 @@ background-color: var(--white) !important; box-shadow: var(--bg-shadow); } -.webbpm.ervu_usr_autority .btn-big-group .btn::before { +.webbpm.account_applications .btn-big-group .btn::before { display: flex; justify-content: center; margin-bottom: 8px; } -.webbpm.ervu_usr_autority .btn-big-group vbox:first-child .btn::before { +.webbpm.account_applications .btn-big-group vbox:first-child .btn::before { content: url(../img/svg/users-bl.svg); } -.webbpm.ervu_usr_autority .btn-big-group vbox:first-child .btn:is(:hover, :active, :focus)::before { +.webbpm.account_applications .btn-big-group vbox:first-child .btn:is(:hover, :active, :focus)::before { content: url(../img/svg/users.svg); } -.webbpm.ervu_usr_autority .btn-big-group vbox:last-child .btn::before { +.webbpm.account_applications .btn-big-group vbox:last-child .btn::before { content: url(../img/svg/notes-bl.svg); } -.webbpm.ervu_usr_autority .btn-big-group vbox:last-child .btn:is(:hover, :active, :focus)::before { +.webbpm.account_applications .btn-big-group vbox:last-child .btn:is(:hover, :active, :focus)::before { content: url(../img/svg/notes.svg); } -.webbpm.ervu_usr_autority .btn-big-group vbox { +.webbpm.account_applications .btn-big-group vbox { padding-right: 0; } -.webbpm.ervu_usr_autority .btn-big-group vbox + vbox { +.webbpm.account_applications .btn-big-group vbox + vbox { margin-left: 40px; } -.webbpm.ervu_usr_autority collapsible-panel .card { +.webbpm.account_applications collapsible-panel .card { margin-bottom: var(--indent-small); border: 1px solid var(--border-light) !important; } -.webbpm.ervu_usr_autority collapsible-panel .card i { +.webbpm.account_applications collapsible-panel .card i { width: 16px; } -.webbpm.ervu_usr_autority collapsible-panel .card-header, -.webbpm.ervu_usr_autority collapsible-panel .card-block .font-bold { +.webbpm.account_applications collapsible-panel .card-header, +.webbpm.account_applications collapsible-panel .card-block .font-bold { font-family: 'InterSB' !important; font-size: var(--size-text-primary) !important; } -.webbpm.ervu_usr_autority collapsible-panel .card-block { +.webbpm.account_applications collapsible-panel .card-block { font-size: var(--size-text-secondary); padding-top: var(--indent-mini) !important; border-top: 1px solid var(--border-light); } -.webbpm.ervu_usr_autority collapsible-panel .card-block .filter-group .horizontal-container > * { +.webbpm.account_applications collapsible-panel .card-block .filter-group .horizontal-container > * { padding-left: var(--indent-big); padding-right: 0; } -.webbpm.ervu_usr_autority collapsible-panel .card-block .filter-group .horizontal-container > *:first-child { +.webbpm.account_applications collapsible-panel .card-block .filter-group .horizontal-container > *:first-child { padding-left: 0; } -.webbpm.ervu_usr_autority collapsible-panel .card-block .filter-group .width-full label { +.webbpm.account_applications collapsible-panel .card-block .filter-group .width-full label { width: 160px; } -.webbpm.ervu_usr_autority collapsible-panel .card-block .filter-group .width-full.fixed-label-mini label { +.webbpm.account_applications collapsible-panel .card-block .filter-group .width-full.fixed-label-mini label { width: 100px; } -.webbpm.ervu_usr_autority collapsible-panel .card-block .filter-group .width-full.fixed-label-extra-mini label { +.webbpm.account_applications collapsible-panel .card-block .filter-group .width-full.fixed-label-extra-mini label { width: 60px; } -.webbpm.ervu_usr_autority grid-v2 { +.webbpm.account_applications grid-v2 { flex: 1; } -.webbpm.ervu_usr_autority * + grid-v2, -.webbpm.ervu_usr_autority grid-v2 ~ *:not([hidden]) { +.webbpm.account_applications * + grid-v2, +.webbpm.account_applications grid-v2 ~ *:not([hidden]) { margin-top: var(--indent-small); } -.webbpm.ervu_usr_autority ag-grid-angular { +.webbpm.account_applications ag-grid-angular { font-family: 'Inter'; -} +} -.webbpm.ervu_usr_autority ag-grid-angular .grid-setting-icon, -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-cell.ag-header-active .ag-header-cell-menu-button, -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-cell .ag-header-icon .ag-icon, -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-row-column-filter :is(.ag-header-cell, .ag-header-group-cell)::after, -.webbpm.ervu_usr_autority ag-grid-angular .ag-filter .ag-filter-condition, -.webbpm.ervu_usr_autority ag-grid-angular .ag-filter .ag-filter-condition ~ * { +.webbpm.account_applications ag-grid-angular .grid-setting-icon, +.webbpm.account_applications ag-grid-angular .ag-header-cell.ag-header-active .ag-header-cell-menu-button, +.webbpm.account_applications ag-grid-angular .ag-header-cell .ag-header-icon .ag-icon, +.webbpm.account_applications ag-grid-angular .ag-header-row-column-filter :is(.ag-header-cell, .ag-header-group-cell)::after, +.webbpm.account_applications ag-grid-angular .ag-filter .ag-filter-condition, +.webbpm.account_applications ag-grid-angular .ag-filter .ag-filter-condition ~ * { display: none !important; } -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-row { +.webbpm.account_applications ag-grid-angular .ag-header-row { font-family: 'InterSB'; } -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-row:not(:first-child) .ag-header-cell, -.webbpm.ervu_usr_autority ag-grid-angular .ag-header-row:not(:first-child) .ag-header-group-cell.ag-header-group-cell-with-group { +.webbpm.account_applications ag-grid-angular .ag-header-row:not(:first-child) .ag-header-cell, +.webbpm.account_applications ag-grid-angular .ag-header-row:not(:first-child) .ag-header-group-cell.ag-header-group-cell-with-group { border-top: 0; } -.webbpm.ervu_usr_autority ag-grid-angular .ag-row.ag-row-hover, -.webbpm.ervu_usr_autority ag-grid-angular .ag-row.ag-row-hover .ag-cell { +.webbpm.account_applications ag-grid-angular .ag-row.ag-row-hover, +.webbpm.account_applications ag-grid-angular .ag-row.ag-row-hover .ag-cell { color: var(--color-link); border-radius: 0; background-color: transparent !important; } -.webbpm.ervu_usr_autority ag-grid-angular .ag-row.ag-row-hover, -.webbpm.ervu_usr_autority ag-grid-angular .ag-row.ag-row-hover + .ag-row { +.webbpm.account_applications ag-grid-angular .ag-row.ag-row-hover, +.webbpm.account_applications ag-grid-angular .ag-row.ag-row-hover + .ag-row { border-color: var(--border-light); } -.webbpm.ervu_usr_autority ag-grid-angular .ag-row-last:not(.ag-row-first) { +.webbpm.account_applications ag-grid-angular .ag-row-last:not(.ag-row-first) { border-width: 1px 0 0; } -.webbpm.ervu_usr_autority ag-grid-angular .ag-cell-focus:not(.ag-cell-range-selected):focus-within { +.webbpm.account_applications ag-grid-angular .ag-cell-focus:not(.ag-cell-range-selected):focus-within { border-color: var(--color-link); -} \ No newline at end of file +} diff --git a/frontend/src/resources/css/inbox-autority.css b/frontend/src/resources/css/inbox-autority.css index 3bc1ecae..8d1956c4 100644 --- a/frontend/src/resources/css/inbox-autority.css +++ b/frontend/src/resources/css/inbox-autority.css @@ -29,13 +29,13 @@ font-style: normal; } -body.webbpm.ervu_usr_autority { +body.webbpm.account_applications { -ms-text-size-adjust: 100%; -moz-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; } -.webbpm.ervu_usr_autority { +.webbpm.account_applications { --color-text-primary: #1d1e21; --color-text-secondary: #acacac; --color-link: #c64e1b; @@ -56,7 +56,7 @@ body.webbpm.ervu_usr_autority { --size-text-title: 36px; --size-text-subtitle: 20px; --size-text-primary: 18px; - --size-text-secondary: 16px; + --size-text-secondary: 16px; --indent-huge: 48px; --indent-big: 40px; @@ -66,68 +66,68 @@ body.webbpm.ervu_usr_autority { --indent-extra-mini: 10px; } -.webbpm.ervu_usr_autority a { - color: var(--color-link); +.webbpm.account_applications a { + color: var(--color-link); text-decoration: none; } -.webbpm.ervu_usr_autority a:is(:hover, :focus, :active) { +.webbpm.account_applications a:is(:hover, :focus, :active) { color: var(--color-link-hover); } -.webbpm.ervu_usr_autority .header { - font-family: 'Inter'; +.webbpm.account_applications .header { + font-family: 'Inter'; min-height: var(--h-header); border: 0; background-color: var(--color-text-primary); } -.webbpm.ervu_usr_autority .header .header-logo { +.webbpm.account_applications .header .header-logo { margin-left: var(--w-screen); } -.webbpm.ervu_usr_autority .header .header-logo a { +.webbpm.account_applications .header .header-logo a { color: var(--white); font-family: 'Inter'; } -.webbpm.ervu_usr_autority .header .header-logo .logo { +.webbpm.account_applications .header .header-logo .logo { position: relative; display: flex; align-items: center; } -.webbpm.ervu_usr_autority .header .header-logo .logo a { +.webbpm.account_applications .header .header-logo .logo a { position: absolute; width: 62px; height: 40px; background: url(../img/svg/mil-logo.svg) no-repeat 0 50%; } -.webbpm.ervu_usr_autority .header .header-logo .main-page { +.webbpm.account_applications .header .header-logo .main-page { font-family: 'InterSB'; margin-left: calc(62px + 16px); } -.webbpm.ervu_usr_autority footer { +.webbpm.account_applications footer { height: var(--h-footer); border: 0; background-color: var(--color-text-primary); } -.webbpm.ervu_usr_autority .container { +.webbpm.account_applications .container { padding-top: var(--h-header); bottom: var(--h-footer); } -.webbpm.ervu_usr_autority .container-inside { +.webbpm.account_applications .container-inside { display: flex; flex-direction: column; font-family: 'Inter'; - height: 100%; + height: 100%; padding: 0; overflow: auto; } -.webbpm.ervu_usr_autority .container-inside > div { +.webbpm.account_applications .container-inside > div { flex: 1; padding: var(--indent-huge) var(--w-screen); } /*----------------- Login ---------------- */ -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) { color: var(--color-text-primary); font-size: var(--size-text-secondary); width: 500px; @@ -138,14 +138,14 @@ body.webbpm.ervu_usr_autority { background-color: var(--white); box-shadow: var(--bg-shadow); } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) :is(h1, h2) { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) :is(h1, h2) { color: var(--color-form); font-family: 'InterB'; font-size: var(--size-text-subtitle); text-align: left; margin-bottom: 0; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .logo { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .logo { position: relative; display: flex; justify-content: center; @@ -154,7 +154,7 @@ body.webbpm.ervu_usr_autority { padding: 0 0 0 128px; margin-bottom: 32px; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .logo::after { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .logo::after { position: absolute; content: ""; left: 0; @@ -162,14 +162,14 @@ body.webbpm.ervu_usr_autority { height: 72px; background-image: url(../img/svg/form-logo.svg); } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .row { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .row { position: relative; margin-bottom: 0; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .row + .row { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .row + .row { margin-top: 20px; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input { height: 56px; padding-top: 20px; padding-left: 16px; @@ -177,42 +177,42 @@ body.webbpm.ervu_usr_autority { border-radius: 8px; background-color: var(--bg-light); } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input[type="password"] { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input[type="password"] { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input[type="password"] ~ .input-group-append > .input-group-text { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input[type="password"] ~ .input-group-append > .input-group-text { border: 0; background-color: var(--bg-light); } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input + label { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input + label { position: absolute; top: 16px; left: 16px; pointer-events: none; transition: all 200ms; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input:focus + label, -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) input:not(:placeholder-shown) + label { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input:focus + label, +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) input:not(:placeholder-shown) + label { top: 4px; font-size: var(--indent-extra-mini); z-index: 20; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .msg-text { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .msg-text { margin-top: 12px; } -.webbpm.ervu_usr_autority :is(.form-signin, .form-signup, .confirm) .btn-box { +.webbpm.account_applications :is(.form-signin, .form-signup, .confirm) .btn-box { margin-top: 32px; } -.webbpm.ervu_usr_autority .form-signin .row.registration > * + *, -.webbpm.ervu_usr_autority .form-signin .login-btn-box .password, -.webbpm.ervu_usr_autority .form-signin .login-btn-box .btn + .btn { +.webbpm.account_applications .form-signin .row.registration > * + *, +.webbpm.account_applications .form-signin .login-btn-box .password, +.webbpm.account_applications .form-signin .login-btn-box .btn + .btn { margin-left: 32px; } /*--------------- end Login -------------- */ -.webbpm.ervu_usr_autority .loader { +.webbpm.account_applications .loader { font-size: 15px; left: calc(50% - 50px); top: calc(50% - 50px); @@ -250,4 +250,4 @@ body.webbpm.ervu_usr_autority { 87.5% { box-shadow: 0em -2.6em 0em 0em rgba(198, 78, 27, 0.3), 1.8em -1.8em 0 0em rgba(198, 78, 27, 0.3), 2.5em 0em 0 0em rgba(198, 78, 27, 0.3), 1.75em 1.75em 0 0em rgba(198, 78, 27, 0.3), 0em 2.5em 0 0em rgba(198, 78, 27, 0.3), -1.8em 1.8em 0 0em rgba(198, 78, 27, 0.7), -2.6em 0em 0 0em rgba(198, 78, 27, 1), -1.8em -1.8em 0 0em #ffffff; } -} \ No newline at end of file +} diff --git a/frontend/src/resources/template/ervu-usr-autority/component/container/VBoxLoadValues.html b/frontend/src/resources/template/account_applications/component/container/VBoxLoadValues.html similarity index 100% rename from frontend/src/resources/template/ervu-usr-autority/component/container/VBoxLoadValues.html rename to frontend/src/resources/template/account_applications/component/container/VBoxLoadValues.html diff --git a/frontend/src/ts/ervu-usr-autority/component/container/VBoxLoadValues.ts b/frontend/src/ts/account_applications/component/container/VBoxLoadValues.ts similarity index 86% rename from frontend/src/ts/ervu-usr-autority/component/container/VBoxLoadValues.ts rename to frontend/src/ts/account_applications/component/container/VBoxLoadValues.ts index bf9d1e6b..493cc901 100644 --- a/frontend/src/ts/ervu-usr-autority/component/container/VBoxLoadValues.ts +++ b/frontend/src/ts/account_applications/component/container/VBoxLoadValues.ts @@ -4,7 +4,7 @@ import {VBox} from "@webbpm/base-package"; @Component({ moduleId: module.id, selector: 'vbox-load-values', - templateUrl: '../../../../../src/resources/template/ervu-usr-autority/component/container/VBoxLoadValues.html', + templateUrl: '../../../../resources/template/account_applications/component/container/VBoxLoadValues.html', changeDetection: ChangeDetectionStrategy.OnPush }) export class VBoxLoadValues extends VBox { diff --git a/frontend/src/ts/ervu-usr-autority/scripts/SetCurrentUserIdAsDefValue.ts b/frontend/src/ts/account_applications/scripts/SetCurrentUserIdAsDefValue.ts similarity index 100% rename from frontend/src/ts/ervu-usr-autority/scripts/SetCurrentUserIdAsDefValue.ts rename to frontend/src/ts/account_applications/scripts/SetCurrentUserIdAsDefValue.ts diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index 17d7af57..783ba4dd 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -26,7 +26,7 @@ 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 {VBoxLoadValues} from "../../ervu-usr-autority/component/container/VBoxLoadValues"; +import {VBoxLoadValues} from "../../account_applications/component/container/VBoxLoadValues"; registerLocaleData(localeRu); export const DIRECTIVES = [ diff --git a/pom.xml b/pom.xml index a23e54a5..fefa79f6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,13 @@ 4.0.0 - ervu_usr_autority - ervu_usr_autority + ru.micord.ervu + account-applications 1.0.0-SNAPSHOT pom backend resources - test scm:git:git://gitserver/webbpm/webbpm-components.git @@ -33,7 +32,7 @@ import - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications backend ${project.version} war @@ -70,19 +69,19 @@ - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications backend ${project.version} classes - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications frontend ${project.version} war - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications resources ${project.version} diff --git a/resources/pom.xml b/resources/pom.xml index 1c7e17b9..daf3eac0 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - ervu_usr_autority - ervu_usr_autority + ru.micord.ervu + account-applications 1.0.0-SNAPSHOT - ervu_usr_autority.ervu_usr_autority + ru.micord.ervu.account_applications resources diff --git a/resources/src/main/resources/business-model/user_accounts.jrxml b/resources/src/main/resources/business-model/user_accounts.jrxml index 55549193..15546cba 100644 --- a/resources/src/main/resources/business-model/user_accounts.jrxml +++ b/resources/src/main/resources/business-model/user_accounts.jrxml @@ -1,7 +1,7 @@ - + @@ -31,11 +31,11 @@ addinfo.user_login as username, addinfo.ip_address from public.user_application_list addinfo join public.link_user_application_user_group luaug1 on luaug1.user_application_list_id=addinfo.user_application_list_id -inner join security.user_group ug1 on ug1.user_group_id=luaug1.user_group_id +inner join security.user_group ug1 on ug1.user_group_id=luaug1.user_group_id where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])])) and (ug1.name ='Военный комиссар' or ug1.name ='Сотрудник ВК') -and addinfo.application_status = 'IN_PROGRESS' -and addinfo.application_kind = 'CREATE_USER' +and addinfo.application_status = 'IN_PROGRESS' +and addinfo.application_kind = 'CREATE_USER' EXCEPT select luaug1.user_application_list_id, @@ -55,7 +55,7 @@ join public.link_user_application_user_group luaug2 on luaug2.user_application_l join security.user_group ug2 on (ug2.user_group_id=luaug2.user_group_id and ug2.name ='Сотрудник ВК') where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])])) and (luaug1.user_application_list_id = luaug2.user_application_list_id) -and addinfo.application_status = 'IN_PROGRESS' +and addinfo.application_status = 'IN_PROGRESS' and addinfo.application_kind = 'CREATE_USER']]> diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page index ebf4b5d0..291366ff 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page @@ -1472,7 +1472,7 @@ UserAuthorityFormService - ru.micord.ervu.user_authority.service + ru.micord.ervu.account_applications.service diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 61447c88..92632fb7 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -817,7 +817,7 @@ UserAuthorityFormService - ru.micord.ervu.user_authority.service + ru.micord.ervu.account_applications.service @@ -2557,7 +2557,7 @@ SetCurrentUserIdAsDefValue - ervu-usr-autority.scripts + account_applications.scripts true true diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page index 595a448c..f8f362cd 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page @@ -817,7 +817,7 @@ UserAuthorityFormService - ru.micord.ervu.user_authority.service + ru.micord.ervu.account_applications.service @@ -2562,7 +2562,7 @@ SetCurrentUserIdAsDefValue - ervu-usr-autority.scripts + account_applications.scripts true true diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page index f64e5353..d0641935 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page @@ -817,7 +817,7 @@ UserAuthorityFormService - ru.micord.ervu.user_authority.service + ru.micord.ervu.account_applications.service @@ -2633,7 +2633,7 @@ SetCurrentUserIdAsDefValue - ervu-usr-autority.scripts + account_applications.scripts true true diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page index b88381cd..a1844108 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page @@ -1253,7 +1253,7 @@ SetCurrentUserIdAsDefValue - ervu-usr-autority.scripts + account_applications.scripts true true @@ -3892,7 +3892,7 @@ form - {"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"ervu-usr-autority.component.container","className":"VBoxLoadValues","type":"TS"} + {"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"account_applications.component.container","className":"VBoxLoadValues","type":"TS"} @@ -4567,7 +4567,7 @@ behavior - {"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"ervu-usr-autority.component.container","className":"VBoxLoadValues","type":"TS"} + {"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"account_applications.component.container","className":"VBoxLoadValues","type":"TS"} @@ -6100,7 +6100,7 @@ EnumColumnFormatter -ervu_usr_autority +ru.micord.ervu.account_applications @@ -6145,7 +6145,7 @@ EnumColumnFormatter -ervu_usr_autority +ru.micord.ervu.account_applications @@ -6279,7 +6279,7 @@ EnumColumnFormatter -ervu_usr_autority +ru.micord.ervu.account_applications @@ -6565,7 +6565,7 @@ VBoxLoadValues - ervu-usr-autority.component.container + account_applications.component.container true true diff --git a/resources/src/main/resources/database/datasource.xml b/resources/src/main/resources/database/datasource.xml index db8fe365..5e3a21ec 100644 --- a/resources/src/main/resources/database/datasource.xml +++ b/resources/src/main/resources/database/datasource.xml @@ -1,7 +1,7 @@ - ervu_usr_autority.ervu_usr_autority.db_beans - ervu_usr_autority + ru.micord.ervu.account_applications.db_beans + account_applications org.postgresql.Driver 10.10.31.118 false @@ -10,7 +10,7 @@ public security POSTGRES - jdbc:postgresql://10.10.31.118:5432/ervu_usr_autority + jdbc:postgresql://10.10.31.118:5432/account_applications jdbc:postgresql: ervu diff --git a/test/pom.xml b/test/pom.xml deleted file mode 100644 index 99e6dd96..00000000 --- a/test/pom.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - 4.0.0 - - ervu_usr_autority - ervu_usr_autority - 1.0.0-SNAPSHOT - - - ervu_usr_autority.ervu_usr_autority - 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-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 deleted file mode 100644 index 2f251ce8..00000000 --- a/test/src/test/java/SuiteAdmin.java +++ /dev/null @@ -1,30 +0,0 @@ -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; -import tests.AuthoritiesIT; -import tests.GroupsIT; -import tests.LoginIT; -import tests.OrganizationsIT; -import tests.ProcessesIT; -import tests.RolesIT; -import tests.UsersIT; -import tests.TokensIT; - -/** - * @author gulnaz - */ -@Suite -@SelectClasses({ - AuthoritiesIT.class, - GroupsIT.class, - LoginIT.class, - OrganizationsIT.class, - ProcessesIT.class, - RolesIT.class, - TokensIT.class, - UsersIT.class -}) - -public class SuiteAdmin { - SuiteAdmin() { - } -} diff --git a/test/src/test/java/pages/AuthoritiesPage.java b/test/src/test/java/pages/AuthoritiesPage.java deleted file mode 100644 index f453567f..00000000 --- a/test/src/test/java/pages/AuthoritiesPage.java +++ /dev/null @@ -1,51 +0,0 @@ -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_ON_DIALOG_BY_NAME = "//div[@class='modal-body']//button[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 clickOnButtonOnDialog(String name) { - waitForElementToBeClickable(getBy(BUTTON_ON_DIALOG_BY_NAME, name)).click(); - } - - 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/GroupsPage.java b/test/src/test/java/pages/GroupsPage.java deleted file mode 100644 index 8261fcdc..00000000 --- a/test/src/test/java/pages/GroupsPage.java +++ /dev/null @@ -1,112 +0,0 @@ -package pages; - -import core.BasePage; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.Keys; -import org.openqa.selenium.support.FindBy; - -import java.util.List; - -/** - * @author kote - */ -public class GroupsPage extends BasePage { - - private static final String TEXT_ON_PAGE = "//text//div[contains(.,'%s')]"; - private static final String GROUPS_GRID = "//in-memory-static-column-grid[@object-name='Grid']"; - private static final String ROLES_GRID = "//in-memory-static-column-grid[@object-name='RolesGrid']"; - private static final String ROWS = "//div[@role='row'][not(contains(@class,'ag-header'))]"; - private static final String ROW_BY_TEXT = "//div[@role='row'][.//span[contains(.,'%s')]]"; - private static final String GROUPS_ROWS = GROUPS_GRID + ROWS; - private static final String ROLES_ROWS = ROLES_GRID + ROWS; - private static final String GROUPS_ROW_BY_TEXT = GROUPS_GRID + ROW_BY_TEXT; - private static final String ROLES_ROW_BY_TEXT = ROLES_GRID + ROW_BY_TEXT; - - private static final String TABLE_TO_ADD = "//in-memory-static-column-grid[@object-name='AvailableRecordsGrid']"; - private static final String TABLE_ADDED = "//static-column-link-field[@object-name='LinkFieldDialog']"; - private static final String ROLES = "//div[@col-id='role$name'][not(contains(@class,'ag-header'))]"; - private static final String ROLE_CELL_BY_NAME = "//div[@col-id='role$name'][.//div[contains(.,'%s')]]"; - private static final String ROLES_DATES_HEADER = TABLE_TO_ADD + "//div[@col-id='role$updated'][contains(@class,'ag-header')]"; - private static final String MOVE_BUTTON_BY_NAME = "//vbox[@class='many-to-many-move-buttons']//button[text()='%s']"; - private static final String CHECHBOX_BY_ROW_INDEX = "//div[@class='ag-pinned-left-cols-container']//div[@row-index='%s']"; - - @FindBy(xpath = "//div[label[span[contains(.,'Наименование')]]]//input") - private WebElement groupName; - @FindBy(xpath = "//combo-box//div[contains(@class,'selectize-input')]") - private WebElement accessLevel; - @FindBy(xpath = "//*[@object-name='search']//input") - private WebElement searchField; - - public GroupsPage(WebDriver browser) { - super(browser, "/#/user-management/groups"); - } - - public boolean isTitleVisible(String title) { - return isPresent(getBy(TEXT_ON_PAGE, title)); - } - - public boolean isGroupVisible(String name) { - return isPresent(getBy(GROUPS_ROW_BY_TEXT, name)); - } - - public boolean isRoleVisible(String name) { - return isPresent(getBy(ROLES_ROW_BY_TEXT, name)); - } - - public void clickOnGroup(String name) { - waitForElementToBeClickable(getBy(GROUPS_ROW_BY_TEXT, name)).click(); - } - - public void clickOnRoleToAdd(String roleName) { - waitForElementToBeClickable(getBy(TABLE_TO_ADD + ROLE_CELL_BY_NAME, roleName)).click(); - } - - public void clickOnRoleAdded(String roleName) { - waitForElementToBeClickable(getBy(TABLE_ADDED + ROLE_CELL_BY_NAME, roleName)).click(); - } - - public void clickOnCheckboxNearRoleToAdd(int rowIndex) { - waitForElementToBeClickable(getBy(TABLE_TO_ADD + CHECHBOX_BY_ROW_INDEX, rowIndex)).click(); - } - - public void clickOnRoleDateColumnHeader() { - waitForElementToBeClickable(getBy(ROLES_DATES_HEADER)).click(); - } - - public void clickOnMoveButton(String name) { - waitForElementToBeClickable(getBy(MOVE_BUTTON_BY_NAME, name)).click(); - } - - public void editGroupName(String value) { - editField(groupName, value); - } - - public void editSearchField(String value) { - editField(searchField, value); - searchField.sendKeys(Keys.ENTER); - } - - public int getNumberOfGroupRows() { - return findElements(getBy(GROUPS_ROWS)).size(); - } - - public int getNumberOfRolesRows() { - return findElements(getBy(ROLES_ROWS)).size(); - } - - public List getListOfRolesNamesToAdd() { - return getTexts(getBy(TABLE_TO_ADD + ROLES)); - } - - public void selectAccessLevel(String value) { - clickAndSelectValue(accessLevel, value); - } - - public boolean hasRolesInTable(String tableName, List expectedValues) { - String table = tableName.equals("ADDED") ? TABLE_ADDED : TABLE_TO_ADD; - return getElementsTexts(driver.findElements(By.xpath(table + ROLES))) - .containsAll(expectedValues); - } -} diff --git a/test/src/test/java/pages/OrganizationsPage.java b/test/src/test/java/pages/OrganizationsPage.java deleted file mode 100644 index 5a93f3c7..00000000 --- a/test/src/test/java/pages/OrganizationsPage.java +++ /dev/null @@ -1,55 +0,0 @@ -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 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']"; - - @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 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); - } -} diff --git a/test/src/test/java/pages/ProcessesPage.java b/test/src/test/java/pages/ProcessesPage.java deleted file mode 100644 index a60341bf..00000000 --- a/test/src/test/java/pages/ProcessesPage.java +++ /dev/null @@ -1,41 +0,0 @@ -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 LINK_BY_NAME = "//a[@class='nav-link'][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 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(); - } -} diff --git a/test/src/test/java/pages/RegistrationPage.java b/test/src/test/java/pages/RegistrationPage.java deleted file mode 100644 index 3c70b6a2..00000000 --- a/test/src/test/java/pages/RegistrationPage.java +++ /dev/null @@ -1,96 +0,0 @@ -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 deleted file mode 100644 index 24f4657e..00000000 --- a/test/src/test/java/pages/ResetPasswordPage.java +++ /dev/null @@ -1,58 +0,0 @@ -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/RolesPage.java b/test/src/test/java/pages/RolesPage.java deleted file mode 100644 index a66658a4..00000000 --- a/test/src/test/java/pages/RolesPage.java +++ /dev/null @@ -1,76 +0,0 @@ -package pages; - -import java.util.List; - -import core.BasePage; -import org.openqa.selenium.Keys; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -/** - * @author kote - */ -public class RolesPage extends BasePage { - - private static final String TEXT_ON_PAGE = "//text//div[contains(.,'%s')]"; - private static final String ROLES_GRID = "//in-memory-static-column-grid[@object-name='Grid']"; - private static final String GROUPS_GRID = "//in-memory-static-column-grid[@object-name='GroupsGrid']"; - private static final String ROWS = "//div[@role='row'][not(contains(@class,'ag-header'))]"; - private static final String ROLES_ROWS = ROLES_GRID + ROWS; - private static final String GROUPS_ROWS = GROUPS_GRID + ROWS; - private static final String ROLES_ROW_BY_TEXT = ROLES_GRID + "//div[@role='row'][.//span[contains(.,'%s')]]"; - private static final String GROUPS_ROW_BY_TEXT = GROUPS_GRID + "//div[@role='row'][.//span[contains(.,'%s')]]"; - private static final String ROLES_NAMES_CELLS = ROLES_GRID + "//div[@col-id='role$name'][not(contains(@class,'ag-header'))]"; - private static final String ROLES_NAME_COLUMN_HEADER = ROLES_GRID + "//div[@col-id='role$name'][contains(@class,'ag-header')]"; - - @FindBy(xpath = "//div[label[span[contains(.,'Наименование')]]]//input") - private WebElement roleName; - @FindBy(xpath = "//*[@object-name='search']//input") - private WebElement searchField; - - public RolesPage(WebDriver browser) { - super(browser, "/#/user-management/roles"); - } - - public boolean isTitleVisible(String title) { - return isPresent(getBy(TEXT_ON_PAGE, title)); - } - - public boolean isRoleVisible(String name) { - return isPresent(getBy(ROLES_ROW_BY_TEXT, name)); - } - - public boolean isGroupVisible(String name) { - return isPresent(getBy(GROUPS_ROW_BY_TEXT, name)); - } - - public void clickOnRole(String name) { - waitForElementToBeClickable(getBy(ROLES_ROW_BY_TEXT, name)).click(); - } - - public void clickOnRoleNameColumnHeader() { - waitForElementToBeClickable(getBy(ROLES_NAME_COLUMN_HEADER)).click(); - } - - public void editRoleName(String value) { - editField(roleName, value); - } - - public void editSearchField(String value) { - editField(searchField, value); - searchField.sendKeys(Keys.ENTER); - } - - public int getNumberOfRolesRows() { - return findElements(getBy(ROLES_ROWS)).size(); - } - - public int getNumberOfGroupRows() { - return findElements(getBy(GROUPS_ROWS)).size(); - } - - public List getListOfRolesNames() { - return getTexts(getBy(ROLES_NAMES_CELLS)); - } -} \ No newline at end of file diff --git a/test/src/test/java/pages/TestProcessPage.java b/test/src/test/java/pages/TestProcessPage.java deleted file mode 100644 index fba30d01..00000000 --- a/test/src/test/java/pages/TestProcessPage.java +++ /dev/null @@ -1,28 +0,0 @@ -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']"; - - 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); - } -} \ No newline at end of file diff --git a/test/src/test/java/pages/UsersPage.java b/test/src/test/java/pages/UsersPage.java deleted file mode 100644 index 9c5d9021..00000000 --- a/test/src/test/java/pages/UsersPage.java +++ /dev/null @@ -1,128 +0,0 @@ -package pages; - -import core.BasePage; -import org.openqa.selenium.Keys; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -/** - * @author kote - */ -public class UsersPage extends BasePage { - - private static final String TEXT_ON_PAGE = "//text//div[contains(.,'%s')]"; - private static final String USERS_GRID = "//static-column-grid[@object-name='Grid']"; - private static final String GROUPS_GRID = "//static-column-grid[@object-name='DependentGrid']"; - private static final String ROWS = "//div[@role='row'][not(contains(@class,'ag-header'))]"; - private static final String ROW_BY_TEXT = "//div[@role='row'][.//span[contains(.,'%s')]]"; - private static final String USERS_ROWS = USERS_GRID + ROWS; - private static final String GROUPS_ROWS = GROUPS_GRID + ROWS; - private static final String USERS_ROW_BY_TEXT = USERS_GRID + ROW_BY_TEXT; - private static final String GROUPS_ROW_BY_TEXT = GROUPS_GRID + ROW_BY_TEXT; - - private static final String TABLE_TO_ADD = "//in-memory-static-column-grid[@object-name='AvailableRecordsGrid']"; - private static final String GROUP_CELL_BY_NAME = "//div[@role='row']//div[contains(.,'%s')]"; - private static final String GROUPS_DATES_HEADER = TABLE_TO_ADD + "//div[@col-id='group$updated'][contains(@class,'ag-header')]"; - private static final String MOVE_BUTTON_BY_NAME = "//vbox[@class='many-to-many-move-buttons']//button[text()='%s']"; - - @FindBy(xpath = "//*[@object-name='last-name']//input") - private WebElement lastName; - @FindBy(xpath = "//*[@object-name='first-name']//input") - private WebElement firstName; - @FindBy(xpath = "//*[@object-name='middleName']//input") - private WebElement middleName; - @FindBy(xpath = "//*[@object-name='login']//input") - private WebElement login; - @FindBy(xpath = "//*[@object-name='password']//input") - private WebElement password; - @FindBy(xpath = "//*[@object-name='password-repeat']//input") - private WebElement passwordRepeat; - @FindBy(xpath = "//*[@object-name='email']//input") - private WebElement email; - @FindBy(xpath = "//combo-box//div[contains(@class,'selectize-input')]") - private WebElement organization; - @FindBy(xpath = "//*[contains(text(),'Фильтр по пользователям')]") //todo kote - private WebElement filterPanel; - - public UsersPage(WebDriver browser) { - super(browser, "/#/"); - } - - public boolean isTitleVisible(String title) { - return isPresent(getBy(TEXT_ON_PAGE, title)); - } - - public boolean isUserVisible(String name) { - return isPresent(getBy(USERS_ROW_BY_TEXT, name)); - } - - public boolean isGroupVisible(String name) { - return isPresent(getBy(GROUPS_ROW_BY_TEXT, name)); - } - - public void clickOnUser(String name) { - waitForElementToBeClickable(getBy(USERS_ROW_BY_TEXT, name)).click(); - } - - public void clickOnFilterPanel() { - waitForElementToBeClickable(filterPanel).click(); - } - - public void clickOnGroupDateColumnHeader() { - waitForElementToBeClickable(getBy(GROUPS_DATES_HEADER)).click(); - } - - public void clickOnGroupToAdd(String groupName) { - waitForElementToBeClickable(getBy(TABLE_TO_ADD + GROUP_CELL_BY_NAME, groupName)).click(); - } - - public void clickOnMoveButton(String name) { - waitForElementToBeClickable(getBy(MOVE_BUTTON_BY_NAME, name)).click(); - } - - public void editUserLastName(String value) { - editField(lastName, value); - } - - public void editUserFirstName(String value) { - editField(firstName, value); - } - - public void editUserMiddleName(String value) { - editField(middleName, value); - } - - public void editUserLogin(String value) { - editField(login, value); - } - - public void editUserPassword(String value) { - editField(password, value); - } - - public void editUserPasswordRepeat(String value) { - editField(passwordRepeat, value); - } - - public void editUserEmail(String value) { - editField(email, value); - } - - public void editSearchFieldLastName(String value) { - editField(lastName, value); - lastName.sendKeys(Keys.ENTER); - } - - public void selectOrganization(String value) { - clickAndSelectValue(organization, value); - } - - public int getNumberOfUserRows() { - return findElements(getBy(USERS_ROWS)).size(); - } - - public int getNumberOfGroupsRows() { - return findElements(getBy(GROUPS_ROWS)).size(); - } -} \ No newline at end of file diff --git a/test/src/test/java/tests/AuthoritiesIT.java b/test/src/test/java/tests/AuthoritiesIT.java deleted file mode 100644 index 120dacbd..00000000 --- a/test/src/test/java/tests/AuthoritiesIT.java +++ /dev/null @@ -1,116 +0,0 @@ -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; - - @BeforeAll - public static void beforeAll() { - generatedName = generateName("authoritiesTest"); - 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/GroupsIT.java b/test/src/test/java/tests/GroupsIT.java deleted file mode 100644 index 3ddc05c6..00000000 --- a/test/src/test/java/tests/GroupsIT.java +++ /dev/null @@ -1,213 +0,0 @@ -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.GroupsPage; -import pages.InboxPage; - -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.assertTrue; -import static org.openqa.selenium.support.PageFactory.initElements; - -/** - * @author kote - */ -public class GroupsIT extends BaseTest { - - private static final String ADMINISTRATION = "Администрирование"; - private static final String GROUPS = "Группы"; - private static final String CREATE = "Создать"; - private static final String EDIT = "Редактировать"; - private static final String SAVE = "Сохранить"; - private static final String ADD_ONE = ">"; - private static final String REMOVE_ONE = "<"; - private static final String TABLE_ADDED = "ADDED"; - private static final String TABLE_TO_ADD = "TO_ADD"; - private static final String CONFIRMATION_TITLE = "Подтверждение действия"; - private static final String YES = "Да"; - private static final String PART_FOR_NAME = "groupsTest"; - - private GroupsPage groupsPage; - - @AfterAll - public static void afterAll() { - EXECUTION_MANAGER.deleteGroupByName(PART_FOR_NAME); - EXECUTION_MANAGER.deleteRoleByName(PART_FOR_NAME); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void crudGroups(Browser browser) { - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(GROUPS); - groupsPage = initElements(driver, GroupsPage.class); - assertTrue(groupsPage.pageLoadSuccessfully()); - assertTrue(groupsPage.isTitleVisible("Администрирование групп")); - - //check create and search group: - groupsPage.clickOnButton(CREATE); - assertTrue(groupsPage.pageLoadSuccessfully()); - - String groupName = generateName(PART_FOR_NAME); - groupsPage.editGroupName(groupName); - groupsPage.selectAccessLevel("user access level"); - groupsPage.clickOnButton(SAVE); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.editSearchField(groupName); - groupsPage.waitGridProgressBarNotVisible(); - assertTrue(groupsPage.isGroupVisible(groupName)); - assertEquals(1, groupsPage.getNumberOfGroupRows()); - - //check edit group: - groupsPage.clickOnGroup(groupName); - groupsPage.clickOnButton(EDIT); - assertTrue(groupsPage.pageLoadSuccessfully()); - - String newGroupName = generateName(PART_FOR_NAME); - groupsPage.editGroupName(newGroupName); - groupsPage.clickOnButton(SAVE); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.editSearchField(groupName); - groupsPage.waitGridProgressBarNotVisible(); - assertEquals(0, groupsPage.getNumberOfGroupRows()); - - groupsPage.editSearchField(newGroupName); - groupsPage.waitGridProgressBarNotVisible(); - assertTrue(groupsPage.isGroupVisible(newGroupName)); - assertEquals(1, groupsPage.getNumberOfGroupRows()); - - //check delete group: - groupsPage.clickOnGroup(newGroupName); - groupsPage.clickOnButton("Удалить"); - assertTrue(groupsPage.isDialogOpened(CONFIRMATION_TITLE)); - - groupsPage.clickOnButton(YES); - assertTrue(groupsPage.pageLoadSuccessfully()); - assertEquals(0, groupsPage.getNumberOfGroupRows()); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void addAndRemoveRoles(Browser browser) { - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(GROUPS); - groupsPage = initElements(driver, GroupsPage.class); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.clickOnButton(CREATE); - assertTrue(groupsPage.pageLoadSuccessfully()); - - String roleName = generateName(PART_FOR_NAME); - EXECUTION_MANAGER.insertRole(roleName); - String groupName = generateName(PART_FOR_NAME); - groupsPage.editGroupName(groupName); - groupsPage.selectAccessLevel("user access level"); - - //check > 1 element: - List listRoles = groupsPage.getListOfRolesNamesToAdd(); - groupsPage.clickOnRoleToAdd(listRoles.get(1)); - groupsPage.clickOnMoveButton(ADD_ONE); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_ADDED, listRoles.subList(1, 2), true); - checkRolesInTable(TABLE_TO_ADD, listRoles.subList(1, 2), false); - - //check < 1 element: - groupsPage.clickOnRoleAdded(listRoles.get(1)); - groupsPage.clickOnMoveButton(REMOVE_ONE); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_TO_ADD, listRoles.subList(1, 2), true); - checkRolesInTable(TABLE_ADDED, listRoles.subList(1, 2), false); - - //check > 2 elements: - //здесь не проверяем выбор двух ролей чекбоксом из-за бага Selenium получения списка - //(он не в том порядке, в котором они отображаются), проверяем кликом по конкретной роли - listRoles = groupsPage.getListOfRolesNamesToAdd(); //актуализируем список - groupsPage.clickOnRoleToAdd(listRoles.get(1)); - groupsPage.clickOnMoveButton(ADD_ONE); - groupsPage.clickOnRoleToAdd(listRoles.get(2)); - groupsPage.clickOnMoveButton(ADD_ONE); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_ADDED, listRoles.subList(1, 3), true); - checkRolesInTable(TABLE_TO_ADD, listRoles.subList(1, 3), false); - - //check < 2 elements: - groupsPage.clickOnRoleAdded(listRoles.get(1)); - groupsPage.clickOnMoveButton(REMOVE_ONE); - groupsPage.clickOnRoleAdded(listRoles.get(2)); - groupsPage.clickOnMoveButton(REMOVE_ONE); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_TO_ADD, listRoles.subList(1, 3), true); - checkRolesInTable(TABLE_ADDED, listRoles.subList(1, 3), false); - - //check >>: - listRoles = groupsPage.getListOfRolesNamesToAdd(); //актуализируем список - groupsPage.clickOnMoveButton(">>"); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_ADDED, listRoles, true); - checkRolesInTable(TABLE_TO_ADD, listRoles, false); - - //check <<: - groupsPage.clickOnMoveButton("<<"); - groupsPage.waitGridProgressBarNotVisible(); - checkRolesInTable(TABLE_TO_ADD, listRoles, true); - checkRolesInTable(TABLE_ADDED, listRoles, false); - - //check Ok and linked roles grid: - groupsPage.clickOnRoleDateColumnHeader(); - groupsPage.clickOnRoleToAdd(roleName); - groupsPage.clickOnMoveButton(ADD_ONE); - groupsPage.waitGridProgressBarNotVisible(); - groupsPage.clickOnButton(SAVE); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.editSearchField(groupName); - groupsPage.waitGridProgressBarNotVisible(); - groupsPage.clickOnGroup(groupName); - groupsPage.waitGridProgressBarNotVisible(); - assertTrue(groupsPage.isRoleVisible(roleName)); - assertEquals(1, groupsPage.getNumberOfRolesRows()); - - //check Cancel: - groupsPage.clickOnButton(EDIT); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.clickOnRoleAdded(roleName); - groupsPage.clickOnMoveButton(REMOVE_ONE); - groupsPage.clickOnButton("Отменить"); - assertTrue(groupsPage.isDialogOpened(CONFIRMATION_TITLE)); - - groupsPage.clickOnButton(YES); - assertTrue(groupsPage.pageLoadSuccessfully()); - - groupsPage.editSearchField(groupName); - groupsPage.waitGridProgressBarNotVisible(); - groupsPage.clickOnGroup(groupName); - groupsPage.waitGridProgressBarNotVisible(); - assertTrue(groupsPage.isRoleVisible(roleName)); - assertEquals(1, groupsPage.getNumberOfRolesRows()); - } - - private void checkRolesInTable(String table, List expectedValues, boolean shouldHaveValues) { - if (shouldHaveValues) { - assertTrue(groupsPage.hasRolesInTable(table, expectedValues)); - } - else { - assertFalse(groupsPage.hasRolesInTable(table, expectedValues)); - } - } -} \ No newline at end of file diff --git a/test/src/test/java/tests/LoginIT.java b/test/src/test/java/tests/LoginIT.java deleted file mode 100644 index 3efe4ff6..00000000 --- a/test/src/test/java/tests/LoginIT.java +++ /dev/null @@ -1,163 +0,0 @@ -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 = "loginTest"; - private static final String REG_EMAIL = "qa_new_account@mail.ru"; - private static final String RESET_EMAIL = "password_recovery_account@mail.ru"; - - @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(PART_FOR_NAME); - 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 deleted file mode 100644 index a8fcd5c3..00000000 --- a/test/src/test/java/tests/OrganizationsIT.java +++ /dev/null @@ -1,118 +0,0 @@ -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 = "organizationsTest"; - - @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 deleted file mode 100644 index d271c5ab..00000000 --- a/test/src/test/java/tests/ProcessesIT.java +++ /dev/null @@ -1,100 +0,0 @@ -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 = "Тестовая страница"; - - @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/java/tests/RolesIT.java b/test/src/test/java/tests/RolesIT.java deleted file mode 100644 index e3203a41..00000000 --- a/test/src/test/java/tests/RolesIT.java +++ /dev/null @@ -1,137 +0,0 @@ -package tests; - -import com.google.common.collect.Comparators; -import core.BaseTest; -import core.Browser; -import core.BrowserArgumentProvider; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ArgumentsSource; -import pages.InboxPage; -import pages.RolesPage; - -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 RolesIT extends BaseTest { - - private static final String ADMINISTRATION = "Администрирование"; - private static final String ROLES = "Роли"; - private static final String SAVE = "Сохранить"; - private static final String PART_FOR_NAME = "rolesTest"; - - @AfterAll - public static void afterAll() { - EXECUTION_MANAGER.deleteGroupByName(PART_FOR_NAME); - EXECUTION_MANAGER.deleteRoleByName(PART_FOR_NAME); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void crudRoles(Browser browser) { - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(ROLES); - RolesPage rolesPage = initElements(driver, RolesPage.class); - assertTrue(rolesPage.pageLoadSuccessfully()); - assertTrue(rolesPage.isTitleVisible("Администрирование ролей")); - - //check create and search role: - rolesPage.clickOnButton("Создать"); - assertTrue(rolesPage.pageLoadSuccessfully()); - - String roleName = generateName(PART_FOR_NAME); - rolesPage.editRoleName(roleName); - rolesPage.clickOnButton(SAVE); - assertTrue(rolesPage.pageLoadSuccessfully()); - - rolesPage.editSearchField(roleName); - rolesPage.waitGridProgressBarNotVisible(); - assertTrue(rolesPage.isRoleVisible(roleName)); - assertEquals(1, rolesPage.getNumberOfRolesRows()); - - //check edit role: - rolesPage.clickOnRole(roleName); - rolesPage.clickOnButton("Редактировать"); - assertTrue(rolesPage.pageLoadSuccessfully()); - - String newRoleName = generateName(PART_FOR_NAME); - rolesPage.editRoleName(newRoleName); - rolesPage.clickOnButton(SAVE); - assertTrue(rolesPage.pageLoadSuccessfully()); - - rolesPage.editSearchField(roleName); - rolesPage.waitGridProgressBarNotVisible(); - assertEquals(0, rolesPage.getNumberOfRolesRows()); - - rolesPage.editSearchField(newRoleName); - rolesPage.waitGridProgressBarNotVisible(); - assertTrue(rolesPage.isRoleVisible(newRoleName)); - assertEquals(1, rolesPage.getNumberOfRolesRows()); - - //check delete role: - rolesPage.clickOnRole(newRoleName); - rolesPage.clickOnButton("Удалить"); - assertTrue(rolesPage.isDialogOpened("Подтверждение действия")); - - rolesPage.clickOnButton("Да"); - assertTrue(rolesPage.pageLoadSuccessfully()); - assertEquals(0, rolesPage.getNumberOfRolesRows()); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void checkLinkedGroups(Browser browser) { - String generatedName = generateName(PART_FOR_NAME); - EXECUTION_MANAGER.insertGroupAndLinkedRole(generatedName); - - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(ROLES); - RolesPage rolesPage = initElements(driver, RolesPage.class); - assertTrue(rolesPage.pageLoadSuccessfully()); - - rolesPage.editSearchField(generatedName); - rolesPage.waitGridProgressBarNotVisible(); - rolesPage.clickOnRole(generatedName); - rolesPage.waitGridProgressBarNotVisible(); - assertTrue(rolesPage.isGroupVisible(generatedName)); - assertEquals(1, rolesPage.getNumberOfGroupRows()); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void staticGridSorting(Browser browser) { - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(ROLES); - RolesPage rolesPage = initElements(driver, RolesPage.class); - assertTrue(rolesPage.pageLoadSuccessfully()); - assertTrue(Comparators.isInOrder(rolesPage.getListOfRolesNames(), String.CASE_INSENSITIVE_ORDER)); - - rolesPage.clickOnRoleNameColumnHeader(); - //из-за бага(?) Selenium после сортировки список возвращается неверный (изначальный) - //поэтому используем обновление страницы с включенным в гриде св-вом Save Column State: - rolesPage.refreshPage(); - assertTrue(rolesPage.pageLoadSuccessfully()); - assertTrue(Comparators.isInOrder(rolesPage.getListOfRolesNames(), String.CASE_INSENSITIVE_ORDER.reversed())); - - rolesPage.clickOnRoleNameColumnHeader(); - //из-за бага(?) Selenium после сортировки список возвращается неверный (изначальный) - //поэтому используем обновление страницы с включенным в гриде св-вом Save Column State: - rolesPage.refreshPage(); - assertTrue(rolesPage.pageLoadSuccessfully()); - assertTrue(Comparators.isInOrder(rolesPage.getListOfRolesNames(), String.CASE_INSENSITIVE_ORDER)); - } -} \ No newline at end of file diff --git a/test/src/test/java/tests/TokensIT.java b/test/src/test/java/tests/TokensIT.java deleted file mode 100644 index f42dbd23..00000000 --- a/test/src/test/java/tests/TokensIT.java +++ /dev/null @@ -1,114 +0,0 @@ -package tests; - -import java.io.IOException; -import java.util.Base64; -import java.util.Date; -import java.util.Properties; -import javax.crypto.SecretKey; - -import core.BaseTest; -import core.Browser; -import core.BrowserArgumentProvider; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; -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 pages.InboxPage; -import security.SecurityUtils; -import util.PropertyManager; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - - -/** - * @author kote - */ -public class TokensIT extends BaseTest { - private static final String SECRET_KEY = "ZjE5ZjMxNmYtODViZC00ZTQ5LWIxZmYtOGEzYzE3Yjc1MDVk}"; - private static final SecretKey SIGNING_KEY; - - private final Properties config; - - static { - byte[] encodedKey = Base64.getMimeDecoder().decode(SECRET_KEY); - SIGNING_KEY = Keys.hmacShaKeyFor(encodedKey); - } - - public TokensIT() throws IOException { - super(); - config = PropertyManager.getProperties(); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void checkAliveAndDeadAccessAndRefreshTokens(Browser browser) { - InboxPage inboxPage = loginInApp(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - //check alive access token - inboxPage.refreshPage(); - inboxPage.waitForPageToLoad(); - assertFalse(inboxPage.isFormSigninVisible()); - - //check refresh token (when access token dead) - pasteDeadAccessToken(); - inboxPage.refreshPage(); - inboxPage.waitForPageToLoad(); - assertFalse(inboxPage.isFormSigninVisible()); - - //check refresh token (when access token deleted) - driver.manage().deleteCookieNamed(SecurityUtils.TOKEN); - inboxPage.refreshPage(); - inboxPage.waitForPageToLoad(); - assertFalse(inboxPage.isFormSigninVisible()); - - //check dead access and refresh tokens - driver.manage().deleteAllCookies(); - inboxPage.refreshPage(); - inboxPage.waitForPageToLoad(); - assertTrue(inboxPage.isFormSigninVisible()); - } - - @Disabled("dev WEBBPMNEXT-9213") - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void checkClearLocalStorage(Browser browser) { - InboxPage inboxPage = loginInApp(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - ((JavascriptExecutor) driver).executeScript( - "window.localStorage.clear();"); //clear localStorage - inboxPage.refreshPage(); - assertTrue(inboxPage.isFormSigninVisible()); - } - - private void pasteDeadAccessToken() { - String deadAccessToken = createDeadAccessToken(config.getProperty("login")); - Cookie cookieAccessToken = driver.manage().getCookieNamed(SecurityUtils.TOKEN); - driver.manage().deleteCookie(cookieAccessToken); - addCookie(driver, cookieAccessToken, deadAccessToken); - } - - 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 addCookie(WebDriver driver, Cookie cookie, String value) { - driver.manage().addCookie(new Cookie.Builder(cookie.getName(), value) - .expiresOn(cookie.getExpiry()) - .path(cookie.getPath()) - .build() - ); - } -} diff --git a/test/src/test/java/tests/UsersIT.java b/test/src/test/java/tests/UsersIT.java deleted file mode 100644 index 2fc77a89..00000000 --- a/test/src/test/java/tests/UsersIT.java +++ /dev/null @@ -1,240 +0,0 @@ -package tests; - -import java.io.IOException; -import java.util.Properties; - -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.UsersPage; -import util.PropertyManager; - -import static org.junit.jupiter.api.Assertions.assertEquals; -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 UsersIT extends BaseTest { - - private static final String ADMINISTRATION = "Администрирование"; - private static final String USERS = "Пользователи"; - private static final String EDIT = "Редактировать"; - private static final String SAVE = "Сохранить"; - private static final String PART_FOR_NAME = "usersTest"; - - public UsersIT() { - super(); - } - - @AfterAll - public static void afterAll() { - EXECUTION_MANAGER.deleteUserByEmail(PART_FOR_NAME); - EXECUTION_MANAGER.deleteGroupByName(PART_FOR_NAME); - EXECUTION_MANAGER.deleteOrganizationByName(PART_FOR_NAME); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void crudUsers(Browser browser) { - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(USERS); - UsersPage usersPage = initElements(driver, UsersPage.class); - assertTrue(usersPage.pageLoadSuccessfully()); - assertTrue(usersPage.isTitleVisible("Администрирование пользователей")); - - //check create and search user: - usersPage.clickOnButton("Создать"); - assertTrue(usersPage.pageLoadSuccessfully()); - - String userName = generateName(PART_FOR_NAME); - usersPage.editUserLastName(userName); - usersPage.editUserFirstName(userName); - usersPage.editUserMiddleName(userName); - usersPage.editUserLogin(userName); - usersPage.editUserPassword(userName); - usersPage.editUserPasswordRepeat(userName); - usersPage.editUserEmail(userName + "@test.ru"); - usersPage.selectOrganization("Default Organization"); - usersPage.clickOnGroupToAdd("BPMN User"); - usersPage.clickOnMoveButton(">"); - usersPage.clickOnButton(SAVE); - assertTrue(usersPage.pageLoadSuccessfully()); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userName); - usersPage.waitGridProgressBarNotVisible(); - assertTrue(usersPage.isUserVisible(userName)); - assertEquals(1, usersPage.getNumberOfUserRows()); - - //check login by created user: - logout(inboxPage); - - LoginPage loginPage = initElements(driver, LoginPage.class); - assertTrue(loginPage.pageLoadSuccessfully()); - - loginPage.typeLoginPasswordAndEnter(userName, userName); - assertTrue(inboxPage.pageLoadSuccessfully()); - - //check edit user: - logout(inboxPage); - reloginInAppByAdmin(); - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(USERS); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userName); - usersPage.waitGridProgressBarNotVisible(); - usersPage.clickOnUser(userName); - usersPage.clickOnButton(EDIT); - assertTrue(usersPage.pageLoadSuccessfully()); - - String newUserName = generateName(PART_FOR_NAME); - usersPage.editUserLastName(newUserName); - usersPage.clickOnButton(SAVE); - assertTrue(usersPage.pageLoadSuccessfully()); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userName); - usersPage.waitGridProgressBarNotVisible(); - assertEquals(0, usersPage.getNumberOfUserRows()); - - usersPage.editSearchFieldLastName(newUserName); - usersPage.waitGridProgressBarNotVisible(); - assertTrue(usersPage.isUserVisible(newUserName)); - assertEquals(1, usersPage.getNumberOfUserRows()); - - //check delete user: - usersPage.clickOnUser(newUserName); - usersPage.clickOnButton("Удалить"); - assertTrue(usersPage.isDialogOpened("Подтверждение действия")); - - usersPage.clickOnButton("Да"); - assertTrue(usersPage.pageLoadSuccessfully()); - assertEquals(0, usersPage.getNumberOfUserRows()); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void addNewOrganizationAndGroup(Browser browser) { - String userName = generateName(PART_FOR_NAME); - String groupName = generateName(PART_FOR_NAME); - String organizationName = generateName(PART_FOR_NAME); - EXECUTION_MANAGER.insertUser(userName, userName + "@test.ru", userName); - EXECUTION_MANAGER.insertGroup(groupName); - EXECUTION_MANAGER.insertSubsidiaryToDefaultOrganization(organizationName); - //тк пользователь видит только пользователей из своей организации или дочерних к ней - - InboxPage inboxPage = loginInAppByAdmin(browser); - assertTrue(inboxPage.pageLoadSuccessfully()); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(USERS); - UsersPage usersPage = initElements(driver, UsersPage.class); - assertTrue(usersPage.pageLoadSuccessfully()); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userName); - usersPage.waitGridProgressBarNotVisible(); - usersPage.clickOnUser(userName); - usersPage.clickOnButton(EDIT); - assertTrue(usersPage.pageLoadSuccessfully()); - - //attach new organization: - usersPage.selectOrganization(organizationName); - - //attach new group: - usersPage.clickOnGroupDateColumnHeader(); - usersPage.clickOnGroupToAdd(groupName); - usersPage.clickOnMoveButton(">"); - usersPage.waitGridProgressBarNotVisible(); - usersPage.clickOnButton(SAVE); - assertTrue(usersPage.pageLoadSuccessfully()); - - //check user visibility from a subsidiary organization: - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userName); - usersPage.waitGridProgressBarNotVisible(); - assertTrue(usersPage.isUserVisible(userName)); - assertEquals(1, usersPage.getNumberOfUserRows()); - - //check linked groups grid: - usersPage.clickOnUser(userName); - usersPage.waitGridProgressBarNotVisible(); - assertTrue(usersPage.isGroupVisible(groupName)); - assertEquals(1, usersPage.getNumberOfGroupsRows()); - } - - @ParameterizedTest - @ArgumentsSource(BrowserArgumentProvider.class) - public void accessLevelOrganizationAndGroup(Browser browser) throws IOException { - String userNameForGroup = generateName(PART_FOR_NAME); - String securityAdminGroup = "Security Admin"; - String securityAdminGroupId = "84c5c1e2-081e-45e1-a874-d6bb232e57ad"; - String userAccountId = EXECUTION_MANAGER.insertUser(userNameForGroup, - userNameForGroup + "@test.ru", userNameForGroup - ); - EXECUTION_MANAGER.linkGroupToUser(userAccountId, securityAdminGroupId); - - String userNameForOrg = generateName(PART_FOR_NAME); - String organizationName = generateName(PART_FOR_NAME); - String organizationId = EXECUTION_MANAGER.insertOrganization(organizationName); - EXECUTION_MANAGER.insertUser(userNameForOrg, userNameForOrg + "@test.ru", userNameForOrg, - organizationId - ); - - //check that the user can see the group of the current access level: - Properties config = PropertyManager.getProperties(); - String demo_login = config.getProperty("demo_login"); - String demo_password = config.getProperty("demo_password"); - - LoginPage loginPage = openApp(browser); - assertTrue(loginPage.pageLoadSuccessfully()); - - loginPage.typeLoginPasswordAndEnter(demo_login, demo_password); - assertTrue(loginPage.pageLoadSuccessfully()); - - InboxPage inboxPage = initElements(driver, InboxPage.class); - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(USERS); - - UsersPage usersPage = initElements(driver, UsersPage.class); - assertTrue(usersPage.pageLoadSuccessfully()); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userNameForGroup); - usersPage.waitGridProgressBarNotVisible(); - usersPage.clickOnUser(userNameForGroup); - usersPage.waitGridProgressBarNotVisible(); - assertTrue(usersPage.isGroupVisible(securityAdminGroup)); - - //check that the user cannot see a higher access level group: - logout(inboxPage); - reloginInAppByAdmin(); - - inboxPage.clickOnMenu(ADMINISTRATION); - inboxPage.clickOnSubMenu(USERS); - assertTrue(usersPage.pageLoadSuccessfully()); - - usersPage.clickOnFilterPanel(); - usersPage.editSearchFieldLastName(userNameForGroup); - usersPage.waitGridProgressBarNotVisible(); - usersPage.clickOnUser(userNameForGroup); - assertFalse(usersPage.isGroupVisible(securityAdminGroup)); - - //check that the user cannot see the user from another organization: - usersPage.editSearchFieldLastName(userNameForOrg); - usersPage.waitGridProgressBarNotVisible(); - assertFalse(usersPage.isUserVisible(userNameForOrg)); - } -} \ No newline at end of file diff --git a/test/src/test/resources/junit-platform.properties b/test/src/test/resources/junit-platform.properties deleted file mode 100644 index ecd09831..00000000 --- a/test/src/test/resources/junit-platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# параметр включения/выключения параллельного выполнения тестов. -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 deleted file mode 100644 index 78b6e3ab..00000000 --- a/test/src/test/resources/logback.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - [%-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 deleted file mode 100644 index 2625ecce..00000000 --- a/test/src/test/resources/test.properties +++ /dev/null @@ -1,15 +0,0 @@ -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