Merge branch 'refs/heads/main' into feature/786-add-authorization-to-…

…all-endpoints
eclipse-tractusx · Jun 28, 2024 · 4cde3b1 · 4cde3b1
2 parents 5d7471f + 2a504a9
commit 4cde3b1
Show file tree

Hide file tree

Showing 15 changed files with 122 additions and 26 deletions.
diff --git a/docs/src/images/user-manual/policy-management/delete-policies-dialog.png b/docs/src/images/user-manual/policy-management/delete-policies-dialog.png
diff --git a/frontend/src/app/mocks/services/policy-mock/policy.model.ts b/frontend/src/app/mocks/services/policy-mock/policy.model.ts
@@ -19,8 +19,8 @@ import { OperatorType, Policy, PolicyAction, PolicyResponseMap } from '@page/pol
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 // For now Mocks are built by current response (any). This is because Policy Model changes frequently
-export const getPolicies = (): Policy[] => {
-  return mockedPolicyList;
+export const getPolicies = (): PolicyResponseMap => {
+  return MockPolicyResponseMap;
 };
 
 export const getPolicyById = (policyId: string | ReadonlyArray<string>): Policy => {
@@ -183,11 +183,32 @@ export const MockPolicyResponseMap: PolicyResponseMap = {
                 'and': null,
                 'or': [
                   {
-                    'leftOperand': 'asd',
+                    'leftOperand': 'cx-policy:FrameworkAgreement',
                     'operator': {
                       '@id': OperatorType.EQ,
                     },
-                    'odrl:rightOperand': 'dsa',
+                    'odrl:rightOperand': 'traceability:1.0',
+                  },
+                  {
+                    'leftOperand': 'cx-policy:FrameworkAgreement',
+                    'operator': {
+                      '@id': OperatorType.EQ,
+                    },
+                    'odrl:rightOperand': 'traceability:1.0',
+                  },
+                  {
+                    'leftOperand': 'cx-policy:FrameworkAgreement',
+                    'operator': {
+                      '@id': OperatorType.EQ,
+                    },
+                    'odrl:rightOperand': 'traceability:1.0',
+                  },
+                  {
+                    'leftOperand': 'cx-policy:FrameworkAgreement',
+                    'operator': {
+                      '@id': OperatorType.EQ,
+                    },
+                    'odrl: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
@@ -84,7 +84,7 @@ describe('PoliciesAssembler', () => {
     expect(assembledPolicy.createdOn).toBe('2024-01-01T00:00');
     expect(assembledPolicy.validUntil).toBe('2024-12-31T23:59');
     expect(assembledPolicy.accessType).toBe('USE');
-    expect(assembledPolicy.constraints).toEqual([ 'left1', '=', 'right1', 'left2', '!=', 'right2' ]);
+    expect(assembledPolicy.constraints).toEqual('left1=right1left2!=right2');
 
   });
 
@@ -107,15 +107,21 @@ describe('PoliciesAssembler', () => {
       },
     };
     const constraints = PoliciesAssembler.mapDisplayPropsToPolicyRootLevelFromPolicyEntry(policyEntry);
-    expect(constraints).toEqual([
-      'left1', '=', 'right1', 'left2', '!=', 'right2',
-    ]);
+    expect(constraints).toEqual('left1=right1left2!=right2');
   });
 
   it('should map display props to policy root level from policy', () => {
     const constraints = PoliciesAssembler.mapDisplayPropsToPolicyRootLevelFromPolicy(mockPolicy2);
-    expect(constraints).toEqual([
-      'left1', '=', 'right1', 'left2', '!=', 'right2',
-    ]);
+    expect(constraints).toEqual('left1=right1left2!=right2');
   });
+
+  it('should remove everything after the third symbol', () => {
+    const testString = 'a,b,c,d,e';
+    const result = PoliciesAssembler.removeAfterThird(',', testString);
+    expect(result).toEqual('a,b,c,');
+    const testString2 = 'a,b,c';
+    const resul2 = PoliciesAssembler.removeAfterThird(',', testString2);
+    expect(resul2).toEqual('a,b,c');
+  });
+
 });
diff --git a/...rc/app/modules/page/admin/presentation/policy-management/policies/policies.component.html b/...rc/app/modules/page/admin/presentation/policy-management/policies/policies.component.html
@@ -18,6 +18,7 @@
         [showHover]="false"
         [tableType]="TableType.POLICIES"
         [tableSettingsEnabled]="true"
+        [selectedPoliciesInfoLabel]="selectedPoliciesInfoLabel"
         [deselectTrigger]="deselectPartTrigger$ | async"
         (selected)="openDetailedView($event)"
         (editClicked)="openEditView($event)"

diff --git a/...app/modules/page/admin/presentation/policy-management/policies/policies.component.spec.ts b/...app/modules/page/admin/presentation/policy-management/policies/policies.component.spec.ts
@@ -116,6 +116,21 @@ describe('PoliciesComponent', () => {
     expect(policyFacadeMock.setPolicies).toHaveBeenCalled();
   }));
 
