Merge branch 'master' into develop

backend/src/main/java/ru/micord/ervu/audit/config/AuditDisabledCondition.java

@@ -0,0 +1,19 @@
+package ru.micord.ervu.audit.config;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author Adel Kalimullin
+ */
+public class AuditDisabledCondition implements Condition {
+  private static final String AUDIT_ENABLED_PROPERTY_NAME = "audit.kafka.enabled";
+
+  @Override
+  public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+    Environment env = context.getEnvironment();
+    return !Boolean.parseBoolean(env.getProperty(AUDIT_ENABLED_PROPERTY_NAME));
+  }
+}

backend/src/main/java/ru/micord/ervu/audit/config/AuditEnabledCondition.java

@@ -0,0 +1,20 @@
+package ru.micord.ervu.audit.config;
+
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author Adel Kalimullin
+ */
+public class AuditEnabledCondition implements Condition {
+  private static final String AUDIT_ENABLED_PROPERTY_NAME = "audit.kafka.enabled";
+
+  @Override
+  public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+    Environment env = context.getEnvironment();
+    return Boolean.parseBoolean(env.getProperty(AUDIT_ENABLED_PROPERTY_NAME));
+  }
+}

backend/src/main/java/ru/micord/ervu/audit/config/AuditKafkaConfig.java

@@ -11,6 +11,7 @@ import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.config.TopicBuilder;
 import org.springframework.kafka.core.DefaultKafkaProducerFactory;
@@ -22,6 +23,7 @@ import org.springframework.kafka.core.ProducerFactory;
  * @author Adel Kalimullin
  */
 @Configuration
