Skip to content

Commit 6028f22

Browse files
committed
Merge branch 'release/V4.0.0'
2 parents f813ba2 + ab523a0 commit 6028f22

File tree

188 files changed

+8262
-5416
lines changed

Some content is hidden

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

188 files changed

+8262
-5416
lines changed

Angular/package-lock.json

Lines changed: 5903 additions & 3844 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
"@angular/compiler-cli": "~17.3.12",
7272
"@angular/language-service": "~17.3.12",
7373
"@ngrx/store-devtools": "~17.2.0",
74-
"@types/node": "~20.17.10",
74+
"@types/node": "~20.17.14",
7575
"@types/papaparse": "~5.3.15",
7676
"@typescript-eslint/eslint-plugin": "~5.62.0",
7777
"@typescript-eslint/parser": "~5.62.0",
7878
"eslint": "~8.57.1",
7979
"eslint-config-prettier": "~9.1.0",
8080
"eslint-plugin-deprecation": "~3.0.0",
81-
"eslint-plugin-prettier": "~5.2.1",
81+
"eslint-plugin-prettier": "~5.2.3",
8282
"prettier": "~3.4.2",
8383
"prettier-eslint": "~16.3.0",
8484
"prettier-plugin-organize-imports": "~4.1.0",

Angular/src/app/core/bia-core/services/bia-message.service.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class BiaMessageService {
5454

5555
showErrorHttpResponse(err: HttpErrorResponse) {
5656
if (err.status == HttpStatusCode.UnprocessableEntity) {
57-
this.showErrorDetail(err.error, undefined);
57+
this.showErrorDetail(err.error);
5858
} else {
5959
this.showError();
6060
}
@@ -93,15 +93,19 @@ export class BiaMessageService {
9393
});
9494
}
9595

96-
showErrorDetail(detailValue: string, life = undefined) {
96+
showErrorDetail(
97+
detailValue: string,
98+
sticky = true,
99+
life: number = MESSAGE_LIFE_DEFAULT * 2
100+
) {
97101
const summaryValue = this.translateService.instant('bia.error');
98102
this.messageService.add({
99103
key: 'bia',
100104
severity: 'error',
101105
summary: summaryValue,
102106
detail: detailValue,
103107
life: life,
104-
sticky: true,
108+
sticky: sticky,
105109
});
106110
}
107111

Angular/src/app/domains/bia-domains/app-settings/model/app-settings.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export interface TokenConf {
6363
}
6464

6565
export interface ProfileConfiguration {
66-
urlProfileImage: string;
67-
urlEditProfileImage: string;
66+
clientProfileImageGetMode: boolean;
67+
profileImageUrlOrPath: string;
68+
editProfileImageUrl: string;
6869
}

Angular/src/app/features/aircraft-maintenance-companies/children/maintenance-teams/views/maintenance-teams-index/maintenance-teams-index.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
*ngIf="canEdit"
3333
class="p-button-outlined"
3434
label="{{ 'maintenanceTeam.edit' | translate }}"
35-
(click)="onEdit(selectedCrudItems[0].id)"></button>
35+
(click)="onEdit(selectedCrudItems[0].id)"
36+
pTooltip="{{ 'maintenanceTeam.edit' | translate }}"
37+
tooltipPosition="top"></button>
3638
<button
3739
pButton
3840
[disabled]="

Angular/src/app/features/aircraft-maintenance-companies/views/aircraft-maintenance-companies-index/aircraft-maintenance-companies-index.component.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
*ngIf="canEdit"
3333
class="p-button-outlined"
3434
label="{{ 'aircraftMaintenanceCompany.edit' | translate }}"
35-
(click)="onEdit(selectedCrudItems[0].id)"></button>
35+
(click)="onEdit(selectedCrudItems[0].id)"
36+
pTooltip="{{ 'aircraftMaintenanceCompany.edit' | translate }}"
37+
tooltipPosition="top"></button>
3638
<!-- // Begin Child MaintenanceTeam -->
3739
<button
3840
pButton
@@ -42,7 +44,11 @@
4244
label="{{
4345
'aircraftMaintenanceCompany.maintenanceTeams' | translate
4446
}}"
45-
(click)="onViewMaintenanceTeams()"></button>
47+
(click)="onViewMaintenanceTeams()"
48+
pTooltip="{{
49+
'aircraftMaintenanceCompany.maintenanceTeams' | translate
50+
}}"
51+
tooltipPosition="top"></button>
4652
<button
4753
pButton
4854
[disabled]="

