diff --git a/.github/markdown-link-checker-config.jq b/.github/markdown-link-checker-config.jq index 7cda1d139..41c68c524 100755 --- a/.github/markdown-link-checker-config.jq +++ b/.github/markdown-link-checker-config.jq @@ -7,7 +7,8 @@ {"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": [ { diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4907d26..0e542f60a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ 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 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) } 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)