Skip to content

Commit

Permalink
Merge pull request #745 from catenax-ng/main
Browse files Browse the repository at this point in the history 
Extended import states and smaller adjustments regarding policies and frontend design
  • Loading branch information
@ds-mmaul
ds-mmaul authored Mar 14, 2024
2 parents 8132d1b + 7f5a2da commit a466da6
Show file tree
Hide file tree
Showing 84 changed files with 3,033 additions and 3,280 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/pull-request_backend.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,29 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
review-message: "Please add a short description of the feature/fix to the Changelog.md."
Check-Pom-update:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Check pom for -SNAPSHOT
id: pom-version
run: |
snapshot_count_root_pom=$(grep -o '\-SNAPSHOT' pom.xml | wc -l)
if [ "$snapshot_count_root_pom" > 1 ]; then
echo "pom_changed=true" >> $GITHUB_OUTPUT
else
echo "pom_changed=false" >> $GITHUB_OUTPUT
fi
- name: Create Review Comment
uses: ntsd/auto-request-changes-action@v3
if: steps.pom-version.outputs.pom_changed == 'true'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
review-message: "Please remove -SNAPSHOT from property versions "


Test-and-Sonar:
permissions:
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ _**For better traceability add the corresponding GitHub issue number in each cha
## [UNRELEASED - DD.MM.YYYY]

### Added
- #421 Added contract agreement view
- #515 Service Unavailable Response on Notification failure

- #536 Added import state PUBLISHED_TO_CX in frontend
- #420 add /contracts api to fetch contract agreement information from EDC for assets

- Added a step to the pull-request-backend.yml which checks if the pom.xml(root) properties have some versions ending with -SNAPSHOT
- Added a PostConstruct method in PolicyStartUpConfig to allow Integration tests to run without errors in stack traces.
### Changed
- Updated RELEASE.md to the latest release guide (added more steps)
- #515 Fixed notification toast click area
- #625 increased height of tables
- #423 Moved errorMessages from investigation/alert to notification list
- Updated COMPATIBILITY.md matrix adding release C-X 24.3 and 23.12
- #536 rework /policies to respond with policies from the IRS policy store

### Removed
- #625 Removed the header and breadcrumbs section from app layout
Expand Down
127 changes: 122 additions & 5 deletions COMPATIBILITY_MATRIX.md
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,132 @@
# Compatibility matrix Trace-X

## Catena-X Release?
- [x] yes -> Catena-X Release 9.0.0-rc2

## Trace-X version [[10.6.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.6.0)] - 2024-03-04

### Catena-X Release?

- [ ] yes
- [x] no

### Helm Version [1.3.31](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.31)

| Dependency | Name of Service | Version | Helm | Comments |
|------------------|------------------------------|---------------------------------|--------|-----------------------------------------------------------------------------------|
| EDC | edc-postgresql | 12.1.6 | 2.0.0 | Enterprise Data Connector for PostgreSQL |
| IRS | irs-helm | 4.4.0 | 6.13.0 | Helm charts for Item Relationship Service |
| EDC | tractusx-connector | 0.5.3 | 2.0.0 | Connector for Data Transfer and Registration |
| Discovery Finder | discovery service | v0.2.4-M1 | 0.1.11 | Service for discovering and registering artifacts |
| Portal | portal | 1.7.0 | 1.7.0 | Web portal for interacting with Trace-X |
| SD-Factory | SD-Factory | 2.1.7 | 2.1.8 | Service Discovery Factory for managing dependencies |
| Wallet | wallet | 0.3.0 | 0.3.0 | Secure storage for sensitive information |
| SDE | Simple Data Exchanger (SDE) | 2.3.3 | 0.1.3 | Standalone service for companies to provide data in the Eclipse Tractus-X network |
| Aspect Model | SerialPart | [1.0.0,1.1.0,2.0.0,3.0.0) | - | |
| Aspect Model | Batch | [1.0.1,1.0.2,2.0.0,2.0.1,3.0.0) | - | |
| Aspect Model | PartAsPlanned | [1.0.0,1.0.1,2.0.0) | - | |
| Aspect Model | PartSiteInformationAsPlanned | [1.0.0] | - | |
| Aspect Model | JustInSequencePart | [1.0.0,2.0.0,3.0.0) | - | |
| Aspect Model | TractionBatteryCode | [1.0.0] | - | |
| Aspect Model | SingleLevelUsageAsBuilt | [1.0.1] | - | |
| Aspect Model | SingleLevelBomAsBuilt | [1.0.0, 2.0.0) | - | |
| Aspect Model | SingleLevelBomAsPlanned | [1.0.1, 1.1.0) | - | |


