SUPPORT-8737 rename sources

backend/pom.xml

@@ -3,11 +3,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>ervu_usr_autority</groupId>
-    <artifactId>ervu_usr_autority</artifactId>
+    <groupId>ru.micord.ervu</groupId>
+    <artifactId>account-applications</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
-  <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+  <groupId>ru.micord.ervu.account_applications</groupId>
   <artifactId>backend</artifactId>
   <packaging>war</packaging>
   <dependencies>
@@ -25,7 +25,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+      <groupId>ru.micord.ervu.account_applications</groupId>
       <artifactId>resources</artifactId>
       <scope>runtime</scope>
     </dependency>

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

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;

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;

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

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

config/dev/standalone.xml

@@ -161,7 +161,7 @@
                     </timeout>
                 </datasource>
                 <datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" statistics-enabled="true">
-                    <connection-url>jdbc:postgresql://10.10.31.118:5432/ervu_usr_autority</connection-url>
+                    <connection-url>jdbc:postgresql://10.10.31.118:5432/account_applications</connection-url>
                     <driver>postgres</driver>
                     <security>
                         <user-name>ervu</user-name>

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";

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
 --
-

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

distribution/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>ervu_usr_autority</groupId>
-    <artifactId>ervu_usr_autority</artifactId>
+    <groupId>ru.micord.ervu</groupId>
+    <artifactId>account-applications</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+  <groupId>ru.micord.ervu.account_applications</groupId>
   <artifactId>distribution</artifactId>
   <packaging>ear</packaging>
 
@@ -17,12 +17,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+      <groupId>ru.micord.ervu.account_applications</groupId>
       <artifactId>backend</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+      <groupId>ru.micord.ervu.account_applications</groupId>
       <artifactId>frontend</artifactId>
       <type>war</type>
     </dependency>
@@ -37,13 +37,13 @@
         <configuration>
           <modules>
             <webModule>
-              <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+              <groupId>ru.micord.ervu.account_applications</groupId>
               <artifactId>frontend</artifactId>
               <contextRoot>/</contextRoot>
               <bundleFileName>frontend.war</bundleFileName>
             </webModule>
             <webModule>
-              <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+              <groupId>ru.micord.ervu.account_applications</groupId>
               <artifactId>backend</artifactId>
               <contextRoot>${backendContext}</contextRoot>
               <bundleFileName>${project.parent.artifactId}.war</bundleFileName>

frontend/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>ervu_usr_autority</title>
+    <title>account_applications</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
     <link rel="stylesheet" href="src/resources/css/style.css"/>
@@ -17,7 +17,7 @@
         });
     </script>
 </head>
-<body webbpm class="webbpm ervu_usr_autority">
+<body webbpm class="webbpm account-applications">
     <div class="loader"></div>
 </body>
 </html>

frontend/index.webpack.html

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>ervu_usr_autority</title>
+    <title>account_applications</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
 </head>
-<body webbpm class="webbpm ervu_usr_autority">
+<body webbpm class="webbpm account-applications">
 <div class="loader"></div>
 </body>
 </html>

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",

frontend/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>ervu_usr_autority</groupId>
-    <artifactId>ervu_usr_autority</artifactId>
+    <groupId>ru.micord.ervu</groupId>
+    <artifactId>account-applications</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+  <groupId>ru.micord.ervu.account_applications</groupId>
   <artifactId>frontend</artifactId>
   <packaging>war</packaging>
 

frontend/preview.html

@@ -17,7 +17,7 @@
       });
     </script>
 </head>
-<body preview-container id="webbpm-angular-application-container" class="webbpm ervu_usr_autority">
+<body preview-container id="webbpm-angular-application-container" class="webbpm account-applications">
     <div class="loader"></div>
 </body>
 </html>

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": "",

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);
-}
+}

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;
     }