+@Conditional(AuditEnabledCondition.class)
 public class AuditKafkaConfig {
   @Value("${audit.kafka.bootstrap.servers}")
   private String bootstrapServers;
@@ -35,11 +37,11 @@ public class AuditKafkaConfig {
   private String password;
   @Value("${audit.kafka.sasl.mechanism}")
   private String saslMechanism;
-  @Value("${audit.kafka.authorization.topic}")
+  @Value("${audit.kafka.authorization.topic:ervu.lkrp.auth.events}")
   private String authorizationTopic;
-  @Value("${audit.kafka.action.topic}")
+  @Value("${audit.kafka.action.topic:ervu.lkrp.action.events}")
   private String actionTopic;
-  @Value("${audit.kafka.file.download.topic}")
+  @Value("${audit.kafka.file.download.topic:ervu.lkrp.import.file}")
   private String fileDownloadTopic;
 
   @Bean("auditProducerFactory")

backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditKafkaPublisher.java

@@ -3,20 +3,20 @@ package ru.micord.ervu.audit.service.impl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
+import ru.micord.ervu.audit.config.AuditEnabledCondition;
 import ru.micord.ervu.audit.service.AuditKafkaPublisher;
 
 /**
  * @author Adel Kalimullin
  */
 @Service
+@Conditional(AuditEnabledCondition.class)
 public class BaseAuditKafkaPublisher implements AuditKafkaPublisher {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseAuditKafkaPublisher.class);
   private final KafkaTemplate<String, String> kafkaTemplate;
-  @Value("${audit.kafka.enabled}")
-  private boolean auditEnabled;
 
   public BaseAuditKafkaPublisher(
       @Qualifier("auditTemplate") KafkaTemplate<String, String> kafkaTemplate) {
@@ -25,7 +25,6 @@ public class BaseAuditKafkaPublisher implements AuditKafkaPublisher {
 
   @Override
   public void publishEvent(String topic, String message) {
-    if (auditEnabled) {
       kafkaTemplate.send(topic, message)
           .addCallback(
               result -> {
@@ -35,8 +34,4 @@ public class BaseAuditKafkaPublisher implements AuditKafkaPublisher {
               )
           );
     }
-    else {
-      LOGGER.info("Audit is disabled. Event not published.");
-    }
-  }
 }

backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java

@@ -5,7 +5,9 @@ import javax.servlet.http.HttpServletRequest;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Service;
+import ru.micord.ervu.audit.config.AuditEnabledCondition;
 import ru.micord.ervu.audit.constants.AuditConstants;
 import ru.micord.ervu.audit.model.AuditActionEvent;
 import ru.micord.ervu.audit.model.AuditActionRequest;
@@ -22,15 +24,16 @@ import ru.micord.ervu.util.NetworkUtils;
  * @author Adel Kalimullin
  */
 @Service
+@Conditional(AuditEnabledCondition.class)
 public class BaseAuditService implements AuditService {
   private final AuditKafkaPublisher auditPublisher;
   private final JwtTokenService jwtTokenService;
   private final ObjectMapper objectMapper;
-  @Value("${audit.kafka.authorization.topic}")
+  @Value("${audit.kafka.authorization.topic:ervu.lkrp.auth.events}")
   private String authorizationTopic;
-  @Value("${audit.kafka.action.topic}")
+  @Value("${audit.kafka.action.topic:ervu.lkrp.action.events}")
   private String actionTopic;
-  @Value("${audit.kafka.file.download.topic}")
+  @Value("${audit.kafka.file.download.topic:ervu.lkrp.import.file}")
   private String fileDownloadTopic;
 
   public BaseAuditService(AuditKafkaPublisher auditPublisher, JwtTokenService jwtTokenService,

backend/src/main/java/ru/micord/ervu/audit/service/impl/StubAuditService.java

@@ -0,0 +1,32 @@
+package ru.micord.ervu.audit.service.impl;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.context.annotation.Conditional;
+import org.springframework.stereotype.Service;
+import ru.micord.ervu.audit.config.AuditDisabledCondition;
+import ru.micord.ervu.audit.model.AuditActionRequest;
+import ru.micord.ervu.audit.service.AuditService;
+import ru.micord.ervu.security.esia.model.PersonModel;
+
+/**
+ * @author Adel Kalimullin
+ */
+@Service
+@Conditional(AuditDisabledCondition.class)
+public class StubAuditService implements AuditService {
+
+  @Override
+  public void processActionEvent(HttpServletRequest request,
+      AuditActionRequest auditActionRequest) {}
+
+  @Override
+  public void processAuthEvent(HttpServletRequest request, PersonModel personModel, String status,
+      String eventType) {
+  }
+
+  @Override
+  public void processDownloadEvent(HttpServletRequest request, int fileSize, String fileName,
+      String formatRegistry, String status) {
+  }
+}

backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java

@@ -1,11 +1,14 @@
 package ru.micord.ervu.security.esia;
 
 import java.lang.invoke.MethodHandles;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ru.micord.ervu.security.esia.exception.EsiaException;
 import ru.micord.ervu.security.esia.model.ExpiringState;
 import ru.micord.ervu.security.esia.model.ExpiringToken;
 
@@ -16,7 +19,7 @@ public class EsiaAuthInfoStore {
   private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final Map<String, ExpiringToken> ACCESS_TOKENS_MAP = new ConcurrentHashMap<>();
   private static final Map<String, ExpiringToken> REFRESH_TOKENS_MAP = new ConcurrentHashMap<>();
-  private static final Map<String, ExpiringState> PRNS_UUID_STATE_MAP = new ConcurrentHashMap<>();
+  private static final Map<String, List<ExpiringState>> PRNS_UUID_STATE_MAP = new ConcurrentHashMap<>();
 
   public static void addAccessToken(String prnOid, String token, long expiresIn) {
     if (token != null) {
@@ -79,13 +82,34 @@ public class EsiaAuthInfoStore {
     REFRESH_TOKENS_MAP.remove(prnOid);
   }
 
-  public static void addState(String prnsUUID, String state, long expiresIn) {
+  public static void addState(String prnsUUID, String state, long expiresIn, long attemptsCount) {
     long expiryTime = System.currentTimeMillis() + expiresIn * 1000L;
-    PRNS_UUID_STATE_MAP.put(prnsUUID, new ExpiringState(state, expiryTime));
+    ExpiringState newState = new ExpiringState(state, expiryTime);
+    PRNS_UUID_STATE_MAP.compute(prnsUUID, (key, states) -> {
+      if (states == null) {
+        states = new CopyOnWriteArrayList<>();
+      }
+      if (states.size() >= attemptsCount) {
+        throw new EsiaException("The number of login attempts has been exceeded.");
+      }
+      states.add(newState);
+      return states;
+    });
   }
 
-  public static String getState(String prnsUUID) {
+  public static boolean containsState(String prnsUUID, String state) {
-    return PRNS_UUID_STATE_MAP.get(prnsUUID).getState();
+    List<ExpiringState> states = PRNS_UUID_STATE_MAP.get(prnsUUID);
+    if (states == null) {
+      return false;
+    }
+    long currentTime = System.currentTimeMillis();
+    states.removeIf(expiringState -> expiringState.getExpiryTime() < currentTime);
+    for (ExpiringState expiringState : states) {
+      if (expiringState.getState().equals(state)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   public static void removeState(String prnsUUID) {
@@ -94,10 +118,10 @@ public class EsiaAuthInfoStore {
 
   public static void removeExpiredState() {
     for (String key : PRNS_UUID_STATE_MAP.keySet()) {
-      ExpiringState state = PRNS_UUID_STATE_MAP.get(key);
+      PRNS_UUID_STATE_MAP.computeIfPresent(key, (k, states) -> {
-      if (state != null && state.isExpired()) {
+        states.removeIf(ExpiringState::isExpired);
-        PRNS_UUID_STATE_MAP.remove(key);
+        return states.isEmpty() ? null : states;
-      }
+      });
     }
   }
-}
+}

backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java

@@ -59,6 +59,9 @@ public class EsiaConfig {
   @Value("${esia.state.cookie.life.time:300}")
   private long esiaStateCookieLifeTime;
 
+  @Value("${esia.login.attempts.count:5}")
+  private long esiaLoginAttemptsCount;
+
 
   public String getEsiaScopes() {
     String[] scopeItems = esiaScopes.split(",");
@@ -123,4 +126,8 @@ public class EsiaConfig {
   public long getEsiaStateCookieLifeTime() {
     return esiaStateCookieLifeTime;
   }
+
+  public long getEsiaLoginAttemptsCount() {
+    return esiaLoginAttemptsCount;
+  }
 }

backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java

@@ -32,8 +32,8 @@ public class EsiaController {
   private JwtTokenService jwtTokenService;
 
   @RequestMapping(value = "/esia/url")
-  public String getEsiaUrl(HttpServletResponse response) {
+  public String getEsiaUrl(HttpServletResponse response, HttpServletRequest request) {
-    return esiaAuthService.generateAuthCodeUrl(response);
+    return esiaAuthService.generateAuthCodeUrl(response, request);
   }
 
   @GetMapping(value = "/esia/auth")

backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java

@@ -14,6 +14,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -30,6 +31,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.http.ResponseCookie;
 import org.springframework.security.core.context.SecurityContext;
+import ru.micord.ervu.audit.constants.AuditConstants;
+import ru.micord.ervu.audit.service.AuditService;
 import org.springframework.web.util.WebUtils;
 import ru.micord.ervu.audit.constants.AuditConstants;
 import ru.micord.ervu.audit.service.AuditService;
@@ -97,7 +100,7 @@ public class EsiaAuthService {
   @Value("${ervu.kafka.request.topic}")
   private String requestTopic;
 
-  public String generateAuthCodeUrl(HttpServletResponse response) {
+  public String generateAuthCodeUrl(HttpServletResponse response, HttpServletRequest request) {
     try {
       String clientId = esiaConfig.getClientId();
       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
@@ -105,6 +108,10 @@ public class EsiaAuthService {
       String timestamp = dt.format(formatter);
       String state = UUID.randomUUID().toString();
       String prnsUUID = UUID.randomUUID().toString();
+      Cookie oldPrnsCookie =  WebUtils.getCookie(request, PRNS_UUID);
+      if (oldPrnsCookie != null) {
+        prnsUUID = oldPrnsCookie.getValue();
+      }
       String redirectUrl = esiaConfig.getRedirectUrl();
       String redirectUrlEncoded = redirectUrl.replaceAll(":", "%3A")
           .replaceAll("/", "%2F");
@@ -118,7 +125,7 @@ public class EsiaAuthService {
       parameters.put("redirect_uri", esiaConfig.getRedirectUrl());
 
       String clientSecret = signMap(parameters);
-      EsiaAuthInfoStore.addState(prnsUUID, state, esiaConfig.getEsiaStateCookieLifeTime());
+      EsiaAuthInfoStore.addState(prnsUUID, state, esiaConfig.getEsiaStateCookieLifeTime(), esiaConfig.getEsiaLoginAttemptsCount());
       ResponseCookie prnsCookie = securityHelper.createCookie(PRNS_UUID, prnsUUID, "/")
           .maxAge(esiaConfig.getEsiaStateCookieLifeTime())
           .build();
@@ -330,6 +337,9 @@ public class EsiaAuthService {
             tokenResponse != null ? tokenResponse.getErrorDescription() : "response is empty";
         throw new IllegalStateException("Esia response error. " + errMsg);
       }
+      if (!tokenResponse.getState().equals(state)) {
+        throw new EsiaException("Token invalid. State from request not equals with state from response.");
+      }
       String esiaAccessTokenStr = tokenResponse.getAccessToken();
       String verifyResult = verifyToken(esiaAccessTokenStr);
       if (verifyResult != null) {
@@ -385,6 +395,7 @@ public class EsiaAuthService {
 
   public String logout(HttpServletRequest request, HttpServletResponse response) {
     PersonModel personModel = null;
+    String status = null;
     try {
       String userId = jwtTokenService.getUserAccountId(request);
       String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
@@ -399,18 +410,19 @@ public class EsiaAuthService {
           "client_id", esiaConfig.getClientId(),
           "redirect_url", redirectUrl
       );
-      auditService.processAuthEvent(
+      status = AuditConstants.SUCCESS_STATUS;
-              request, personModel, AuditConstants.SUCCESS_STATUS, AuditConstants.LOGOUT_EVENT_TYPE
-      );
       return buildUrl(url, params);
     }
     catch (Exception e) {
+      status = AuditConstants.FAILURE_STATUS;
+      throw new EsiaException(e);
+    }
+    finally {
       if (personModel != null){
         auditService.processAuthEvent(
-                request, personModel, AuditConstants.FAILURE_STATUS, AuditConstants.LOGOUT_EVENT_TYPE
+            request, personModel, status, AuditConstants.LOGOUT_EVENT_TYPE
         );
       }
-      throw new EsiaException(e);
     }
   }
 
@@ -475,8 +487,11 @@ public class EsiaAuthService {
         ZoneId.systemDefault()
     );
     LocalDateTime currentTime = LocalDateTime.now();
-    if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) {
+    if (currentTime.getNano() > 0) {
-      return "Token invalid. Token expired";
+      currentTime = currentTime.plusSeconds(1).truncatedTo(ChronoUnit.SECONDS);
+    }
+    if (currentTime.isBefore(iatTime) || expTime.isBefore(iatTime) || currentTime.isAfter(expTime)) {
+      return "Token invalid. Token expired, current: " + currentTime + " iat: " + iatTime + " exp: " + expTime;
     }
     HttpResponse<String> response = signVerify(accessToken);
     if (response.statusCode() != 200) {
@@ -512,8 +527,7 @@ public class EsiaAuthService {
       return "State invalid. Cookie not found";
     }
     String prnsUUID = cookie.getValue();
-    String oldState = EsiaAuthInfoStore.getState(prnsUUID);
+    if (!EsiaAuthInfoStore.containsState(prnsUUID, state)) {
-    if (oldState == null || !oldState.equals(state)) {
       return "State invalid. State from ESIA not equals with state before";
     }
     EsiaAuthInfoStore.removeState(prnsUUID);

backend/src/main/resources/i18n/exception_handler_messages_en_US.properties

@@ -1 +1 @@
-error.unknown=The system is temporarily unavailable. Please try again later.
+error.unknown=The system is temporarily unavailable. Please try again later.

config/nginx.conf

@@ -81,7 +81,7 @@ http {
          	index index.html;
           	try_files $uri @index;
 
-			add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;";
+			add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://xn--1-6tb.xn--b1afabzvcegckfhg.xn--p1ai/ https://xn--2-6tb.xn--b1afbulhcegckfhg.xn--p1ai/; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;";
 
 		#Application config
 		location = /src/resources/app-config.json {
@@ -106,7 +106,7 @@ http {
 	location @index {
 		root /frontend;
     		add_header Cache-Control "no-cache";
-    		add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;";
+    		add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://xn--1-6tb.xn--b1afabzvcegckfhg.xn--p1ai/ https://xn--2-6tb.xn--b1afbulhcegckfhg.xn--p1ai/; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;";
     		expires 0;
     		try_files /index.html =404;
 	}

frontend/index.webpack.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="Content-Security-Policy"
-          content="default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:"/>
+          content="default-src 'self'; connect-src 'self' https://xn--1-6tb.xn--b1afabzvcegckfhg.xn--p1ai/ https://xn--2-6tb.xn--b1afbulhcegckfhg.xn--p1ai/; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:"/>
     <meta name="referrer" content="strict-origin-when-cross-origin"/>
     <link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
 </head>

frontend/package-lock.json

@@ -1748,9 +1748,9 @@
       }
     },
     "@webbpm/base-package": {
-      "version": "3.187.2",
+      "version": "3.187.4",
-      "resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.187.2.tgz",
+      "resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.187.4.tgz",
-      "integrity": "sha512-qDW+Yjm/gyTIM/4N7uQasQR1zk2tGGAF6rJFpSUSb1A7PYreXPqSAShzWJJJ1YZ9CCz2dAXSQzm6JjUJKu2VUg==",
+      "integrity": "sha512-2MrVersJ+No7/DMDxJPuBXGoy3NmLNPtTsa4Ua0kooZmR1er7w7YnrIUtkakEXrWSODt0ki7XB9w3f1RFVAGtg==",
       "requires": {
         "tslib": "^1.9.0"
       }

frontend/package.json

@@ -26,7 +26,7 @@
     "@angular/platform-browser-dynamic": "7.2.15",
     "@angular/router": "7.2.15",
     "@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1",
-    "@webbpm/base-package": "3.187.2",
+    "@webbpm/base-package": "3.187.4",
     "ag-grid-angular": "29.0.0-micord.4",
     "ag-grid-community": "29.0.0-micord.4",
     "angular-calendar": "0.28.28",

frontend/src/resources/app-config.json

@@ -17,5 +17,6 @@
   "password_pattern_error": "Пароль должен содержать заглавные или прописные буквы и как минимум 1 цифру",
   "show.client.errors": false,
   "available_task.single_fetch": true,
-  "cert_check_url": "https://lkrp-dev2.micord.ru"
+  "cert_check_url": "https://xn--1-6tb.xn--b1afabzvcegckfhg.xn--p1ai/",
+  "unknown.error.msg": "Система временно недоступна. Пожалуйста, повторите попытку позже."
 }

frontend/src/resources/css/inbox-lkrp.css

@@ -211,6 +211,8 @@ body.webbpm.ervu_lkrp_fl {
 }
 
 .webbpm.ervu_lkrp_fl .container {
+    display: flex;
+    flex-direction: column;
     padding-top: var(--h-header);
     bottom: 0;
 }
@@ -226,6 +228,9 @@ body.webbpm.ervu_lkrp_fl {
     flex: 1;
     padding: var(--indent-huge) var(--w-screen);
 }
+.webbpm.ervu_lkrp_ul .container-inside home-landing + app-footer {
+    display: none;
+}
 
 /*@media ((max-width: 780px) or ((orientation: landscape) and (max-device-width : 1024px))) {*/
 @media (max-width: 1024px) {

frontend/src/ts/ervu/service/AuditService.ts

@@ -1,6 +1,7 @@
 import {Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {Router} from "@angular/router";
+import {AuthenticationService} from "../../modules/security/authentication.service";
 
 
 @Injectable({
@@ -8,26 +9,30 @@ import {Router} from "@angular/router";
             })
 export class AuditService {
 
-  constructor(private httpClient: HttpClient, private router: Router) {
+  constructor(private httpClient: HttpClient,
+              private router: Router,
+              private authService: AuthenticationService) {
   }
 
   public logActionAudit(eventType: string, fileName?: string): void {
-    const currentRoute = this.router.url;
+    if (this.authService.isAuthenticated()) {
-    const sourceUrl = window.location.href;
+      const currentRoute = this.router.url;
-    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+      const sourceUrl = window.location.href;
+      const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
-    const data: AuditAction = {
+      const data: AuditAction = {
-      eventType: eventType,
+        eventType: eventType,
-      sourceUrl: sourceUrl,
+        sourceUrl: sourceUrl,
-      route: currentRoute,
+        route: currentRoute,
-      fileName: fileName
+        fileName: fileName
-    };
+      };
 
-    this.httpClient.post("audit/action", data, {
+      this.httpClient.post("audit/action", data, {
-      headers: {
+        headers: {
-        "Client-Time-Zone": timeZone,
+          "Client-Time-Zone": timeZone,
-      }
+        }
-    }).toPromise();
+      }).toPromise();
+    }
   }
 }
 

frontend/src/ts/modules/security/authentication.service.ts

@@ -2,6 +2,7 @@ import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {CookieService} from "ngx-cookie";
 import {AppConfigService} from "@webbpm/base-package";
+import {map, tap} from "rxjs/operators";
 
 @Injectable({providedIn: 'root'})
 export class AuthenticationService {
@@ -22,4 +23,13 @@ export class AuthenticationService {
   public isAuthenticated(): boolean {
     return this.cookieService.get('webbpm.ervu-lkrp-fl') != null;
   }
+
+  public redirectToEsia() {
+    return this.http.get<string>("esia/url").pipe(
+        tap(url => {
+          window.open(url, "_self");
+        }),
+        map(() => true)
+    );
+  }
 }

frontend/src/ts/modules/security/guard/auth.guard.ts

@@ -33,7 +33,7 @@ export abstract class AuthGuard implements CanActivate {
       }
       if (error) {
         let errorMessage =
-            'Произошла неизвестная ошибка. Обратитесь к системному администратору';
+            this.messageService.getUnknowErrorMessage();
         let errorCode = this.extractCode(errorDescription);
         if (errorCode) {
           errorMessage = EsiaErrorDetail.getDescription(errorCode);
@@ -49,24 +49,28 @@ export abstract class AuthGuard implements CanActivate {
                               params: params,
                               responseType: 'text',
                               observe: 'response',
+                              headers: {
+                                "Error-intercept-skip":"true"
+                              }
                             })
             .toPromise()
             .then(
                 () => {
                   window.open(url.origin + url.pathname, "_self");
-                });
+                })
+            .catch(reason => {
+              const json = JSON.parse(reason.error);
+              json.messages.forEach((errorMessage) => {
+                this.messageService.error(errorMessage, json);
+              })
+            });
         return false;
       }
       else {
-        return this.httpClient.get<string>("esia/url")
+        return this.authenticationService.redirectToEsia().toPromise().catch((reason) => {
-            .toPromise()
+          console.error(reason);
-            .then(url => {
+          return false;
-              window.open(url, "_self");
+        });
-              return true;
-            }).catch((reason)=> {
-              console.error(reason);
-              return false;
-            });
       }
     }).catch((reason) => {
       console.error(reason);

frontend/src/ts/modules/webbpm/component/webbpm.component.ts

@@ -34,12 +34,7 @@ export class WebbpmComponent {
                || event instanceof NavigationError
                || event instanceof NavigationCancel) {
         progressIndicationService.hideProgressBar();
-
+        this.auditService.logActionAudit(AuditConstants.OPEN_PAGE_EVENT);
-        if (event instanceof NavigationEnd
-            && event.url != '/home'
-            && event.url != '/access-denied') {
-          this.auditService.logActionAudit(AuditConstants.OPEN_PAGE_EVENT);
-        }
       }
     })
   }

frontend/src/ts/modules/webbpm/interceptor/default-interceptors.prod.ts

@@ -1,14 +1,14 @@
 import {HTTP_INTERCEPTORS} from "@angular/common/http";
 import {
   FormDirtyInterceptor,
-  HttpSecurityErrorInterceptor,
   HttpSecurityInterceptor
 } from "@webbpm/base-package";
 import {AbsoluteUrlCsrfInterceptor} from "./absolute-url-csrf.interceptor";
+import {ErvuHttpSecurityErrorInterceptor} from "./ervu-http-security-error-interceptor";
 
 export const DEFAULT_HTTP_INTERCEPTOR_PROVIDERS = [
   {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityInterceptor, multi: true},
-  {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityErrorInterceptor, multi: true},
+  {provide: HTTP_INTERCEPTORS, useClass: ErvuHttpSecurityErrorInterceptor, multi: true},
   {provide: HTTP_INTERCEPTORS, useClass: FormDirtyInterceptor, multi: true},
   {provide: HTTP_INTERCEPTORS, useClass: AbsoluteUrlCsrfInterceptor, multi: true}
 ];

frontend/src/ts/modules/webbpm/interceptor/default-interceptors.ts

@@ -2,10 +2,11 @@ import {HTTP_INTERCEPTORS} from "@angular/common/http";
 import {FormDirtyInterceptor, HttpSecurityInterceptor} from "@webbpm/base-package";
 import {DevHttpSecurityErrorInterceptor} from "./http-security-error-interceptor.dev";
 import {AbsoluteUrlCsrfInterceptor} from "./absolute-url-csrf.interceptor";
+import {ErvuHttpSecurityErrorInterceptor} from "./ervu-http-security-error-interceptor";
 
 export const DEFAULT_HTTP_INTERCEPTOR_PROVIDERS = [
   {provide: HTTP_INTERCEPTORS, useClass: HttpSecurityInterceptor, multi: true},
-  {provide: HTTP_INTERCEPTORS, useClass: DevHttpSecurityErrorInterceptor, multi: true},
+  {provide: HTTP_INTERCEPTORS, useClass: ErvuHttpSecurityErrorInterceptor, multi: true},
   {provide: HTTP_INTERCEPTORS, useClass: FormDirtyInterceptor, multi: true},
   {provide: HTTP_INTERCEPTORS, useClass: AbsoluteUrlCsrfInterceptor, multi: true},
 ];

frontend/src/ts/modules/webbpm/interceptor/ervu-http-security-error-interceptor.ts

@@ -0,0 +1,43 @@
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest, HttpResponse
+} from "@angular/common/http";
+import {
+  HttpSecurityErrorInterceptor,
+  MessagesService,
+  UserService
+} from "@webbpm/base-package";
+import {Injectable} from "@angular/core";
+import {Router} from "@angular/router";
+import {from, Observable} from "rxjs";
+import {catchError, map} from "rxjs/operators";
+import {AuthenticationService} from "../../security/authentication.service";
+
+@Injectable()
+export class ErvuHttpSecurityErrorInterceptor extends HttpSecurityErrorInterceptor
+    implements HttpInterceptor {
+  private authService: AuthenticationService;
+
+  constructor(router: Router, messagesService: MessagesService, userService: UserService,
+              authService: AuthenticationService) {
+    super(router, messagesService, userService);
+    this.authService = authService;
+  }
+
+  protected processAuthError(req: HttpRequest<any>, next: HttpHandler,
+                             error: any): Observable<HttpEvent<any>> {
+    if (this.authService.isAuthenticated()) {
+      return super.processAuthError(req, next, error);
+    }
+    else {
+      return from(this.authService.redirectToEsia()).pipe(
+          map(() => new HttpResponse<any>()),
+          catchError((err) => {
+            throw err;
+          })
+      );
+    }
+  }
+}

frontend/src/ts/modules/webbpm/interceptor/http-security-error-interceptor.dev.ts

@@ -1,19 +1,20 @@
 import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http";
-import {HttpSecurityErrorInterceptor, MessagesService, UserService} from "@webbpm/base-package";
+import {MessagesService, UserService} from "@webbpm/base-package";
 import {Injectable} from "@angular/core";
 import {Router} from "@angular/router";
 import {EMPTY, Observable} from "rxjs";
 import {catchError} from "rxjs/operators";
+import {ErvuHttpSecurityErrorInterceptor} from "./ervu-http-security-error-interceptor";
+import {AuthenticationService} from "../../security/authentication.service";
 
 @Injectable()
-export class DevHttpSecurityErrorInterceptor extends HttpSecurityErrorInterceptor
+export class DevHttpSecurityErrorInterceptor extends ErvuHttpSecurityErrorInterceptor
     implements HttpInterceptor {
-  private router: Router;
 
 
-  constructor(router: Router, messagesService: MessagesService, userService: UserService) {
+  constructor(router: Router, messagesService: MessagesService, userService: UserService,
-    super(router, messagesService, userService);
+              authService: AuthenticationService) {
-    this.router = router;
+    super(router, messagesService, userService, authService);
   }
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {

packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.cg.webbpm.packages.base</groupId>
   <artifactId>resources</artifactId>
-  <version>3.187.2</version>
+  <version>3.187.4</version>
   <organization>
     <name>Micord</name>
   </organization>
@@ -28,13 +28,13 @@
     <jooq.version>3.19.3</jooq.version>
     <jupiter.version>5.10.2</jupiter.version>
     <enforcer.manageVersions>true</enforcer.manageVersions>
-    <webbpm-platform.version>3.187.2</webbpm-platform.version>
+    <webbpm-platform.version>3.187.4</webbpm-platform.version>
     <h2.version>1.4.200</h2.version>
-    <build.timestamp>0115092226</build.timestamp>
+    <build.timestamp>0226064041</build.timestamp>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <junit.platform.version>1.10.0</junit.platform.version>
     <enforcer.manageExclusions>true</enforcer.manageExclusions>
-    <revision>3.187.2</revision>
+    <revision>3.187.4</revision>
     <metadata.ts.filename>typescript.metadata.json</metadata.ts.filename>
     <package.repository.url>https://repo.micord.ru</package.repository.url>
     <maven.build.timestamp.format>MMddHHmmss</maven.build.timestamp.format>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>ru.cg.webbpm.packages.base</groupId>
       <artifactId>converters</artifactId>
-      <version>3.187.2</version>
+      <version>3.187.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>ru.cg.webbpm.packages.base</groupId>
       <artifactId>backend</artifactId>
-      <version>3.187.2</version>
+      <version>3.187.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>ru.cg.webbpm.packages.base</groupId>
       <artifactId>frontend</artifactId>
-      <version>3.187.2</version>
+      <version>3.187.4</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html

@@ -60,7 +60,7 @@
 <ul>
 
 <li>&#x41e;&#x431;&#x440;&#x430;&#x437;&#x435;&#x446; &#x432;&#x43d;&#x435;&#x448;&#x43d;&#x435;&#x439; &#x441;&#x441;&#x44b;&#x43b;&#x43a;&#x438;: <code>https://www.wildberries.ru/catalog/${sku}/detail.aspx</code></li>
-<li>&#x41e;&#x431;&#x440;&#x430;&#x437;&#x435;&#x446; &#x432;&#x43d;&#x443;&#x442;&#x440;&#x435;&#x43d;&#x43d;&#x435;&#x439; &#x441;&#x441;&#x44b;&#x43b;&#x43a;&#x438;: <code>products/ru.cg.webbpm.packages.base:resources:jar:3.187.2</code></li>
+<li>&#x41e;&#x431;&#x440;&#x430;&#x437;&#x435;&#x446; &#x432;&#x43d;&#x443;&#x442;&#x440;&#x435;&#x43d;&#x43d;&#x435;&#x439; &#x441;&#x441;&#x44b;&#x43b;&#x43a;&#x438;: <code>products/ru.cg.webbpm.packages.base:resources:jar:3.187.4</code></li>
 </ul>
 </li>
 <li>

packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml

@@ -4,17 +4,17 @@
     <description>Base webbpm package</description>
     <groupId>ru.cg.webbpm.packages.base</groupId>
     <artifactId>resources</artifactId>
-    <version>3.187.2</version>
+    <version>3.187.4</version>
-    <studioVersion>3.187.2</studioVersion>
+    <studioVersion>3.187.4</studioVersion>
 
     <backendModule>
         <groupId>ru.cg.webbpm.packages.base</groupId>
         <artifactId>backend</artifactId>
-        <version>3.187.2</version>
+        <version>3.187.4</version>
     </backendModule>
     <frontendModule>
         <packageName>@webbpm/base-package</packageName>
-        <version>3.187.2</version>
+        <version>3.187.4</version>
     </frontendModule>
 </packageInfo>
 

packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_отмены.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_очистки_фильтра.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_удаления.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_загрузки.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_вызова_ошибки.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component

@@ -7,11 +7,11 @@
     <documentation>component/buttons/Кнопка_выполнения_бизнес-процесса.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_выполнения_SQL.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_для_фильтрации.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_навигации.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_сохранения.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_выбора.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_подписи.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/Кнопка_запуска_бизнес-процесса.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>  
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/reporting/Кнопка_печати_из_графа_сущности.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component

@@ -8,11 +8,11 @@
     <documentation>component/buttons/reporting/Кнопка_печати_отчета_из_формы.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Сворачиваемая_панель.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Диалог.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Контейнер_с_кнопками.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Группа_полей.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Набор_фильтров.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Форма.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Горизонтальный_контейнер.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Контейнер_вкладок.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Вкладка.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Вертикальный_контейнер.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component

@@ -8,11 +8,11 @@
     <documentation>component/containers/Окно.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component

@@ -8,11 +8,11 @@
     <documentation>component/editable-grids/EditableGrid.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/autocomplete</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/check-box</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/combo-box</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/date-time-picker</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/money-field</localization>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/number-field</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/one-to-many</localization>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/one-to-many</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component

@@ -6,11 +6,11 @@
     <localization>META-INF/components/localization/editable-grids/read-only</localization>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component

@@ -5,11 +5,11 @@
     <category>editable-grids</category>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component

@@ -8,11 +8,11 @@
     <documentation>Статичный_выпадающий_список_колонки_таблицы.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/text-area</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/text-field</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component

@@ -7,11 +7,11 @@
     <localization>META-INF/components/localization/editable-grids/time-picker</localization>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/ФИАС.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Поле_ввода_с_подбором_значения.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Флаг.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Выпадающий_список.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Дата.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/EditableOneToMany.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Файл.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Файл.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/ManyToMany.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/ManyToManyField.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Денежное_поле.html</documentation>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Числовое_поле.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/OneToMany.html</documentation>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/OneToMany.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Переключатель.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/SignVerification.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Статичный_выпадающий_список.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Статичный_переключатель.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Текст.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Многострочное_поле.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Текстовое_поле.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/Время.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component

@@ -8,11 +8,11 @@
   <documentation>component/fields/TreeField.html</documentation>
   <internal>false</internal>
   <versions>
-    <studioVersion>3.187.2</studioVersion>
+    <studioVersion>3.187.4</studioVersion>
     <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
   </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component

@@ -5,11 +5,11 @@
     <localization>META-INF/components/localization/editable-grid</localization>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component

@@ -4,11 +4,11 @@
     <name>EditableOneToManyForm</name>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component

@@ -5,11 +5,11 @@
     <localization>META-INF/components/localization/fields/file-upload-field</localization>
     <internal>true</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/filters/Фильтр_по_полю_адреса.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/filters/Поле_ввода_с_подбором_значения.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/filters/Фильтр_по_компоненте_Флаг.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>

packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component

@@ -8,11 +8,11 @@
     <documentation>component/fields/filters/Флаг.html</documentation>
     <internal>false</internal>
     <versions>
-        <studioVersion>3.187.2</studioVersion>
+        <studioVersion>3.187.4</studioVersion>
         <packageVersions>
                 <entry>
                 <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.187.2</value>
+                <value>3.187.4</value>
                 </entry>
                 </packageVersions>
     </versions>