From a6c780dfcb33470a00b332cf4751599b70af3d72 Mon Sep 17 00:00:00 2001 From: Kamil Czaja Date: Wed, 13 Mar 2024 16:01:20 +0100 Subject: [PATCH 1/5] feat: added sorting to organization lists --- .../pages/organizationmanagement/OrganizationInfoApiService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/organizationmanagement/OrganizationInfoApiService.kt b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/organizationmanagement/OrganizationInfoApiService.kt index f3b81ce45..7bdb4ea9d 100644 --- a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/organizationmanagement/OrganizationInfoApiService.kt +++ b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/organizationmanagement/OrganizationInfoApiService.kt @@ -55,7 +55,7 @@ class OrganizationInfoApiService { val userCounts = userService.getUserCountsByMdsIds() val dtos = organizations.map { buildOrganizationOverviewEntryDto(it, userCounts, connectorCounts, environmentId) - } + }.sortedWith(compareBy { it.name }) return OrganizationOverviewResult(dtos) } From c4bc4177c0a2a7e91396a1f1842e17118bebf99a Mon Sep 17 00:00:00 2001 From: Kamil Czaja Date: Wed, 13 Mar 2024 16:02:19 +0100 Subject: [PATCH 2/5] chore: updated CHANGELOG --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4907d26..041d3f871 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,11 +38,12 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Changed the wording of the reset password functionality ([#51](https://github.com/sovity/authority-portal/issues/51)) - Removed "Control Center" from breadcrumb path to improve UX ([#54](https://github.com/sovity/authority-portal/issues/54)) - Adjusted the ordering of users in the organization details page ([#50](https://github.com/sovity/authority-portal/issues/50)) +- Adjusted the ordering of organizations in the organization overview page ([#49](https://github.com/sovity/authority-portal/issues/49)) - Cleaned up repository for open-source release: - - Removed internal tools and utilities - - Rebased the entire history to remove secrets and unrelated code - - Cleaned up dead links - - Adjusted release issue template + - Removed internal tools and utilities + - Rebased the entire history to remove secrets and unrelated code + - Cleaned up dead links + - Adjusted release issue template ### Known issues From c0b675ed07ca94c38c4c3061613660a3a52d92f1 Mon Sep 17 00:00:00 2001 From: Jan Ridderbusch Date: Wed, 13 Mar 2024 16:57:36 +0100 Subject: [PATCH 3/5] fix: Tests and Markdown linter --- .github/markdown-link-checker-config.jq | 1 + .../organizationmanagement/OrganizationInfoApiServiceTest.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/markdown-link-checker-config.jq b/.github/markdown-link-checker-config.jq index 7cda1d139..af9ff43f3 100755 --- a/.github/markdown-link-checker-config.jq +++ b/.github/markdown-link-checker-config.jq @@ -8,6 +8,7 @@ {"pattern": "https://(.*?)\\.azure\\.sovity\\.io"}, {"pattern": "http://edc[0-9]*:"}, {"pattern": "https://test-connector.hosting-environment.io"} + {"pattern": "https://github.com/sovity/authority-portal-ee"} ], "replacementPatterns": [ { diff --git a/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/integration/pages/organizationmanagement/OrganizationInfoApiServiceTest.kt b/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/integration/pages/organizationmanagement/OrganizationInfoApiServiceTest.kt index c5f421230..ed24845a9 100644 --- a/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/integration/pages/organizationmanagement/OrganizationInfoApiServiceTest.kt +++ b/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/integration/pages/organizationmanagement/OrganizationInfoApiServiceTest.kt @@ -79,7 +79,7 @@ class OrganizationInfoApiServiceTest { val result = organizationInfoApiService.organizationsOverview("test") // assert - val organization1 = result.organizations[0] + val organization1 = result.organizations[8] assertThat(result.organizations.size).isEqualTo(9) assertThat(organization1.mdsId).isEqualTo(testMdsId) assertThat(organization1.name).isEqualTo(testOrganizationName) From 769d149c4f002cd434235b33ff28c3aaf981c2c7 Mon Sep 17 00:00:00 2001 From: Jan Ridderbusch Date: Wed, 13 Mar 2024 17:01:05 +0100 Subject: [PATCH 4/5] fix: Changelog indentation --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041d3f871..0e542f60a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,10 +40,10 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Adjusted the ordering of users in the organization details page ([#50](https://github.com/sovity/authority-portal/issues/50)) - Adjusted the ordering of organizations in the organization overview page ([#49](https://github.com/sovity/authority-portal/issues/49)) - Cleaned up repository for open-source release: - - Removed internal tools and utilities - - Rebased the entire history to remove secrets and unrelated code - - Cleaned up dead links - - Adjusted release issue template + - Removed internal tools and utilities + - Rebased the entire history to remove secrets and unrelated code + - Cleaned up dead links + - Adjusted release issue template ### Known issues From db24b9b9348c1d98c7c69cc456dbbc0b33fc129f Mon Sep 17 00:00:00 2001 From: Jan Ridderbusch Date: Wed, 13 Mar 2024 17:02:34 +0100 Subject: [PATCH 5/5] fix: markdown linter config --- .github/markdown-link-checker-config.jq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/markdown-link-checker-config.jq b/.github/markdown-link-checker-config.jq index af9ff43f3..41c68c524 100755 --- a/.github/markdown-link-checker-config.jq +++ b/.github/markdown-link-checker-config.jq @@ -7,7 +7,7 @@ {"pattern": "^https://www\\.linkedin\\.com"}, {"pattern": "https://(.*?)\\.azure\\.sovity\\.io"}, {"pattern": "http://edc[0-9]*:"}, - {"pattern": "https://test-connector.hosting-environment.io"} + {"pattern": "https://test-connector.hosting-environment.io"}, {"pattern": "https://github.com/sovity/authority-portal-ee"} ], "replacementPatterns": [