Skip to content

Commit ef90c26

Browse files
GwenouGwenou
committed
Merge branch 'release/V4.0.0-alpha'
2 parents e6eb820 + 082c527 commit ef90c26

File tree

434 files changed

+12638
-2571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+12638
-2571
lines changed

‎.vscode/launch.json

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,90 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8+
"name": "Angular",
89
"type": "msedge",
910
"request": "launch",
10-
"name": "Launch Edge against localhost",
1111
"url": "http://localhost:4200",
12+
"webRoot": "${workspaceFolder}/Angular",
13+
"sourceMaps": true
14+
},
15+
{
16+
"name": "Angular + npm start",
17+
"type": "msedge",
18+
"request": "launch",
19+
"preLaunchTask": "angular: start",
20+
"url": "http://localhost:4200",
21+
"webRoot": "${workspaceFolder}/Angular",
22+
"sourceMaps": true
23+
},
24+
{
25+
"type": "chrome",
26+
"request": "attach",
27+
"name": "Attach to Chrome",
28+
"port": 9222,
29+
"urlFilter": "http://localhost:4200/*",
1230
"webRoot": "${workspaceFolder}/Angular"
31+
},
32+
{
33+
"name": "DotNet WebApi",
34+
"type": "coreclr",
35+
"request": "launch",
36+
"preLaunchTask": "dotnet: build debug api",
37+
"program": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.Presentation.Api/bin/Debug/net8.0/TheBIADevCompany.BIADemo.Presentation.Api.dll",
38+
"args": [
39+
"--urls=http://localhost:32128",
40+
"--pathbase=/BIADemo/WebApi",
41+
"--hot-reload"
42+
],
43+
"cwd": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.Presentation.Api/bin/Debug/net8.0/",
44+
"stopAtEntry": false,
45+
"serverReadyAction": {
46+
"action": "openExternally",
47+
"pattern": "\\bNow listening on:\\s+(https?://\\S+:32128)",
48+
"uriFormat": "%s/BIADemo/WebApi/swagger/index.html"
49+
},
50+
"env": {
51+
"ASPNETCORE_ENVIRONMENT": "Development",
52+
"DOTNET_USE_POLLING_FILE_WATCHER": "true",
53+
"ASPNETCORE_PATHBASE": "/BIADemo",
54+
"ASPNETCORE_URLS": "http://localhost:32128/"
55+
}
56+
},
57+
{
58+
"name": "DotNet Worker",
59+
"type": "coreclr",
60+
"request": "launch",
61+
"preLaunchTask": "dotnet: build debug worker",
62+
"program": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.WorkerService/bin/Debug/net8.0/TheBIADevCompany.BIADemo.WorkerService.dll",
63+
"args": ["--hot-reload"],
64+
"cwd": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.WorkerService",
65+
"stopAtEntry": false,
66+
"env": {
67+
"ASPNETCORE_ENVIRONMENT": "Development",
68+
"DOTNET_USE_POLLING_FILE_WATCHER": "true"
69+
},
70+
"console": "internalConsole"
71+
},
72+
{
73+
"name": "DotNet DeployDB",
74+
"type": "coreclr",
75+
"request": "launch",
76+
"preLaunchTask": "dotnet: build debug deploy db",
77+
"program": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.DeployDB/bin/Debug/net8.0/TheBIADevCompany.BIADemo.DeployDB.dll",
78+
"args": ["--hot-reload"],
79+
"cwd": "${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.DeployDB",
80+
"stopAtEntry": false,
81+
"env": {
82+
"ASPNETCORE_ENVIRONMENT": "Development",
83+
"DOTNET_USE_POLLING_FILE_WATCHER": "true"
84+
},
85+
"console": "internalConsole"
86+
}
87+
],
88+
"compounds": [
89+
{
90+
"name": "Debug Full Stack",
91+
"configurations": ["DotNet WebApi", "Angular + npm start"]
1392
}
1493
]
1594
}