## Trace-X version [[10.5.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.5.0)]- 2024-02-22

### Catena-X Release?

- [ ] yes
- [x] no


| Dependency | Name of Service | Version | Helm | Comments |
|------------------|------------------------------|---------------------------------|--------|-----------------------------------------------------------------------------------|
| EDC | edc-postgresql | 12.1.6 | 2.0.0 | Enterprise Data Connector for PostgreSQL |
| IRS | irs-helm | 4.4.0 | 6.13.0 | Helm charts for Item Relationship Service |
| EDC | tractusx-connector | 0.5.3 | 2.0.0 | Connector for Data Transfer and Registration |
| Discovery Finder | discovery service | v0.2.4-M1 | 0.1.11 | Service for discovering and registering artifacts |
| Portal | portal | 1.7.0 | 1.7.0 | Web portal for interacting with Trace-X |
| SD-Factory | SD-Factory | 2.1.7 | 2.1.8 | Service Discovery Factory for managing dependencies |
| Wallet | wallet | 0.3.0 | 0.3.0 | Secure storage for sensitive information |
| SDE | Simple Data Exchanger (SDE) | 2.3.3 | 0.1.3 | Standalone service for companies to provide data in the Eclipse Tractus-X network |
| Aspect Model | SerialPart | [1.0.0,1.1.0,2.0.0,3.0.0) | - | |
| Aspect Model | Batch | [1.0.1,1.0.2,2.0.0,2.0.1,3.0.0) | - | |
| Aspect Model | PartAsPlanned | [1.0.0,1.0.1,2.0.0) | - | |
| Aspect Model | PartSiteInformationAsPlanned | [1.0.0] | - | |
| Aspect Model | JustInSequencePart | [1.0.0,2.0.0,3.0.0) | - | |
| Aspect Model | TractionBatteryCode | [1.0.0] | - | |
| Aspect Model | SingleLevelUsageAsBuilt | [1.0.1] | - | |
| Aspect Model | SingleLevelBomAsBuilt | [1.0.0, 2.0.0) | - | |
| Aspect Model | SingleLevelBomAsPlanned | [1.0.1, 1.1.0) | - | |


## Trace-X version [[10.4.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.4.0)] - 2024-02-19

### Catena-X Release?

- [ ] yes
- [x] no

### Helm Version [1.3.29](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.29)