+  it('should call deletePolicies and handle success', fakeAsync(async () => {
+    const { fixture } = await renderPoliciesComponent();
+    const componentInstance = fixture.componentInstance;
+    componentInstance.selectedPolicies = [ { policyId: '1' }, { policyId: '2' } ] as Policy[];
+
+    componentInstance.multiSelection(componentInstance.selectedPolicies);
+    expect(componentInstance.selectedPoliciesInfoLabel).toEqual('pageAdmin.policyManagement.selectedPolicies');
+
+    componentInstance.selectedPolicies = [ { policyId: '1' } ] as Policy[];
+
+    componentInstance.multiSelection(componentInstance.selectedPolicies);
+    expect(componentInstance.selectedPoliciesInfoLabel).toEqual('pageAdmin.policyManagement.selectedPolicy');
+
+  }));
+
   it('should call deletePolicies and handle error', fakeAsync(async () => {
     policyFacadeMock.deletePolicies.and.returnValue(throwError('error'));
 

diff --git a/.../src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts b/.../src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts
@@ -33,6 +33,7 @@ export class PoliciesComponent {
   multiSortList: TableHeaderSort[] = [];
   ctrlKeyState: boolean = false;
   deselectPartTrigger$ = new Subject<Policy[]>();
+  selectedPoliciesInfoLabel: string = 'pageAdmin.policyManagement.selectedPolicies';
 
   constructor(public readonly policyFacade: PoliciesFacade, private readonly router: Router, private readonly toastService: ToastService, public dialog: MatDialog, private readonly roleService: RoleService) {
     window.addEventListener('keydown', (event) => {
@@ -82,6 +83,7 @@ export class PoliciesComponent {
   }
 
   multiSelection(selectedPolicies: Policy[]) {
+    this.selectedPoliciesInfoLabel = selectedPolicies.length === 1 ? 'pageAdmin.policyManagement.selectedPolicy' : 'pageAdmin.policyManagement.selectedPolicies';
     this.selectedPolicies = selectedPolicies;
   }
 

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
@@ -35,7 +35,7 @@ export class PoliciesAssembler {
     return list;
   }
 
-  public static mapDisplayPropsToPolicyRootLevelFromPolicyEntry(entry: PolicyEntry): string[] {
+  public static mapDisplayPropsToPolicyRootLevelFromPolicyEntry(entry: PolicyEntry): string {
     entry.payload.policy.policyName = entry.payload['@id'];
     entry.payload.policy.accessType = entry.payload.policy.permissions[0].action;
     let constrainsList = [];
@@ -45,42 +45,68 @@ export class PoliciesAssembler {
         constrainsList.push(getOperatorTypeSign(OperatorType[andConstraint.operator['@id'].toUpperCase()]));
         constrainsList.push(andConstraint['odrl:rightOperand']);
         if (index !== permission.constraint.and.length - 1) {
-          constrainsList.push(' AND ');
+          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']);
         if (index !== permission.constraint.or.length - 1) {
-          constrainsList.push(' OR ');
+          constrainsList.push('*OR ');
         }
       });
     });
-    return constrainsList;
+    return this.formatConstraintsListForTable(constrainsList);
   }
 
-  public static mapDisplayPropsToPolicyRootLevelFromPolicy(policy: Policy): string[] {
+  public static mapDisplayPropsToPolicyRootLevelFromPolicy(policy: Policy): string {
     let constrainsList = [];
     policy.permissions.forEach((permission) => {
       permission.constraints?.and?.forEach((andConstraint, index) => {
         constrainsList.push(andConstraint.leftOperand);
         constrainsList.push(getOperatorTypeSign(andConstraint.operatorTypeResponse));
         constrainsList.push(andConstraint.rightOperand);
         if (index !== permission.constraints.and.length - 1) {
-          constrainsList.push(' AND ');
+          constrainsList.push('*AND ');
         }
       });
       permission.constraints?.or?.forEach((orConstraint, index) => {
         constrainsList.push(orConstraint.leftOperand);
         constrainsList.push(getOperatorTypeSign(orConstraint.operatorTypeResponse));
         constrainsList.push(orConstraint.rightOperand);
         if (index !== permission.constraints.or.length - 1) {
-          constrainsList.push(' OR ');
+          constrainsList.push('*OR ');
         }
       });
     });
-    return constrainsList;
+    return this.formatConstraintsListForTable(constrainsList);
+  }
+
+  public static formatConstraintsListForTable(constrainsList: string[]): string {
+    let formattedString = constrainsList.toString().replaceAll(',', '');
+    formattedString = formattedString.replaceAll('*', '<br>');
+    formattedString = this.removeAfterThird('<br>', formattedString);
+    return formattedString;
+  }
+
+  public static removeAfterThird(substring: string, text: string): string {
+    let index = 0;
+    let count = 0;
+
+    // Continuously update the index to the next occurrence of the substring
+    while ((index = text.indexOf(substring, index)) !== -1) {
+      count++;
+      if (count === 3) {
+        // Return the substring up to and including the third occurrence
+        return text.substring(0, index + substring.length);
+      }
+      // Advance index past the current match
+      index += substring.length;
+    }
+
+    // Return the original text if less than three occurrences are found
+    return text;
   }
 
   /**

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
@@ -48,7 +48,7 @@ describe('PolicyEditorComponent', () => {
         },
       },
     ],
-    constraints: [],
+    constraints: null,
   };
 
   beforeEach(() => {

diff --git a/frontend/src/app/modules/page/policies/model/policy.model.ts b/frontend/src/app/modules/page/policies/model/policy.model.ts
@@ -50,7 +50,7 @@ export interface Policy {
   // additional props
   policyName?: string;
   bpn?: string;
-  constraints?: string[]
+  constraints?: string,
   accessType?: PolicyAction,
   businessPartnerNumber?: string | string[]
 

diff --git a/.../src/app/modules/shared/components/notification-reason/notification-reason.component.html b/.../src/app/modules/shared/components/notification-reason/notification-reason.component.html
@@ -28,7 +28,7 @@
 <ng-template #chatBubble let-message="message" let-lastDate="lastDate" let-isFirst="isFirst">
   <ng-container>
     <div class="message--separator" *ngIf="isFirst || (!isFirst && lastDate && !isSameDay(lastDate, message.date))">
-      {{ message.date | date:'mediumDate' }}
+      {{ message.date | formatDate : { dateStyle: 'long' } }}
     </div>
     <div class="message--text message--text__{{ message.direction }} message--text-arrow__{{ message.direction }}"
          [class.self-start]="message.direction === 'left'" [class.self-end]="message.direction === 'right'">

diff --git a/frontend/src/app/modules/shared/components/table/table.component.html b/frontend/src/app/modules/shared/components/table/table.component.html
@@ -30,6 +30,7 @@
     </div>
     <div *ngIf="tableHeaderMenuEnabled || basicTableHeaderMenuEnabled"
          class="table-header--action--container flex mt-1">
+      <div class="table-header--action--container--left-section flex">
       <div class="mr-0.5"
            *ngIf="tableHeaderMenuEnabled"
            matTooltip="{{ (roleService.isAdmin() ? 'routing.unauthorized':'table.createNotification') | i18n}}"
@@ -158,6 +159,11 @@
           </button>
         </div>
       </mat-menu>
+      </div>
+      <div class="table-header--action--container--right-section flex items-center">
+        <p *ngIf="selectedPoliciesInfoLabel"
+           class="regular-text table&#45;&#45;selected&#45;&#45;label">{{ selectedPoliciesInfoLabel | i18n : {count: selection?.selected?.length || 0} }}</p>
+      </div>
     </div>
   </div>
 </div>
@@ -415,7 +421,7 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
           *matCellDef="let element" mat-cell class="table--cell" data-testid="table-component--cell-data"
           [ngClass]="{'max-width-column': labelId === 'contracts' && column === 'contractId' }">
           <ng-container *ngIf="!isDateElement(column)"
-            [ngTemplateOutlet]="tableConfig?.cellRenderers?.[column] ? tableConfig?.cellRenderers?.[column] : autoFormat"
+                        [ngTemplateOutlet]="tableConfig?.cellRenderers?.[column] ? tableConfig?.cellRenderers?.[column] : (column === 'constraints' ? constraintsFormat : autoFormat)"
             [ngTemplateOutletContext]="{ value: element[column], row: element }"
           >
           </ng-container>
@@ -446,3 +452,10 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
 <ng-template #autoFormat let-value="value">
   {{ value | autoFormat | i18n }}
 </ng-template>
+
+<ng-template #constraintsFormat let-value="value">
+  <div [innerHTML]="value" class="cellFormat-constrains-container">
+
+  </div>
+
+</ng-template>
diff --git a/frontend/src/app/modules/shared/components/table/table.component.scss b/frontend/src/app/modules/shared/components/table/table.component.scss
@@ -266,3 +266,12 @@ tr.error {
   height: 63vh !important;
 }
 
+.table-header--action--container {
+  display: flex;
+  justify-content: space-between;
+}
+
+.cellFormat-constrains-container {
+  word-break: keep-all;
+}
+
diff --git a/frontend/src/app/modules/shared/components/table/table.component.ts b/frontend/src/app/modules/shared/components/table/table.component.ts
@@ -89,6 +89,7 @@ export class TableComponent {
   @Input() showHover = true;
 
   @Input() selectedPartsInfoLabel: string;
+  @Input() selectedPoliciesInfoLabel: string;
   @Input() selectedPartsActionLabel: string;
 
   @Input() tableHeader: string;

diff --git a/frontend/src/assets/locales/de/page.admin.json b/frontend/src/assets/locales/de/page.admin.json
@@ -95,7 +95,9 @@
       "bpnsHint" : "Liste von BPNs separiert durch ein Kommazeichen",
       "bpnHint" : "",
       "savePolicy" : "Richtlinie speichern",
-      "addConstraint" : "Regel hinzufügen"
+      "addConstraint" : "Regel hinzufügen",
+      "selectedPolicy" : "{{count}} Richtlinie für diese Seite ausgewählt.",
+      "selectedPolicies" : "{{count}} Richtlinien für diese Seite ausgewählt."
     }
   }
 }
diff --git a/...c/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java b/...c/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java
@@ -57,8 +57,8 @@ public class ApplicationStartupConfig {
 
     @Autowired
     public ApplicationStartupConfig(PolicyRepository policyRepository,
-                                    @Qualifier("assetAsBuiltServiceImpl") AssetBaseService asPlannedService,
-                                    @Qualifier("assetAsPlannedServiceImpl") AssetBaseService asBuiltService,
+                                    @Qualifier("assetAsBuiltServiceImpl") AssetBaseService asBuiltService,
+                                    @Qualifier("assetAsPlannedServiceImpl") AssetBaseService asPlannedService,
                                     EdcNotificationContractService edcNotificationContractService,
                                     ContractService contractService) {
         this.policyRepository = policyRepository;
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ describe('PolicyEditorComponent', () => { @@
             },
           },
         ],
-        constraints: [],
+        constraints: null,
       };
       beforeEach(() => {
@@ Expand Down @@