‎.vscode/tasks.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "angular: start",
6+
"type": "npm",
7+
"script": "start",
8+
"options": {
9+
"cwd": "${workspaceFolder}/Angular"
10+
},
11+
"isBackground": true,
12+
"problemMatcher": {
13+
"owner": "typescript",
14+
"pattern": "$tsc",
15+
"background": {
16+
"activeOnStart": true,
17+
"beginsPattern": {
18+
"regexp": "(.*?)"
19+
},
20+
"endsPattern": {
21+
"regexp": "bundle generation complete"
22+
}
23+
}
24+
}
25+
},
26+
{
27+
"label": "angular: test",
28+
"type": "npm",
29+
"script": "test",
30+
"options": {
31+
"cwd": "${workspaceFolder}/Angular"
32+
},
33+
"isBackground": true,
34+
"problemMatcher": {
35+
"owner": "typescript",
36+
"pattern": "$tsc",
37+
"background": {
38+
"activeOnStart": true,
39+
"beginsPattern": {
40+
"regexp": "(.*?)"
41+
},
42+
"endsPattern": {
43+
"regexp": "bundle generation complete"
44+
}
45+
}
46+
}
47+
},
48+
{
49+
"label": "dotnet: build debug api",
50+
"command": "dotnet",
51+
"type": "process",
52+
"args": [
53+
"build",
54+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.Presentation.Api/TheBIADevCompany.BIADemo.Presentation.Api.csproj",
55+
"/property:GenerateFullPaths=true",
56+
"/consoleloggerparameters:NoSummary"
57+
],
58+
"problemMatcher": "$msCompile"
59+
},
60+
{
61+
"label": "dotnet: build debug worker",
62+
"command": "dotnet",
63+
"type": "process",
64+
"args": [
65+
"build",
66+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.WorkerService/TheBIADevCompany.BIADemo.WorkerService.csproj",
67+
"/property:GenerateFullPaths=true",
68+
"/consoleloggerparameters:NoSummary"
69+
],
70+
"problemMatcher": "$msCompile"
71+
},
72+
{
73+
"label": "dotnet: build debug deploy db",
74+
"command": "dotnet",
75+
"type": "process",
76+
"args": [
77+
"build",
78+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.DeployDB/TheBIADevCompany.BIADemo.DeployDB.csproj",
79+
"/property:GenerateFullPaths=true",
80+
"/consoleloggerparameters:NoSummary"
81+
],
82+
"problemMatcher": "$msCompile"
83+
},
84+
{
85+
"label": "dotnet: build release api",
86+
"command": "dotnet",
87+
"type": "process",
88+
"args": [
89+
"build",
90+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.Presentation.Api/TheBIADevCompany.BIADemo.Presentation.Api.csproj",
91+
"-c",
92+
"Release"
93+
],
94+
"problemMatcher": "$msCompile"
95+
},
96+
{
97+
"label": "dotnet: build release worker",
98+
"command": "dotnet",
99+
"type": "process",
100+
"args": [
101+
"build",
102+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.WorkerService/TheBIADevCompany.BIADemo.WorkerService.csproj",
103+
"-c",
104+
"Release"
105+
],
106+
"problemMatcher": "$msCompile"
107+
},
108+
{
109+
"label": "dotnet: build release deploy db",
110+
"command": "dotnet",
111+
"type": "process",
112+
"args": [
113+
"build",
114+
"${workspaceFolder}/DotNet/TheBIADevCompany.BIADemo.DeployDB/TheBIADevCompany.BIADemo.DeployDB.csproj",
115+
"-c",
116+
"Release"
117+
],
118+
"problemMatcher": "$msCompile"
119+
}
120+
]
121+
}

