chore: Removed asset:prop:type. Fixed typescript error.

eclipse-tractusx · Apr 17, 2024 · 6ed34b2 · 6ed34b2
1 parent 9d3da8e
commit 6ed34b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/frontend/src/models/types/edc/catalog.ts b/frontend/src/models/types/edc/catalog.ts
@@ -33,12 +33,22 @@ export type CatalogPermission = {
     'odrl:action': {
         'odrl:type': string;
     }
-  'odrl:constraint': {
+    'odrl:constraint': {
       'odrl:leftOperand': string;
       'odrl:operator': {
           '@id': string;
       };
       'odrl:rightOperand': string;
+    } | {
+        '@type': string,
+        'odrl:and': {
+           '@type': string,
+            'odrl:leftOperand': string;
+            'odrl:operator': {
+                '@id': string;
+            };
+            'odrl:rightOperand': string;
+        }[]
   };
 };
 

diff --git a/frontend/src/views/CatalogView.tsx b/frontend/src/views/CatalogView.tsx
@@ -98,7 +98,7 @@ export const CatalogView = () => {
                                         <div className="flex">
                                             <h4 className="font-semibold w-[20ch]">Asset condition(s): </h4>
                                             <div className="flex flex-col gap-1 w-[30ch]">
-                                                {item.permission['odrl:constraint']['odrl:and'] ?
+                                                {'odrl:and' in item.permission['odrl:constraint'] ?
                                                     (item.permission['odrl:constraint']['odrl:and'].map(constraint => (
                                                         <div className="flex">
                                                             {constraint['odrl:leftOperand'] + ' '}