Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ordering of organizations #78

Merged
merged 5 commits into from
Mar 13, 2024
Merged

Ordering of organizations #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6c780d
feat: added sorting to organization lists
kamilczaja Mar 13, 2024
c4bc417
chore: updated CHANGELOG
kamilczaja Mar 13, 2024
c0b675e
fix: Tests and Markdown linter
jridderbusch Mar 13, 2024
769d149
fix: Changelog indentation
jridderbusch Mar 13, 2024
db24b9b
fix: markdown linter config
jridderbusch Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/markdown-link-checker-config.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../de/sovity/authorityportal/web/pages/organizationmanagement/OrganizationInfoApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion ...rityportal/web/integration/pages/organizationmanagement/OrganizationInfoApiServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading