anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1925 Types | Fix | Extend search api to be able to include several spaces when needed (#573)

Browse source
This commit is contained in:
Evgenii Kozlov 2023-11-20 13:54:52 +01:00 • committed by GitHub
parent 5b9dedffad
commit 9a467e62a0
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,7 +559,9 @@ open class EditorTestSetup {
repo.stub {
onBlocking {
searchObjects(
filters = ObjectSearchConstants.filterTypes(workspaceId),
filters = ObjectSearchConstants.filterTypes(
spaces = listOf(workspaceId)
),
keys = ObjectSearchConstants.defaultKeysObjectType,
sorts = emptyList(),
limit = 0,

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

@ -4843,7 +4843,9 @@ class EditorViewModel(
val params = GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = buildList {
add(spaceManager.get())
},
recommendedLayouts = SupportedLayouts.editorLayouts
),
keys = ObjectSearchConstants.defaultKeysObjectType
@ -5919,7 +5921,9 @@ class EditorViewModel(
val params = GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = buildList {
add(spaceManager.get())
},
recommendedLayouts = SupportedLayouts.createObjectLayouts
),
keys = ObjectSearchConstants.defaultKeysObjectType

2
presentation/src/main/java/com/anytypeio/anytype/presentation/library/delegates/LibraryTypesDelegate.kt
View file

@ -49,7 +49,7 @@ class LibraryTypesDelegate @Inject constructor(
subscription = SUB_LIBRARY_TYPES,
keys = ObjectSearchConstants.defaultKeys,
filters = ObjectSearchConstants.filterTypes(
spaceId = MARKETPLACE_SPACE_ID
spaces = listOf(MARKETPLACE_SPACE_ID)
)
)
}

2
presentation/src/main/java/com/anytypeio/anytype/presentation/library/delegates/MyTypesDelegate.kt
View file

@ -63,7 +63,7 @@ class MyTypesDelegate @Inject constructor(
Relations.RESTRICTIONS
),
filters = ObjectSearchConstants.filterTypes(
spaceId = space
spaces = listOf(space)
)
)
}

2
presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModel.kt
View file

@ -126,7 +126,7 @@ class MoveToViewModel(
val params = GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = listOf(spaceManager.get()),
recommendedLayouts = SupportedLayouts.editorLayouts
),
keys = ObjectSearchConstants.defaultKeysObjectType

2
presentation/src/main/java/com/anytypeio/anytype/presentation/objects/CreateObjectOfTypeViewModel.kt
View file

@ -37,7 +37,7 @@ class CreateObjectOfTypeViewModel(
GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = listOf(spaceManager.get()),
recommendedLayouts = SupportedLayouts.createObjectLayouts
),
keys = ObjectSearchConstants.defaultKeysObjectType,

4
presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModel.kt
View file

@ -236,7 +236,7 @@ class ObjectTypeChangeViewModel(
filters = buildList {
addAll(
ObjectSearchConstants.filterTypes(
spaceId = Marketplace.MARKETPLACE_SPACE_ID,
spaces = listOf(Marketplace.MARKETPLACE_SPACE_ID),
recommendedLayouts = SupportedLayouts.editorLayouts
)
)
@ -263,7 +263,7 @@ class ObjectTypeChangeViewModel(
) = getObjectTypes.run(
GetObjectTypes.Params(
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = listOf(spaceManager.get()),
recommendedLayouts = SupportedLayouts.editorLayouts
),
sorts = ObjectSearchConstants.defaultObjectSearchSorts(),

6
presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchConstants.kt
View file

@ -641,7 +641,7 @@ object ObjectSearchConstants {
//region OBJECT TYPES
fun filterTypes(
spaceId: Id,
spaces: List<Id>,
recommendedLayouts: List<ObjectType.Layout> = emptyList()
): List<DVFilter> {
return buildList {
@ -669,8 +669,8 @@ object ObjectSearchConstants {
),
DVFilter(
relation = Relations.SPACE_ID,
condition = DVFilterCondition.EQUAL,
value = spaceId
condition = DVFilterCondition.IN,
value = spaces
)
)
)

2
presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt
View file

@ -118,7 +118,7 @@ open class ObjectSearchViewModel(
val params = GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get()
spaces = listOf(spaceManager.get())
),
keys = ObjectSearchConstants.defaultKeysObjectType
)

2
presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
View file

@ -1805,7 +1805,7 @@ class ObjectSetViewModel(
private suspend fun fetchAndProcessObjectTypes(selectedType: Id, widgetState: TypeTemplatesWidgetUI.Data) {
val filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get(),
spaces = listOf(spaceManager.get()),
recommendedLayouts = SupportedLayouts.createObjectLayouts
)
val params = GetObjectTypes.Params(

2
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/collection/CollectionViewModel.kt
View file

@ -166,7 +166,7 @@ class CollectionViewModel(
val params = GetObjectTypes.Params(
sorts = emptyList(),
filters = ObjectSearchConstants.filterTypes(
spaceId = spaceManager.get()
spaces = listOf(spaceManager.get())
),
keys = ObjectSearchConstants.defaultKeysObjectType
)

31
presentation/src/test/java/com/anytypeio/anytype/presentation/types/ObjectTypeChangeViewModelTest.kt
View file

@ -111,7 +111,10 @@ class ObjectTypeChangeViewModelTest {
stubSpaceManager(spaceId)
val vm = givenViewModel()
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(spaceId, SupportedLayouts.editorLayouts)
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(
spaces = listOf(spaceId),
recommendedLayouts = SupportedLayouts.editorLayouts
)
// TESTING
@ -150,14 +153,17 @@ class ObjectTypeChangeViewModelTest {
stubSpaceManager(spaceId)
val vm = givenViewModel()
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(spaceId, SupportedLayouts.editorLayouts)
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(
spaces = listOf(spaceId),
recommendedLayouts = SupportedLayouts.editorLayouts
)
val expectedMyTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeFilters = buildList {
addAll(
ObjectSearchConstants.filterTypes(
spaceId = MARKETPLACE_SPACE_ID,
spaces = listOf(MARKETPLACE_SPACE_ID),
recommendedLayouts = SupportedLayouts.editorLayouts
)
)
@ -241,14 +247,17 @@ class ObjectTypeChangeViewModelTest {
stubSpaceManager(spaceId)
val vm = givenViewModel()
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(spaceId, SupportedLayouts.editorLayouts)
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(
spaces = listOf(spaceId),
recommendedLayouts = SupportedLayouts.editorLayouts
)
val expectedMyTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeFilters = buildList {
addAll(
ObjectSearchConstants.filterTypes(
spaceId = MARKETPLACE_SPACE_ID,
spaces = listOf(MARKETPLACE_SPACE_ID),
recommendedLayouts = SupportedLayouts.editorLayouts
)
)
@ -410,14 +419,17 @@ class ObjectTypeChangeViewModelTest {
val expectedInstalledTypeId = MockDataFactory.randomUuid()
val expectedInstalledTypeUniqueKey = ObjectTypeIds.PAGE
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(space, SupportedLayouts.editorLayouts)
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(
spaces = listOf(space),
recommendedLayouts = SupportedLayouts.editorLayouts
)
val expectedMyTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeKeys = ObjectSearchConstants.defaultKeysObjectType
val expectedMarketplaceTypeFilters = buildList {
addAll(
ObjectSearchConstants.filterTypes(
spaceId = MARKETPLACE_SPACE_ID,
spaces = listOf(MARKETPLACE_SPACE_ID),
recommendedLayouts = SupportedLayouts.editorLayouts
)
)
@ -556,7 +568,10 @@ class ObjectTypeChangeViewModelTest {
stubSpaceManager(spaceId)
val vm = givenViewModel()
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(spaceId, SupportedLayouts.editorLayouts)
val expectedMyTypesFilters = ObjectSearchConstants.filterTypes(
spaces = listOf(spaceId),
recommendedLayouts = SupportedLayouts.editorLayouts
)
val expectedMyTypeKeys = ObjectSearchConstants.defaultKeysObjectType
blockRepository.stub {