From 1652dc1b4c8eb6c7cb0bd3ffa53d19fb3225106a Mon Sep 17 00:00:00 2001
From: Evgenii Kozlov <ubuphobos@gmail.com>
Date: Wed, 13 Sep 2023 18:32:34 +0200
Subject: [PATCH] DROID-1729 Sets or Collections | Fix |  Fix broken logic for
 searching relations for data view sorts (#371)

---
 .../modals/sort/SelectSortRelationFragment.kt    | 16 +++++++++++++++-
 .../presentation/sets/SearchRelationViewModel.kt |  7 +++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/SelectSortRelationFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/SelectSortRelationFragment.kt
index be674dff22..30c9ddaf32 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/SelectSortRelationFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/SelectSortRelationFragment.kt
@@ -14,7 +14,11 @@ import com.anytypeio.anytype.R
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_ui.features.sets.SearchRelationAdapter
 import com.anytypeio.anytype.core_ui.reactive.textChanges
-import com.anytypeio.anytype.core_utils.ext.*
+import com.anytypeio.anytype.core_utils.ext.arg
+import com.anytypeio.anytype.core_utils.ext.drawable
+import com.anytypeio.anytype.core_utils.ext.invisible
+import com.anytypeio.anytype.core_utils.ext.subscribe
+import com.anytypeio.anytype.core_utils.ext.visible
 import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetTextInputFragment
 import com.anytypeio.anytype.databinding.FragmentSelectSortOrFilterRelationBinding
 import com.anytypeio.anytype.di.common.componentManager
@@ -75,6 +79,16 @@ class SelectSortRelationFragment : BaseBottomSheetTextInputFragment<FragmentSele
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        vm.onStart(viewer)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        vm.onStop()
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         with(lifecycleScope) {
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModel.kt
index 3a9c4e2950..d9723c0c22 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModel.kt
@@ -3,6 +3,7 @@ package com.anytypeio.anytype.presentation.sets
 import androidx.lifecycle.viewModelScope
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.Relations
+import com.anytypeio.anytype.core_utils.ext.cancel
 import com.anytypeio.anytype.core_utils.ext.withLatestFrom
 import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.presentation.common.BaseListViewModel
@@ -44,8 +45,7 @@ abstract class SearchRelationViewModel(
                     objectState = objectState.value,
                     viewerId = viewerId,
                     storeOfRelations = storeOfRelations
-                )
-                    .filterNot { notAllowedRelations(it) }
+                ).filterNot { notAllowedRelations(it) }
         }
         // Searching and mapping views based on query changes.
         jobs += viewModelScope.launch {
@@ -73,8 +73,7 @@ abstract class SearchRelationViewModel(
     }
 
     fun onStop() {
-        jobs.forEach { it.cancel() }
-        jobs.clear()
+        jobs.cancel()
     }
 
     protected open suspend fun filterRelationsFromAlreadyInUse(