DROID-4115 Spaces | Tech | Fix search filters (filtering out chats in chat spaces, showing them in data spaces)

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

@@ -10,6 +10,7 @@ import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes
 import com.anytypeio.anytype.domain.block.repo.BlockRepository
 import com.anytypeio.anytype.domain.misc.DateProvider
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
 import com.anytypeio.anytype.domain.primitives.FieldParser
 import com.anytypeio.anytype.domain.search.SearchObjects
@@ -79,4 +80,5 @@ interface BacklinkOrAddToObjectDependencies : ComponentDependencies {
     fun dateProvider(): DateProvider
     fun fieldParser(): FieldParser
     fun storeOfObjectTypes(): StoreOfObjectTypes
-}
+    fun spaceViews(): SpaceViewSubscriptionContainer
+}

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

@@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.block.repo.BlockRepository
 import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
 import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.domain.primitives.FieldParser
@@ -60,4 +61,5 @@ interface GlobalSearchDependencies : ComponentDependencies {
     fun analyticsHelper(): AnalyticSpaceHelperDelegate
     fun userSettingsRepository(): UserSettingsRepository
     fun fieldParser(): FieldParser
-}
+    fun spaceViews(): SpaceViewSubscriptionContainer
+}

core-models/src/main/java/com/anytypeio/anytype/core_models/SupportedLayouts.kt

@@ -134,7 +134,7 @@ object SupportedLayouts {
      */
     fun getSystemLayouts(spaceUxType: SpaceUxType?): List<ObjectType.Layout> {
         return when (spaceUxType) {
-            SpaceUxType.CHAT -> baseSystemLayouts + listOf(ObjectType.Layout.CHAT_DERIVED)
+            SpaceUxType.CHAT -> baseSystemLayouts + listOf(ObjectType.Layout.CHAT_DERIVED, ObjectType.Layout.CHAT)
             else -> baseSystemLayouts
         }
     }
@@ -170,4 +170,21 @@ object SupportedLayouts {
             else -> baseLayouts + listOf(ObjectType.Layout.CHAT_DERIVED)
         }
     }
+
+    /**
+     * Get layouts for object search (global search, link to, etc.).
+     * 
+     * Combines base layouts, file layouts, date layouts, and object type layout,
+     * filtered by space UX type.
+     * 
+     * @param spaceUxType The UX type of the current space
+     * @return List of layouts for object search operations
+     */
+    fun getObjectSearchLayouts(spaceUxType: SpaceUxType? = null): List<ObjectType.Layout> {
+        return getLayouts(spaceUxType)
+            .plus(fileLayouts)
+            .plus(dateLayouts)
+            .plus(listOf(ObjectType.Layout.OBJECT_TYPE))
+            .distinct()
+    }
 }

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

@@ -6526,11 +6526,13 @@ class EditorViewModel(
                 return
             }
             val fullText = filter.removePrefix(MENTION_PREFIX)
