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-3438 Widgets | Fix | Filter already used suggested types (#2225)

Browse source
This commit is contained in:
Evgenii Kozlov 2025-04-02 09:19:02 +02:00 • committed by GitHub
parent 8835800699
commit 34999aa788
Signed by: github
GPG key ID: B5690EEEBB952194
4 changed files with 70 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/anytypeio/anytype/di/feature/widgets/SelectWidgetSourceDI.kt
View file

@ -6,6 +6,7 @@ import com.anytypeio.anytype.di.common.ComponentDependencies
import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes
import com.anytypeio.anytype.domain.block.repo.BlockRepository
import com.anytypeio.anytype.domain.debugging.Logger
import com.anytypeio.anytype.domain.misc.UrlBuilder
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.domain.primitives.FieldParser
@ -51,6 +52,7 @@ interface SelectWidgetSourceDependencies : ComponentDependencies {
fun analyticsHelper(): AnalyticSpaceHelperDelegate
fun searchObjects(): SearchObjects
fun fieldParser(): FieldParser
fun logger(): Logger
}
@Module

65
domain/src/main/java/com/anytypeio/anytype/domain/widgets/GetSuggestedWidgetTypes.kt
View file

@ -1,9 +1,16 @@
package com.anytypeio.anytype.domain.widgets
import com.anytypeio.anytype.core_models.Block
import com.anytypeio.anytype.core_models.DVFilter
import com.anytypeio.anytype.core_models.DVFilterCondition
import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.ObjectType
import com.anytypeio.anytype.core_models.ObjectTypeUniqueKeys
import com.anytypeio.anytype.core_models.ObjectWrapper
import com.anytypeio.anytype.core_models.Relations
import com.anytypeio.anytype.core_models.ext.asMap
import com.anytypeio.anytype.core_models.primitives.Space
import com.anytypeio.anytype.core_models.primitives.SpaceId
import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
import com.anytypeio.anytype.domain.base.ResultInteractor
import com.anytypeio.anytype.domain.block.repo.BlockRepository
@ -16,13 +23,34 @@ class GetSuggestedWidgetTypes @Inject constructor(
override suspend fun doWork(params: Params): List<ObjectWrapper.Type> {
// TODO DROID-3438 open widget object preview and filter out existing object types
val alreadyUsedObjectTypes = getAlreadyUsedTypes(
space = params.space,
widgets = params.ctx
)
val types = repo.searchObjects(
space = params.space,
limit = DEFAULT_LIMIT,
filters = params.objectTypeFilters,
keys = params.objectTypeKeys
keys = params.objectTypeKeys,
filters = buildList {
addAll(params.objectTypeFilters)
if (alreadyUsedObjectTypes.isNotEmpty()) {
add(
DVFilter(
relation = Relations.ID,
condition = DVFilterCondition.NOT_IN,
value = alreadyUsedObjectTypes
)
)
}
add(
DVFilter(
relation = Relations.UNIQUE_KEY,
condition = DVFilterCondition.NOT_EQUAL,
value = ObjectTypeUniqueKeys.OBJECT_TYPE
)
)
}
).map { result ->
ObjectWrapper.Type(result)
}
@ -30,8 +58,39 @@ class GetSuggestedWidgetTypes @Inject constructor(
return types
}
private suspend fun getAlreadyUsedTypes(space: SpaceId, widgets: Id) : List<Id> {
val result = mutableListOf<Id>()
runCatching {
val preview = repo.getObject(space = space, id = widgets)
val map = preview.blocks.asMap()
map.getOrDefault(widgets, emptyList()).forEach { block ->
if (block.content is Block.Content.Widget && block.children.isNotEmpty()) {
val link = preview.blocks.find { it.id == block.children.first() }
val content = link?.content
if (content is Block.Content.Link) {
val source = preview.details.getOrDefault(
content.target,
emptyMap()
)
val wrapper = ObjectWrapper.Basic(source)
if (wrapper.layout == ObjectType.Layout.OBJECT_TYPE) {
result.add(wrapper.id)
}
}
}
}
}
return result.distinct()
}
data class Params(
val space: Space,
val ctx: Id,
val objectTypeFilters: List<DVFilter>,
val objectTypeKeys: List<Id>
)

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

@ -771,7 +771,7 @@ object ObjectSearchConstants {
recommendedLayouts: List<ObjectType.Layout> = emptyList(),
excludedTypeKeys: List<TypeKey> = emptyList(),
excludeParticipant: Boolean = true,
excludeTemplates: Boolean = true
excludeTemplates: Boolean = true,
): List<DVFilter> {
return buildList {
addAll(

9
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetSourceViewModel.kt
View file

@ -146,7 +146,7 @@ class SelectWidgetSourceViewModel(
target = target,
isInEditMode = isInEditMode
)
proceedWithSearchQuery()
proceedWithSearchQuery(ctx)
}
fun onStartWithExistingWidget(
@ -164,10 +164,10 @@ class SelectWidgetSourceViewModel(
type = type,
isInEditMode = isInEditMode
)
proceedWithSearchQuery()
proceedWithSearchQuery(ctx)
}
private fun proceedWithSearchQuery() {
private fun proceedWithSearchQuery(ctx: Id) {
viewModelScope.launch {
getSuggestedWidgetTypes.async(
params = GetSuggestedWidgetTypes.Params(
@ -182,7 +182,8 @@ class SelectWidgetSourceViewModel(
)
addAll(ObjectSearchConstants.filterTypes())
},
objectTypeKeys = ObjectSearchConstants.defaultKeysObjectType
objectTypeKeys = ObjectSearchConstants.defaultKeysObjectType,
ctx = ctx
)
).onSuccess { types ->
suggested.value = types.map { type ->