Skip to content

Commit

Permalink
fix: policy dto after edc extensions model update
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardtreier
richardtreier committed Jul 12, 2023
1 parent c11f368 commit 4da10a6
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 254 deletions.
84 changes: 3 additions & 81 deletions fake-backend/json/brokerCatalogPage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,33 +79,7 @@
"createdAt": "2023-05-26T12:02:41+02:00",
"updatedAt": "2023-05-31T12:02:41+02:00",
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"action": {
"type": "USE"
},
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
]
}
],
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"action\": {\n \"type\": \"USE\"\n },\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ]\n }\n ],\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
}
}
]
Expand Down Expand Up @@ -142,33 +116,7 @@
"createdAt": "2023-05-26T12:02:41+02:00",
"updatedAt": "2023-05-31T12:02:41+02:00",
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"action": {
"type": "USE"
},
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
]
}
],
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"action\": {\n \"type\": \"USE\"\n },\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ]\n }\n ],\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
}
}
]
Expand Down Expand Up @@ -205,33 +153,7 @@
"createdAt": "2023-05-26T12:02:41+02:00",
"updatedAt": "2023-05-31T12:02:41+02:00",
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"action": {
"type": "USE"
},
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
]
}
],
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"action\": {\n \"type\": \"USE\"\n },\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ]\n }\n ],\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
}
}
]
Expand Down
168 changes: 4 additions & 164 deletions fake-backend/json/contractAgreementPage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,7 @@
}
},
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"uid": null,
"target": "urn:artifact:my-own-asset",
"action": {
"type": "USE",
"includedIn": null,
"constraint": null
},
"assignee": null,
"assigner": null,
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
],
"duties": []
}
],
"prohibitions": [],
"obligations": [],
"extensibleProperties": {},
"inheritsFrom": null,
"assigner": null,
"assignee": null,
"target": "urn:artifact:my-own-asset",
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"uid\": null,\n \"target\": \"urn:artifact:my-own-asset\",\n \"action\": {\n \"type\": \"USE\",\n \"includedIn\": null,\n \"constraint\": null\n },\n \"assignee\": null,\n \"assigner\": null,\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ],\n \"duties\": []\n }\n ],\n \"prohibitions\": [],\n \"obligations\": [],\n \"extensibleProperties\": {},\n \"inheritsFrom\": null,\n \"assigner\": null,\n \"assignee\": null,\n \"target\": \"urn:artifact:my-own-asset\",\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
},
"transferProcesses": [
{
Expand Down Expand Up @@ -123,47 +83,7 @@
}
},
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"uid": null,
"target": "urn:artifact:consumed-asset",
"action": {
"type": "USE",
"includedIn": null,
"constraint": null
},
"assignee": null,
"assigner": null,
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
],
"duties": []
}
],
"prohibitions": [],
"obligations": [],
"extensibleProperties": {},
"inheritsFrom": null,
"assigner": null,
"assignee": null,
"target": "urn:artifact:my-test-asset",
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"uid\": null,\n \"target\": \"urn:artifact:consumed-asset\",\n \"action\": {\n \"type\": \"USE\",\n \"includedIn\": null,\n \"constraint\": null\n },\n \"assignee\": null,\n \"assigner\": null,\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ],\n \"duties\": []\n }\n ],\n \"prohibitions\": [],\n \"obligations\": [],\n \"extensibleProperties\": {},\n \"inheritsFrom\": null,\n \"assigner\": null,\n \"assignee\": null,\n \"target\": \"urn:artifact:my-test-asset\",\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
},
"transferProcesses": [
{
Expand Down Expand Up @@ -215,47 +135,7 @@
}
},
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"uid": null,
"target": "urn:artifact:my-test-asset-2",
"action": {
"type": "USE",
"includedIn": null,
"constraint": null
},
"assignee": null,
"assigner": null,
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
],
"duties": []
}
],
"prohibitions": [],
"obligations": [],
"extensibleProperties": {},
"inheritsFrom": null,
"assigner": null,
"assignee": null,
"target": "urn:artifact:my-test-asset-2",
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"uid\": null,\n \"target\": \"urn:artifact:my-test-asset-2\",\n \"action\": {\n \"type\": \"USE\",\n \"includedIn\": null,\n \"constraint\": null\n },\n \"assignee\": null,\n \"assigner\": null,\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ],\n \"duties\": []\n }\n ],\n \"prohibitions\": [],\n \"obligations\": [],\n \"extensibleProperties\": {},\n \"inheritsFrom\": null,\n \"assigner\": null,\n \"assignee\": null,\n \"target\": \"urn:artifact:my-test-asset-2\",\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
},
"transferProcesses": []
},
Expand All @@ -275,47 +155,7 @@
}
},
"contractPolicy": {
"legacyPolicy": {
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"uid": null,
"target": "urn:artifact:consumed-asset",
"action": {
"type": "USE",
"includedIn": null,
"constraint": null
},
"assignee": null,
"assigner": null,
"constraints": [
{
"edctype": "AtomicConstraint",
"leftExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "ALWAYS_TRUE"
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
"value": "true"
},
"operator": "EQ"
}
],
"duties": []
}
],
"prohibitions": [],
"obligations": [],
"extensibleProperties": {},
"inheritsFrom": null,
"assigner": null,
"assignee": null,
"target": "urn:artifact:my-test-asset",
"@type": {
"@policytype": "set"
}
}
"legacyPolicy": "{\n \"permissions\": [\n {\n \"edctype\": \"dataspaceconnector:permission\",\n \"uid\": null,\n \"target\": \"urn:artifact:consumed-asset\",\n \"action\": {\n \"type\": \"USE\",\n \"includedIn\": null,\n \"constraint\": null\n },\n \"assignee\": null,\n \"assigner\": null,\n \"constraints\": [\n {\n \"edctype\": \"AtomicConstraint\",\n \"leftExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"ALWAYS_TRUE\"\n },\n \"rightExpression\": {\n \"edctype\": \"dataspaceconnector:literalexpression\",\n \"value\": \"true\"\n },\n \"operator\": \"EQ\"\n }\n ],\n \"duties\": []\n }\n ],\n \"prohibitions\": [],\n \"obligations\": [],\n \"extensibleProperties\": {},\n \"inheritsFrom\": null,\n \"assigner\": null,\n \"assignee\": null,\n \"target\": \"urn:artifact:my-test-asset\",\n \"@type\": {\n \"@policytype\": \"set\"\n }\n }"
},
"transferProcesses": [
{
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@ng-apimock/core": "^3.6.0",
"@ngxs/store": "^3.8.1",
"@sovity.de/broker-server-client": "0.20230712.71619-main-a4860cff",
"@sovity.de/edc-client": "0.20230706.64046-main-d2fd35a8",
"@sovity.de/edc-client": "0.20230711.54203-main-f9c4b8f7",
"clean-deep": "^3.4.0",
"date-fns": "^2.29.3",
"dotenv": "^16.0.3",
Expand Down
Loading

0 comments on commit 4da10a6

Please sign in to comment.