Skip to content

DROID-4115 Spaces | Fix | Data space vs. chat space object filtering logic #2868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 13, 2025
Merged

DROID-4115 Spaces | Fix | Data space vs. chat space object filtering logic #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13dd957
DROID-4115 fixes
uburoiubu Nov 12, 2025
4991ad5
DROID-4115 fixes
uburoiubu Nov 12, 2025
4d16ebb
DROID-4115 fixes
uburoiubu Nov 12, 2025
9bfe8f7
DROID-4115 fixes
uburoiubu Nov 13, 2025
063e986
DROID-4115 fixes
uburoiubu Nov 13, 2025
22938e1
DROID-4115 fixes
uburoiubu Nov 13, 2025
487476a
Merge branch 'main' into DROID-4115-chat-space-decluttering
uburoiubu Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...c/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
import com.anytypeio.anytype.domain.objects.ObjectStore
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
Expand Down Expand Up @@ -77,6 +78,9 @@ class CreateSelectedFilterTest {
@Mock
lateinit var fieldParser: FieldParser

@Mock
lateinit var spaceViews: SpaceViewSubscriptionContainer

private lateinit var updateDataViewViewer: UpdateDataViewViewer
private lateinit var searchObjects: SearchObjects
private lateinit var getOptions: GetOptions
Expand Down Expand Up @@ -109,7 +113,8 @@ class CreateSelectedFilterTest {
objectSetDatabase = db,
getOptions = getOptions,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}

Expand Down
7 changes: 6 additions & 1 deletion ...androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
import com.anytypeio.anytype.domain.objects.ObjectStore
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
Expand Down Expand Up @@ -82,6 +83,9 @@ class ModifyInputValueFilterTest {
@Mock
lateinit var fieldParser: FieldParser

@Mock
lateinit var spaceViews: SpaceViewSubscriptionContainer

private lateinit var updateDataViewViewer: UpdateDataViewViewer
private lateinit var searchObjects: SearchObjects
private lateinit var getOptions: GetOptions
Expand Down Expand Up @@ -113,7 +117,8 @@ class ModifyInputValueFilterTest {
objectSetDatabase = db,
getOptions = getOptions,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}

Expand Down
7 changes: 6 additions & 1 deletion ...src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
import com.anytypeio.anytype.domain.objects.ObjectStore
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
Expand Down Expand Up @@ -81,6 +82,9 @@ class ModifyStatusFilterTest {
@Mock
lateinit var spaceManager: SpaceManager

@Mock
lateinit var spaceViews: SpaceViewSubscriptionContainer

private lateinit var updateDataViewViewer: UpdateDataViewViewer
private lateinit var searchObjects: SearchObjects
private lateinit var getOptions: GetOptions
Expand Down Expand Up @@ -113,7 +117,8 @@ class ModifyStatusFilterTest {
storeOfRelations = storeOfRelations,
objectSetDatabase = db,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}

Expand Down
7 changes: 6 additions & 1 deletion app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
import com.anytypeio.anytype.domain.objects.ObjectStore
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
Expand Down Expand Up @@ -80,6 +81,9 @@ class ModifyTagFilterTest {
@Mock
lateinit var fieldParser: FieldParser

@Mock
lateinit var spaceViews: SpaceViewSubscriptionContainer

private lateinit var updateDataViewViewer: UpdateDataViewViewer
private lateinit var searchObjects: SearchObjects
private lateinit var getOptions: GetOptions
Expand Down Expand Up @@ -112,7 +116,8 @@ class ModifyTagFilterTest {
objectSetDatabase = db,
getOptions = getOptions,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}

Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectDI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.anytypeio.anytype.di.common.ComponentDependencies
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
Expand Down Expand Up @@ -46,7 +47,7 @@ interface LinkToObjectDependencies: ComponentDependencies {
fun dateProvider(): DateProvider
fun fieldParser(): FieldParser
fun storeOfObjectTypes(): StoreOfObjectTypes

fun spaceViews(): SpaceViewSubscriptionContainer
}

@Module
Expand All @@ -63,7 +64,8 @@ object LinkToObjectModule {
analytics: Analytics,
analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
fieldParser: FieldParser,
storeOfObjectTypes: StoreOfObjectTypes
storeOfObjectTypes: StoreOfObjectTypes,
spaceViews: SpaceViewSubscriptionContainer
): LinkToObjectViewModelFactory = LinkToObjectViewModelFactory(
vmParams = vmParams,
urlBuilder = urlBuilder,
Expand All @@ -72,6 +74,7 @@ object LinkToObjectModule {
analytics = analytics,
analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
fieldParser = fieldParser,
storeOfObjectTypes = storeOfObjectTypes
storeOfObjectTypes = storeOfObjectTypes,
spaceViews = spaceViews
)
}
}
7 changes: 5 additions & 2 deletions app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectOrWebDi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics
import com.anytypeio.anytype.core_utils.di.scope.PerModal
import com.anytypeio.anytype.core_utils.tools.UrlValidator
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
Expand Down Expand Up @@ -49,7 +50,8 @@ object LinkToObjectOrWebModule {
stores: Editor.Storage,
urlValidator: UrlValidator,
analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
fieldParser: FieldParser
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): LinkToObjectOrWebViewModelFactory = LinkToObjectOrWebViewModelFactory(
vmParams = vmParams,
urlBuilder = urlBuilder,
Expand All @@ -59,6 +61,7 @@ object LinkToObjectOrWebModule {
stores = stores,
urlValidator = urlValidator,
analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
17 changes: 12 additions & 5 deletions app/src/main/java/com/anytypeio/anytype/di/feature/ObjectValueDI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.anytypeio.anytype.core_utils.di.scope.PerModal
import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
import com.anytypeio.anytype.domain.block.repo.BlockRepository
import com.anytypeio.anytype.domain.misc.UrlBuilder
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.`object`.DuplicateObject
import com.anytypeio.anytype.domain.`object`.UpdateDetail
import com.anytypeio.anytype.domain.objects.SetObjectListIsArchived
Expand Down Expand Up @@ -74,6 +75,7 @@ object ObjectValueObjectModule {
analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
storeOfRelations: StoreOfRelations,
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
Expand All @@ -89,7 +91,8 @@ object ObjectValueObjectModule {
duplicateObject = duplicateObject,
analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
storeOfRelations = storeOfRelations,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
//endregion
Expand Down Expand Up @@ -132,7 +135,8 @@ object ObjectValueSetModule {
duplicateObject: DuplicateObject,
analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
storeOfRelations: StoreOfRelations,
fieldParser: FieldParser
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
Expand All @@ -148,7 +152,8 @@ object ObjectValueSetModule {
duplicateObject = duplicateObject,
analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
storeOfRelations = storeOfRelations,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
//endregion
Expand Down Expand Up @@ -191,7 +196,8 @@ object ObjectValueDataViewModule {
duplicateObject: DuplicateObject,
analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
storeOfRelations: StoreOfRelations,
fieldParser: FieldParser
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
Expand All @@ -207,7 +213,8 @@ object ObjectValueDataViewModule {
duplicateObject = duplicateObject,
analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
storeOfRelations = storeOfRelations,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
//endregion
4 changes: 3 additions & 1 deletion app/src/main/java/com/anytypeio/anytype/di/feature/objects/SelectObjectTypeDI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository
import com.anytypeio.anytype.domain.config.ConfigStorage
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.workspace.SpaceManager
import com.anytypeio.anytype.presentation.analytics.AnalyticSpaceHelperDelegate
import com.anytypeio.anytype.presentation.objects.SelectObjectTypeViewModel
Expand Down Expand Up @@ -56,4 +57,5 @@ interface SelectObjectTypeDependencies : ComponentDependencies {
fun userSettingsRepository(): UserSettingsRepository
fun provideSpaceManger(): SpaceManager
fun provideUrlBuilder(): UrlBuilder
}
fun spaceViews(): SpaceViewSubscriptionContainer
}
7 changes: 5 additions & 2 deletions app/src/main/java/com/anytypeio/anytype/di/feature/sets/CreateFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
import com.anytypeio.anytype.domain.workspace.SpaceManager
Expand Down Expand Up @@ -54,7 +55,8 @@ object CreateFilterModule {
analytics: Analytics,
getOptions: GetOptions,
spaceManager: SpaceManager,
fieldParser: FieldParser
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): FilterViewModel.Factory = FilterViewModel.Factory(
objectState = state,
dispatcher = dispatcher,
Expand All @@ -67,6 +69,7 @@ object CreateFilterModule {
analytics = analytics,
getOptions = getOptions,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
7 changes: 5 additions & 2 deletions app/src/main/java/com/anytypeio/anytype/di/feature/sets/ModifyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.domain.objects.options.GetOptions
import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
import com.anytypeio.anytype.domain.primitives.FieldParser
import com.anytypeio.anytype.domain.search.SearchObjects
import com.anytypeio.anytype.domain.workspace.SpaceManager
Expand Down Expand Up @@ -54,7 +55,8 @@ object ModifyFilterModule {
getOptions: GetOptions,
storeOfRelations: StoreOfRelations,
spaceManager: SpaceManager,
fieldParser: FieldParser
fieldParser: FieldParser,
spaceViews: SpaceViewSubscriptionContainer
): FilterViewModel.Factory = FilterViewModel.Factory(
objectState = state,
dispatcher = dispatcher,
Expand All @@ -67,6 +69,7 @@ object ModifyFilterModule {
analytics = analytics,
getOptions = getOptions,
spaceManager = spaceManager,
fieldParser = fieldParser
fieldParser = fieldParser,
spaceViews = spaceViews
)
}
Loading