Skip to content

Commit 52f1c1e

Browse files
authored
Merge pull request #869 from eclipse-tractusx/release/10.8.4
Release/10.8.4
2 parents 6e39afc + 2fac597 commit 52f1c1e

File tree

6 files changed

+33
-3
lines changed

6 files changed

+33
-3
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858

5959
- name: Update the frontend package.json appVersion
6060
run: |
61-
npm install -g json
62-
json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
61+
sudo npm install -g json
62+
sudo json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
6363
6464
- name: Prepare Helm release
6565
uses: peter-evans/create-pull-request@v6

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
_**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_
99
## [UNRELEASED - DD.MM.YYYY]
10+
### Added
11+
-
12+
### Changed
13+
-
14+
### Removed
15+
-
16+
## [10.8.4 - 17.04.2024]
1017

1118
### Added
1219
- #780 store api documenation in docs/api to conform with TRG 1.08

COMPATIBILITY_MATRIX.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Compatibility matrix Trace-X
22

3+
## Trace-X version [[10.8.4](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.4)] - 2024-04-17
4+
- No changes to 10.8.1
35
## Trace-X version [[10.8.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.1)] - 2024-04-03
46

57
### Catena-X Release?

charts/traceability-foss/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.3.36] - 2024-04-17
8+
### No changes
9+
10+
## [1.3.35] - 2024-04-17
11+
### No changes
12+
713
## [1.3.34] - 2024-04-04
814
### No changes
915

frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,14 @@ export class NotificationEditComponent implements OnDestroy {
258258
});
259259

260260
if (!this.affectedPartIds || this.affectedPartIds.length === 0) {
261-
this.partsFacade.setSupplierPartsAsBuiltSecondEmpty();
261+
if ( this.selectedNotification.type === NotificationType.INVESTIGATION){
262+
this.partsFacade.setSupplierPartsAsBuiltSecondEmpty();
263+
this.partsFacade.setSupplierPartsAsBuilt();
264+
} else{
265+
this.ownPartsFacade.setPartsAsBuiltSecondEmpty();
266+
this.ownPartsFacade.setPartsAsBuilt();
267+
}
268+
262269
this.isSaveButtonDisabled = true;
263270
} else {
264271
this.isSaveButtonDisabled = this.notificationFormGroup.invalid || this.affectedPartIds.length < 1;

frontend/src/app/modules/page/parts/core/parts.facade.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ export class PartsFacade {
6767
});
6868
}
6969

70+
public setPartsAsBuiltSecondEmpty(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsBuiltFilter?: AssetAsBuiltFilter, isOrSearch?: boolean): void {
71+
this.partsAsBuiltSubscriptionSecond?.unsubscribe();
72+
this.partsAsBuiltSubscriptionSecond = this.partsService.getPartsAsBuilt(page, pageSize, sorting, assetAsBuiltFilter, isOrSearch).subscribe({
73+
next: data => (this.partsState.partsAsBuiltSecond = { data: provideDataObject(null) }),
74+
error: error => (this.partsState.partsAsBuiltSecond = { error }),
75+
});
76+
}
77+
7078
public setPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsPlannedFilter?: AssetAsPlannedFilter, isOrSearch?: boolean): void {
7179
this.partsAsPlannedSubscription?.unsubscribe();
7280
this.partsAsPlannedSubscription = this.partsService.getPartsAsPlanned(page, pageSize, sorting, assetAsPlannedFilter, isOrSearch).subscribe({

0 commit comments

Comments
 (0)