fix: Renamed policy-ids in milestone 7 edc #54

sovity · Nov 21, 2022 · 9ad803d · 9ad803d
1 parent fc24393
commit 9ad803d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
@@ -1511,7 +1511,7 @@ components:
       properties:
         policy:
           $ref: '#/components/schemas/Policy'
-        uid:
+        id:
           type: string
     Prohibition:
       type: object

diff --git a/...onents/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html b/...onents/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
@@ -10,7 +10,7 @@
             <mat-label>Access policy</mat-label>
             <mat-select [(ngModel)]="accessPolicy" required>
                 <mat-option *ngFor="let policy of policies" [value]="policy">
-                    {{policy.uid}}
+                    {{policy.id}}
                 </mat-option>
             </mat-select>
         </mat-form-field>
@@ -19,7 +19,7 @@
             <mat-label>Contract policy</mat-label>
             <mat-select [(ngModel)]="contractPolicy" required>
                 <mat-option *ngFor="let policy of policies" [value]="policy">
-                    {{policy.uid}}
+                    {{policy.id}}
                 </mat-option>
             </mat-select>
         </mat-form-field>

diff --git a/...mponents/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts b/...mponents/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts
@@ -39,8 +39,8 @@ export class ContractDefinitionEditorDialog implements OnInit {
   ngOnInit(): void {
     this.policyService.getAllPolicies().subscribe(polices => {
       this.policies = polices;
-      this.accessPolicy = this.policies.find(policy => policy.uid === this.contractDefinition.accessPolicyId);
-      this.contractPolicy = this.policies.find(policy => policy.uid === this.contractDefinition.contractPolicyId);
+      this.accessPolicy = this.policies.find(policy => policy.id === this.contractDefinition.accessPolicyId);
+      this.contractPolicy = this.policies.find(policy => policy.id === this.contractDefinition.contractPolicyId);
     });
     this.assetService.getAllAssets().pipe(map(asset => asset.map(a => new Asset(a.properties)))).subscribe(assets => {
       this.availableAssets = assets;
@@ -54,8 +54,8 @@ export class ContractDefinitionEditorDialog implements OnInit {
 
   onSave() {
     this.contractDefinition.id = this.contractDefinition.id!.trim();
-    this.contractDefinition.accessPolicyId = this.accessPolicy!.uid;
-    this.contractDefinition.contractPolicyId = this.contractPolicy!.uid;
+    this.contractDefinition.accessPolicyId = this.accessPolicy!.id;
+    this.contractDefinition.contractPolicyId = this.contractPolicy!.id;
     this.contractDefinition.criteria = [];
 
     const ids = this.assets.map(asset => asset.id);

diff --git a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html
@@ -3,7 +3,7 @@
   <!--  ID -->
   <mat-form-field class="form-field-stretch" color="accent" id="form-field-id">
     <mat-label>ID</mat-label>
-    <input [(ngModel)]="policyDefinition.uid" matInput required>
+    <input [(ngModel)]="policyDefinition.id" matInput required>
   </mat-form-field>
 
   <mat-form-field class="form-field" color="accent">

diff --git a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts
@@ -16,7 +16,7 @@ export class NewPolicyDialogComponent implements OnInit {
   };
   policyDefinition: PolicyDefinition = {
     policy: this.policy,
-    uid: ''
+    id: ''
   };
   policyType: string = '';
   range = new FormGroup({
@@ -32,8 +32,8 @@ export class NewPolicyDialogComponent implements OnInit {
   }
 
   onSave() {
-    this.policyDefinition.uid = this.policyDefinition.uid.trim()
-    const permissionTemplate: string = "{    \"edctype\": \"dataspaceconnector:permission\",    \"uid\": null,    \"target\": \"urn:artifact:urn:artifact:bitcoin\",    \"action\": {      \"type\": \"USE\",      \"includedIn\": null,      \"constraint\": null    },    \"assignee\": null,    \"assigner\": null,    \"constraints\": [      {        \"edctype\": \"AtomicConstraint\",        \"leftExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"POLICY_EVALUATION_TIME\"        },        \"operator\": \"GT\",        \"rightExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"2022-08-31T00:00:00.001Z\"        }      },      {        \"edctype\": \"AtomicConstraint\",        \"leftExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"POLICY_EVALUATION_TIME\"        },        \"operator\": \"LT\",        \"rightExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"2023-08-31T23:59:59.000Z\"        }      }    ],    \"duties\": []  }";
+    this.policyDefinition.id = this.policyDefinition.id.trim()
+    const permissionTemplate: string = "{    \"edctype\": \"dataspaceconnector:permission\",    \"id\": null,    \"target\": \"urn:artifact:urn:artifact:bitcoin\",    \"action\": {      \"type\": \"USE\",      \"includedIn\": null,      \"constraint\": null    },    \"assignee\": null,    \"assigner\": null,    \"constraints\": [      {        \"edctype\": \"AtomicConstraint\",        \"leftExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"POLICY_EVALUATION_TIME\"        },        \"operator\": \"GT\",        \"rightExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"2022-08-31T00:00:00.001Z\"        }      },      {        \"edctype\": \"AtomicConstraint\",        \"leftExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"POLICY_EVALUATION_TIME\"        },        \"operator\": \"LT\",        \"rightExpression\": {          \"edctype\": \"dataspaceconnector:literalexpression\",          \"value\": \"2023-08-31T23:59:59.000Z\"        }      }    ],    \"duties\": []  }";
     let permission = JSON.parse(permissionTemplate);
     let constraints = permission["constraints"];
     let startDateConstraint = constraints[0]
@@ -45,7 +45,7 @@ export class NewPolicyDialogComponent implements OnInit {
     this.policy.permissions = [permission]
     this.dialogRef.close({
       policy: this.policyDefinition.policy,
-      uid: this.policyDefinition.uid
+      id: this.policyDefinition.id
     })
   }
 }
diff --git a/src/modules/edc-demo/components/policy-view/policy-view.component.html b/src/modules/edc-demo/components/policy-view/policy-view.component.html
@@ -23,7 +23,7 @@
     <mat-card *ngFor="let policyDef of policyDefinitions" class="policy-card">
       <mat-card-header>
         <mat-icon mat-card-avatar>policy</mat-icon>
-        <mat-card-title><span class="code">{{policyDef.uid}}</span></mat-card-title>
+        <mat-card-title><span class="code">{{policyDef.id}}</span></mat-card-title>
       </mat-card-header>
 
       <mat-card-content>

diff --git a/src/modules/edc-demo/components/policy-view/policy-view.component.ts b/src/modules/edc-demo/components/policy-view/policy-view.component.ts
@@ -67,13 +67,13 @@ export class PolicyViewComponent implements OnInit {
 
   delete(policy: PolicyDefinition) {
 
-    const dialogData = ConfirmDialogModel.forDelete("policy", policy.uid);
+    const dialogData = ConfirmDialogModel.forDelete("policy", policy.id);
 
     const ref = this.dialog.open(ConfirmationDialogComponent, {maxWidth: '20%', data: dialogData});
 
     ref.afterClosed().subscribe(res => {
       if (res) {
-        this.policyService.deletePolicy(policy.uid).subscribe(this.errorOrUpdateSubscriber);
+        this.policyService.deletePolicy(policy.id).subscribe(this.errorOrUpdateSubscriber);
       }
     });
   }

diff --git a/src/modules/edc-dmgmt-client/model/policyDefinition.ts b/src/modules/edc-dmgmt-client/model/policyDefinition.ts
@@ -14,6 +14,6 @@ import { Policy } from './policy';
 
 export interface PolicyDefinition {
     policy: Policy;
-    uid: string;
+    id: string;
 }