-} 
+}

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 {

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 = [

pom.xml

@@ -2,14 +2,13 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ervu_usr_autority</groupId>
-  <artifactId>ervu_usr_autority</artifactId>
+  <groupId>ru.micord.ervu</groupId>
+  <artifactId>account-applications</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
     <module>resources</module>
-    <module>test</module>
   </modules>
   <scm>
     <connection>scm:git:git://gitserver/webbpm/webbpm-components.git</connection>
@@ -33,7 +32,7 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+        <groupId>ru.micord.ervu.account_applications</groupId>
         <artifactId>backend</artifactId>
         <version>${project.version}</version>
         <type>war</type>
@@ -70,19 +69,19 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+        <groupId>ru.micord.ervu.account_applications</groupId>
         <artifactId>backend</artifactId>
         <version>${project.version}</version>
         <classifier>classes</classifier>
       </dependency>
       <dependency>
-        <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+        <groupId>ru.micord.ervu.account_applications</groupId>
         <artifactId>frontend</artifactId>
         <version>${project.version}</version>
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+        <groupId>ru.micord.ervu.account_applications</groupId>
         <artifactId>resources</artifactId>
         <version>${project.version}</version>
       </dependency>

resources/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>ervu_usr_autority</groupId>
-    <artifactId>ervu_usr_autority</artifactId>
+    <groupId>ru.micord.ervu</groupId>
+    <artifactId>account-applications</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
+  <groupId>ru.micord.ervu.account_applications</groupId>
   <artifactId>resources</artifactId>
 
   <dependencies>

resources/src/main/resources/business-model/user_accounts.jrxml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.9.0.final using JasperReports Library version 6.9.0-cb8f9004be492ccc537180b49c026951f4220bf3  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="user_accounts" pageWidth="810" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="810" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="53ee4624-8ac8-49f2-a973-c9ccb4285695">
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="ervu_usr_autority"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="ervu-account-applications"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -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']]>
 	</queryString>
 	<field name="user_application_list_id" class="java.lang.Long">

resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page

@@ -1472,7 +1472,7 @@
                         </complex>
                         <implRef type="JAVA">
                             <className>UserAuthorityFormService</className>
-                            <packageName>ru.micord.ervu.user_authority.service</packageName>
+                            <packageName>ru.micord.ervu.account_applications.service</packageName>
                         </implRef>
                     </value>
                 </entry>

resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page

@@ -817,7 +817,7 @@
                         </complex>
                         <implRef type="JAVA">
                             <className>UserAuthorityFormService</className>
-                            <packageName>ru.micord.ervu.user_authority.service</packageName>
+                            <packageName>ru.micord.ervu.account_applications.service</packageName>
                         </implRef>
                     </value>
                 </entry>
@@ -2557,7 +2557,7 @@
                 <scripts id="db9c1a9d-2cf4-4fca-b2b0-5c3f78e4cb88">
                     <classRef type="TS">
                         <className>SetCurrentUserIdAsDefValue</className>
-                        <packageName>ervu-usr-autority.scripts</packageName>
+                        <packageName>account_applications.scripts</packageName>
                     </classRef>
                     <enabled>true</enabled>
                     <expanded>true</expanded>

resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page

@@ -817,7 +817,7 @@
                         </complex>
                         <implRef type="JAVA">
                             <className>UserAuthorityFormService</className>
-                            <packageName>ru.micord.ervu.user_authority.service</packageName>
+                            <packageName>ru.micord.ervu.account_applications.service</packageName>
                         </implRef>
                     </value>
                 </entry>
@@ -2562,7 +2562,7 @@
                 <scripts id="db9c1a9d-2cf4-4fca-b2b0-5c3f78e4cb88">
                     <classRef type="TS">
                         <className>SetCurrentUserIdAsDefValue</className>
-                        <packageName>ervu-usr-autority.scripts</packageName>
+                        <packageName>account_applications.scripts</packageName>
                     </classRef>
                     <enabled>true</enabled>
                     <expanded>true</expanded>

resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page

@@ -817,7 +817,7 @@
                         </complex>
                         <implRef type="JAVA">
                             <className>UserAuthorityFormService</className>
-                            <packageName>ru.micord.ervu.user_authority.service</packageName>
+                            <packageName>ru.micord.ervu.account_applications.service</packageName>
                         </implRef>
                     </value>
                 </entry>
@@ -2633,7 +2633,7 @@
                 <scripts id="db9c1a9d-2cf4-4fca-b2b0-5c3f78e4cb88">
                     <classRef type="TS">
                         <className>SetCurrentUserIdAsDefValue</className>
-                        <packageName>ervu-usr-autority.scripts</packageName>
+                        <packageName>account_applications.scripts</packageName>
                     </classRef>
                     <enabled>true</enabled>
                     <expanded>true</expanded>

resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page

@@ -1253,7 +1253,7 @@
                             <scripts id="db9c1a9d-2cf4-4fca-b2b0-5c3f78e4cb88">
 <classRef type="TS">
     <className>SetCurrentUserIdAsDefValue</className>
-    <packageName>ervu-usr-autority.scripts</packageName>
+    <packageName>account_applications.scripts</packageName>
 </classRef>
 <enabled>true</enabled>
 <expanded>true</expanded>
@@ -3892,7 +3892,7 @@
                     <entry>
                         <key>form</key>
                         <value>
-                            <simple>{"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"ervu-usr-autority.component.container","className":"VBoxLoadValues","type":"TS"}</simple>
+                            <simple>{"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"account_applications.component.container","className":"VBoxLoadValues","type":"TS"}</simple>
                         </value>
                     </entry>
                 </properties>
@@ -4567,7 +4567,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"ervu-usr-autority.component.container","className":"VBoxLoadValues","type":"TS"}</simple>
+                <simple>{"objectId":"90a6357d-ce58-4770-bd11-69c07fc8cb3f","packageName":"account_applications.component.container","className":"VBoxLoadValues","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -6100,7 +6100,7 @@
                         <value>
                             <implRef type="JAVA">
 <className>EnumColumnFormatter</className>
-<packageName>ervu_usr_autority</packageName>
+<packageName>ru.micord.ervu.account_applications</packageName>
                             </implRef>
                         </value>
                     </entry>
@@ -6145,7 +6145,7 @@
                         <value>
                             <implRef type="JAVA">
 <className>EnumColumnFormatter</className>
-<packageName>ervu_usr_autority</packageName>
+<packageName>ru.micord.ervu.account_applications</packageName>
                             </implRef>
                         </value>
                     </entry>
@@ -6279,7 +6279,7 @@
                         <value>
                             <implRef type="JAVA">
 <className>EnumColumnFormatter</className>
-<packageName>ervu_usr_autority</packageName>
+<packageName>ru.micord.ervu.account_applications</packageName>
                             </implRef>
                         </value>
                     </entry>
@@ -6565,7 +6565,7 @@
         <scripts id="d918879e-db8a-4aa3-a9a7-186a855d99f4">
             <classRef type="TS">
                 <className>VBoxLoadValues</className>
-                <packageName>ervu-usr-autority.component.container</packageName>
+                <packageName>account_applications.component.container</packageName>
             </classRef>
             <enabled>true</enabled>
             <expanded>true</expanded>

resources/src/main/resources/database/datasource.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource>
-    <dbBeanPackage>ervu_usr_autority.ervu_usr_autority.db_beans</dbBeanPackage>
-    <dbName>ervu_usr_autority</dbName>
+    <dbBeanPackage>ru.micord.ervu.account_applications.db_beans</dbBeanPackage>
+    <dbName>account_applications</dbName>
     <driverClassName>org.postgresql.Driver</driverClassName>
     <host>10.10.31.118</host>
     <manually>false</manually>
@@ -10,7 +10,7 @@
     <schemas>public</schemas>
     <schemas>security</schemas>
     <sqlDialect>POSTGRES</sqlDialect>
-    <url>jdbc:postgresql://10.10.31.118:5432/ervu_usr_autority</url>
+    <url>jdbc:postgresql://10.10.31.118:5432/account_applications</url>
     <urlPrefix>jdbc:postgresql:</urlPrefix>
     <user>ervu</user>
 </datasource>

test/pom.xml

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>ervu_usr_autority</groupId>
-    <artifactId>ervu_usr_autority</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>ervu_usr_autority.ervu_usr_autority</groupId>
-  <artifactId>test</artifactId>
-
-  <properties>
-    <application.url>http://localhost:8080/test</application.url>
-    <selenium.grid.url>http://127.0.0.1:4444/wd/hub</selenium.grid.url>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>31.0.1-jre</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>ru.cg.webbpm</groupId>
-      <artifactId>web-tests-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ru.micord.fias</groupId>
-      <artifactId>client</artifactId>
-    </dependency>
-
-    <!--JWT-->
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ru.cg.webbpm.modules.database</groupId>
-      <artifactId>database-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ru.cg.webbpm.modules.security</groupId>
-      <artifactId>security-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-suite-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.2.5</version>
-          <inherited>true</inherited>
-          <configuration>
-            <trimStackTrace>false</trimStackTrace>
-            <systemPropertyVariables>
-              <application.url>${application.url}</application.url>
-              <selenium.grid.url>${selenium.grid.url}</selenium.grid.url>
-            </systemPropertyVariables>
-            <failIfNoTests>true</failIfNoTests>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <profiles>
-
-    <profile>
-      <id>chrome</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <browsers>chrome</browsers>
-      </properties>
-    </profile>
-    <profile>
-      <id>all-browsers</id>
-      <properties>
-        <browsers>all</browsers>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>integration-tests-admin</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-                <configuration>
-                  <includes>
-                    <include>SuiteAdmin.java</include>
-                  </includes>
-                  <argLine>-Xmx4g -XX:+HeapDumpOnOutOfMemoryError
-                    -XX:HeapDumpPath=/tmp/integration-tests-admin-dump.hprof
-                  </argLine>
-                  <systemPropertyVariables>
-                    <browsers>${browsers}</browsers>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-            <version>2.22.2</version>
-            <reportSets>
-              <reportSet>
-                <id>integration-tests-admin</id>
-                <reports>
-                  <report>failsafe-report-only</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-        </plugins>
-      </reporting>
-    </profile>
-  </profiles>
-
-</project>

test/src/test/java/SuiteAdmin.java

@@ -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() {
-  }
-}

test/src/test/java/pages/AuthoritiesPage.java

@@ -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));
-  }
-}

test/src/test/java/pages/GroupsPage.java

@@ -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<String> getListOfRolesNamesToAdd() {
-    return getTexts(getBy(TABLE_TO_ADD + ROLES));
-  }
-
-  public void selectAccessLevel(String value) {
-    clickAndSelectValue(accessLevel, value);
-  }
-
-  public boolean hasRolesInTable(String tableName, List<String> expectedValues) {
-    String table = tableName.equals("ADDED") ? TABLE_ADDED : TABLE_TO_ADD;
-    return getElementsTexts(driver.findElements(By.xpath(table + ROLES)))
-        .containsAll(expectedValues);
-  }
-}