Fix/create workspace template (#85)

* fix: update create workspace from UI template * fix: update import default workspace slots renaming * fix: update tests --------- Co-authored-by: milan.horvath <[email protected]>
onecx · Jun 7, 2024 · f2b15b2 · f2b15b2
1 parent 45a28ea
commit f2b15b2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/src/main/resources/template/workspace-create.json b/src/main/resources/template/workspace-create.json
@@ -1,7 +1,7 @@
 {
   "slots": [
     {
-      "name": "menu",
+      "name": "onecx-shell-vertical-menu",
       "components": [
         {
           "productName": "onecx-workspace",
@@ -16,7 +16,7 @@
       ]
     },
     {
-      "name": "headerRight",
+      "name": "onecx-shell-header-right",
       "components": [
         {
           "productName": "onecx-help",
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "name": "horizontalMenu",
+      "name": "onecx-shell-horizontal-menu",
       "components": [
         {
           "productName": "onecx-workspace",

diff --git a/src/main/resources/template/workspace-import.json b/src/main/resources/template/workspace-import.json
@@ -54,7 +54,7 @@
       ],
       "slots": [
         {
-          "name": "menu",
+          "name": "onecx-shell-vertical-menu",
           "components": [
             {
               "productName": "onecx-workspace",
@@ -69,7 +69,7 @@
           ]
         },
         {
-          "name": "headerRight",
+          "name": "onecx-shell-header-right",
           "components": [
             {
               "productName": "onecx-help",
@@ -79,7 +79,7 @@
           ]
         },
         {
-          "name": "horizontalMenu",
+          "name": "onecx-shell-horizontal-menu",
           "components": [
             {
               "productName": "onecx-workspace",
@@ -174,4 +174,4 @@
       ]
     }
   ]
-}
+}
diff --git a/...it/onecx/workspace/rs/internal/controllers/WorkspaceInternalCreateRestControllerTest.java b/...it/onecx/workspace/rs/internal/controllers/WorkspaceInternalCreateRestControllerTest.java
@@ -88,7 +88,8 @@ void createWorkspaceTest() {
 
         assertThat(slotsResponse.getSlots().get(0)).isNotNull();
         var slotMap = slotsResponse.getSlots().stream().collect(Collectors.toMap(SlotDTO::getName, x -> x));
-        assertThat(slotMap).containsOnlyKeys("menu", "headerRight", "horizontalMenu");
+        assertThat(slotMap).containsOnlyKeys("onecx-shell-vertical-menu", "onecx-shell-header-right",
+                "onecx-shell-horizontal-menu");
 
         var productsResponse = given()
                 .when()

diff --git a/...cx/workspace/rs/internal/controllers/WorkspaceInternalCustomConfigRestControllerTest.java b/...cx/workspace/rs/internal/controllers/WorkspaceInternalCustomConfigRestControllerTest.java
@@ -294,8 +294,9 @@ void createWorkspaceFileTest() {
         assertThat(slotsResponse.getSlots()).isNotNull().hasSize(3);
         assertThat(slotsResponse.getSlots().get(0)).isNotNull();
         var slotMap = slotsResponse.getSlots().stream().collect(Collectors.toMap(SlotDTO::getName, x -> x));
-        assertThat(slotMap).containsOnlyKeys("menu", "headerRight", "horizontalMenu");
-        assertThat(slotMap.get("menu").getComponents()).isNotNull().hasSize(2);
+        assertThat(slotMap).containsOnlyKeys("onecx-shell-vertical-menu", "onecx-shell-header-right",
+                "onecx-shell-horizontal-menu");
+        assertThat(slotMap.get("onecx-shell-vertical-menu").getComponents()).isNotNull().hasSize(2);
 
         var productsResponse = given()
                 .when()

diff --git a/src/test/resources/template/workspace-create-test.json b/src/test/resources/template/workspace-create-test.json
@@ -1,7 +1,7 @@
 {
   "slots": [
     {
-      "name": "menu",
+      "name": "onecx-shell-vertical-menu",
       "components": [
         {
           "productName": "onecx-workspace",
@@ -16,7 +16,7 @@
       ]
     },
     {
-      "name": "headerRight",
+      "name": "onecx-shell-header-right",
       "components": [
         {
           "productName": "onecx-help",
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "name": "horizontalMenu",
+      "name": "onecx-shell-horizontal-menu",
       "components": [
         {
           "productName": "onecx-workspace",