Merge branch 'develop' into release/1.10.0

This commit is contained in:
Zaripov Emil 2025-05-28 09:26:25 +03:00
commit d4e5736d97
145 changed files with 520 additions and 376 deletions

View file

@ -35,7 +35,6 @@ import ervu.model.webdav.Server;
import org.apache.http.client.ClientProtocolException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
@ -46,7 +45,6 @@ import org.springframework.retry.annotation.Backoff;
import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import ru.micord.ervu.security.esia.config.EsiaConfig;
import ru.micord.ervu.util.UrlUtils;
/**
@ -215,8 +213,10 @@ public class WebDavClient {
@Retryable(value = {IOException.class}, backoff = @Backoff(delayExpression = "${webdav.retry.delay:500}"))
public void deleteFilesOlderThan(long seconds, String url, String... extensions) throws IOException {
Sardine sardine = initClient(username, password);
AtomicInteger deletedCount = new AtomicInteger();
try {
LOGGER.info("Connecting to WebDAV at URL: {}", url);
List<DavResource> resources = sardine.list(url);
resources.stream().filter(getPredicate(extensions))
.forEach(davResource -> {
@ -225,12 +225,16 @@ public class WebDavClient {
if (age > seconds * 1000) {
try {
sardine.delete(url + davResource.getPath());
LOGGER.debug("Deleted file: {}", davResource.getName());
deletedCount.getAndIncrement();
}
catch (IOException e) {
LOGGER.error("Failed to delete file {}", davResource.getName(), e);
}
}
});
LOGGER.info("Deleted {} old file(s) from WebDAV at URL: {}", deletedCount.get(), url);
}
finally {
try {

View file

@ -33,13 +33,16 @@ public class WebDavSchedulerService {
@Scheduled(cron = "${webdav.cleanup.cron:0 0 0 * * *}")
@SchedulerLock(name = "webDavOldFilesCleaning")
public void deleteOldFiles() {
LOGGER.info("Starting scheduled WebDAV cleanup job");
Arrays.stream(urls).forEach(url -> {
try {
LOGGER.info("Cleaning up WebDAV at URL: {}", url);
webDavClient.deleteFilesOlderThan(fileLifetime, url, fileExtensions);
}
catch (IOException e) {
LOGGER.error("Failed to clean up WebDAV on {}", url, e);
}
});
LOGGER.info("Finished scheduled WebDAV cleanup job");
}
}

View file

@ -0,0 +1,16 @@
package ru.micord.ervu.controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author gulnaz
*/
@RestController
public class HealthController {
@GetMapping(value = "/health")
public String health() {
return "healthy";
}
}

View file

