micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Eduard Tihomirov 2025-03-21 11:49:58 +03:00
commit c7054cafd9
167 changed files with 8573 additions and 8382 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/src/main/java/ru/micord/ervu/audit/config/AuditDisableCondition.java Normal file
View file

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

19
backend/src/main/java/ru/micord/ervu/audit/config/AuditEnabledCondition.java Normal file
View file

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

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

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

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

@ -4,20 +4,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) {
@ -26,18 +26,13 @@ public class BaseAuditKafkaPublisher implements AuditKafkaPublisher {
@Override
public void publishEvent(String topic, String message) {
if (auditEnabled) {
kafkaTemplate.send(topic, message)
.addCallback(
result -> {
},
ex -> LOGGER.error("Failed to send message to topic {}: {}", topic, ex.getMessage(),
ex
)
);
}
else {
LOGGER.info("Audit is disabled. Event not published.");
}
kafkaTemplate.send(topic, message)
.addCallback(
result -> {
},
ex -> LOGGER.error("Failed to send message to topic {}: {}", topic, ex.getMessage(),
ex
)
);
}
}

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

@ -11,7 +11,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import ervu.model.fileupload.FileInfo;
import ervu.model.fileupload.UploadOrgInfo;
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.*;
import ru.micord.ervu.audit.service.AuditKafkaPublisher;
@ -28,18 +30,19 @@ import ru.micord.ervu.util.NetworkUtils;
* @author Adel Kalimullin
*/
@Service
@Conditional(AuditEnabledCondition.class)
public class BaseAuditService implements AuditService {
private final AuditKafkaPublisher auditKafkaPublisher;
private final JwtTokenService jwtTokenService;
private final UlDataService ulDataService;
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.upload.topic}")
@Value("${audit.kafka.file.upload.topic:ervu.lkrp.download.request}")
private String fileUploadTopic;
@Value("${audit.kafka.file.download.topic}")
@Value("${audit.kafka.file.download.topic:ervu.lkrp.import.file}")
private String fileDownloadTopic;
public BaseAuditService(AuditKafkaPublisher auditKafkaPublisher, JwtTokenService jwtTokenService,

34
backend/src/main/java/ru/micord/ervu/audit/service/impl/StubAuditService.java Normal file
View file

@ -0,0 +1,34 @@
package ru.micord.ervu.audit.service.impl;
import javax.servlet.http.HttpServletRequest;
import ervu.model.fileupload.FileInfo;
import ervu.model.fileupload.UploadOrgInfo;
import org.springframework.context.annotation.Conditional;
import org.springframework.stereotype.Service;
import ru.micord.ervu.audit.config.AuditDisableCondition;
import ru.micord.ervu.audit.model.AuditActionRequest;
import ru.micord.ervu.audit.service.AuditService;
import ru.micord.ervu.kafka.model.OrgInfo;
/**
* @author Adel Kalimullin
*/
@Service
@Conditional(AuditDisableCondition.class)
public class StubAuditService implements AuditService {
@Override
public void processActionEvent(HttpServletRequest request,
AuditActionRequest auditActionRequest) {}
@Override
public void processAuthEvent(HttpServletRequest request, OrgInfo orgInfo, String prnOid,
String status, String eventType) {}
@Override
public void processUploadEvent(UploadOrgInfo uploadOrgInfo, FileInfo fileInfo) {}
@Override
public void processDownloadEvent(HttpServletRequest request, long fileSize, String fileName,
int formatRegistry, String status, String s3FileUrl) {}
}

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

@ -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) {
return PRNS_UUID_STATE_MAP.get(prnsUUID).getState();
public static boolean containsState(String prnsUUID, String state) {
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);
if (state != null && state.isExpired()) {
PRNS_UUID_STATE_MAP.remove(key);
}
PRNS_UUID_STATE_MAP.computeIfPresent(key, (k, states) -> {
states.removeIf(ExpiringState::isExpired);
return states.isEmpty() ? null : states;
});
}
}
}

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

