Skip to content

Commit

Permalink
Merge pull request #254 from catenax-ng/release/v2.2.0-units-update
Browse files Browse the repository at this point in the history 
[ 1 ° ] - Release/v2.2.0 units and translations update + separate collection icon
  • Loading branch information
@saudkhan116
saudkhan116 authored Mar 26, 2024
2 parents bfef930 + 2ed8490 commit 53180f3
Show file tree
Hide file tree
Showing 22 changed files with 3,598 additions and 853 deletions.
1,645 changes: 863 additions & 782 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

956 changes: 932 additions & 24 deletions deployment/local/testing/testdata/testdata-payload.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deployment/local/testing/upload-testdata.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# SPDX-License-Identifier: Apache-2.0
#################################################################################

./transform-and-upload.sh -s https://materialpass.dev.demo.catena-x.net/provider_backend \
-e https://materialpass.dev.demo.catena-x.net/BPNL000000000000 \
-a https://materialpass.dev.demo.catena-x.net/semantics/registry/api/v3.0 \
./transform-and-upload.sh -s https://materialpass.int.demo.catena-x.net/provider_backend \
-e https://materialpass.int.demo.catena-x.net/BPNL000000000000 \
-a https://materialpass.int.demo.catena-x.net/semantics/registry/api/v3.0 \
-k <API-Key> \
-f ./testdata/testdata-payload.json
304 changes: 304 additions & 0 deletions src/assets/MOCK/SNJ-4654-76.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
{
"metadata": {
"contract": {
"@id": "9b3c0977-6b14-4201-bd76-55f681a92872",
"@type": "dcat:Dataset",
"odrl:hasPolicy": {
"@id": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:dc616f20-2781-450a-837a-290d861c8e0a",
"@type": "odrl:Set",
"odrl:permission": [],
"odrl:prohibition": [],
"odrl:obligation": [],
"odrl:target": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
},
"dcat:distribution": [
{
"@type": "dcat:Distribution",
"dct:format": {
"@id": "HttpProxy"
},
"dcat:accessService": "1795254a-e354-46c7-9d88-04608b05ca9f"
},
{
"@type": "dcat:Distribution",
"dct:format": {
"@id": "AmazonS3"
},
"dcat:accessService": "1795254a-e354-46c7-9d88-04608b05ca9f"
}
],
"edc:description": "Battery Passport test data",
"edc:id": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
},
"negotiation": {
"init": {
"request": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "NegotiationInitiateRequestDto",
"connectorAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
"protocol": "dataspace-protocol-http",
"connectorId": "BPNL00000000CBA5",
"offer": {
"offerId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:dc616f20-2781-450a-837a-290d861c8e0a",
"assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
"policy": {
"@type": "odrl:Set",
"odrl:permission": [],
"odrl:prohibition": [],
"odrl:obligation": [],
"odrl:target": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
}
}
},
"response": {
"@id": "b8a41089-1eac-462a-b8e8-e40f724b302f",
"@type": "edc:IdResponseDto",
"edc:createdAt": 1688393629505,
"@context": {
"dct": "https://purl.org/dc/terms/",
"tx": "https://w3id.org/tractusx/v0.0.1/ns/",
"edc": "https://w3id.org/edc/v0.0.1/ns/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
}
}
},
"get": {
"response": {
"@id": "b8a41089-1eac-462a-b8e8-e40f724b302f",
"@type": "edc:ContractNegotiationDto",
"edc:type": "CONSUMER",
"edc:protocol": "dataspace-protocol-http",
"edc:state": "FINALIZED",
"edc:counterPartyAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
"edc:callbackAddresses": [],
"edc:contractAgreementId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390",
"@context": {
"dct": "https://purl.org/dc/terms/",
"tx": "https://w3id.org/tractusx/v0.0.1/ns/",
"edc": "https://w3id.org/edc/v0.0.1/ns/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
}
}
}
},
"transfer": {
"init": {
"request": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
"connectorAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
"contractId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390",
"dataDestination": {
"properties": {
"type": "HttpProxy"
}
},
"managedResources": false,
"privateProperties": {
"receiverHttpEndpoint": "https://materialpass.dev.demo.catena-x.net/endpoint/bb8d235e-96c1-4fa3-a9ea-2ec71255ed18"
},
"protocol": "dataspace-protocol-http",
"transferType": {
"contentType": "application/octet-stream",
"isFinite": true
}
},
"response": {
"@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
"@type": "edc:IdResponseDto",
"edc:createdAt": 1688393631831,
"@context": {
"dct": "https://purl.org/dc/terms/",
"tx": "https://w3id.org/tractusx/v0.0.1/ns/",
"edc": "https://w3id.org/edc/v0.0.1/ns/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
}
}
},
"get": {
"response": {
"@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
"@type": "edc:TransferProcessDto",
"edc:state": "COMPLETED",
"edc:stateTimestamp": 1688393633142,
"edc:type": "CONSUMER",
"edc:callbackAddresses": [],
"edc:dataDestination": {
"edc:type": "HttpProxy"
},
"edc:dataRequest": {
"@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
"@type": "edc:DataRequestDto",
"edc:assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
"edc:contractId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390"
},
"edc:receiverHttpEndpoint": "https://materialpass.dev.demo.catena-x.net/endpoint/bb8d235e-96c1-4fa3-a9ea-2ec71255ed18",
"@context": {
"dct": "https://purl.org/dc/terms/",
"tx": "https://w3id.org/tractusx/v0.0.1/ns/",
"edc": "https://w3id.org/edc/v0.0.1/ns/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
}
}
}
}
},
"semanticId": "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass",
"aspect": {
"productSpecificParameters": {
"torqueConverter": [
"ABC1234567890",
"XYZ9876543210"
],
"driveType": "Combustion Engine",
"oilType": "ZF Lifeguard Hybrid 2",
"spreading": 6.79,
"torque": 500.0,
"power": 300.0,
"standardGearRatio": {
"gear": "1",
"ratio": 4.1567
},
"oilCapacity": 8.9,
"electricPerformance": [
"Electric Performance Specification A",
"Electric Performance Specification B"
],
"speedResistance": {
"speed": 7800,
"gear": "1"
}
},
"instructions": {
"packagingInstructions": [
{
"documentTitle": "Packaging Instructions",
"documentLink": "https://www.example.com/packaging-instructions.pdf"
}
],
"transportationInstructions": [
{
"documentTitle": "Transportation Instructions",
"documentLink": "https://www.example.com/transportation-instructions.pdf"
}
],
"dismantlingProcedure": [
{
"documentTitle": "Dismantling Procedure",
"documentLink": "https://www.example.com/dismantling-procedure.pdf"
}
],
"safetyMeasures": [
{
"documentTitle": "Safety Measures",
"documentLink": "https://www.example.com/safety-measures.pdf"
}
],
"vehicleDismantlingProcedure": [
{
"documentTitle": "Vehicle Dismantling Procedure",
"documentLink": "https://www.example.com/vehicle-dismantling-procedure.pdf"
}
]
},
"identification": {
"manufacturerId": "XYZ78901",
"localIdentifiers": [
{
"value": "SNJ-4654-76",
"key": "PartInstanceID"
}
],
"dataMatrixCode": "ABCDEF1234567890"
},
"sparePartSupplier": [
{
"supplierContact": {
"faxNumber": "+49 89 0987654321",
"website": "https://www.example-supplier.com",
"phoneNumber": "+49 89 1234567890",
"email": "[email protected]"
},
"supplierId": "BPNL1234567890ZZ",
"sparePartName": "Torque Converter"
}
],
"stateOfHealth": {
"serviceHistory": [
"2023-05-22T13:16:47.239+02:00"
],
"expectedLifespan": 500000,
"remanufacturing": {
"remanufacturingDate": "2023-05-22T13:16:47.239+02:00",
"productStatusValue": "First Life"
}
},
"generalInformation": {
"additionalInformation": "This is a test product with realistic data.",
"physicalDimensionsProperty": {
"width": 1000.0,
"length": 20000.1,
"weight": 100.7,
"diameter": 0.03,
"height": 0.1
},
"warrantyPeriod": 60.0,
"productDescription": "Manual Transmission",
"productType": "8HP60MH"
},
"sustainability": {
"substancesOfConcern": [
"Substance A",
"Substance B"
],
"responsibleSourcingDocument": [
{
"documentTitle": "Responsible Sourcing Document",
"documentLink": "https://www.example.com/responsible-sourcing.pdf"
}
],
"recyclateContent": {
"nickel": 0.05,
"lithium": 0.01,
"cobalt": 0.02,
"otherSubstance": [
{
"substancePercentage": 0.1,
"substanceName": "Lead"
}
]
},
"criticalRawMaterials": [
"Material X",
"Material Y"
],
"carbonFootprint": {
"crossSectoralStandardsUsed": [
{
"crossSectoralStandard": "GHG Protocol Product Standard"
}
],
"co2FootprintTotal": 200.0,
"productOrSectorSpecificRules": [
{
"operator": "PEF",
"ruleNames": "ABC 2021",
"otherOperatorName": "NSF"
}
]
}
}
}
}
Loading

0 comments on commit 53180f3

Please sign in to comment.