Merge branch 'main' into crawler_integration

.github/workflows/license_scan.yml

@@ -13,7 +13,11 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run license scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/[email protected]
+        env:
+          #try default GitHub DBs, if failing, use AWS mirror instead (https://github.com/aquasecurity/trivy-action/issues/389)
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           scan-type: "rootfs"
           scan-ref: "."
@@ -32,7 +36,11 @@ jobs:
       - name: npm install (authority-portal-frontend)
         run: cd authority-portal-frontend && npm install
       - name: Run license scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/[email protected]
+        env:
+          #try default GitHub DBs, if failing, use AWS mirror instead (https://github.com/aquasecurity/trivy-action/issues/389)
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           scan-type: "repo"
           scan-ref: "."

.github/workflows/secret_scan.yml

@@ -17,7 +17,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Run vulnerability scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/[email protected]
+        env:
+          #try default GitHub DBs, if failing, use AWS mirror instead (https://github.com/aquasecurity/trivy-action/issues/389)
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           scan-type: "fs"
           exit-code: "1"

.github/workflows/security_scan.yml

@@ -12,15 +12,23 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run static analysis (rootfs)
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/[email protected]
+        env:
+          #try default GitHub DBs, if failing, use AWS mirror instead (https://github.com/aquasecurity/trivy-action/issues/389)
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           scan-type: "rootfs"
           scanners: "vuln,misconfig"
           ignore-unfixed: true
           format: 'table'
           severity: "CRITICAL,HIGH"
       - name: Run static analysis (repo)
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/[email protected]
+        env:
+          #try default GitHub DBs, if failing, use AWS mirror instead (https://github.com/aquasecurity/trivy-action/issues/389)
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           scan-type: "repo"
           scanners: "vuln,misconfig"

CHANGELOG.md

