fix contract definition page failing for all operators but IN

sovity · May 2, 2023 · c1a2c3c · c1a2c3c
1 parent cb0d494
commit c1a2c3c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/fake-backend/json/contractDefinitions.json b/fake-backend/json/contractDefinitions.json
@@ -70,5 +70,29 @@
       }
     ],
     "id": "Charging Station - Walkthrough"
+  },
+  {
+    "id": "example-using-asset-prop-id-eq",
+    "accessPolicyId": "end-of-the-year",
+    "contractPolicyId": "end-of-the-year",
+    "criteria": [
+      {
+        "operandLeft": "asset:prop:id",
+        "operator": "eq",
+        "operandRight": "urn:artifact:db-rail-network-2023-jan"
+      }
+    ]
+  },
+  {
+    "id": "example-using-asset-prop-usecase-eq",
+    "accessPolicyId": "end-of-the-year",
+    "contractPolicyId": "end-of-the-year",
+    "criteria": [
+      {
+        "operandLeft": "asset:prop:usecase",
+        "operator": "eq",
+        "operandRight": "urn:usecase:my-example-usecase"
+      }
+    ]
   }
 ]
diff --git a/...modules/edc-demo/components/contract-definition-cards/contract-definition-card-builder.ts b/...modules/edc-demo/components/contract-definition-cards/contract-definition-card-builder.ts
@@ -53,6 +53,7 @@ export class ContractDefinitionCardBuilder {
         contractDefinition.accessPolicyId,
         policyDefinitionById,
       ),
+
       criteria: contractDefinition.criteria.map((criterion) => ({
         label: this.extractCriterionOperation(criterion),
         values: this.extractCriterionValues(criterion, assetById),
@@ -93,10 +94,8 @@ export class ContractDefinitionCardBuilder {
     let {operandRight, operandLeft} = criterion;
 
     let values: (object | string)[] = [];
-    if (Array.isArray(values)) {
+    if (Array.isArray(operandRight)) {
       values = operandRight as string[];
-    } else if (typeof operandRight === 'string') {
-      values = [operandRight];
     } else {
       values = [operandRight];
     }
@@ -109,7 +108,7 @@ export class ContractDefinitionCardBuilder {
           searchTargets: [it],
         };
 
-        // Try find asset
+        // Try to find asset
         if (operandLeft === AssetProperties.id) {
           let asset = assetsById.get(it);
           if (asset) {