@ -68,6 +68,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 getEsiaOrgScopes() {
String[] scopeItems = esiaOrgScopes.split(",");
return String.join(" ", Arrays.stream(scopeItems).map(item -> orgScopeUrl + item.trim()).toArray(String[]::new));
@ -139,4 +142,8 @@ public class EsiaConfig {
public long getEsiaStateCookieLifeTime() {
return esiaStateCookieLifeTime;
}
public long getEsiaLoginAttemptsCount() {
return esiaLoginAttemptsCount;
}
}

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

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

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

@ -15,6 +15,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.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
@ -95,7 +96,7 @@ public class EsiaAuthService {
@Value("${ervu.kafka.org.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");
@ -103,6 +104,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 +123,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();
@ -344,12 +349,15 @@ 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 esiaNewRefreshToken = tokenResponse.getRefreshToken();
String verifyResult = verifyToken(esiaAccessTokenStr);
if (verifyResult != null) {
throw new EsiaException(verifyResult);
}
String esiaNewRefreshToken = tokenResponse.getRefreshToken();
EsiaAccessToken esiaAccessToken = ulDataService.readToken(esiaAccessTokenStr);
String prnOid = esiaAccessToken.getSbjId();
Long expiresIn = tokenResponse.getExpiresIn();
@ -400,6 +408,7 @@ public class EsiaAuthService {
public String logout(HttpServletRequest request, HttpServletResponse response) {
OrgInfo orgInfo = null;
String userId = null;
String status = null;
try {
userId = jwtTokenService.getUserAccountId(request);
String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
@ -412,19 +421,21 @@ public class EsiaAuthService {
URL url = new URL(logoutUrl);
Map<String, String> params = mapOf(
"client_id", esiaConfig.getClientId(),
"redirect_url", redirectUrl);
auditService.processAuthEvent(request, orgInfo, userId, AuditConstants.SUCCESS_STATUS_TYPE,
AuditConstants.LOGOUT_EVENT_TYPE
"redirect_url", redirectUrl
);
status = AuditConstants.SUCCESS_STATUS_TYPE;
return buildUrl(url, params);
}
catch (Exception e) {
status = AuditConstants.FAILURE_STATUS_TYPE;
throw new EsiaException(e);
}
finally {
if (orgInfo != null) {
auditService.processAuthEvent(request, orgInfo, userId, AuditConstants.FAILURE_STATUS_TYPE,
auditService.processAuthEvent(request, orgInfo, userId, status,
AuditConstants.LOGOUT_EVENT_TYPE
);
}
throw new EsiaException(e);
}
}
@ -556,8 +567,11 @@ public class EsiaAuthService {
ZoneId.systemDefault()
);
LocalDateTime currentTime = LocalDateTime.now();
if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) {
return "Token invalid. Token expired";
if (currentTime.getNano() > 0) {
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) {
@ -593,8 +607,7 @@ public class EsiaAuthService {
return "State invalid. Cookie not found";
}
String prnsUUID = cookie.getValue();
String oldState = EsiaAuthInfoStore.getState(prnsUUID);
if (oldState == null || !oldState.equals(state)) {
if (!EsiaAuthInfoStore.containsState(prnsUUID, state)) {
return "State invalid. State from ESIA not equals with state before";
}
EsiaAuthInfoStore.removeState(prnsUUID);

2
backend/src/main/resources/i18n/exception_handler_messages_en_US.properties
View file

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

2000
frontend/doc/example/Пример_Прил.10_Не состоящие, но обязанные состоять.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/example/Пример_Прил.10_Не состоящие, но обязанные состоять.xlsx
View file

Binary file not shown.

2000
frontend/doc/example/Пример_Прил.11_Граждане_подлежащие_постановке_в_след_году.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/example/Пример_Прил.11_Граждане_подлежащие_постановке_в_след_году.xlsx
View file

Binary file not shown.

2000
frontend/doc/example/Пример_Прил.12_Ежегодная_сверка_данных.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/example/Пример_Прил.12_Ежегодная_сверка_данных.xlsx
View file

Binary file not shown.

2000
frontend/doc/example/Пример_Прил.9_Прием(зачисление)_увольнение(отчисление).csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/example/Пример_Прил.9_Прием(зачисление)_увольнение(отчисление).xlsx
View file

Binary file not shown.

BIN
frontend/doc/Инструкция_по_заполнению_шаблонов_сохранению_их_в_CSV.docx
View file

Binary file not shown.

2000
frontend/doc/Прил.10_Не состоящие, но обязанные состоять.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/Прил.10_Не состоящие, но обязанные состоять.xlsx
View file

Binary file not shown.

2000
frontend/doc/Прил.11_Граждане_подлежащие_постановке_в_след_году.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/Прил.11_Граждане_подлежащие_постановке_в_след_году.xlsx
View file

Binary file not shown.

2000
frontend/doc/Прил.12_Ежегодная_сверка_данных.csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/Прил.12_Ежегодная_сверка_данных.xlsx
View file

Binary file not shown.

1998
frontend/doc/Прил.9_Прием(зачисление)_увольнение(отчисление).csv
View file

File diff suppressed because it is too large Load diff

BIN
frontend/doc/Прил.9_Прием(зачисление)_увольнение(отчисление).xlsx
View file

Binary file not shown.

6
frontend/package-lock.json generated
View file

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

2
frontend/package.json
View file

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

3
frontend/src/resources/app-config.json
View file

@ -16,5 +16,6 @@
"password_pattern": "^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$",
"password_pattern_error": "Пароль должен содержать заглавные или прописные буквы и как минимум 1 цифру",
"show.client.errors": false,
"available_task.single_fetch": true
"available_task.single_fetch": true,
"unknown.error.msg": "Система временно недоступна. Пожалуйста, повторите попытку позже."
}

5
frontend/src/resources/css/inbox-lkrp.css
View file

@ -212,6 +212,8 @@ body.webbpm.ervu_lkrp_ul {
}
.webbpm.ervu_lkrp_ul .container {
display: flex;
flex-direction: column;
padding-top: var(--h-header);
bottom: 0;
}
@ -226,6 +228,9 @@ body.webbpm.ervu_lkrp_ul {
.webbpm.ervu_lkrp_ul .container-inside > div {
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) {

5
frontend/src/resources/landing/home.css
View file

@ -122,6 +122,11 @@ button, a.btn {
border-radius: 4px;
background: var(--color-link);
}
a.btn.disabled {
pointer-events: none;
opacity: 0.5;
cursor: not-allowed;
}
button:is(:hover, :focus, :active),
a.btn:is(:hover, :focus, :active) {
background: var(--color-link-hover);

4
frontend/src/resources/template/app/component/home_landing.html
View file

@ -25,7 +25,7 @@
<div class="user short-text">Доступ предоставляется тольĸо сотрудниĸу, наделенному соответствующими полномочиями (ролью) на ведения воинсĸого учета внутри организации</div>
</div>
<div class="btn-group">
<a href="." class="btn">Войти в Личный кабинет</a>
<a id="login-button" href="." class="btn">Войти в Личный кабинет</a>
</div>
</div>
</div>
@ -77,6 +77,4 @@
<div class="msg-list">
<span class="info"></span>Если в файле будут ошибĸи, данные не будут приняты Реестром и выгрузĸу сведений придется повторить
</div>
</div>
<div class="list-group lk-docs">
</div>

35
frontend/src/ts/ervu/service/AuditService.ts
View file

@ -1,31 +1,36 @@
import {Injectable} from "@angular/core";
import {HttpClient} from "@angular/common/http";
import {Router} from "@angular/router";
import {AuthenticationService} from "../../modules/security/authentication.service";
@Injectable({
providedIn: "root"
})
export class AuditService {
constructor(private httpClient: HttpClient, private router: Router) {
constructor(private httpClient: HttpClient,
private router: Router,
private authService: AuthenticationService) {
}
public logActionAudit(eventType: string, filterInfo?: Record<string, FilterInfo>,
fileName?: string): void {
const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const route = this.router.url;
const sourceUrl = window.location.href;
const auditEvent: AuditAction = {
eventType: eventType,
route: route,
sourceUrl: sourceUrl,
filterInfo: filterInfo,
fileName: fileName
}
this.httpClient.post("audit/action", auditEvent, {
headers: {
"Client-Time-Zone": timeZone,
if (this.authService.isAuthenticated()) {
const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const route = this.router.url;
const sourceUrl = window.location.href;
const auditEvent: AuditAction = {
eventType: eventType,
route: route,
sourceUrl: sourceUrl,
filterInfo: filterInfo,
fileName: fileName
}
}).toPromise();
this.httpClient.post("audit/action", auditEvent, {
headers: {
"Client-Time-Zone": timeZone,
}
}).toPromise();
}
}
}

3
frontend/src/ts/modules/app/component/home-landing.component.ts
View file

@ -22,6 +22,9 @@ export class HomeLandingComponent implements OnInit {
if (AccessChecker.checkBrowser() && cspCheckPassed) {
document.getElementById("browser-check-info").hidden = true;
}
else {
document.getElementById("login-button").classList.add('disabled');
}
});
this.cd.markForCheck();
}

4
frontend/src/ts/modules/security/AccessChecker.ts
View file

@ -45,6 +45,10 @@ export class AccessChecker {
});
});
})
.catch((error) => {
console.error("Ошибка при получении версии CSP:", error);
resolve(false);
})
.finally(() => {
clearTimeout(timeout);

10
frontend/src/ts/modules/security/authentication.service.ts
View file

@ -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 {
@ -24,4 +25,13 @@ export class AuthenticationService {
public isAuthenticated(): boolean {
return this.cookieService.get('webbpm.ervu-lkrp-ul') != null;
}
public redirectToEsia() {
return this.http.get<string>("esia/url").pipe(
tap(url => {
window.open(url, "_self");
}),
map(() => true)
);
}
}

26
frontend/src/ts/modules/security/guard/auth.guard.ts
View file

@ -50,7 +50,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);
@ -66,24 +66,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")
.toPromise()
.then(url => {
window.open(url, "_self");
return true;
}).catch((reason) => {
console.error(reason);
return false;
});
return this.authenticationService.redirectToEsia().toPromise().catch((reason) => {
console.error(reason);
return false;
});
}
}).catch((reason) => {
if (reason !== 'Navigation on /home') {

7
frontend/src/ts/modules/webbpm/component/webbpm.component.ts
View file

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

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

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

3
frontend/src/ts/modules/webbpm/interceptor/default-interceptors.ts
View file

@ -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},
];

44
frontend/src/ts/modules/webbpm/interceptor/ervu-http-security-error-interceptor.ts Normal file
View file

@ -0,0 +1,44 @@
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;
})
);
}
}
}

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

@ -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) {
super(router, messagesService, userService);
this.router = router;
constructor(router: Router, messagesService: MessagesService, userService: UserService,
authService: AuthenticationService) {
super(router, messagesService, userService, authService);
}
intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {

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

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

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

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

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

@ -4,17 +4,17 @@
<description>Base webbpm package</description>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>resources</artifactId>
<version>3.187.2</version>
<studioVersion>3.187.2</studioVersion>
<version>3.187.4</version>
<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>

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component
View file

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

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

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

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

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component
View file

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

4
packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component
View file

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

Some files were not shown because too many files have changed in this diff Show more