Merge branch 'main' into feature/product-path-to-routes

onecx · May 28, 2024 · 2c13f5a · 2c13f5a
2 parents 16547ef + 6bd8ce0
commit 2c13f5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java b/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java
@@ -4,6 +4,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.mapstruct.AfterMapping;
@@ -54,6 +55,7 @@ default LoadWorkspaceConfigResponseDTO createResponse(WorkspaceWrapper workspace
     @Mapping(target = "name", ignore = true)
     @Mapping(target = "baseUrl", source = "mfe.remoteBaseUrl")
     @Mapping(target = "remoteEntryUrl", source = "mfe.remoteEntry")
+    @Mapping(target = "elementName", source = "mfe.tagName")
     @Mapping(target = "productName", source = "product.name")
     RemoteComponentDTO createComponent(LoadProductItemPSV1 product, LoadProductMicrofrontendPSV1 mfe);
 
@@ -90,6 +92,7 @@ default String componentName(String productName, String appId, String exposedMod
     @Mapping(target = "exposedModule", source = "mfe.exposedModule")
     @Mapping(target = "remoteName", source = "mfe.remoteName")
     @Mapping(target = "endpoints", source = "mfe.endpoints")
+    @Mapping(target = "elementName", source = "mfe.tagName")
     RouteDTO createRoute(LoadProductItemPSV1 product, LoadProductMicrofrontendPSV1 mfe, Map<String, String> pathMapping,
             WorkspaceWrapper workspace, String productBaseUrl);
 
@@ -111,6 +114,7 @@ default SlotDTO createSlot(WorkspaceWrapperSlot slot) {
 
         SlotDTO result = new SlotDTO().name(slot.getName());
         if (slot.getComponents() != null) {
+            slot.getComponents().removeIf(Objects::isNull);
             slot.getComponents()
                     .forEach(c -> result.addComponentsItem(componentName(c.getProductName(), c.getAppId(), c.getName())));
         }

diff --git a/src/main/openapi/openapi-bff.yaml b/src/main/openapi/openapi-bff.yaml
@@ -254,6 +254,8 @@ components:
           $ref: '#/components/schemas/PathMatch'
         remoteName:
           type: string
+        elementName:
+          type: string
         displayName:
           type: string
         endpoints:
@@ -269,7 +271,7 @@ components:
           type: string
     Technologies:
       type: string
-      enum: ['Angular', 'WebComponent']
+      enum: ['Angular', 'WebComponent', 'WebComponentScript', 'WebComponentModule' ]
     PathMatch:
       type: string
       enum: ['full', 'prefix']
@@ -298,6 +300,10 @@ components:
           type: string
         remoteName:
           type: string
+        elementName:
+          type: string
+        technology:
+          $ref: '#/components/schemas/Technologies'
     GetUserProfileResponse:
       type: object
       required:

diff --git a/src/test/java/org/tkit/onecx/shell/bff/rs/WorkspaceConfigRestControllerTest.java b/src/test/java/org/tkit/onecx/shell/bff/rs/WorkspaceConfigRestControllerTest.java
@@ -234,6 +234,7 @@ void loadWorkspaceConfigByBaseUrlTest() {
                                 .addMicrofrontendsItem(new Microfrontend().basePath("/app1").mfeId("app1")))
                 .addSlotsItem(
                         new WorkspaceWrapperSlot().name("slot1")
+                                .addComponentsItem(null)
                                 .addComponentsItem(
                                         new WorkspaceWrapperComponent().productName("product1").appId("app1")
                                                 .name("App1Component"))