‎Angular/BIAToolKit.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"Children": [],
69-
"Options": [],
69+
"Options": ["Part"],
7070
"Partial": [
7171
"src\\app\\shared\\permission.ts",
7272
"src\\app\\features\\planes\\plane.module.ts",
@@ -77,15 +77,14 @@
7777
{
7878
"Feature": "Option",
7979
"Type": "Option",
80-
"FeatureName": "Airport",
81-
"FeatureNamePlural": "Airports",
80+
"FeatureName": "Country",
81+
"FeatureNamePlural": "Countries",
8282
"ZipName": "option.zip",
8383
"Contains": {
84-
"Include": ["src\\app\\domains\\airport-option\\*"],
84+
"Include": ["src\\app\\domains\\country-option\\*"],
8585
"Exclude": []
8686
},
8787
"Children": [],
88-
"Options": [],
8988
"Partial": []
9089
},
9190
{
@@ -138,7 +137,7 @@
138137
}
139138
],
140139
"Children": [],
141-
"Options": [],
140+
"Options": ["Airport", "Country"],
142141
"Partial": [
143142
"src\\app\\app-routing.module.ts",
144143
"src\\app\\shared\\navigation.ts",

‎Angular/package-lock.json

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Angular/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
"deepmerge": "4.3.1",
5050
"dexie": "3.2.7",
5151
"file-saver": "2.0.5",
52+
"jwt-decode": "4.0.0",
5253
"keycloak-angular": "15.3.0",
5354
"keycloak-js": "21.1.2",
5455
"ngx-logger": "5.0.12",
5556
"papaparse": "5.4.1",
5657
"primeflex": "3.3.1",
57-
"primeicons": "6.0.1",
58+
"primeicons": "7.0.0",
5859
"primeng": "17.18.10",
5960
"rxjs": "7.8.1",
6061
"zone.js": "0.14.10"

‎Angular/src/app/app.component.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
33
import { PrimeNGConfig } from 'primeng/api';
44
import { BiaInjectExternalService } from './core/bia-core/services/bia-inject-external.service';
55
import { BiaMatomoService } from './core/bia-core/services/matomo/bia-matomo.service';
6+
import { BiaLayoutService } from './shared/bia-shared/components/layout/services/layout.service';
67

78
@Component({
89
selector: 'app-root',
@@ -16,8 +17,19 @@ export class AppComponent implements OnInit {
1617
private biaMatomoService: BiaMatomoService,
1718
private biaExternalJsService: BiaInjectExternalService,
1819
private primeNgConfig: PrimeNGConfig,
19-
private translateService: TranslateService
20-
) {}
20+
private translateService: TranslateService,
21+
private layoutService: BiaLayoutService
22+
) {
23+
// Begin BIADemo
24+
this.layoutService.defaultConfigUpdate({});
25+
this.layoutService.setConfigDisplay({
26+
showMenuStyle: true,
27+
showFooterStyle: true,
28+
showToggleStyle: true,
29+
});
30+
31+
// End BIADemo
32+
}
2133

2234
ngOnInit() {
2335
this.biaMatomoService.init();

‎Angular/src/app/core/bia-core/services/auth.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { HttpStatusCode } from '@angular/common/http';
22
import { Injectable, Injector, OnDestroy } from '@angular/core';
33
import { Store } from '@ngrx/store';
44
import { TranslateService } from '@ngx-translate/core';
5+
import { jwtDecode } from 'jwt-decode';
56
import { BehaviorSubject, NEVER, Observable, of, Subscription } from 'rxjs';
67
import { catchError, filter, map, skip, switchMap, take } from 'rxjs/operators';
78
import { DomainTeamsActions } from 'src/app/domains/bia-domains/team/store/teams-actions';
@@ -140,9 +141,7 @@ export class AuthService extends AbstractDas<AuthInfo> implements OnDestroy {
140141
}
141142

142143
public decodeToken(token: string): Token {
143-
const jsonDecodedToken: string = atob(token.split('.')[1]);
144-
const objDecodedToken: any = JSON.parse(jsonDecodedToken);
145-
144+
const objDecodedToken: any = jwtDecode(token);
146145
const decodedToken = <Token>{
147146
id: +objDecodedToken[
148147
'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/sid'

‎Angular/src/app/core/bia-core/services/bia-theme.service.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
import { Injectable, Renderer2, RendererFactory2, Inject } from '@angular/core';
21
import { DOCUMENT } from '@angular/common';
2+
import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
33
import { BehaviorSubject } from 'rxjs';
44
import { map } from 'rxjs/operators';
5-
import { THEME_LIGHT, THEME_DARK } from 'src/app/shared/constants';
5+
import {
6+
BiaLayoutService,
7+
ColorScheme,
8+
} from 'src/app/shared/bia-shared/components/layout/services/layout.service';
9+
import { THEME_DARK, THEME_LIGHT } from 'src/app/shared/constants';
610

711
export const STORAGE_THEME_KEY = 'theme';
812
const DEFAULT_THEME = THEME_LIGHT;
@@ -20,6 +24,7 @@ export class BiaThemeService {
2024
);
2125

2226
constructor(
27+
private readonly layoutService: BiaLayoutService,
2328
rendererFactory: RendererFactory2,
2429
@Inject(DOCUMENT) document: any
2530
) {
@@ -63,6 +68,7 @@ export class BiaThemeService {
6368
}
6469
this.applyPrimeNgTheme(theme);
6570
this.currentTheme.next(theme);
71+
this.layoutService.config().colorScheme = theme as ColorScheme;
6672
}
6773

6874
protected applyPrimeNgTheme(theme: string) {

‎Angular/src/app/domains/airport-option/services/airport-option-das.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ import { OptionDto } from 'src/app/shared/bia-shared/model/option-dto';
77
})
88
export class AirportOptionDas extends AbstractDas<OptionDto> {
99
constructor(injector: Injector) {
10-
super(injector, 'Airports');
10+
super(injector, 'AirportOptions');
1111
}
1212
}

0 commit comments

Comments
 (0)