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

SUPPORT-8783: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2025-01-24 11:47:15 +03:00
parent 1e36465c7a
commit ff21779a66
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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,
"cert_check_url": "https://www.sberbank.ru/"
}

2
frontend/src/ts/modules/app/app-routing.module.ts
View file

@ -28,7 +28,7 @@ const appRoutes: Routes = [
canActivate: [AuthGuard],
},
{
path: 'home-landing',
path: 'home',
component: HomeLandingComponent,
canActivate: [ConfirmExitGuard],
},

9
frontend/src/ts/modules/app/component/app-header.component.ts
View file

@ -4,7 +4,7 @@ import {
} from "@angular/core";
import {ErvuDataService} from "../service/ervu-data.service";
import {CookieService} from "ngx-cookie";
import {Router} from "@angular/router";
import {NavigationStart, Router} from "@angular/router";
@Component({
moduleId: module.id,
@ -20,10 +20,11 @@ export class AppHeaderComponent {
if (cookieService.get("webbpm.ervu-lkrp-fl")) {
this.ervuDataService.getData();
}
this.isLanding = window.location.href.endsWith('home-landing');
router.events.subscribe((event) => {
this.isLanding = window.location.href.endsWith('home-landing');
this.cd.markForCheck();
if (event instanceof NavigationStart) {
this.isLanding = event.url == '/home-landing';
this.cd.markForCheck();
}
})
}
}

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

@ -1,5 +1,5 @@
import {ChangeDetectorRef, Component, OnInit} from "@angular/core";
import {CadesHelper} from "@webbpm/base-package";
import {AppConfigService, CadesHelper} from "@webbpm/base-package";
@Component({
moduleId: module.id,
@ -8,13 +8,14 @@ import {CadesHelper} from "@webbpm/base-package";
})
export class HomeLandingComponent implements OnInit {
constructor(private cd: ChangeDetectorRef) {
constructor(private cd: ChangeDetectorRef, private appConfigService: AppConfigService) {
}
ngOnInit(): void {
fetch("esia/auth")
let url = this.appConfigService.getParamValue("cert_check_url")
fetch(url)
.then(() => document.getElementById("browser-check-info").hidden = true)
.catch(() => document.getElementById("browser-check-info").hidden = false);
this.cd.markForCheck();
.catch(() => document.getElementById("browser-check-info").hidden = false)
.finally(() => this.cd.markForCheck());
}
}

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

@ -22,18 +22,17 @@ export class WebbpmComponent {
constructor(private router: Router,
private progressIndicationService: ProgressIndicationService,
private cd: ChangeDetectorRef) {
this.isLanding = window.location.href.endsWith('home-landing');
router.events.subscribe((event: Event) => {
this.isLanding = window.location.href.endsWith('home-landing');
if (event instanceof NavigationStart) {
progressIndicationService.showProgressBar();
this.isLanding = event.url == '/home-landing';
this.cd.markForCheck();
}
else if (event instanceof NavigationEnd
|| event instanceof NavigationError
|| event instanceof NavigationCancel) {
progressIndicationService.hideProgressBar();
}
this.cd.markForCheck();
})
}
}