From 6d15c9a75d28a3f6df6c9381b72aff3b892d9d55 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Mon, 15 Jul 2024 10:19:13 +0200 Subject: [PATCH 01/12] feat: add system variable to menuitem url --- .../onecx/workspace/rs/user/mappers/UserMenuMapper.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java index 34621f3..60f296b 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java @@ -3,6 +3,8 @@ import java.util.*; import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringSubstitutor; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.tkit.onecx.workspace.domain.models.MenuItem; @@ -42,6 +44,12 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection Date: Mon, 15 Jul 2024 11:40:49 +0200 Subject: [PATCH 02/12] fix: add system variable to menuitem url --- .../rs/user/mappers/UserMenuMapper.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java index 60f296b..05d3749 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java @@ -3,7 +3,6 @@ import java.util.*; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -27,12 +26,15 @@ default UserWorkspaceMenuStructureDTO empty(String workspaceName) { default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection entities, Map> mapping, Set roles, Set mappingKeys) { UserWorkspaceMenuStructureDTO dto = empty(workspace.getName()); + + final var sub = new StringSubstitutor(System.getenv()); if (entities.isEmpty()) { return dto; } Set items; if (!mappingKeys.isEmpty()) { - items = entities.stream().filter(m -> m.getParentId() == null) + items = entities.stream() + .filter(m -> m.getParentId() == null) .filter(m -> mappingKeys.contains(m.getKey())) .collect(Collectors.toSet()); } else { @@ -44,28 +46,34 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection filterMenu(Set items, Map> mapping, Set roles, String workspaceUrl) { Set tmp = new HashSet<>(items); + final var sub = new StringSubstitutor(System.getenv()); tmp.forEach(m -> { var mr = mapping.get(m.getId()); + var mUrl = m.getUrl(); + if (mUrl != null) { + sub.replace(mUrl); + } if (mr == null || mr.stream().noneMatch(roles::contains)) { items.remove(m); } else { From 7055c7a97fbf10704778c77abfa3920fe087d003 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Mon, 15 Jul 2024 11:41:57 +0200 Subject: [PATCH 03/12] fix: add system variable to menuitem url --- .../onecx/workspace/rs/user/mappers/UserMenuMapper.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java index 05d3749..92511d8 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java @@ -27,7 +27,6 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection> mapping, Set roles, Set mappingKeys) { UserWorkspaceMenuStructureDTO dto = empty(workspace.getName()); - final var sub = new StringSubstitutor(System.getenv()); if (entities.isEmpty()) { return dto; } @@ -46,12 +45,6 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection Date: Mon, 15 Jul 2024 15:49:12 +0200 Subject: [PATCH 04/12] fix: add tests to url system env --- pom.xml | 1 + .../UserMenuInternalControllerTest.java | 23 +++++++++++++++++++ src/test/resources/data/testdata-user.xml | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index deae068..26880af 100644 --- a/pom.xml +++ b/pom.xml @@ -323,6 +323,7 @@ interpolated6 interpolated7 interpolated8 + testItem1 diff --git a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java index 0cf28f3..a7f52c4 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java @@ -106,6 +106,29 @@ void getMenuStructureNoAssignmentTest() { assertThat(data.getMenu()).isNotNull().isEmpty(); } + @Test + void getMenuStructure_shouldReturnSystemURL() { + + var workspaceName = "test03"; + var accessToken = createAccessTokenBearer(USER_BOB); + var idToken = createToken("org1"); + + var data = given() + .auth().oauth2(getKeycloakClientToken("testClient")) + .when() + .contentType(APPLICATION_JSON) + .header(APM_HEADER_PARAM, idToken) + .body(new UserWorkspaceMenuRequestDTO().token(accessToken)) + .pathParam("workspaceName", workspaceName) + .post() + .then() + .statusCode(OK.getStatusCode()) + .extract().body().as(UserWorkspaceMenuStructureDTO.class); + + assertThat(data).isNotNull(); + assertThat(data.getMenu().get(1).getChildren().get(0).getUrl()).isEqualTo("/company3/testItem1"); + } + @Test void getMenuStructureForUserIdTest() { diff --git a/src/test/resources/data/testdata-user.xml b/src/test/resources/data/testdata-user.xml index 50c213a..0ab84a5 100644 --- a/src/test/resources/data/testdata-user.xml +++ b/src/test/resources/data/testdata-user.xml @@ -32,7 +32,7 @@ - + From 4f5d9116c4e2f1669d1813a9f042bb4dd3322d8f Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Tue, 16 Jul 2024 09:42:35 +0200 Subject: [PATCH 05/12] fix: remove logs adjust UserMenuMapper --- pom.xml | 4 ---- .../rs/user/mappers/UserMenuMapper.java | 19 +++++++++---------- .../WorkspaceEximV1RestControllerTest.java | 6 +++--- .../AssignmentRestControllerTest.java | 2 +- .../MenuInternalRestControllerTenantTest.java | 2 +- .../WorkspaceInternalRestControllerTest.java | 1 - 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 26880af..a99ce1a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,6 @@ org.tkit.onecx.quarkus onecx-security - - io.quarkus - quarkus-oidc - diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java index 92511d8..e9f499d 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java @@ -48,10 +48,9 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection filterMenu(Set items, Map> m tmp.forEach(m -> { var mr = mapping.get(m.getId()); var mUrl = m.getUrl(); - if (mUrl != null) { - sub.replace(mUrl); - } if (mr == null || mr.stream().noneMatch(roles::contains)) { items.remove(m); } else { - filterChildren(m, mapping, roles, workspaceUrl); + if (mUrl != null) { + sub.replace(mUrl); + } + filterChildren(m, mapping, roles, workspaceUrl, sub); } }); return items; } - default void filterChildren(MenuItem menuItem, Map> mapping, Set roles, String workspaceUrl) { + default void filterChildren(MenuItem menuItem, Map> mapping, Set roles, String workspaceUrl, StringSubstitutor sub) { Set items = new HashSet<>(menuItem.getChildren()); items.forEach(child -> { var mr = mapping.get(child.getId()); @@ -85,9 +84,9 @@ default void filterChildren(MenuItem menuItem, Map> mapping, menuItem.getChildren().remove(child); } else { if (child.getChildren() != null && !child.getChildren().isEmpty()) { - filterChildren(child, mapping, roles, workspaceUrl); + filterChildren(child, mapping, roles, workspaceUrl, sub); } else { - child.setUrl(updateInternalUrl(workspaceUrl, child.getUrl(), child.isExternal())); + child.setUrl(updateInternalUrl(workspaceUrl, child.getUrl(), child.isExternal(), sub)); } } }); diff --git a/src/test/java/org/tkit/onecx/workspace/rs/exim/v1/controllers/WorkspaceEximV1RestControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/exim/v1/controllers/WorkspaceEximV1RestControllerTest.java index c81dcd5..eae4291 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/exim/v1/controllers/WorkspaceEximV1RestControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/exim/v1/controllers/WorkspaceEximV1RestControllerTest.java @@ -35,7 +35,7 @@ void exportWorkspaceTest() { .contentType(APPLICATION_JSON) .body(request) .post("/export") - .then().log().all() + .then() .statusCode(OK.getStatusCode()) .extract().as(WorkspaceSnapshotDTOV1.class); @@ -69,7 +69,7 @@ void exportWorkspaceNoMenuTest() { .contentType(APPLICATION_JSON) .body(request) .post("/export") - .then().log().all() + .then() .statusCode(OK.getStatusCode()) .extract().as(WorkspaceSnapshotDTOV1.class); @@ -677,7 +677,7 @@ void importMenuToNonExistingWorkspaceTest() { .contentType(APPLICATION_JSON) .body(snapshot) .post("/111111/menu/import") - .then().log().all() + .then() .statusCode(BAD_REQUEST.getStatusCode()) .extract().as(EximProblemDetailResponseDTOV1.class); diff --git a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/AssignmentRestControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/AssignmentRestControllerTest.java index 841088a..7095ea4 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/AssignmentRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/AssignmentRestControllerTest.java @@ -207,7 +207,7 @@ void searchAssignmentTest() { .contentType(APPLICATION_JSON) .body(criteria2) .post("/search") - .then().log().all() + .then() .statusCode(OK.getStatusCode()) .contentType(APPLICATION_JSON) .extract() diff --git a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/MenuInternalRestControllerTenantTest.java b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/MenuInternalRestControllerTenantTest.java index a5894f6..276fb76 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/MenuInternalRestControllerTenantTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/MenuInternalRestControllerTenantTest.java @@ -137,7 +137,7 @@ void deleteAllMenuItemsForWorkspaceTest() { .header(APM_HEADER_PARAM, createToken("org1")) .body(criteria) .post("search") - .then().log().all() + .then() .statusCode(OK.getStatusCode()) .extract().as(MenuItemPageResultDTO.class); diff --git a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/WorkspaceInternalRestControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/WorkspaceInternalRestControllerTest.java index 38f42ab..ff51179 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/WorkspaceInternalRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/internal/controllers/WorkspaceInternalRestControllerTest.java @@ -375,7 +375,6 @@ void modificationCountTest() { .pathParam("id", "11-222") .put("{id}") .then() - .log().all() .statusCode(BAD_REQUEST.getStatusCode()) .extract().as(ProblemDetailResponseDTO.class); } From 7af7fdfb655a848b29f48081a3085d5161f308c5 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Tue, 16 Jul 2024 09:56:27 +0200 Subject: [PATCH 06/12] fix: formatter --- .../tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java index e9f499d..ed0aa0c 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java @@ -76,7 +76,8 @@ default Set filterMenu(Set items, Map> m return items; } - default void filterChildren(MenuItem menuItem, Map> mapping, Set roles, String workspaceUrl, StringSubstitutor sub) { + default void filterChildren(MenuItem menuItem, Map> mapping, Set roles, String workspaceUrl, + StringSubstitutor sub) { Set items = new HashSet<>(menuItem.getChildren()); items.forEach(child -> { var mr = mapping.get(child.getId()); From ff17d0b67bf2ef6b3cb37be8e8d231a374ceb51d Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Tue, 16 Jul 2024 09:59:31 +0200 Subject: [PATCH 07/12] fix: docs added --- .../pages/onecx-workspace-svc-extensions.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc b/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc index e8d79e8..625cc6e 100644 --- a/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc +++ b/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc @@ -44,12 +44,6 @@ h| Version | https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link] | 2.27.0 -| quarkus-oidc - -| https://quarkus.io/guides/security-oidc-bearer-token-authentication-tutorial[Link] -| https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-oidc.adoc[Link] -| 3.12.2 - | onecx-tenant | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-tenant.html[Link] @@ -68,6 +62,12 @@ h| Version | https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link] | 2.27.0 +| quarkus-oidc + +| https://quarkus.io/guides/security-oidc-bearer-token-authentication-tutorial[Link] +| https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-oidc.adoc[Link] +| 3.12.2 + | quarkus-arc | https://quarkus.io/guides/cdi-reference[Link] From 8904fccda34cc3b18a18e8261f38dd6e3bcb4467 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Tue, 16 Jul 2024 14:10:18 +0200 Subject: [PATCH 08/12] feat: add homePage to WorkspaceWrapper external --- src/main/openapi/onecx-workspace-v1-openapi.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/openapi/onecx-workspace-v1-openapi.yaml b/src/main/openapi/onecx-workspace-v1-openapi.yaml index 8e01858..57e38e0 100644 --- a/src/main/openapi/onecx-workspace-v1-openapi.yaml +++ b/src/main/openapi/onecx-workspace-v1-openapi.yaml @@ -130,6 +130,8 @@ components: type: string baseUrl: type: string + homePage: + type: string theme: type: string products: From 610be015c9dc44de10a284f7d40b201cedcc9dc2 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Wed, 17 Jul 2024 11:27:19 +0200 Subject: [PATCH 09/12] feat: add disabled to Export import --- .../workspace/rs/exim/v1/mappers/ExportImportMapperV1.java | 1 - src/main/openapi/onecx-workspace-exim-v1-openapi.yaml | 2 ++ .../exim/v1/controllers/WorkspaceEximV1RestControllerTest.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tkit/onecx/workspace/rs/exim/v1/mappers/ExportImportMapperV1.java b/src/main/java/org/tkit/onecx/workspace/rs/exim/v1/mappers/ExportImportMapperV1.java index b55c1c6..6fad9ad 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/exim/v1/mappers/ExportImportMapperV1.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/exim/v1/mappers/ExportImportMapperV1.java @@ -98,7 +98,6 @@ default Map map(Map data, Map Date: Wed, 17 Jul 2024 11:31:54 +0200 Subject: [PATCH 10/12] feat: add interpolate test userMenu url --- ...MenuInternalControllerInterpolateTest.java | 47 +++++++++++++++++++ .../UserMenuInternalControllerTest.java | 22 --------- 2 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java diff --git a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java new file mode 100644 index 0000000..27b04f7 --- /dev/null +++ b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java @@ -0,0 +1,47 @@ +package org.tkit.onecx.workspace.rs.user.controllers; + +import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuRequestDTO; +import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuStructureDTO; +import io.quarkus.test.common.http.TestHTTPEndpoint; +import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Test; +import org.tkit.onecx.workspace.test.AbstractTest; +import org.tkit.quarkus.security.test.GenerateKeycloakClient; +import org.tkit.quarkus.test.WithDBData; + +import static io.restassured.RestAssured.given; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; +import static org.assertj.core.api.Assertions.assertThat; +import static org.tkit.quarkus.security.test.SecurityTestUtils.getKeycloakClientToken; + +@QuarkusTest +@TestHTTPEndpoint(UserMenuInternalController.class) +@WithDBData(value = "data/testdata-user.xml", deleteBeforeInsert = true, deleteAfterTest = true, rinseAndRepeat = true) +@GenerateKeycloakClient(clientName = "testClient", scopes = { "ocx-ws:all", "ocx-ws:read", "ocx-ws:write" }) +public class UserMenuInternalControllerInterpolateTest extends AbstractTest { + + @Test + void getMenuStructure_shouldReturnSystemURL() { + + var workspaceName = "test03"; + var accessToken = createAccessTokenBearer(USER_BOB); + var idToken = createToken("org1"); + + var data = given() + .auth().oauth2(getKeycloakClientToken("testClient")) + .when() + .contentType(APPLICATION_JSON) + .header(APM_HEADER_PARAM, idToken) + .body(new UserWorkspaceMenuRequestDTO().token(accessToken)) + .pathParam("workspaceName", workspaceName) + .post() + .then() + .statusCode(OK.getStatusCode()) + .extract().body().as(UserWorkspaceMenuStructureDTO.class); + + assertThat(data).isNotNull(); + assertThat(data.getMenu().get(1).getChildren().get(0).getUrl()).isEqualTo("/company3/testItem1"); + } + +} diff --git a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java index a7f52c4..405e97c 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java @@ -106,28 +106,6 @@ void getMenuStructureNoAssignmentTest() { assertThat(data.getMenu()).isNotNull().isEmpty(); } - @Test - void getMenuStructure_shouldReturnSystemURL() { - - var workspaceName = "test03"; - var accessToken = createAccessTokenBearer(USER_BOB); - var idToken = createToken("org1"); - - var data = given() - .auth().oauth2(getKeycloakClientToken("testClient")) - .when() - .contentType(APPLICATION_JSON) - .header(APM_HEADER_PARAM, idToken) - .body(new UserWorkspaceMenuRequestDTO().token(accessToken)) - .pathParam("workspaceName", workspaceName) - .post() - .then() - .statusCode(OK.getStatusCode()) - .extract().body().as(UserWorkspaceMenuStructureDTO.class); - - assertThat(data).isNotNull(); - assertThat(data.getMenu().get(1).getChildren().get(0).getUrl()).isEqualTo("/company3/testItem1"); - } @Test void getMenuStructureForUserIdTest() { From 74342f94866b25b6b08c6399ec101086ce3ce769 Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Wed, 17 Jul 2024 11:33:14 +0200 Subject: [PATCH 11/12] fix: format --- ...MenuInternalControllerInterpolateTest.java | 19 ++++++++++--------- .../UserMenuInternalControllerTest.java | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java index 27b04f7..67ddde2 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerInterpolateTest.java @@ -1,20 +1,21 @@ package org.tkit.onecx.workspace.rs.user.controllers; -import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuRequestDTO; -import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuStructureDTO; -import io.quarkus.test.common.http.TestHTTPEndpoint; -import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.Test; -import org.tkit.onecx.workspace.test.AbstractTest; -import org.tkit.quarkus.security.test.GenerateKeycloakClient; -import org.tkit.quarkus.test.WithDBData; - import static io.restassured.RestAssured.given; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static jakarta.ws.rs.core.Response.Status.OK; import static org.assertj.core.api.Assertions.assertThat; import static org.tkit.quarkus.security.test.SecurityTestUtils.getKeycloakClientToken; +import org.junit.jupiter.api.Test; +import org.tkit.onecx.workspace.test.AbstractTest; +import org.tkit.quarkus.security.test.GenerateKeycloakClient; +import org.tkit.quarkus.test.WithDBData; + +import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuRequestDTO; +import gen.org.tkit.onecx.workspace.rs.user.model.UserWorkspaceMenuStructureDTO; +import io.quarkus.test.common.http.TestHTTPEndpoint; +import io.quarkus.test.junit.QuarkusTest; + @QuarkusTest @TestHTTPEndpoint(UserMenuInternalController.class) @WithDBData(value = "data/testdata-user.xml", deleteBeforeInsert = true, deleteAfterTest = true, rinseAndRepeat = true) diff --git a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java index 405e97c..0cf28f3 100644 --- a/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java +++ b/src/test/java/org/tkit/onecx/workspace/rs/user/controllers/UserMenuInternalControllerTest.java @@ -106,7 +106,6 @@ void getMenuStructureNoAssignmentTest() { assertThat(data.getMenu()).isNotNull().isEmpty(); } - @Test void getMenuStructureForUserIdTest() { From a57c6e6ffb33ccaabcf5eebb652e4a843311822e Mon Sep 17 00:00:00 2001 From: Jannik Steenken Date: Wed, 17 Jul 2024 11:38:42 +0200 Subject: [PATCH 12/12] fix: docs --- .../pages/onecx-workspace-svc-extensions.adoc | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc b/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc index 625cc6e..3f757ae 100644 --- a/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc +++ b/docs/modules/onecx-workspace-svc/pages/onecx-workspace-svc-extensions.adoc @@ -11,56 +11,56 @@ h| Version | tkit-quarkus-data-import | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-data-import.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-data-import.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-data-import.adoc[Link] +| 2.28.0 | tkit-quarkus-jpa | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-jpa.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.adoc[Link] +| 2.28.0 | tkit-quarkus-log-cdi | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-cdi.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link] +| 2.28.0 | tkit-quarkus-log-rs | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-rs.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link] +| 2.28.0 | tkit-quarkus-log-json | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-json.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link] +| 2.28.0 | tkit-quarkus-rest | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link] +| 2.28.0 | onecx-tenant | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-tenant.html[Link] -| https://github.com/onecx/onecx-quarkus/blob/0.22.0/docs/modules/onecx-quarkus/pages/includes/onecx-tenant.adoc[Link] -| 0.22.0 +| https://github.com/onecx/onecx-quarkus/blob/0.24.0/docs/modules/onecx-quarkus/pages/includes/onecx-tenant.adoc[Link] +| 0.24.0 | tkit-quarkus-jpa-tenant | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-jpa-tenant.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa-tenant.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa-tenant.adoc[Link] +| 2.28.0 | tkit-quarkus-rest-context | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest-context.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link] +| 2.28.0 | quarkus-oidc @@ -137,14 +137,14 @@ h| Version | tkit-quarkus-security | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-security.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.27.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-security.adoc[Link] -| 2.27.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-security.adoc[Link] +| 2.28.0 | onecx-core | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-core.html[Link] | -| 0.22.0 +| 0.24.0 | quarkus-container-image-docker @@ -157,7 +157,7 @@ h| Version | | -| 0.22.0 +| 0.24.0 |=== \ No newline at end of file