@@ -16,6 +16,9 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 #### Patch
 
 - Added documentation for roles and rights ([#334](https://github.com/sovity/authority-portal/issues/334))
+- Fixed Confirm and Delete buttons' behavior in confirmation modals ([#304](https://github.com/sovity/authority-portal/issues/304))
+- Fixed final step not showing when registering a central component ([#305](https://github.com/sovity/authority-portal/issues/305))
+- Fixed My Organization page not updated when switching between environments ([#255](https://github.com/sovity/authority-portal/issues/255))
 
 ### Known issues
 

authority-portal-frontend/src/app/pages/component-registration-pages/register-central-component-page/register-central-component-page/register-central-component-page.component.ts

@@ -113,7 +113,7 @@ export class RegisterCentralComponentPageComponent
         () => {
           setTimeout(() => {
             this.stepper.next();
-          }, 0);
+          }, 300);
         },
       ),
     );

authority-portal-frontend/src/app/pages/control-center-organization-members-page/control-center-organization-members-page/control-center-organization-members-page.component.ts

@@ -15,6 +15,7 @@ import {Router} from '@angular/router';
 import {Subject, takeUntil} from 'rxjs';
 import {Store} from '@ngxs/store';
 import {MemberInfo} from '@sovity.de/authority-portal-client';
+import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils';
 import {BreadcrumbService} from '../../../shared/common/portal-layout/breadcrumb/breadcrumb.service';
 import {Reset} from './state/control-center-organization-members-page-action';
 import {
@@ -37,11 +38,13 @@ export class ControlCenterOrganizationMembersPageComponent
     private store: Store,
     private router: Router,
     private breadcrumbService: BreadcrumbService,
+    private globalStateUtils: GlobalStateUtils,
   ) {}
 
   ngOnInit(): void {
     this.refresh();
     this.startListeningToState();
+    this.startRefreshingOnEnvChange();
   }
 
   refresh(): void {
@@ -69,6 +72,15 @@ export class ControlCenterOrganizationMembersPageComponent
     this.router.navigate(['control-center/users-and-roles', user.userId]);
   }
 
+  startRefreshingOnEnvChange() {
+    this.globalStateUtils.onDeploymentEnvironmentChangeSkipFirst({
+      ngOnDestroy$: this.ngOnDestroy$,
+      onChanged: () => {
+        this.refresh();
+      },
+    });
+  }
+
   ngOnDestroy$ = new Subject();
   ngOnDestroy(): void {
     this.ngOnDestroy$.next(null);

authority-portal-frontend/src/app/pages/control-center-organization-profile-page/control-center-organization-profile-page/control-center-organization-profile-page.component.ts

@@ -13,6 +13,7 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Subject, takeUntil} from 'rxjs';
 import {Store} from '@ngxs/store';
+import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils';
 import {Reset} from '../state/control-center-organization-profile-page-action';
 import {
   ControlCenterOrganizationProfilePageState,
@@ -30,11 +31,15 @@ export class ControlCenterOrganizationProfilePageComponent
   state: ControlCenterOrganizationProfilePageState =
     DEFAULT_CONTROL_CENTER_ORGANIZATION_PROFILE_PAGE_STATE;
 
-  constructor(private store: Store) {}
+  constructor(
+    private store: Store,
+    private globalStateUtils: GlobalStateUtils,
+  ) {}
 
   ngOnInit(): void {
     this.refresh();
     this.startListeningToState();
+    this.startRefreshingOnEnvChange();
   }
 
   refresh(): void {
@@ -52,6 +57,15 @@ export class ControlCenterOrganizationProfilePageComponent
       });
   }
 
+  startRefreshingOnEnvChange() {
+    this.globalStateUtils.onDeploymentEnvironmentChangeSkipFirst({
+      ngOnDestroy$: this.ngOnDestroy$,
+      onChanged: () => {
+        this.refresh();
+      },
+    });
+  }
+
   ngOnDestroy$ = new Subject();
   ngOnDestroy(): void {
     this.ngOnDestroy$.next(null);

authority-portal-frontend/src/app/pages/control-center-user-profile-page/control-center-user-profile-page/control-center-user-profile-page.component.ts

@@ -13,6 +13,7 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Subject, takeUntil} from 'rxjs';
 import {Store} from '@ngxs/store';
+import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils';
 import {Reset} from '../state/control-center-user-profile-page-action';
 import {
   ControlCenterUserProfilePageState,
@@ -30,11 +31,15 @@ export class ControlCenterUserProfilePageComponent
   state: ControlCenterUserProfilePageState =
     DEFAULT_CONTROL_CENTER_USER_PROFILE_PAGE_STATE;
 
-  constructor(private store: Store) {}
+  constructor(
+    private store: Store,
+    private globalStateUtils: GlobalStateUtils,
+  ) {}
 
   ngOnInit(): void {
     this.refresh();
     this.startListeningToState();
+    this.startRefreshingOnEnvChange();
   }
 
   refresh(): void {
@@ -52,6 +57,15 @@ export class ControlCenterUserProfilePageComponent
       });
   }
 
+  startRefreshingOnEnvChange() {
+    this.globalStateUtils.onDeploymentEnvironmentChangeSkipFirst({
+      ngOnDestroy$: this.ngOnDestroy$,
+      onChanged: () => {
+        this.refresh();
+      },
+    });
+  }
+
   ngOnDestroy$ = new Subject();
   ngOnDestroy(): void {
     this.ngOnDestroy$.next(null);

authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html

@@ -5,7 +5,7 @@
 </mat-dialog-content>
 <mat-dialog-actions class="flex gap-3" align="end">
   <button
-    *ngFor="let button of confirmationDialog.actionButtons.reverse()"
+    *ngFor="let button of confirmationDialog.actionButtons"
     [ngClass]="button?.style || 'btn-accent-outline'"
     (click)="actionHandler(button.action)">
     {{ button.label }}

authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts

@@ -23,10 +23,16 @@ export class ConfirmationDialogComponent {
     private dialogRef: MatDialogRef<ConfirmationDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public confirmationDialog: ConfirmationDialog,
   ) {
-    this.confirmationDialog.actionButtons.push({
-      label: 'Cancel',
-      action: 'CANCEL',
-    });
+    this.confirmationDialog = {
+      ...this.confirmationDialog,
+      actionButtons: [
+        ...this.confirmationDialog.actionButtons,
+        {
+          label: 'Cancel',
+          action: 'CANCEL',
+        },
+      ].reverse(),
+    };
   }
 
   actionHandler(action: string) {