@ -31,7 +31,7 @@ import static ru.micord.ervu.security.SecurityConstants.ESIA_LOGOUT;
@EnableWebSecurity
public class SecurityConfig {
private static final String[] PERMIT_ALL = new String[] {
"/version", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout"
"/health", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout"
};
@Autowired
private JwtAuthenticationFilter jwtAuthenticationFilter;
@ -60,6 +60,8 @@ public class SecurityConfig {
http.authorizeHttpRequests(
(authorizeHttpRequests) -> authorizeHttpRequests.requestMatchers(PERMIT_ALL)
.permitAll()
.requestMatchers("/version")
.denyAll()
.anyRequest()
.authenticated())
.csrf((csrf) -> csrf.csrfTokenRepository(tokenRepository)

View file

@ -2,4 +2,8 @@ package ru.micord.ervu.security;
public class SecurityConstants {
public static final String ESIA_LOGOUT = "/esia/logout";
public static final String AUTH_TOKEN = "auth_token";
public static final String AUTH_MARKER = "webbpm.ervu-lkrp-ul";
public static final String PRNS_UUID = "prns_uuid_ul";
public static final String STICKY_SESSION = "stickysession";
}

View file

@ -9,8 +9,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.MessageSourceAccessor;
import ru.micord.ervu.security.esia.exception.EsiaException;
import ru.micord.ervu.security.esia.model.ExpiringState;
import ru.micord.ervu.security.esia.model.ExpiringToken;
import ru.micord.ervu.security.exception.UnauthorizedException;
import ru.cg.webbpm.modules.core.runtime.api.LocalizedException;
import ru.cg.webbpm.modules.core.runtime.api.MessageBundleUtils;
@ -34,7 +36,14 @@ public class EsiaAuthInfoStore {
}
public static String getAccessToken(String prnOid) {
return ACCESS_TOKENS_MAP.get(prnOid).getAccessToken();
ExpiringToken token = ACCESS_TOKENS_MAP.get(prnOid);
if (token == null || token.getAccessToken() == null) {
throw new UnauthorizedException("Failed to get access token. No access token found for prnOid: " + prnOid);
}
else if (token.isExpired()) {
throw new UnauthorizedException("Failed to get access token. Access token is expired for prnOid: " + prnOid);
}
return token.getAccessToken();
}
public static boolean validateAccessToken(String prnOid) {
@ -105,19 +114,30 @@ public class EsiaAuthInfoStore {
});
}
public static boolean containsState(String prnsUUID, String state) {
public static void validateState(String prnsUUID, String state, String stickySession) {
List<ExpiringState> states = PRNS_UUID_STATE_MAP.get(prnsUUID);
if (states == null) {
return false;
throw new EsiaException(
"State invalid. No state found. PrnsUUID: " + prnsUUID + ". State: " + state
+ ". Sticky session:" + stickySession);
}
long currentTime = System.currentTimeMillis();
states.removeIf(expiringState -> expiringState.getExpiryTime() < currentTime);
StringBuilder statesStringBuilder = new StringBuilder();
for (ExpiringState expiringState : states) {
if (expiringState.getState().equals(state)) {
return true;
if (expiringState.getExpiryTime() < currentTime) {
throw new EsiaException(
"State invalid. PrnsUUID: " + prnsUUID + ". Sticky session:" + stickySession
+ ". State : " + state + " expired at : " + expiringState.getExpiryTime());
}
return;
}
statesStringBuilder.append(expiringState.getState()).append(", ");
}
return false;
throw new EsiaException(
"State invalid. PrnsUUID: " + prnsUUID + ". Sticky session:" + stickySession
+ ". Backend states :" + statesStringBuilder + " cookie state :" + state);
}
public static void removeState(String prnsUUID) {

View file

@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import ru.micord.ervu.security.exception.UnauthorizedException;
import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication;
import ru.micord.ervu.security.webbpm.jwt.helper.SecurityHelper;
import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
@ -65,6 +66,9 @@ import ru.micord.ervu.security.webbpm.jwt.model.Token;
import ru.cg.webbpm.modules.core.runtime.api.LocalizedException;
import ru.cg.webbpm.modules.core.runtime.api.MessageBundleUtils;
import static ru.micord.ervu.security.SecurityConstants.PRNS_UUID;
import static ru.micord.ervu.security.SecurityConstants.STICKY_SESSION;
/**
* @author Eduard Tihomirov
*/
@ -73,7 +77,6 @@ public class EsiaAuthService {
private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final MessageSourceAccessor MESSAGE_SOURCE = MessageBundleUtils.createAccessor(
"messages/common_errors_messages");
private static final String PRNS_UUID = "prns_uuid";
@Autowired
private ObjectMapper objectMapper;
@Autowired
@ -102,7 +105,6 @@ public class EsiaAuthService {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
ZonedDateTime dt = ZonedDateTime.now();
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) {
@ -119,12 +121,18 @@ public class EsiaAuthService {
parameters.put("scope", scope);
parameters.put("scope_org", scopeOrg);
parameters.put("timestamp", timestamp);
parameters.put("state", state);
parameters.put("state", "%s");
parameters.put("redirect_uri", esiaConfig.getRedirectUrl());
String clientSecret = signMap(parameters);
SignResponse signResponse = signMap(parameters);
String state = signResponse.getState();
String clientSecret = signResponse.getSignature();
EsiaAuthInfoStore.addState(prnsUUID, state, esiaConfig.getEsiaStateCookieLifeTime(), esiaConfig.getEsiaLoginAttemptsCount());
ResponseCookie prnsCookie = securityHelper.createCookie(PRNS_UUID, prnsUUID, "/")
Cookie stickySession = WebUtils.getCookie(request, STICKY_SESSION);
LOGGER.info("Auth states initialized: PrnsUUID: {}; State: {}; StickySession: {}", prnsUUID, state,
stickySession != null ? stickySession.getValue() : "is null"
);
ResponseCookie prnsCookie = securityHelper.createAccessCookie(PRNS_UUID, prnsUUID)
.maxAge(esiaConfig.getEsiaStateCookieLifeTime())
.build();
securityHelper.addResponseCookie(response, prnsCookie);
@ -184,16 +192,12 @@ public class EsiaAuthService {
Long expiresIn = null;
boolean hasRole = false;
long timeSignSecret = 0, timeRequestAccessToken = 0, timeVerifySecret = 0;
String verifyStateResult = verifyStateFromCookie(request, state, response);
if (verifyStateResult != null) {
throw new EsiaException(verifyStateResult);
}
verifyStateFromCookie(request, state, response);
try {
String clientId = esiaConfig.getClientId();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
ZonedDateTime dt = ZonedDateTime.now();
String timestamp = dt.format(formatter);
String newState = UUID.randomUUID().toString();
String redirectUrl = esiaConfig.getRedirectUrl();
String scope = esiaConfig.getEsiaScopes();
String scopeOrg = esiaConfig.getEsiaOrgScopes();
@ -203,13 +207,15 @@ public class EsiaAuthService {
parameters.put("scope", scope);
parameters.put("scope_org", scopeOrg);
parameters.put("timestamp", timestamp);
parameters.put("state", newState);
parameters.put("state", "%s");
parameters.put("redirect_uri", redirectUrl);
parameters.put("code", esiaAuthCode);
long startTime = System.currentTimeMillis();
String clientSecret = signMap(parameters);
SignResponse signResponse = signMap(parameters);
timeSignSecret = System.currentTimeMillis() - startTime;
String newState = signResponse.getState();
String clientSecret = signResponse.getSignature();
String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl();
String postBody = new FormUrlencoded()
.setParameter("client_id", clientId)
@ -303,7 +309,6 @@ public class EsiaAuthService {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
ZonedDateTime dt = ZonedDateTime.now();
String timestamp = dt.format(formatter);
String state = UUID.randomUUID().toString();
String redirectUrl = esiaConfig.getRedirectUrl();
String scope = esiaConfig.getEsiaScopes();
String scopeOrg = esiaConfig.getEsiaOrgScopes();
@ -313,11 +318,13 @@ public class EsiaAuthService {
parameters.put("scope", scope);
parameters.put("scope_org", scopeOrg);
parameters.put("timestamp", timestamp);
parameters.put("state", state);
parameters.put("state", "%s");
parameters.put("redirect_uri", esiaConfig.getRedirectUrl());
parameters.put("refresh_token", refreshToken);
String clientSecret = signMap(parameters);
SignResponse signResponse = signMap(parameters);
String state = signResponse.getState();
String clientSecret = signResponse.getSignature();
String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl();
String postBody = new FormUrlencoded()
.setParameter("client_id", clientId)
@ -372,7 +379,7 @@ public class EsiaAuthService {
}
}
private String signMap(Map<String, String> paramsToSign) {
private SignResponse signMap(Map<String, String> paramsToSign) {
try {
StringBuilder toSign = new StringBuilder();
for (String s : paramsToSign.values()) {
@ -391,7 +398,7 @@ public class EsiaAuthService {
.build()
.send(request, HttpResponse.BodyHandlers.ofString());
errorHandler(response);
return response.body();
return objectMapper.readValue(response.body(), SignResponse.class);
}
catch (Exception e) {
@ -410,12 +417,20 @@ public class EsiaAuthService {
String userId = null;
String status = null;
try {
userId = jwtTokenService.getUserAccountId(request);
String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
orgInfo = getOrgInfo(accessToken);
try {
userId = jwtTokenService.getUserAccountId(request);
String accessToken = jwtTokenService.getAccessTokenByUserId(userId);
orgInfo = getOrgInfo(accessToken);
EsiaAuthInfoStore.removeAccessToken(userId);
EsiaAuthInfoStore.removeRefreshToken(userId);
}
catch (UnauthorizedException e) {
//logout should always happen
}
catch (Exception e) {
LOGGER.error(e.getMessage());
}
securityHelper.clearAccessCookies(response);
EsiaAuthInfoStore.removeAccessToken(userId);
EsiaAuthInfoStore.removeRefreshToken(userId);
String logoutUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaLogoutUrl();
String redirectUrl = esiaConfig.getLogoutRedirectUrl();
URL url = new URL(logoutUrl);
@ -601,17 +616,24 @@ public class EsiaAuthService {
}
}
private String verifyStateFromCookie(HttpServletRequest request, String state, HttpServletResponse response) {
private void verifyStateFromCookie(HttpServletRequest request, String state, HttpServletResponse response) {
Cookie cookie = WebUtils.getCookie(request, PRNS_UUID);
Cookie stickySessionCookie = WebUtils.getCookie(request, STICKY_SESSION);
String stickySession = stickySessionCookie != null ? stickySessionCookie.getValue() : "is null";
if (cookie == null) {
return "State invalid. Cookie not found";
throw new EsiaException(
"State invalid. Cookie not found. State: " + state + ". Sticky session: " + stickySession);
}
String prnsUUID = cookie.getValue();
if (!EsiaAuthInfoStore.containsState(prnsUUID, state)) {
return "State invalid. State from ESIA not equals with state before";
try {
EsiaAuthInfoStore.validateState(prnsUUID, state, stickySession);
}
finally {
EsiaAuthInfoStore.removeState(prnsUUID);
LOGGER.info(
"Remove all states for prnsUUID: " + prnsUUID + ". State: " + state + ". Sticky session: "
+ stickySession);
securityHelper.clearAccessCookie(response, PRNS_UUID);
}
EsiaAuthInfoStore.removeState(prnsUUID);
securityHelper.clearCookie(response, PRNS_UUID, "/");
return null;
}
}

View file

@ -14,8 +14,9 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import static org.springframework.web.context.request.RequestAttributes.REFERENCE_REQUEST;
import static ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil.AUTH_MARKER;
import static ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil.AUTH_TOKEN;
import static ru.micord.ervu.security.SecurityConstants.AUTH_MARKER;
import static ru.micord.ervu.security.SecurityConstants.AUTH_TOKEN;
import static ru.micord.ervu.security.SecurityConstants.PRNS_UUID;
public final class SecurityHelper {
@Value("${cookie.path:#{null}}")
@ -36,9 +37,7 @@ public final class SecurityHelper {
}
public void clearAccessCookies(HttpServletResponse response) {
ResponseCookie emptyAuthToken = createCookie(AUTH_TOKEN, null, accessCookiePath)
.maxAge(0).build();
addResponseCookie(response, emptyAuthToken);
clearCookie(response, AUTH_TOKEN, accessCookiePath);
ResponseCookie emptyAuthMarker = createCookie(AUTH_MARKER, null, "/")
.maxAge(0)
@ -46,6 +45,7 @@ public final class SecurityHelper {
.httpOnly(false)
.build();
addResponseCookie(response, emptyAuthMarker);
clearCookie(response, PRNS_UUID, accessCookiePath);
}
public void addResponseCookie(HttpServletResponse response, ResponseCookie cookie) {
@ -92,4 +92,12 @@ public final class SecurityHelper {
.maxAge(0).build();
addResponseCookie(response, emptyCookie);
}
public ResponseCookie.ResponseCookieBuilder createAccessCookie(String name, String value) {
return createCookie(name, value, accessCookiePath);
}
public void clearAccessCookie(HttpServletResponse response, String name) {
clearCookie(response, name, accessCookiePath);
}
}

View file

@ -84,6 +84,10 @@ public class JwtTokenService {
return EsiaAuthInfoStore.getAccessToken(getUserAccountId(request));
}
public String getAccessTokenByUserId(String userId) {
return EsiaAuthInfoStore.getAccessToken(userId);
}
public String getRefreshToken(HttpServletRequest request) {
return EsiaAuthInfoStore.getRefreshToken(getUserAccountId(request));
}

View file

@ -11,10 +11,8 @@ import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import static ru.micord.ervu.security.SecurityConstants.AUTH_TOKEN;
public final class SecurityUtil {
public static final String AUTH_TOKEN = "auth_token";
public static final String AUTH_MARKER = "webbpm.ervu-lkrp-ul";
private SecurityUtil() {
//empty

View file

@ -1748,9 +1748,9 @@
}
},
"@webbpm/base-package": {
"version": "3.192.9",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.9.tgz",
"integrity": "sha512-W93LcQTm/OUGwRLJqyffNOqs0Uv9F4bdV26SqZr4QWngPeWKQ0pO8Jg5Lsy7d0xTVN4rfMM/NEaU2FYCC/yKzw==",
"version": "3.192.12",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.12.tgz",
"integrity": "sha512-IZvSvh7fgPTe8TIISvARjVV4xFsTQbLEfmxw5Pi493TYDMIAEWAH0zoIHh7ZTHBDSS598lvjpFCOKxduP26ywg==",
"requires": {
"tslib": "^1.9.0"
}

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.192.9",
"@webbpm/base-package": "3.192.12",
"ag-grid-angular": "29.0.0-micord.4",
"ag-grid-community": "29.0.0-micord.4",
"angular-calendar": "0.28.28",

View file

@ -81,7 +81,7 @@ body.webbpm.ervu_lkrp_ul {
--size-text-title: 36px;
--size-text-subtitle: 20px;
--size-text-primary: 18px;
--size-text-secondary: 16px;
--size-text-secondary: 16px;
--indent-huge: 48px;
--indent-big: 40px;
@ -94,7 +94,7 @@ body.webbpm.ervu_lkrp_ul {
--l-size-text-title: 40px;
--l-size-text-subtitle: 32px;
--l-size-text-primary: 20px;
--l-indent-huge: 72px;
--l-indent-big: 52px;
}
@ -108,7 +108,7 @@ body.webbpm.ervu_lkrp_ul {
}
.webbpm.ervu_lkrp_ul .header {
font-family: 'Inter';
font-family: 'Inter';
min-height: var(--h-header);
border: 0;
background-color: var(--color-bg-main);
@ -136,7 +136,7 @@ body.webbpm.ervu_lkrp_ul {
}
.webbpm.ervu_lkrp_ul .header .header-logo .header-menu-left {
font-family: 'InterL';
margin-left: 24px;
margin-left: 24px;
}
.webbpm.ervu_lkrp_ul .header .header-logo .active {
font-family: 'InterSB';
@ -290,6 +290,13 @@ body.webbpm.ervu_lkrp_ul {
max-width: 85px;
overflow: hidden;
}
.webbpm.ervu_lkrp_ul .overlay-container {
width: calc(100% - 30px);
}
.webbpm.ervu_lkrp_ul #toast-container .toast-error {
width: 100%;
min-width: auto;
}
}
/*----------------- Login ---------------- */
@ -378,7 +385,16 @@ body.webbpm.ervu_lkrp_ul {
}
/*--------------- end Login -------------- */
.webbpm.ervu_lkrp_ul .loader {
.webbpm.ervu_lkrp_ul .modal.show.loader .modal-content {
background: none;
border: none;
}
.webbpm.ervu_lkrp_ul .modal.show.loader .modal-dialog {
margin: auto;
}
.webbpm.ervu_lkrp_ul .loader:not(.modal) {
font-size: 15px;
left: calc(50% - 0.4em);
top: calc(50% - 0.4em);

View file

@ -6,6 +6,8 @@
[columnDefs]="columnDefs"
[defaultColDef]="defaultColDef"
[headerHeight]="headerHeight"
[skipHeaderOnAutoSize]="skipHeaderOnAutoSize"
[autoSizePadding]="autoSizePadding"
[rowHeight]="rowHeight"
[rowSelection]="rowSelection"
[rowMultiSelectWithClick]="isRowMultiSelectWithClick()"

View file

@ -0,0 +1,9 @@
import {ColumnHeaderProvider} from "@webbpm/base-package";
import {CustomHeader} from "./CustomHeader";
export class CustomColumnHeaderProvider implements ColumnHeaderProvider {
getHeaderType(): any {
return CustomHeader;
}
}

View file

@ -0,0 +1,15 @@
import {GridSettingHeader} from "@webbpm/base-package";
export class CustomHeader extends GridSettingHeader {
protected getRequiredTemplate(): string {
return `<div class="ag-cell-label-container" role="presentation">
<span ref="eMenu" class="ag-header-icon ag-header-cell-menu-button" aria-hidden="true"></span>
<span ref="eFilterButton" class="ag-header-icon ag-header-cell-filter-button" aria-hidden="true"></span>
<div ref="eLabel" class="ag-header-cell-label" role="presentation">
<span ref="eText" class="ag-header-cell-text"></span>
<span ref="eFilter" class="ag-header-icon ag-header-label-icon ag-filter-icon" aria-hidden="true"></span>
</div>
</div>`
}
}

View file

@ -15,7 +15,6 @@ import {AppHeaderComponent} from "./component/app-header.component";
import {AppFooterComponent} from "./component/app-footer.component";
import {LogOutComponent} from "./component/logout.component";
import {AccessDeniedComponent} from "./component/access-denied.component";
import {ApplicationVersionComponent} from "./component/application-version.component";
import {RouterModule} from "@angular/router";
import {InternationalPhoneNumberModule} from "ngx-international-phone-number";
import {AppProgressIndicationComponent} from "./component/app-progress-indication.component";
@ -33,7 +32,6 @@ registerLocaleData(localeRu);
export const DIRECTIVES = [
forwardRef(() => AppHeaderComponent),
forwardRef(() => AppFooterComponent),
forwardRef(() => ApplicationVersionComponent),
forwardRef(() => LogOutComponent),
forwardRef(() => AccessDeniedComponent),
forwardRef(() => AppProgressIndicationComponent),

View file

@ -1,24 +0,0 @@
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core";
import {HttpClient} from "@angular/common/http";
@Component({
moduleId: module.id,
selector: "application-version",
templateUrl: "../../../../../src/resources/template/app/component/application_version.html",
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ApplicationVersionComponent {
@Input()
public applicationVersion: string;
constructor(private httpClient: HttpClient, private cd: ChangeDetectorRef) {
this.loadAppVersion(); //TODO: check version url
}
private loadAppVersion() {
this.httpClient.get("version").toPromise().then((version: any) => {
this.applicationVersion = version.number;
this.cd.markForCheck();
})
}
}

View file

@ -13,7 +13,7 @@ export class AuthenticationService {
}
checkAuthentication(): Promise<any>{
return this.appConfigService.load().then(() => this.http.get<any>("version").toPromise())
return this.appConfigService.load().then(() => this.http.get<any>("health").toPromise());
}
logout(): Promise<any> {

View file

@ -7,7 +7,7 @@ import {AuthenticationService} from "../authentication.service";
import {EsiaErrorDetail} from "../EsiaErrorDetail";
import {AccessChecker} from "../AccessChecker";
@Injectable({providedIn:'root'})
@Injectable({providedIn: 'root'})
export abstract class AuthGuard implements CanActivate {
private cspTimeout: number;
@ -24,7 +24,6 @@ export abstract class AuthGuard implements CanActivate {
public canActivate(route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
this.progressIndicationService.showProgressBar();
let url = new URL(window.location.href);
if (!AccessChecker.checkBrowser()) {
this.progressIndicationService.hideProgressBar();
@ -45,6 +44,9 @@ export abstract class AuthGuard implements CanActivate {
let state = params.get('state');
let error = params.get('error');
let errorDescription = params.get('error_description');
if (code || state || error || errorDescription) {
window.history.replaceState({}, document.title, url.pathname);
}
if (isAccess) {
return true;
}
@ -61,6 +63,7 @@ export abstract class AuthGuard implements CanActivate {
return false;
}
if (code && state) {
this.progressIndicationService.showProgressBar();
const params = new HttpParams().set('code', code).set('state', state);
this.httpClient.get("esia/auth",
{
@ -68,12 +71,13 @@ export abstract class AuthGuard implements CanActivate {
responseType: 'text',
observe: 'response',
headers: {
"Error-intercept-skip":"true"
"Error-intercept-skip": "true"
}
})
.toPromise()
.then(
() => {
this.progressIndicationService.hideProgressBar();
window.open(url.origin + url.pathname, "_self");
})
.catch(reason => {
@ -81,7 +85,8 @@ export abstract class AuthGuard implements CanActivate {
json.messages.forEach((errorMessage) => {
this.messageService.error(errorMessage, json);
})
});
})
.finally(() => this.progressIndicationService.hideProgressBar());
return false;
}
else {
@ -95,8 +100,7 @@ export abstract class AuthGuard implements CanActivate {
console.error(reason);
}
return false
})
.finally(() => this.progressIndicationService.hideProgressBar());
});
}
private checkAccess(): boolean {
@ -108,4 +112,4 @@ export abstract class AuthGuard implements CanActivate {
const match = message.match(regex);
return match ? match[0] : null;
}
}
}

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>resources</artifactId>
<version>3.192.9</version>
<version>3.192.12</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.192.9</webbpm-platform.version>
<webbpm-platform.version>3.192.12</webbpm-platform.version>
<h2.version>1.4.200</h2.version>
<build.timestamp>0416115255</build.timestamp>
<build.timestamp>0512113246</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.192.9</revision>
<revision>3.192.12</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.192.9</version>
<version>3.192.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>backend</artifactId>
<version>3.192.9</version>
<version>3.192.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>frontend</artifactId>
<version>3.192.9</version>
<version>3.192.12</version>
<scope>compile</scope>
</dependency>
</dependencies>

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.192.9</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.192.12</code></li>
</ul>
</li>
<li>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,11 +8,11 @@
<documentation>component/editable-grids/EditableGrid.html</documentation>
<internal>false</internal>
<versions>
<studioVersion>3.192.9</studioVersion>
<studioVersion>3.192.12</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.192.9</value>
<value>3.192.12</value>
</entry>
</packageVersions>
</versions>
@ -181,5 +181,12 @@
</classRef>
<enabled>true</enabled>
</scripts>
<scripts id="2db2ad18-0ad6-4965-962c-9f98b199cac0">
<classRef type="TS">
<className>RequiredFieldValidator</className>
<packageName>scripts</packageName>
</classRef>
<enabled>true</enabled>
</scripts>
</rootObject>
</xmlComponent>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,11 +8,11 @@
<documentation>component/fields/EditableOneToMany.html</documentation>
<internal>false</internal>
<versions>
<studioVersion>3.192.9</studioVersion>
<studioVersion>3.192.12</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.192.9</value>
<value>3.192.12</value>
</entry>
</packageVersions>
</versions>
@ -371,6 +371,13 @@
</entry>
</properties>
</scripts>
<scripts id="64f66c80-bec2-4745-ad6d-d13bceebf5df">
<classRef type="TS">
<className>RequiredFieldValidator</className>
<packageName>scripts</packageName>
</classRef>
<enabled>true</enabled>
</scripts>
</children>
<children id="a5848add-1dcf-45d2-8918-12d2aaf7f827">
<prototypeId>86f297f1-ab3d-40e0-ac2f-89cc944b7f0a</prototypeId>

View file

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

View file

@ -8,11 +8,11 @@
<documentation>component/fields/Файл.html</documentation>
<internal>false</internal>
<versions>
<studioVersion>3.192.9</studioVersion>
<studioVersion>3.192.12</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.192.9</value>
<value>3.192.12</value>
</entry>
</packageVersions>
</versions>
@ -133,5 +133,12 @@
<expanded>true</expanded>
<properties/>
</scripts>
<scripts id="daf1f718-6fad-4bdb-9690-1229d0c8bb2d">
<classRef type="TS">
<className>FileUploadValidator</className>
<packageName>component.field.validation</packageName>
</classRef>
<enabled>true</enabled>
</scripts>
</rootObject>
</xmlComponent>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,11 +8,11 @@
<documentation>component/fields/filters/Фильтр_по_числовому_полю.html</documentation>
<internal>false</internal>
<versions>
<studioVersion>3.192.9</studioVersion>
<studioVersion>3.192.12</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.192.9</value>
<value>3.192.12</value>
</entry>
</packageVersions>
</versions>

View file

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

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