Merge pull request #1206 from eclipse-tractusx/bug/#970-policy-respon…

…se-rightOperand-fix bug(policy): 970 fix hidden right operand
eclipse-tractusx · Jul 10, 2024 · 28a4ce4 · 28a4ce4
2 parents 8224cb0 + d686be1
commit 28a4ce4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 ### Changed
 - #1173 Update IRS-Helm from 7.1.4 to 7.2.0 - updated Compatibility Matrix
 - #1082 fix duplicate key errors when synchronizing assets with IRS
+- #970 fixed bug where the right operand of policies was not showing up in table and detailed view
 
 ## [12.0.0 - 05.07.2024]
 

diff --git a/frontend/src/app/mocks/services/policy-mock/policy.model.ts b/frontend/src/app/mocks/services/policy-mock/policy.model.ts
@@ -187,28 +187,28 @@ export const MockPolicyResponseMap: PolicyResponseMap = {
                     'operator': {
                       '@id': OperatorType.EQ,
                     },
-                    'odrl:rightOperand': 'traceability:1.0',
+                    'rightOperand': 'traceability:1.0',
                   },
                   {
                     'leftOperand': 'cx-policy:FrameworkAgreement',
                     'operator': {
                       '@id': OperatorType.EQ,
                     },
-                    'odrl:rightOperand': 'traceability:1.0',
+                    'rightOperand': 'traceability:1.0',
                   },
                   {
                     'leftOperand': 'cx-policy:FrameworkAgreement',
                     'operator': {
                       '@id': OperatorType.EQ,
                     },
-                    'odrl:rightOperand': 'traceability:1.0',
+                    'rightOperand': 'traceability:1.0',
                   },
                   {
                     'leftOperand': 'cx-policy:FrameworkAgreement',
                     'operator': {
                       '@id': OperatorType.EQ,
                     },
-                    'odrl:rightOperand': 'traceability:1.0',
+                    'rightOperand': 'traceability:1.0',
                   },
                 ],
               },

diff --git a/...app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts b/...app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts
@@ -15,15 +15,15 @@ const mockPolicy: Policy = {
             leftOperand: 'left1',
             operator: { '@id': OperatorType.EQ },
             operatorTypeResponse: OperatorType.EQ,
-            'odrl:rightOperand': 'right1',
+            'rightOperand': 'right1',
           },
         ],
         or: [
           {
             leftOperand: 'left2',
             operator: { '@id': OperatorType.NEQ },
             operatorTypeResponse: OperatorType.NEQ,
-            'odrl:rightOperand': 'right2',
+            'rightOperand': 'right2',
           },
         ],
       },

diff --git a/...nd/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts b/...nd/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts
@@ -43,15 +43,15 @@ export class PoliciesAssembler {
       permission.constraint?.and?.forEach((andConstraint, index) => {
         constrainsList.push(andConstraint.leftOperand);
         constrainsList.push(getOperatorTypeSign(OperatorType[andConstraint.operator['@id'].toUpperCase()]));
-        constrainsList.push(andConstraint['odrl:rightOperand']);
+        constrainsList.push(andConstraint.rightOperand);
         if (index !== permission.constraint.and.length - 1) {
           constrainsList.push('*AND ');
         }
       });
       permission.constraint?.or?.forEach((orConstraint, index) => {
         constrainsList.push(orConstraint.leftOperand);
         constrainsList.push(getOperatorTypeSign(OperatorType[orConstraint.operator['@id'].toUpperCase()]));
-        constrainsList.push(orConstraint['odrl:rightOperand']);
+        constrainsList.push(orConstraint.rightOperand);
         if (index !== permission.constraint.or.length - 1) {
           constrainsList.push('*OR ');
         }

diff --git a/...s/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts b/...s/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts
@@ -34,15 +34,15 @@ describe('PolicyEditorComponent', () => {
               leftOperand: 'left1',
               operator: { '@id': OperatorType.EQ },
               operatorTypeResponse: OperatorType.EQ,
-              'odrl:rightOperand': 'right1',
+              'rightOperand': 'right1',
             },
           ],
           or: [
             {
               leftOperand: 'left2',
               operator: { '@id': OperatorType.NEQ },
               operatorTypeResponse: OperatorType.NEQ,
-              'odrl:rightOperand': 'right2',
+              'rightOperand': 'right2',
             },
           ],
         },

diff --git a/frontend/src/app/modules/page/policies/model/policy.model.ts b/frontend/src/app/modules/page/policies/model/policy.model.ts
@@ -84,7 +84,6 @@ export interface PolicyConstraint {
   operator?: { '@id': OperatorType };
   'odrl:operator'?: { '@id': OperatorType };
   rightOperand?: string;
-  'odrl:rightOperand'?: string;
 }
 
 export enum OperatorType {

diff --git a/frontend/src/app/modules/shared/service/policy.service.spec.ts b/frontend/src/app/modules/shared/service/policy.service.spec.ts
@@ -64,15 +64,15 @@ describe('PolicyService', () => {
                 leftOperand: 'left1',
                 operator: { '@id': OperatorType.EQ },
                 operatorTypeResponse: OperatorType.EQ,
-                'odrl:rightOperand': 'right1',
+                'rightOperand': 'right1',
               },
             ],
             or: [
               {
                 leftOperand: 'left2',
                 operator: { '@id': OperatorType.NEQ },
                 operatorTypeResponse: OperatorType.NEQ,
-                'odrl:rightOperand': 'right2',
+                'rightOperand': 'right2',
               },
             ],
           },
@@ -154,15 +154,15 @@ describe('PolicyService', () => {
                     leftOperand: 'left1',
                     operator: { '@id': OperatorType.EQ },
                     operatorTypeResponse: OperatorType.EQ,
-                    'odrl:rightOperand': 'right1',
+                    'rightOperand': 'right1',
                   },
                 ],
                 or: [
                   {
                     leftOperand: 'left2',
                     operator: { '@id': OperatorType.NEQ },
                     operatorTypeResponse: OperatorType.NEQ,
-                    'odrl:rightOperand': 'right2',
+                    'rightOperand': 'right2',
                   },
                 ],
               },
@@ -206,15 +206,15 @@ describe('PolicyService', () => {
                     leftOperand: 'left1',
                     operator: { '@id': OperatorType.EQ },
                     operatorTypeResponse: OperatorType.EQ,
-                    'odrl:rightOperand': 'right1',
+                    'rightOperand': 'right1',
                   },
                 ],
                 or: [
                   {
                     leftOperand: 'left2',
                     operator: { '@id': OperatorType.NEQ },
                     operatorTypeResponse: OperatorType.NEQ,
-                    'odrl:rightOperand': 'right2',
+                    'rightOperand': 'right2',
                   },
                 ],
               },