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-3601 Primitives | Tech | Storing archived types (#2357)

Browse source
This commit is contained in:
Konstantin Ivanov 2025-04-24 21:25:15 +02:00 • committed by Evgenii Kozlov
parent adc36f1a6b
commit fd1c45f780
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
domain/src/main/java/com/anytypeio/anytype/domain/search/ObjectTypesSubscriptionManager.kt
View file

@ -74,11 +74,6 @@ class ObjectTypesSubscriptionManager (
condition = DVFilterCondition.EQUAL,
value = ObjectType.Layout.OBJECT_TYPE.code.toDouble()
),
DVFilter(
relation = Relations.SPACE_ID,
condition = DVFilterCondition.EQUAL,
value = config.space
),
DVFilter(
relation = Relations.IS_DELETED,
condition = DVFilterCondition.NOT_EQUAL,
@ -86,8 +81,7 @@ class ObjectTypesSubscriptionManager (
),
DVFilter(
relation = Relations.IS_ARCHIVED,
condition = DVFilterCondition.NOT_EQUAL,
value = true
condition = DVFilterCondition.NONE
),
DVFilter(
relation = Relations.UNIQUE_KEY,
@ -124,6 +118,7 @@ class ObjectTypesSubscriptionManager (
Relations.RECOMMENDED_FEATURED_RELATIONS,
Relations.RECOMMENDED_HIDDEN_RELATIONS,
Relations.RECOMMENDED_FILE_RELATIONS,
Relations.IS_ARCHIVED
),
ignoreWorkspace = true
)

2
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt
View file

@ -181,7 +181,7 @@ class ObjectTypeViewModel(
//region INIT AND LIFE CYCLE
init {
Timber.d("init, vmParams: $vmParams")
Timber.i("ObjectTypeViewModel init, vmParams: $vmParams")
proceedWithObservingSyncStatus()
proceedWithObservingObjectType()
proceedWithGetObjectTypeConflictingFields()

2
presentation/src/main/java/com/anytypeio/anytype/presentation/types/SpaceTypesViewModel.kt
View file

@ -65,7 +65,7 @@ class SpaceTypesViewModel(
storeOfObjectTypes.getAll().mapNotNull { objectType ->
val resolvedLayout =
objectType.recommendedLayout ?: return@mapNotNull null
if (notAllowedTypesLayouts.contains(resolvedLayout)) {
if (notAllowedTypesLayouts.contains(resolvedLayout) || objectType.isArchived == true) {
return@mapNotNull null
} else {
objectType