DROID-2764 Editor | Fix | User should be able to move or add an objec…

…t inside another object by drag-and-drop (#1928)

app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt

@@ -26,6 +26,7 @@ import com.anytypeio.anytype.domain.block.interactor.ClearBlockStyle
 import com.anytypeio.anytype.domain.block.interactor.CreateBlock
 import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock
 import com.anytypeio.anytype.domain.block.interactor.MergeBlocks
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.MoveOld
 import com.anytypeio.anytype.domain.block.interactor.RemoveLinkMark
 import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock
@@ -141,7 +142,7 @@ open class EditorTestSetup {
     lateinit var uploadBlock: UploadBlock
     lateinit var splitBlock: SplitBlock
     lateinit var updateBackgroundColor: UpdateBackgroundColor
-    lateinit var move: MoveOld
+    lateinit var move: Move
     lateinit var setRelationKey: SetRelationKey
     lateinit var updateDetail: UpdateDetail
 
@@ -371,7 +372,9 @@ open class EditorTestSetup {
             clipboard = clipboard,
             matcher = uriMatcher
         )
-        move = MoveOld(repo)
+        move = Move(
+            repo, dispatchers
+        )
         getObjectTypes = GetObjectTypes(repo, dispatchers)
 
         updateBackgroundColor = UpdateBackgroundColor(repo)

app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt

@@ -20,7 +20,7 @@ import com.anytypeio.anytype.domain.block.interactor.ClearBlockStyle
 import com.anytypeio.anytype.domain.block.interactor.CreateBlock
 import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock
 import com.anytypeio.anytype.domain.block.interactor.MergeBlocks
-import com.anytypeio.anytype.domain.block.interactor.MoveOld
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.RemoveLinkMark
 import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock
 import com.anytypeio.anytype.domain.block.interactor.SetLinkAppearance
@@ -447,7 +447,7 @@ object EditorSessionModule {
         createTable: CreateTable,
         fillTableRow: FillTableRow,
         matcher: DefaultPatternMatcher,
-        move: MoveOld,
+        move: Move,
         copy: Copy,
         paste: Paste,
         undo: Undo,
@@ -819,15 +819,6 @@ object EditorUseCaseModule {
         clipboard = clipboard
     )
 
-    @JvmStatic
-    @Provides
-    @PerScreen
-    fun provideMoveUseCase(
-        repo: BlockRepository
-    ): MoveOld = MoveOld(
-        repo = repo
-    )
-
     @JvmStatic
     @Provides
     @PerScreen

domain/src/main/java/com/anytypeio/anytype/domain/block/interactor/Move.kt

@@ -8,12 +8,13 @@ import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.base.ResultInteractor
 import com.anytypeio.anytype.domain.block.interactor.Move.Params
 import com.anytypeio.anytype.domain.block.repo.BlockRepository
+import javax.inject.Inject
 
 /**
  * Use-case for moving a group of blocks (cross-document, inside one document, one block after another, etc).
  * @see Params for details.
  */
-class Move(
+class Move @Inject constructor(
     private val repo: BlockRepository,
     appCoroutineDispatchers: AppCoroutineDispatchers
 ) : ResultInteractor<Params, Payload>(appCoroutineDispatchers.io) {

presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt

@@ -6360,7 +6360,7 @@ class EditorViewModel(
             orchestrator.proxies.intents.send(
                 Intent.Document.Move(
                     context = context,
-                    target = target,
+                    target = if (targetContext != context) "" else target,
                     targetContext = targetContext,
                     blocks = listOf(dragged),
                     position = position

presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt

@@ -4,13 +4,15 @@ import com.anytypeio.anytype.analytics.base.Analytics
 import com.anytypeio.anytype.analytics.event.EventAnalytics
 import com.anytypeio.anytype.core_models.Block
 import com.anytypeio.anytype.core_models.primitives.SpaceId
+import com.anytypeio.anytype.domain.base.fold
 import com.anytypeio.anytype.domain.base.suspendFold
 import com.anytypeio.anytype.domain.block.UpdateDivider
 import com.anytypeio.anytype.domain.block.interactor.ClearBlockContent
 import com.anytypeio.anytype.domain.block.interactor.ClearBlockStyle
 import com.anytypeio.anytype.domain.block.interactor.CreateBlock
 import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock
 import com.anytypeio.anytype.domain.block.interactor.MergeBlocks
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.MoveOld
 import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock
 import com.anytypeio.anytype.domain.block.interactor.SplitBlock
@@ -81,7 +83,7 @@ class Orchestrator(
     private val updateFields: UpdateFields,
     private val createTable: CreateTable,
     private val fillTableRow: FillTableRow,
-    private val move: MoveOld,
+    private val move: Move,
     private val copy: Copy,
     private val paste: Paste,
     private val undo: Undo,
@@ -417,20 +419,22 @@ class Orchestrator(
                     )
                 }
                 is Intent.Document.Move -> {
-                    move(
-                        params = MoveOld.Params(
+                    move.async(
+                        params = Move.Params(
                             context = intent.context,
                             targetContext = intent.targetContext,
                             targetId = intent.target,
                             blockIds = intent.blocks,
                             position = intent.position
                         )
-                    ).proceed(
-                        failure = defaultOnError,
-                        success = {
+                    ).fold(
+                        onSuccess = {
                             intent.onSuccess?.invoke()
                             proxies.payloads.send(it)
                             analytics.sendAnalyticsReorderBlockEvent(intent.blocks.size)
+                        },
+                        onFailure = {
+                            Timber.e(it, "Error while moving blocks")
                         }
                     )
                 }

presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt

@@ -33,6 +33,7 @@ import com.anytypeio.anytype.domain.block.interactor.ClearBlockStyle
 import com.anytypeio.anytype.domain.block.interactor.CreateBlock
 import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock
 import com.anytypeio.anytype.domain.block.interactor.MergeBlocks
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.MoveOld
 import com.anytypeio.anytype.domain.block.interactor.RemoveLinkMark
 import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock
@@ -277,7 +278,7 @@ open class EditorViewModelTest {
     lateinit var updateTitle: UpdateTitle
 
     @Mock
-    lateinit var move: MoveOld
+    lateinit var move: Move
 
     @Mock
     lateinit var turnIntoDocument: TurnIntoDocument

presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt

@@ -25,6 +25,7 @@ import com.anytypeio.anytype.domain.block.interactor.ClearBlockStyle
 import com.anytypeio.anytype.domain.block.interactor.CreateBlock
 import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock
 import com.anytypeio.anytype.domain.block.interactor.MergeBlocks
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.MoveOld
 import com.anytypeio.anytype.domain.block.interactor.RemoveLinkMark
 import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock
@@ -249,7 +250,7 @@ open class EditorPresentationTestSetup {
     lateinit var replaceBlock: ReplaceBlock
 
     @Mock
-    lateinit var move: MoveOld
+    lateinit var move: Move
 
     lateinit var fieldParser: FieldParser
 
@@ -574,7 +575,7 @@ open class EditorPresentationTestSetup {
 
     fun stubMove() {
         move.stub {
-            onBlocking { invoke(any()) } doReturn Either.Right(
+            onBlocking { async(any()) } doReturn Resultat.Success(
                 Payload(
                     context = root,
                     events = emptyList()

presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt

@@ -4,6 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.anytypeio.anytype.core_models.Block
 import com.anytypeio.anytype.core_models.Position
 import com.anytypeio.anytype.core_models.ext.content
+import com.anytypeio.anytype.domain.block.interactor.Move
 import com.anytypeio.anytype.domain.block.interactor.MoveOld
 import com.anytypeio.anytype.presentation.MockBlockFactory.link
 import com.anytypeio.anytype.presentation.editor.EditorViewModel
@@ -440,8 +441,8 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() {
         }
 
         verifyBlocking(move, times(1)) {
-            invoke(
-                params = MoveOld.Params(
+            async(
+                params = Move.Params(
                     context = root,
                     targetContext = root,
                     targetId = b.id,
@@ -511,8 +512,8 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() {
         }
 
         verifyBlocking(move, times(1)) {
-            invoke(
-                params = MoveOld.Params(
+            async(
+                params = Move.Params(
                     context = root,
                     targetContext = root,
                     targetId = b.id,
@@ -573,8 +574,8 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() {
         }
 
         verifyBlocking(move, times(1)) {
-            invoke(
-                params = MoveOld.Params(
+            async(
+                params = Move.Params(
                     context = root,
                     targetContext = b.content<Block.Content.Link>().target,
                     targetId = b.id,
@@ -882,8 +883,8 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() {
         // Verifying order of selected blocks used in request
 
         verifyBlocking(move, times(1)) {
-            invoke(
-                params = MoveOld.Params(
+            async(
+                params = Move.Params(
                     context = root,
                     targetContext = root,
                     targetId = a.id,