Merge branch '287-authority-section--organizations--users-live-update…

…-when-deactivatingactivating-users' of https://github.com/sovity/authority-portal into 287-authority-section--organizations--users-live-update-when-deactivatingactivating-users
sovity · Oct 9, 2024 · 4cba5fa · 4cba5fa
2 parents 1d74bfd + ff73868
commit 4cba5fa
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 23 deletions.
diff --git a/CHANGELOG.md b/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
 

diff --git a/authority-portal-backend/authority-portal-api-client-ts/package-lock.json b/authority-portal-backend/authority-portal-api-client-ts/package-lock.json
diff --git a/authority-portal-backend/gradle/libs.versions.toml b/authority-portal-backend/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ npmVersion = "8.15.0"
 
 sovity-edcCe = "10.4.1"
 
-quarkus = "3.9.2"
+quarkus = "3.15.1"
 quarkus-keycloakAdminClientReactive = "3.6.6"
 quarkus-jooq = "2.0.0"
 

diff --git a/authority-portal-frontend/package-lock.json b/authority-portal-frontend/package-lock.json
diff --git a/...mponent-page/register-central-component-page/register-central-component-page.component.ts b/...mponent-page/register-central-component-page/register-central-component-page.component.ts
@@ -113,7 +113,7 @@ export class RegisterCentralComponentPageComponent
         () => {
           setTimeout(() => {
             this.stepper.next();
-          }, 0);
+          }, 300);
         },
       ),
     );

diff --git a/...ol-center-organization-members-page/control-center-organization-members-page.component.ts b/...ol-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);

diff --git a/...ol-center-organization-profile-page/control-center-organization-profile-page.component.ts b/...ol-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);

diff --git a/...ofile-page/control-center-user-profile-page/control-center-user-profile-page.component.ts b/...ofile-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);

diff --git a/...tal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html b/...tal-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 }}

diff --git a/...ortal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts b/...ortal-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) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ export class RegisterCentralComponentPageComponent @@
             () => {
               setTimeout(() => {
                 this.stepper.next();
-              }, 0);
+              }, 300);
             },
           ),
         );
@@ Expand Down @@