Skip to content

DROID-3916 Properties | Manual Sorting for Property Options #2942

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
konstantiniiv merged 22 commits into from
Dec 15, 2025
Merged

DROID-3916 Properties | Manual Sorting for Property Options #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1d5a4db
DROID-4199 SetRelationOptionOrder use case
konstantiniiv Nov 29, 2025
867e1b0
DROID-4199 di
konstantiniiv Nov 29, 2025
d2315ae
DROID-4199 compose ui
konstantiniiv Nov 29, 2025
1da1545
DROID-4199 view model
konstantiniiv Nov 29, 2025
b5e5964
DROID-4199 icon
konstantiniiv Nov 29, 2025
c102e6f
DROID-3916 legacy
konstantiniiv Nov 29, 2025
f12f535
DROID-3916 relation option space sub
konstantiniiv Nov 29, 2025
84cfda3
DROID-3916 relation option store
konstantiniiv Nov 29, 2025
4425783
DROID-3916 order id
konstantiniiv Nov 29, 2025
67711a5
DROID-3916 refactoring
konstantiniiv Nov 29, 2025
d3eab25
DROID-3916 tests
konstantiniiv Nov 29, 2025
9e611e0
DROID-3916 refactoring
konstantiniiv Nov 29, 2025
d27f8c3
DROID-3916 di
konstantiniiv Nov 29, 2025
64ee232
DROID-3916 fixes
konstantiniiv Nov 29, 2025
bbb952b
Merge branch 'main' into droid-3916-manual-sorting-for-property-options
konstantiniiv Dec 4, 2025
8a55c21
DROID-3916 Merge branch 'droid-3916-manual-sorting-for-property-optio…
konstantiniiv Dec 14, 2025
dd4e69e
DROID-3916 Merge branch 'main' into droid-3916-manual-sorting-for-pro…
konstantiniiv Dec 14, 2025
3cb3000
DROID-3916 fix
konstantiniiv Dec 15, 2025
e55697a
DROID-3916 previews
konstantiniiv Dec 15, 2025
1572b47
DROID-3916 lock events logic
konstantiniiv Dec 15, 2025
d5e1da3
DROID-3916 legacy
konstantiniiv Dec 15, 2025
3eabc88
DROID-3916 pr fix
konstantiniiv Dec 15, 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
8 changes: 2 additions & 6 deletions ...dTest/java/com/anytypeio/anytype/features/relations/DisplayObjectRelationTextValueTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 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.presentation.relations.providers.DataViewObjectRelationProvider
import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider
import com.anytypeio.anytype.presentation.sets.ObjectSetDatabase
import com.anytypeio.anytype.presentation.sets.RelationTextValueViewModel
Expand Down Expand Up @@ -72,14 +71,11 @@ class DisplayObjectRelationTextValueTest {
fun before() {
MockitoAnnotations.openMocks(this)
TestRelationTextValueFragment.testVmFactory = RelationTextValueViewModel.Factory(
relations = DataViewObjectRelationProvider(
objectState = state,
storeOfRelations = storeOfRelations
),
values = DataViewObjectValueProvider(db = db, objectState = state),
reloadObject = reloadObject,
analytics = analytics,
storeOfObjectTypes = storeOfObjectTypes
storeOfObjectTypes = storeOfObjectTypes,
storeOfRelations = storeOfRelations
)
}

Expand Down
8 changes: 2 additions & 6 deletions ...droidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationNumberValueTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ 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.presentation.relations.providers.DataViewObjectRelationProvider
import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider
import com.anytypeio.anytype.presentation.sets.ObjectSetDatabase
import com.anytypeio.anytype.presentation.sets.RelationTextValueViewModel
Expand Down Expand Up @@ -79,14 +78,11 @@ class DisplayRelationNumberValueTest {
fun setup() {
MockitoAnnotations.openMocks(this)
TestRelationTextValueFragment.testVmFactory = RelationTextValueViewModel.Factory(
relations = DataViewObjectRelationProvider(
objectState = state,
storeOfRelations = storeOfRelations
),
values = DataViewObjectValueProvider(db = db, objectState = state),
reloadObject = reloadObject,
analytics = analytics,
storeOfObjectTypes = storeOfObjectTypes
storeOfObjectTypes = storeOfObjectTypes,
storeOfRelations = storeOfRelations
)
}

Expand Down
8 changes: 2 additions & 6 deletions .../androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationDateValueTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
import com.anytypeio.anytype.domain.objects.ObjectStore
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.presentation.relations.ObjectSetConfig
import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider
import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider
import com.anytypeio.anytype.presentation.sets.ObjectSetDatabase
import com.anytypeio.anytype.presentation.sets.RelationDateValueViewModel
Expand Down Expand Up @@ -65,12 +64,9 @@ class ObjectRelationDateValueTest {
fun setup() {
MockitoAnnotations.openMocks(this)
TestRelationDateValueFragment.testVmFactory = RelationDateValueViewModel.Factory(
relations = DataViewObjectRelationProvider(
objectState = state,
storeOfRelations = storeOfRelations
),
values = DataViewObjectValueProvider(db = db, objectState = state),
dateProvider = dateProvider
dateProvider = dateProvider,
storeOfRelations = storeOfRelations
)
}

Expand Down
28 changes: 14 additions & 14 deletions app/src/main/java/com/anytypeio/anytype/di/feature/EditGridCellDI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository
import com.anytypeio.anytype.domain.misc.DateProvider
import com.anytypeio.anytype.domain.`object`.ReloadObject
import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider
import com.anytypeio.anytype.domain.objects.StoreOfRelations
import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider.Companion.DATA_VIEW_PROVIDER_TYPE
import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider.Companion.INTRINSIC_PROVIDER_TYPE
import com.anytypeio.anytype.presentation.relations.providers.ObjectValueProvider
Expand Down Expand Up @@ -38,17 +38,17 @@ object RelationTextValueModule {
@Provides
@PerModal
fun provideRelationTextValueViewModelFactory(
@Named(INTRINSIC_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(INTRINSIC_PROVIDER_TYPE) values: ObjectValueProvider,
reloadObject: ReloadObject,
analytics: Analytics,
storeOfObjectTypes: StoreOfObjectTypes
storeOfObjectTypes: StoreOfObjectTypes,
storeOfRelations: StoreOfRelations
) = RelationTextValueViewModel.Factory(
relations = relations,
values = values,
reloadObject = reloadObject,
analytics = analytics,
storeOfObjectTypes = storeOfObjectTypes
storeOfObjectTypes = storeOfObjectTypes,
storeOfRelations = storeOfRelations
)

@JvmStatic
Expand Down Expand Up @@ -78,17 +78,17 @@ object RelationDataViewTextValueModule {
@Provides
@PerModal
fun provideRelationTextValueViewModelFactory(
@Named(DATA_VIEW_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(DATA_VIEW_PROVIDER_TYPE) values: ObjectValueProvider,
reloadObject: ReloadObject,
analytics: Analytics,
storeOfObjectTypes: StoreOfObjectTypes
storeOfObjectTypes: StoreOfObjectTypes,
storeOfRelations: StoreOfRelations
) = RelationTextValueViewModel.Factory(
relations = relations,
values = values,
reloadObject = reloadObject,
analytics = analytics,
storeOfObjectTypes = storeOfObjectTypes
storeOfObjectTypes = storeOfObjectTypes,
storeOfRelations = storeOfRelations
)

@JvmStatic
Expand Down Expand Up @@ -118,10 +118,10 @@ object RelationDateValueModule {
@Provides
@PerModal
fun provideEditGridCellViewModelFactory(
@Named(INTRINSIC_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(INTRINSIC_PROVIDER_TYPE) values: ObjectValueProvider,
dateProvider: DateProvider
) = RelationDateValueViewModel.Factory(relations, values, dateProvider)
dateProvider: DateProvider,
storeOfRelations: StoreOfRelations
) = RelationDateValueViewModel.Factory(values, dateProvider, storeOfRelations)
}

@Subcomponent(modules = [RelationDataViewDateValueModule::class])
Expand All @@ -143,8 +143,8 @@ object RelationDataViewDateValueModule {
@Provides
@PerModal
fun provideEditGridCellViewModelFactory(
@Named(DATA_VIEW_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(DATA_VIEW_PROVIDER_TYPE) values: ObjectValueProvider,
storeOfRelations: StoreOfRelations,
dateProvider: DateProvider
) = RelationDateValueViewModel.Factory(relations, values, dateProvider)
) = RelationDateValueViewModel.Factory(values, dateProvider, storeOfRelations)
}
6 changes: 0 additions & 6 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 @@ -60,7 +60,6 @@ object ObjectValueObjectModule {
@Provides
@PerModal
fun provideFactory(
@Named(ObjectRelationProvider.INTRINSIC_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(ObjectRelationProvider.INTRINSIC_PROVIDER_TYPE) values: ObjectValueProvider,
setObjectDetails: UpdateDetail,
dispatcher: Dispatcher<Payload>,
Expand All @@ -79,7 +78,6 @@ object ObjectValueObjectModule {
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
relations = relations,
setObjectDetails = setObjectDetails,
dispatcher = dispatcher,
analytics = analytics,
Expand Down Expand Up @@ -121,7 +119,6 @@ object ObjectValueSetModule {
@Provides
@PerModal
fun provideFactory(
@Named(ObjectRelationProvider.INTRINSIC_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(ObjectRelationProvider.INTRINSIC_PROVIDER_TYPE) values: ObjectValueProvider,
setObjectDetails: UpdateDetail,
dispatcher: Dispatcher<Payload>,
Expand All @@ -140,7 +137,6 @@ object ObjectValueSetModule {
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
relations = relations,
setObjectDetails = setObjectDetails,
dispatcher = dispatcher,
analytics = analytics,
Expand Down Expand Up @@ -182,7 +178,6 @@ object ObjectValueDataViewModule {
@Provides
@PerModal
fun provideFactory(
@Named(ObjectRelationProvider.DATA_VIEW_PROVIDER_TYPE) relations: ObjectRelationProvider,
@Named(ObjectRelationProvider.DATA_VIEW_PROVIDER_TYPE) values: ObjectValueProvider,
setObjectDetails: UpdateDetail,
dispatcher: Dispatcher<Payload>,
Expand All @@ -201,7 +196,6 @@ object ObjectValueDataViewModule {
): ObjectValueViewModelFactory = ObjectValueViewModelFactory(
params = params,
values = values,
relations = relations,
setObjectDetails = setObjectDetails,
dispatcher = dispatcher,
analytics = analytics,
Expand Down
Loading