Skip to content

Commit

Permalink
Merge pull request #934 from catenax-ng/main
Browse files Browse the repository at this point in the history
feature: #837 use digitalTwinType for shell lookup, #603 upgrade aspect models
  • Loading branch information
ds-mwesener authored May 2, 2024
2 parents 3cebb5e + 5749bda commit e14d2bf
Show file tree
Hide file tree
Showing 55 changed files with 4,613 additions and 17,367 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/argo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
- E2E-A/E2E-B
- int-a/int-b
testdata_version:
description: Which Testdata Version CX_Testdata_MessagingTest_v<X.X.X>.json e.g., 0.0.12"
description: Which Testdata Version CX_Testdata_MessagingTest_v<X.X.X>.json e.g., 0.0.13"
required: true
argo_token:
description: Argo Token
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ _**For better traceability add the corresponding GitHub issue number in each cha
### Added
- #844 Validation for BPN to Notification API (Create / Edit), Fixed pagination
- #726 Added @Preauthorize annotation to dashboard controller
- #837 Added digital twin type to data provisioning workflow to be able to lookup shells created by trace-x

### Changed
- #844 Prefilled bpn on investigation creation
- #843 Refactored e2e tests, added edit notification e2e test case
- #828 fix duplicates in traction_battery_code_subcomponent table
- #617 redesigned inbox table
- #XXX Updated spring boot from 3.2.4 to 3.2.5
- #XXX Bumped logback-core & logback-classic from 1.5.4 to 1.5.5
- #603 Upgraded SingleLevelBomAsBuilt, SingleLevelBomAsPlanned & SingleLevelBomAsBuilt to 3.0.0
- #603 Upgraded Batch, SerialPart and JustInSequencePart to 3.0.0
- #603 Upgraded PartAsPlanned to 2.0.0

### Removed
-
## [10.8.4 - 17.04.2024]
Expand Down
4 changes: 2 additions & 2 deletions DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ npm/npmjs/-/d3-timer/3.0.1, ISC, approved, clearlydefined
npm/npmjs/-/d3-transition/3.0.1, ISC, approved, clearlydefined
npm/npmjs/-/d3-zoom/3.0.0, ISC, approved, clearlydefined
npm/npmjs/-/d3/7.8.4, ISC, approved, clearlydefined
npm/npmjs/-/dashdash/1.14.1, MIT, approved, clearlydefined
npm/npmjs/-/dashdash/1.14.1, MIT, restricted, clearlydefined
npm/npmjs/-/data-urls/2.0.0, MIT, approved, clearlydefined
npm/npmjs/-/date-format/4.0.14, MIT, approved, clearlydefined
npm/npmjs/-/dayjs/1.11.7, MIT, approved, #9149
Expand Down Expand Up @@ -592,7 +592,7 @@ npm/npmjs/-/js-tokens/4.0.0, MIT, approved, #2401
npm/npmjs/-/js-yaml/3.14.1, MIT, approved, clearlydefined
npm/npmjs/-/js-yaml/4.1.0, MIT, approved, clearlydefined
npm/npmjs/-/js2xmlparser/4.0.2, Apache-2.0, approved, clearlydefined
npm/npmjs/-/jsbn/0.1.1, MIT, approved, clearlydefined
npm/npmjs/-/jsbn/0.1.1, MIT, restricted, clearlydefined
npm/npmjs/-/jsdoc-type-pratt-parser/4.0.0, MIT, approved, clearlydefined
npm/npmjs/-/jsdom/16.7.0, LGPL-2.0-or-later AND MIT, approved, #1370
npm/npmjs/-/jsesc/0.5.0, MIT, approved, clearlydefined
Expand Down
31 changes: 1 addition & 30 deletions dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ Is achieved by defining the order of the BPNLs of the desired manufacturers. See
and adding an SingleLevelBomAsBuilt Aspect with the corresponding childCatenaXId:
```json
{
"urn:bamm:io.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" : [ {
"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ {
"catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd",
"childParts" : [ {
"quantity" : {
Expand All @@ -237,34 +237,5 @@ and adding an SingleLevelBomAsBuilt Aspect with the corresponding childCatenaXId

Is achieved through adding the SingleLevelusageBuilt - Codeblock and the corresponding parent catenaXId above, see example below (Only SingleLevelUsageBuilt expanded):

```json
[{
"catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd",
"bpnl" : "BPNL00000003CNKC",
"urn:bamm:io.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt": "[...]",
"urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : "[...]"
}, {
"catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37",
"bpnl" : "BPNL00000003AZQP",
"urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : "",
"urn:bamm:io.catenax.single_level_usage_as_built:1.0.1#SingleLevelUsageAsBuilt": [
{
"parentParts": [
{
"parentCatenaXId": "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a",
"quantity": {
"quantityNumber": 1,
"measurementUnit": "unit:piece"
},
"createdOn": "2023-02-03T14:48:54.709Z",
"lastModifiedOn": "2023-02-03T14:48:54.709Z"
}
],
"catenaXId": "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37"
}
]
}
]
```
...AZQP -> CNKC -> ...

Loading

0 comments on commit e14d2bf

Please sign in to comment.