From 56bb1f0103c9219655841aceb2c6af80143c7af8 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:41:10 +0200 Subject: [PATCH 1/7] build(deps): update quarkus-bom (#342) --- authority-portal-backend/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authority-portal-backend/gradle/libs.versions.toml b/authority-portal-backend/gradle/libs.versions.toml index fe22adff4..8e549ccf1 100644 --- 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" From e59cd852bd5e9965459e0e6683674a5892fb3efd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:55:13 +0000 Subject: [PATCH 2/7] chore(deps): bump rollup (#330) Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../authority-portal-api-client-ts/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 index fbc08dc24..2205722e0 100644 --- a/authority-portal-backend/authority-portal-api-client-ts/package-lock.json +++ b/authority-portal-backend/authority-portal-api-client-ts/package-lock.json @@ -1606,9 +1606,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -3009,9 +3009,9 @@ "dev": true }, "rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "requires": { "fsevents": "~2.3.2" From fd67d28d75865820808281065c1781c06d317910 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:33:43 +0200 Subject: [PATCH 3/7] chore(deps-dev): bump rollup in /authority-portal-frontend (#344) Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- authority-portal-frontend/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/authority-portal-frontend/package-lock.json b/authority-portal-frontend/package-lock.json index 3c21f86e1..462e01b2f 100644 --- a/authority-portal-frontend/package-lock.json +++ b/authority-portal-frontend/package-lock.json @@ -71,7 +71,7 @@ "@types/node": "^18.15.11", "prettier": "^2.8.7", "typescript": "~5.1.3", - "vite": "^4.5.3", + "vite": "^4.5.5", "vite-plugin-dts": "^2.2.0" } }, @@ -12762,9 +12762,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -18761,7 +18761,7 @@ "@types/node": "^18.15.11", "prettier": "^2.8.7", "typescript": "~5.1.3", - "vite": "^4.5.3", + "vite": "^4.5.5", "vite-plugin-dts": "^2.2.0" } }, @@ -24939,9 +24939,9 @@ } }, "rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "requires": { "fsevents": "~2.3.2" From 1c33375ee1a7feba3d2ec88f946a051d4046d748 Mon Sep 17 00:00:00 2001 From: Ilia Orlov <66363651+illfixit@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:37:07 +0200 Subject: [PATCH 4/7] feat: refresh on environment switch in control center (#349) --- CHANGELOG.md | 1 + ...center-organization-members-page.component.ts | 12 ++++++++++++ ...center-organization-profile-page.component.ts | 16 +++++++++++++++- ...control-center-user-profile-page.component.ts | 16 +++++++++++++++- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76bfbb5e3..313855ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ 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 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-frontend/src/app/pages/control-center-organization-members-page/control-center-organization-members-page/control-center-organization-members-page.component.ts b/authority-portal-frontend/src/app/pages/control-center-organization-members-page/control-center-organization-members-page/control-center-organization-members-page.component.ts index c6883f009..b41a72f9f 100644 --- a/authority-portal-frontend/src/app/pages/control-center-organization-members-page/control-center-organization-members-page/control-center-organization-members-page.component.ts +++ b/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); diff --git a/authority-portal-frontend/src/app/pages/control-center-organization-profile-page/control-center-organization-profile-page/control-center-organization-profile-page.component.ts b/authority-portal-frontend/src/app/pages/control-center-organization-profile-page/control-center-organization-profile-page/control-center-organization-profile-page.component.ts index 701383cfa..b401402a6 100644 --- a/authority-portal-frontend/src/app/pages/control-center-organization-profile-page/control-center-organization-profile-page/control-center-organization-profile-page.component.ts +++ b/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); diff --git a/authority-portal-frontend/src/app/pages/control-center-user-profile-page/control-center-user-profile-page/control-center-user-profile-page.component.ts b/authority-portal-frontend/src/app/pages/control-center-user-profile-page/control-center-user-profile-page/control-center-user-profile-page.component.ts index bc46eae73..4b0947247 100644 --- a/authority-portal-frontend/src/app/pages/control-center-user-profile-page/control-center-user-profile-page/control-center-user-profile-page.component.ts +++ b/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); From 7f70f4948fa6fe2bcd914901e6d449c3d45cb475 Mon Sep 17 00:00:00 2001 From: Ilia Orlov <66363651+illfixit@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:41:26 +0200 Subject: [PATCH 5/7] chore: fix delete and cancel buttons when deleting central components (#345) --- CHANGELOG.md | 2 ++ .../register-central-component-page.component.ts | 2 +- .../confirmation-dialog.component.html | 2 +- .../confirmation-dialog.component.ts | 14 ++++++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 313855ab5..201433d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ 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-frontend/src/app/pages/component-registration-pages/register-central-component-page/register-central-component-page/register-central-component-page.component.ts b/authority-portal-frontend/src/app/pages/component-registration-pages/register-central-component-page/register-central-component-page/register-central-component-page.component.ts index 260ebb42b..22f7fe21b 100644 --- a/authority-portal-frontend/src/app/pages/component-registration-pages/register-central-component-page/register-central-component-page/register-central-component-page.component.ts +++ b/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); }, ), ); diff --git a/authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html b/authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html index 23e44b607..5431927e1 100644 --- a/authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html +++ b/authority-portal-frontend/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html @@ -5,7 +5,7 @@