Merge pull request #1234 from strictdoc-project/stanislaw/fix_move_node

export/html, server: fix edge case when dropping a req on another req
strictdoc-project · Jul 16, 2023 · cf4f26f · cf4f26f
2 parents 648372e + 8df3665
commit cf4f26f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/strictdoc/server/routers/main_router.py b/strictdoc/server/routers/main_router.py
@@ -1384,6 +1384,14 @@ async def move_node(request: Request):
         )
         current_parent_node = moved_node.parent
 
+        # Currently UI allows a child-like drag-and-drop on a requirement node.
+        # In that case, we make it add a node **after** the target requirement
+        # node (not as its child because that's not possible).
+        if whereto == NodeCreationOrder.CHILD and isinstance(
+            target_node, Requirement
+        ):
+            whereto = NodeCreationOrder.AFTER
+
         if whereto == NodeCreationOrder.CHILD:
             # Disconnect the moved_node from its parent.
             current_parent_node.section_contents.remove(moved_node)

diff --git a/...0_view_document/UC60_T01_document_has_no_content/test_UC60_T01_document_has_no_content.py b/...0_view_document/UC60_T01_document_has_no_content/test_UC60_T01_document_has_no_content.py
@@ -1,5 +1,4 @@
-from seleniumbase import BaseCase
-
+from tests.end2end.e2e_case import E2ECase
 from tests.end2end.end2end_test_setup import End2EndTestSetup
 from tests.end2end.helpers.components.viewtype_selector import ViewType_Selector
 from tests.end2end.helpers.screens.project_index.screen_project_index import (
@@ -8,7 +7,7 @@
 from tests.end2end.server import SDocTestServer
 
 
-class Test_UC60_T01_document_has_no_content(BaseCase):
+class Test(E2ECase):
     def test(self):
         test_setup = End2EndTestSetup(path_to_test_file=__file__)
 

diff --git a/...le/UC60_view_document/UC60_T02_document_has_content/test_UC60_T02_document_has_content.py b/...le/UC60_view_document/UC60_T02_document_has_content/test_UC60_T02_document_has_content.py
@@ -1,5 +1,4 @@
-from seleniumbase import BaseCase
-
+from tests.end2end.e2e_case import E2ECase
 from tests.end2end.end2end_test_setup import End2EndTestSetup
 from tests.end2end.helpers.components.viewtype_selector import ViewType_Selector
 from tests.end2end.helpers.screens.project_index.screen_project_index import (
@@ -8,7 +7,7 @@
 from tests.end2end.server import SDocTestServer
 
 
-class Test_UC60_T02_document_has_content(BaseCase):
+class Test(E2ECase):
     def test(self):
         test_setup = End2EndTestSetup(path_to_test_file=__file__)
 

diff --git a/...0_view_document/UC30_T01_document_has_no_content/test_UC30_T01_document_has_no_content.py b/...0_view_document/UC30_T01_document_has_no_content/test_UC30_T01_document_has_no_content.py
@@ -1,5 +1,4 @@
-from seleniumbase import BaseCase
-
+from tests.end2end.e2e_case import E2ECase
 from tests.end2end.end2end_test_setup import End2EndTestSetup
 from tests.end2end.helpers.components.viewtype_selector import ViewType_Selector
 from tests.end2end.helpers.screens.project_index.screen_project_index import (
@@ -8,7 +7,7 @@
 from tests.end2end.server import SDocTestServer
 
 
-class Test_UC30_T01_document_has_no_content(BaseCase):
+class Test(E2ECase):
     def test(self):
         test_setup = End2EndTestSetup(path_to_test_file=__file__)
 

diff --git a/...ty/UC30_view_document/UC30_T02_document_has_content/test_UC30_T02_document_has_content.py b/...ty/UC30_view_document/UC30_T02_document_has_content/test_UC30_T02_document_has_content.py
@@ -1,5 +1,4 @@
-from seleniumbase import BaseCase
-
+from tests.end2end.e2e_case import E2ECase
 from tests.end2end.end2end_test_setup import End2EndTestSetup
 from tests.end2end.helpers.components.viewtype_selector import ViewType_Selector
 from tests.end2end.helpers.screens.project_index.screen_project_index import (
@@ -8,7 +7,7 @@
 from tests.end2end.server import SDocTestServer
 
 
-class Test_UC30_T02_document_has_content(BaseCase):
+class Test(E2ECase):
     def test(self):
         test_setup = End2EndTestSetup(path_to_test_file=__file__)