feat: add sorting to the list of connectors (#386)

sovity · Dec 2, 2024 · 37c52dd · 37c52dd
1 parent cfea799
commit 37c52dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))
+- Fixed an issue where entries in the connector overview would randomly switch places ([PR #386](https://github.com/sovity/authority-portal/pull/386))
 
 ### 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`
 
@@ -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

diff --git a/...d/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/seeds/DevScenario.kt b/...d/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/seeds/DevScenario.kt
@@ -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"

diff --git a/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt b/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt
@@ -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()
     }
 
@@ -131,6 +132,7 @@ class ConnectorService(
 
         return dsl.selectFrom(c)
             .where(c.ORGANIZATION_ID.eq(organizationId))
+            .orderBy(c.CONNECTOR_ID.asc())
             .fetch()
     }
 
@@ -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()
     }
 
@@ -147,6 +150,7 @@ class ConnectorService(
 
         return dsl.selectFrom(c)
             .where(c.ENVIRONMENT.eq(environment))
+            .orderBy(c.CONNECTOR_ID.asc())
             .fetch()
     }