narvey/anytype-kotlin-wild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DROID-1788 Widgets | Fix | Collection in the widget contains random objects (#594)

Browse Source
This commit is contained in:
Evgenii Kozlov 2023-11-23 14:38:24 +01:00 committed by uburoiubu
parent 03e844d8bb
commit d1450251c6
No known key found for this signature in database
GPG Key ID: C8FB80E0A595FBB6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt
View File

@ -4,6 +4,7 @@ import com.anytypeio.anytype.core_models.DV
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.ObjectTypeIds
import com.anytypeio.anytype.core_models.ObjectView
import com.anytypeio.anytype.core_models.ObjectWrapper
@ -161,7 +162,7 @@ class DataViewListWidgetContainer(
addAll(ObjectSearchConstants.defaultDataViewFilters(space))
add(
DVFilter(
relation = Relations.TYPE,
relation = Relations.TYPE_UNIQUE_KEY,
condition = DVFilterCondition.NOT_IN,
value = listOf(
ObjectTypeIds.OBJECT_TYPE,
@ -181,8 +182,8 @@ class DataViewListWidgetContainer(
},
limit = resolveLimit(),
source = source.setOf,
collection = if (source.type.contains(ObjectTypeIds.COLLECTION))
source.id
collection = if (isCollection())
root
else
null
)
@ -193,3 +194,8 @@ class DataViewListWidgetContainer(
limit = widget.limit
)
}
fun ObjectView.isCollection(): Boolean {
val wrapper = ObjectWrapper.Basic(details.getOrDefault(root, emptyMap()))
return wrapper.layout == ObjectType.Layout.COLLECTION
}

2
presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModelTest.kt
View File

@ -2443,7 +2443,7 @@ class HomeScreenViewModelTest {
addAll(ObjectSearchConstants.defaultDataViewFilters(defaultSpaceConfig.space))
add(
DVFilter(
relation = Relations.TYPE,
relation = Relations.TYPE_UNIQUE_KEY,
condition = DVFilterCondition.NOT_IN,
value = listOf(
ObjectTypeIds.OBJECT_TYPE,