| Dependency | Name of Service | Version | Helm | Comments |
|------------------|------------------------------|---------------------------------|--------|-----------------------------------------------------------------------------------|
| EDC | edc-postgresql | 12.1.6 | 2.0.0 | Enterprise Data Connector for PostgreSQL |
| IRS | irs-helm | 4.4.0 | 6.13.0 | Helm charts for Item Relationship Service |
| EDC | tractusx-connector | 0.5.3 | 2.0.0 | Connector for Data Transfer and Registration |
| Discovery Finder | discovery service | v0.2.4-M1 | 0.1.11 | Service for discovering and registering artifacts |
| Portal | portal | 1.7.0 | 1.7.0 | Web portal for interacting with Trace-X |
| SD-Factory | SD-Factory | 2.1.7 | 2.1.8 | Service Discovery Factory for managing dependencies |
| Wallet | wallet | 0.3.0 | 0.3.0 | Secure storage for sensitive information |
| SDE | Simple Data Exchanger (SDE) | 2.3.3 | 0.1.3 | Standalone service for companies to provide data in the Eclipse Tractus-X network |
| Aspect Model | SerialPart | [1.0.0,1.1.0,2.0.0,3.0.0) | - | |
| Aspect Model | Batch | [1.0.1,1.0.2,2.0.0,2.0.1,3.0.0) | - | |
| Aspect Model | PartAsPlanned | [1.0.0,1.0.1,2.0.0) | - | |
| Aspect Model | PartSiteInformationAsPlanned | [1.0.0] | - | |
| Aspect Model | JustInSequencePart | [1.0.0,2.0.0,3.0.0) | - | |
| Aspect Model | TractionBatteryCode | [1.0.0] | - | |
| Aspect Model | SingleLevelUsageAsBuilt | [1.0.1] | - | |
| Aspect Model | SingleLevelBomAsBuilt | [1.0.0, 2.0.0) | - | |
| Aspect Model | SingleLevelBomAsPlanned | [1.0.1, 1.1.0) | - | |


## Trace-X version [[10.3.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.3.0)] - 2024-02-05

### Catena-X Release?

- [x] yes -> Catena-X Release 24.03
- [ ] no

### Helm Version [1.3.28](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.28)

| Dependency | Name of Service | Version | Helm | Comments |
|------------------|------------------------------|---------------------------------|--------|-----------------------------------------------------------------------------------|
| EDC | edc-postgresql | 12.1.6 | 2.0.0 | Enterprise Data Connector for PostgreSQL |
| IRS | irs-helm | 4.4.0 | 6.13.0 | Helm charts for Item Relationship Service |
| EDC | tractusx-connector | 0.5.3 | 2.0.0 | Connector for Data Transfer and Registration |
| Discovery Finder | discovery service | v0.2.4-M1 | 0.1.11 | Service for discovering and registering artifacts |
| Portal | portal | 1.7.0 | 1.7.0 | Web portal for interacting with Trace-X |
| SD-Factory | SD-Factory | 2.1.7 | 2.1.8 | Service Discovery Factory for managing dependencies |
| Wallet | wallet | 0.3.0 | 0.3.0 | Secure storage for sensitive information |
| SDE | Simple Data Exchanger (SDE) | 2.3.3 | 0.1.3 | Standalone service for companies to provide data in the Eclipse Tractus-X network |
| Aspect Model | SerialPart | [1.0.0,1.1.0,2.0.0,3.0.0) | - | |
| Aspect Model | Batch | [1.0.1,1.0.2,2.0.0,2.0.1,3.0.0) | - | |
| Aspect Model | PartAsPlanned | [1.0.0,1.0.1,2.0.0) | - | |
| Aspect Model | PartSiteInformationAsPlanned | [1.0.0] | - | |
| Aspect Model | JustInSequencePart | [1.0.0,2.0.0,3.0.0) | - | |
| Aspect Model | TractionBatteryCode | [1.0.0] | - | |
| Aspect Model | SingleLevelUsageAsBuilt | [1.0.1] | - | |
| Aspect Model | SingleLevelBomAsBuilt | [1.0.0, 2.0.0) | - | |
| Aspect Model | SingleLevelBomAsPlanned | [1.0.1, 1.1.0) | - | |

### (Trace-X Release) [9.0.0-rc2| Release Notes](https://github.com/catenax-ng/tx-traceability-foss/releases/tag/9.0.0-rc2)

#### Trace-X version 9.0.0-rc2
#### Helm Version 1.3.21
## Trace-X version [[9.0.0-rc2](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/9.0.0-rc2)] - 2023-11-15
## Catena-X Release?

- [x] yes -> Catena-X Release R23.12
- [ ] no

### Helm Version 1.3.21

| Dependency | Name of Service | Version | Helm | Comments |
|-------------------|------------------------------|---------------------------------|-------|-----------------------------------------------------------------------------------|
Expand Down
Loading

0 comments on commit a466da6

Please sign in to comment.