Angular/src/app/features/bia-features/notifications/components/notification-form/notification-form.component.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<button
4343
pButton
4444
type="button"
45+
icon="pi pi-plus"
4546
label="{{ 'bia.translation.addAll' | translate }}"
4647
(click)="addAllTranslation()"
4748
[disabled]="!missingTranslation"></button>
@@ -99,6 +100,7 @@
99100
<button
100101
pButton
101102
type="button"
103+
icon="pi pi-trash"
102104
label="{{ 'bia.translation.delete' | translate }}"
103105
(click)="removeTranslation(i)"></button>
104106
</div>
@@ -135,6 +137,7 @@
135137
class="ui-button-secondary"
136138
pButton
137139
type="button"
140+
icon="pi pi-plus"
138141
label="{{ 'bia.translation.add' | translate }}"
139142
(click)="addTranslation()"
140143
[disabled]="!selectionLanguage"></button>
@@ -297,14 +300,16 @@
297300
<div class="flex flex-row gap-1 justify-content-end">
298301
<button
299302
pButton
300-
label="{{ 'bia.save' | translate }}"
301-
type="submit"
302-
[disabled]="!form.valid"></button>
303-
<button
304-
pButton
303+
icon="pi pi-times"
305304
label="{{ 'bia.cancel' | translate }}"
306305
type="button"
307306
class="p-button-outlined"
308307
(click)="onCancel()"></button>
308+
<button
309+
pButton
310+
icon="pi pi-check"
311+
label="{{ 'bia.save' | translate }}"
312+
type="submit"
313+
[disabled]="!form.valid"></button>
309314
</div>
310315
</form>

Angular/src/app/features/bia-features/notifications/views/notification-detail/notification-detail.component.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
[notification]="notification"></bia-notification-team-warning>
3535
<button
3636
pButton
37-
[label]="notification.data.display | translate"
37+
icon="pi pi-times"
38+
label="{{ 'bia.cancel' | translate }}"
3839
type="button"
39-
class="p-button-primary"
40-
(click)="onAction(notification)"
41-
*ngIf="canAction(notification)"></button>
40+
class="p-button-secondary"
41+
(click)="onCancelled()"></button>
4242
<button
4343
pButton
4444
label="{{ 'bia.edit' | translate }}"
@@ -48,10 +48,11 @@
4848
*ngIf="canEdit"></button>
4949
<button
5050
pButton
51-
label="{{ 'bia.cancel' | translate }}"
51+
[label]="notification.data.display | translate"
5252
type="button"
53-
class="p-button-secondary"
54-
(click)="onCancelled()"></button>
53+
class="p-button-primary"
54+
(click)="onAction(notification)"
55+
*ngIf="canAction(notification)"></button>
5556
</div>
5657
</div>
5758
</ng-container>

Angular/src/app/features/bia-features/notifications/views/notifications-index/notifications-index.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,12 @@ export class NotificationsIndexComponent implements OnInit, OnDestroy {
256256
type: PropType.OneToMany,
257257
}),
258258
Object.assign(new BiaFieldConfig('read', 'notification.read'), {
259-
isSearchable: false,
260259
type: PropType.Boolean,
261260
}),
262261
Object.assign(
263262
new BiaFieldConfig('createdDate', 'notification.createdDate'),
264263
{
265-
type: PropType.Date,
264+
type: PropType.DateTime,
266265
}
267266
),
268267
Object.assign(

Angular/src/app/features/bia-features/users-from-directory/components/user-from-directory-form/user-from-directory-form.component.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@
5454
<div class="flex flex-row gap-1 justify-content-end">
5555
<button
5656
pButton
57-
label="{{ 'bia.save' | translate }}"
58-
type="submit"
59-
[disabled]="!form.valid"></button>
60-
<button
61-
pButton
57+
icon="pi pi-times"
6258
label="{{ 'bia.cancel' | translate }}"
6359
type="button"
6460
class="p-button-outlined"
6561
(click)="onCancel()"></button>
62+
<button
63+
pButton
64+
icon="pi pi-plus"
65+
label="{{ 'bia.add' | translate }}"
66+
type="submit"
67+
[disabled]="!form.valid"></button>
6668
</div>
6769
</form>

0 commit comments

Comments
 (0)