+            val spaceUxType = spaceViews.get(vmParams.space)?.spaceUxType
             val params = SearchObjects.Params(
                 space = vmParams.space,
                 limit = ObjectSearchViewModel.SEARCH_LIMIT,
                 filters = ObjectSearchConstants.getFilterLinkTo(
-                    ignore = context
+                    ignore = context,
+                    spaceUxType = spaceUxType
                 ),
                 sorts = ObjectSearchConstants.sortLinkTo,
                 fulltext = fullText,

presentation/src/main/java/com/anytypeio/anytype/presentation/linking/BackLinkOrAddToObjectViewModel.kt

@@ -9,6 +9,7 @@ import com.anytypeio.anytype.domain.base.Resultat
 import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes
 import com.anytypeio.anytype.domain.misc.DateProvider
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
 import com.anytypeio.anytype.domain.primitives.FieldParser
 import com.anytypeio.anytype.domain.search.SearchObjects
@@ -30,6 +31,7 @@ class BackLinkOrAddToObjectViewModel(
     analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
     fieldParser: FieldParser,
     storeOfObjectTypes: StoreOfObjectTypes,
+    spaceViews: SpaceViewSubscriptionContainer
 ) : ObjectSearchViewModel(
     vmParams = vmParams,
     urlBuilder = urlBuilder,
@@ -38,7 +40,8 @@ class BackLinkOrAddToObjectViewModel(
     analytics = analytics,
     analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
     fieldParser = fieldParser,
-    storeOfObjectTypes = storeOfObjectTypes
+    storeOfObjectTypes = storeOfObjectTypes,
+    spaceViews = spaceViews
 ) {
 
     private val _commands = MutableSharedFlow<Command>(replay = 0)

presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectOrWebViewModel.kt

@@ -237,9 +237,15 @@ class LinkToObjectOrWebViewModel(
     fun getSearchObjectsParams(ignore: Id) = SearchObjects.Params(
         space = vmParams.space,
         limit = ObjectSearchViewModel.SEARCH_LIMIT,
-        filters = ObjectSearchConstants.getFilterLinkTo(
-            ignore = ignore
-        ),
+        filters = buildList {
+            val spaceUxType = spaceViews.get(vmParams.space)?.spaceUxType
+            addAll(
+                ObjectSearchConstants.getFilterLinkTo(
+                    ignore = ignore,
+                    spaceUxType = spaceUxType
+                )
+            )
+        },
         sorts = ObjectSearchConstants.sortLinkTo,
         fulltext = ObjectSearchViewModel.EMPTY_QUERY,
         keys = ObjectSearchConstants.defaultKeys

presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModel.kt

@@ -39,7 +39,8 @@ class LinkToObjectViewModel(
     analytics = analytics,
     analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
     fieldParser = fieldParser,
-    storeOfObjectTypes = storeOfObjectTypes
+    storeOfObjectTypes = storeOfObjectTypes,
+    spaceViews = spaceViews
 ) {
 
     val commands = MutableSharedFlow<Command>(replay = 0)
@@ -51,9 +52,15 @@ class LinkToObjectViewModel(
     override suspend fun getSearchObjectsParams(ignore: Id?) = SearchObjects.Params(
         space = vmParams.space,
         limit = SEARCH_LIMIT,
-        filters = ObjectSearchConstants.getFilterLinkTo(
-            ignore = ignore
-        ),
+        filters = buildList {
+            val spaceUxType = spaceViews.get(vmParams.space)?.spaceUxType
+            addAll(
+                ObjectSearchConstants.getFilterLinkTo(
+                    ignore = ignore,
+                    spaceUxType = spaceUxType
+                )
+            )
+        },
         sorts = ObjectSearchConstants.sortLinkTo,
         fulltext = EMPTY_QUERY,
         keys = ObjectSearchConstants.defaultKeys

presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModelFactory.kt

@@ -81,7 +81,8 @@ class BackLinkOrAddToObjectViewModelFactory @Inject constructor(
     private val analytics: Analytics,
     private val analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
     private val fieldParser: FieldParser,
-    private val storeOfObjectTypes: StoreOfObjectTypes
+    private val storeOfObjectTypes: StoreOfObjectTypes,
+    private val spaceViews: SpaceViewSubscriptionContainer
 ) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
@@ -94,7 +95,8 @@ class BackLinkOrAddToObjectViewModelFactory @Inject constructor(
             analytics = analytics,
             analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
             fieldParser = fieldParser,
-            storeOfObjectTypes = storeOfObjectTypes
+            storeOfObjectTypes = storeOfObjectTypes,
+            spaceViews = spaceViews
         ) as T
     }
 }

presentation/src/main/java/com/anytypeio/anytype/presentation/search/GlobalSearchViewModel.kt

@@ -32,6 +32,7 @@ import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.domain.base.Resultat
 import com.anytypeio.anytype.domain.base.fold
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
 import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.domain.objects.getTypeOfObject
@@ -77,7 +78,8 @@ class GlobalSearchViewModel @Inject constructor(
     private val analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
     private val restoreGlobalSearchHistory: RestoreGlobalSearchHistory,
     private val updateGlobalSearchHistory: UpdateGlobalSearchHistory,
-    private val fieldParser: FieldParser
+    private val fieldParser: FieldParser,
+    private val spaceViews: SpaceViewSubscriptionContainer
 ) : BaseViewModel(), AnalyticSpaceHelperDelegate by analyticSpaceHelperDelegate {
 
     private val userInput = MutableStateFlow("")
@@ -278,7 +280,8 @@ class GlobalSearchViewModel @Inject constructor(
                 offset = 0,
                 keys = DEFAULT_KEYS,
                 filters = buildList {
-                    addAll(filterSearchObjects())
+                    val spaceUxType = spaceViews.get(vmParams.space)?.spaceUxType
+                    addAll(filterSearchObjects(spaceUxType = spaceUxType))
                     add(
                         DVFilter(
                             relation = Relations.ID,
@@ -307,7 +310,10 @@ class GlobalSearchViewModel @Inject constructor(
                     limit = DEFAULT_SEARCH_LIMIT,
                     offset = 0,
                     keys = DEFAULT_KEYS,
-                    filters = ObjectSearchConstants.filterSearchObjects(),
+                    filters = buildList {
+                        val spaceUxType = spaceViews.get(vmParams.space)?.spaceUxType
+                        addAll(ObjectSearchConstants.filterSearchObjects(spaceUxType = spaceUxType))
+                    },
                     sorts = ObjectSearchConstants.sortsSearchObjects,
                     withMetaRelationDetails = true,
                     withMeta = true,
@@ -420,7 +426,8 @@ class GlobalSearchViewModel @Inject constructor(
         private val analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
         private val restoreGlobalSearchHistory: RestoreGlobalSearchHistory,
         private val updateGlobalSearchHistory: UpdateGlobalSearchHistory,
-        private val fieldParser: FieldParser
+        private val fieldParser: FieldParser,
+        private val spaceViews: SpaceViewSubscriptionContainer
     ) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
@@ -434,7 +441,8 @@ class GlobalSearchViewModel @Inject constructor(
                 analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
                 restoreGlobalSearchHistory = restoreGlobalSearchHistory,
                 updateGlobalSearchHistory = updateGlobalSearchHistory,
-                fieldParser = fieldParser
+                fieldParser = fieldParser,
+                spaceViews = spaceViews
             ) as T
         }
     }