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

Merge branch 'develop' into feature/SUPPORT-9362_trace_id

Browse source
This commit is contained in:
gulnaz 2025-09-04 17:59:52 +03:00
commit 1915be2a42
139 changed files with 366 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/package-lock.json generated
View file

@ -1726,9 +1726,9 @@
}
},
"@webbpm/base-package": {
"version": "3.192.17",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.17.tgz",
"integrity": "sha512-rL/HsVMwlXQ9XNuwV3NHgLsY6nqS9XNlEAWclRxaxREHOuwbHq8g8A6QdEMmZWMpTPZn65+tu8bwoYG2oJuvLw==",
"version": "3.192.22",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.22.tgz",
"integrity": "sha512-LZ4+/22/vWcXRehLj3Mdq7O70zh3uTrnxzSUGMi60gjZdaHhfWDIRB7h/n9hog6G2V0VPqnmqYc1/pM9ZV8IQQ==",
"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.192.17",
"@webbpm/base-package": "3.192.22",
"ag-grid-angular": "29.0.0-micord.4",
"ag-grid-community": "29.0.0-micord.4",
"angular-calendar": "0.28.28",

2
frontend/src/ts/account_applications/component/button/UserManagementService.ts
View file

@ -28,7 +28,7 @@ import {ResetPasswordData} from "./dto/password/ResetPasswordData";
import {ProcessRequest} from "./dto/ProcessRequest";
import {StatusUpdateService} from "../../../modules/app/service/status-update.service";
import {BlockedRegion} from "../../../generated/ru/micord/ervu/account_applications/enums/BlockedRegion";
import {ErvuPermission} from "../../../modules/app/enum/ErvuRole";
import {ErvuPermission} from "../../../modules/app/enum/ErvuPermission";
@AnalyticalScope(SaveButton)
export class UserManagementService extends Behavior {

2
frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts
View file

@ -30,7 +30,7 @@ import {
TreeItemRpcService
} from "../../../generated/ru/micord/ervu/account_applications/component/rpc/TreeItemRpcService";
import {AuthorizationService} from "../../../modules/app/service/authorization.service";
import {ErvuPermission} from "../../../modules/app/enum/ErvuRole";
import {ErvuPermission} from "../../../modules/app/enum/ErvuPermission";
@Component({

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

@ -2,7 +2,7 @@ import {NgModule} from "@angular/core";
import {RouterModule, Routes} from "@angular/router";
import {ConfirmExitGuard} from "@webbpm/base-package";
import {RolesGuard} from "./guard/RolesGuard";
import {ErvuPermission} from "./enum/ErvuRole";
import {ErvuPermission} from "./enum/ErvuPermission";
const appRoutes: Routes = [
{

0
frontend/src/ts/modules/app/enum/ErvuRole.ts → frontend/src/ts/modules/app/enum/ErvuPermission.ts
View file

2
frontend/src/ts/modules/app/guard/RolesGuard.ts
View file

@ -9,7 +9,7 @@ import {Injectable} from "@angular/core";
import {AuthorizationService} from "../service/authorization.service";
import {TokenProvider} from "../provider/token.provider";
import {HttpClient} from "@angular/common/http";
import {ErvuPermission} from "../enum/ErvuRole";
import {ErvuPermission} from "../enum/ErvuPermission";
@Injectable({providedIn: 'root'})
export class RolesGuard implements CanActivate{