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.

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

feat: add sorting to the list of connectors #386

Merged
merged 5 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
- Fixed security vulnerabilities
- Fixed the user not being redirected to the correct URL after login ([#324](https://github.com/sovity/authority-portal/issues/324))
- Fixed an issue wherein it was possible to bypass the CaaS request limit in an organization ([PR #384](https://github.com/sovity/authority-portal/pull/384))
- Added sorting to the list of connectors ([PR #386](https://github.com/sovity/authority-portal/pull/386))
illfixit marked this conversation as resolved.
Show resolved Hide resolved

### Known issues

### Deployment Migration Notes

- The Crawler image name and version changed due to the crawler being moved into the AP repository and versions being aligned

- Previously: `ghcr.io/sovity/catalog-crawler-ce`
- Now: `ghcr.io/sovity/authority-portal-crawler`

Expand All @@ -47,8 +49,8 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
- Portal Frontend
- New mandatory variables:
```yaml
# Enables or disables the status uptime dashboard
AUTHORITY_PORTAL_FRONTEND_ENABLE_DASHBOARD: true
# Enables or disables the status uptime dashboard
AUTHORITY_PORTAL_FRONTEND_ENABLE_DASHBOARD: true
```

#### Compatible Versions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ class DevScenario(
val objectMapper = ObjectMapper()

connector(1, 1, 1)
connector(2, 1, 1)
connector(3, 1, 1)
dataOffer(1, 1, 1, assetApplier = {
it.assetId = dummyDevAssetId(1)
it.title = "Asset Title"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ class ConnectorService(

return dsl.selectFrom(c)
.where(c.ORGANIZATION_ID.eq(organizationId).and(c.ENVIRONMENT.eq(environmentId)))
.orderBy(c.CONNECTOR_ID.asc())
.fetch()
}

Expand All @@ -131,6 +132,7 @@ class ConnectorService(

return dsl.selectFrom(c)
.where(c.ORGANIZATION_ID.eq(organizationId))
.orderBy(c.CONNECTOR_ID.asc())
.fetch()
}

Expand All @@ -139,6 +141,7 @@ class ConnectorService(

return dsl.selectFrom(c)
.where(c.PROVIDER_ORGANIZATION_ID.eq(organizationId).and(c.ENVIRONMENT.eq(environmentId)))
.orderBy(c.CONNECTOR_ID.asc())
.fetch()
}

Expand All @@ -147,6 +150,7 @@ class ConnectorService(

return dsl.selectFrom(c)
.where(c.ENVIRONMENT.eq(environment))
.orderBy(c.CONNECTOR_ID.asc())
.fetch()
}

Expand Down