diff --git a/CHANGELOG.md b/CHANGELOG.md index 32681fc4ca..f1c9167baa 100644 --- 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 index b110a5bad2..0de23c0dfe 100644 --- 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/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts index ff4d9a15ed..288a8bcc0b 100644 --- a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts +++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.assembler.spec.ts @@ -15,7 +15,7 @@ const mockPolicy: Policy = { leftOperand: 'left1', operator: { '@id': OperatorType.EQ }, operatorTypeResponse: OperatorType.EQ, - 'odrl:rightOperand': 'right1', + 'rightOperand': 'right1', }, ], or: [ @@ -23,7 +23,7 @@ const mockPolicy: Policy = { leftOperand: 'left2', operator: { '@id': OperatorType.NEQ }, operatorTypeResponse: OperatorType.NEQ, - 'odrl:rightOperand': 'right2', + 'rightOperand': 'right2', }, ], }, diff --git a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts index da0af6e19d..aad14a0865 100644 --- a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts +++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts @@ -43,7 +43,7 @@ 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 '); } @@ -51,7 +51,7 @@ export class PoliciesAssembler { 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/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts b/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts index de27051a8b..98544d1fc1 100644 --- a/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts +++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.spec.ts @@ -34,7 +34,7 @@ describe('PolicyEditorComponent', () => { leftOperand: 'left1', operator: { '@id': OperatorType.EQ }, operatorTypeResponse: OperatorType.EQ, - 'odrl:rightOperand': 'right1', + 'rightOperand': 'right1', }, ], or: [ @@ -42,7 +42,7 @@ describe('PolicyEditorComponent', () => { 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 index 37824fe1a2..a55199f8fd 100644 --- 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 index 7b8c3f27d3..96794a8d95 100644 --- a/frontend/src/app/modules/shared/service/policy.service.spec.ts +++ b/frontend/src/app/modules/shared/service/policy.service.spec.ts @@ -64,7 +64,7 @@ describe('PolicyService', () => { leftOperand: 'left1', operator: { '@id': OperatorType.EQ }, operatorTypeResponse: OperatorType.EQ, - 'odrl:rightOperand': 'right1', + 'rightOperand': 'right1', }, ], or: [ @@ -72,7 +72,7 @@ describe('PolicyService', () => { leftOperand: 'left2', operator: { '@id': OperatorType.NEQ }, operatorTypeResponse: OperatorType.NEQ, - 'odrl:rightOperand': 'right2', + 'rightOperand': 'right2', }, ], }, @@ -154,7 +154,7 @@ describe('PolicyService', () => { leftOperand: 'left1', operator: { '@id': OperatorType.EQ }, operatorTypeResponse: OperatorType.EQ, - 'odrl:rightOperand': 'right1', + 'rightOperand': 'right1', }, ], or: [ @@ -162,7 +162,7 @@ describe('PolicyService', () => { leftOperand: 'left2', operator: { '@id': OperatorType.NEQ }, operatorTypeResponse: OperatorType.NEQ, - 'odrl:rightOperand': 'right2', + 'rightOperand': 'right2', }, ], }, @@ -206,7 +206,7 @@ describe('PolicyService', () => { leftOperand: 'left1', operator: { '@id': OperatorType.EQ }, operatorTypeResponse: OperatorType.EQ, - 'odrl:rightOperand': 'right1', + 'rightOperand': 'right1', }, ], or: [ @@ -214,7 +214,7 @@ describe('PolicyService', () => { leftOperand: 'left2', operator: { '@id': OperatorType.NEQ }, operatorTypeResponse: OperatorType.NEQ, - 'odrl:rightOperand': 'right2', + 'rightOperand': 'right2', }, ], },