From fe65d9ad5aa00eebaafe5096b3b7a0e8d2af2f41 Mon Sep 17 00:00:00 2001 From: Patrick Schauer Date: Fri, 13 Dec 2024 16:30:24 +0100 Subject: [PATCH 1/4] feat: remove frontend url column from all connectors-view for authority- and operator admins --- .../ConnectorManagementApiService.kt | 9 ++++++--- ...thority-connector-list-page.component.html | 19 ------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt index 50d92670..ca190080 100644 --- a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt +++ b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt @@ -107,10 +107,13 @@ class ConnectorManagementApiService( deploymentEnvironmentService.assertValidEnvId(environmentId) val connectors = connectorService.getConnectorsByEnvironment(environmentId) - return buildConnectorOverview(connectors) + return buildConnectorOverview(connectors, withoutFrontendUrl = true) } - private fun buildConnectorOverview(connectors: List): ConnectorOverviewResult { + private fun buildConnectorOverview( + connectors: List, + withoutFrontendUrl: Boolean = false + ): ConnectorOverviewResult { val orgNames = organizationService.getAllOrganizationNames() val connectorDtos = connectors.map { @@ -122,7 +125,7 @@ class ConnectorManagementApiService( environment = deploymentEnvironmentDtoService.findByIdOrThrow(it.environment), name = it.name, status = if (it.type == ConnectorType.CAAS) it.caasStatus.toDto() else it.onlineStatus.toDto(), - frontendUrl = it.frontendUrl + frontendUrl = if (withoutFrontendUrl) null else it.frontendUrl ) } return ConnectorOverviewResult(connectorDtos) diff --git a/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.html b/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.html index ce318be2..8ac3f039 100644 --- a/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.html +++ b/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.html @@ -44,12 +44,6 @@ scope="col"> Environment - - - Frontend - @@ -95,19 +89,6 @@ {{ connector.environment.title }} - - - open_in_new - - From f81eda57d96fa14e2e246b9a420502a25d6cb276 Mon Sep 17 00:00:00 2001 From: Patrick Schauer Date: Fri, 13 Dec 2024 16:32:53 +0100 Subject: [PATCH 2/4] docs: update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050211b0..1f084fd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Uptime Kuma is no longer mandatory and the status dashboard can be disabled - Added Owning Organization in Admin Connector Overview ([#355](https://github.com/sovity/authority-portal/issues/355)) +- Removed link to frontend URL in all-connectors-view for authority- and operator admins ([PR #398](https://github.com/sovity/authority-portal/pull/398)) #### Patch From baab609432b365d75c4e130e4ddb71ee58bff894 Mon Sep 17 00:00:00 2001 From: Patrick Schauer Date: Fri, 13 Dec 2024 16:47:11 +0100 Subject: [PATCH 3/4] test: make sure that frontendUrl is always null for getAllConnectors --- .../services/connector/ConnectorManagementApiServiceTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt b/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt index 05dac375..0f841979 100644 --- a/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt +++ b/authority-portal-backend/authority-portal-quarkus/src/test/kotlin/de/sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt @@ -158,6 +158,7 @@ class ConnectorManagementApiServiceTest { assertThat(result.connectors).hasSize(2) assertThat(result.connectors).noneMatch { it.environment.environmentId != "test" } assertThat(result.connectors).noneMatch { it.id == dummyDevConnectorId(0, 2) } + assertThat(result.connectors).allMatch { it.frontendUrl == null } assertThat(result.connectors[0].id).isEqualTo(dummyDevConnectorId(0, 0)) assertThat(result.connectors[1].id).isEqualTo(dummyDevConnectorId(0, 1)) @@ -191,6 +192,7 @@ class ConnectorManagementApiServiceTest { assertThat(result.connectors).noneMatch { it.environment.environmentId != "other-environment" } assertThat(result.connectors).noneMatch { it.id == dummyDevConnectorId(0, 0) } assertThat(result.connectors).noneMatch { it.id == dummyDevConnectorId(0, 1) } + assertThat(result.connectors).allMatch { it.frontendUrl == null } assertThat(result.connectors[0].id).isEqualTo(dummyDevConnectorId(0, 2)) assertThat(result.connectors[0].environment.environmentId).isEqualTo("other-environment") From 33f91ffec9e42ebf3d3a4d5b93ecbaa460c220e0 Mon Sep 17 00:00:00 2001 From: Patrick Schauer Date: Tue, 17 Dec 2024 16:23:17 +0100 Subject: [PATCH 4/4] refactor: apply suggestion from code review --- .../connectormanagement/ConnectorManagementApiService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt index ca190080..96fa3f67 100644 --- a/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt +++ b/authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt @@ -107,12 +107,12 @@ class ConnectorManagementApiService( deploymentEnvironmentService.assertValidEnvId(environmentId) val connectors = connectorService.getConnectorsByEnvironment(environmentId) - return buildConnectorOverview(connectors, withoutFrontendUrl = true) + return buildConnectorOverview(connectors, showFrontendUrl = false) } private fun buildConnectorOverview( connectors: List, - withoutFrontendUrl: Boolean = false + showFrontendUrl: Boolean = true ): ConnectorOverviewResult { val orgNames = organizationService.getAllOrganizationNames() @@ -125,7 +125,7 @@ class ConnectorManagementApiService( environment = deploymentEnvironmentDtoService.findByIdOrThrow(it.environment), name = it.name, status = if (it.type == ConnectorType.CAAS) it.caasStatus.toDto() else it.onlineStatus.toDto(), - frontendUrl = if (withoutFrontendUrl) null else it.frontendUrl + frontendUrl = if (showFrontendUrl) it.frontendUrl else null ) } return ConnectorOverviewResult(connectorDtos)