Skip to content

Several dashboard fixes #508

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
rteyssandier merged 5 commits into from
Mar 9, 2026
Merged

Several dashboard fixes #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61e70a9
Fix dashboard arrangement key
snappdevelopment Mar 7, 2026
e0aea70
Fix dashboard selection key
snappdevelopment Mar 7, 2026
9e7e368
Fix dashboard list jumping
snappdevelopment Mar 7, 2026
cd7f047
Change toUi to extension function
snappdevelopment Mar 7, 2026
13d91a0
Merge branch 'main' into fix-dashboard-arrangement-key
rteyssandier Mar 9, 2026
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
22 changes: 11 additions & 11 deletions .../github/openflocon/flocondesktop/features/dashboard/delegate/DashboardSelectorDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ class DashboardSelectorDelegate(
if (dashboards.isEmpty()) {
DashboardsStateUiModel.Empty
} else {
val sortedDashboards = dashboards.sortedBy { it }

DashboardsStateUiModel.WithContent(
dashboards = dashboards.map { toUi(it) },
selected =
toUi(
selected ?: run {
dashboards.first().also {
selectCurrentDeviceDashboardUseCase(it)
}
},
),
dashboards = sortedDashboards.map { it.toUi() },
selected = selected?.toUi() ?: run {
sortedDashboards.first().let {
selectCurrentDeviceDashboardUseCase(it)
it.toUi()
}
},
)
}
}.flowOn(dispatcherProvider.viewModel)
Expand All @@ -52,8 +52,8 @@ class DashboardSelectorDelegate(
DashboardsStateUiModel.Loading,
)

fun toUi(dashboardId: DashboardId) = DeviceDashboardUiModel(
id = dashboardId,
fun DashboardId.toUi() = DeviceDashboardUiModel(
id = this,
)

fun onDashboardSelected(dashboardId: DashboardId) {
Expand Down
12 changes: 9 additions & 3 deletions .../kotlin/io/github/openflocon/data/core/dashboard/datasource/DeviceDashboardsDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,27 @@ import kotlinx.coroutines.flow.Flow

interface DeviceDashboardsDataSource {

fun observeSelectedDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardId?>
fun observeSelectedDeviceDashboard(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardId?>

fun selectDeviceDashboard(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
)

fun deleteDashboard(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
)

fun observeDashboardArrangement(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardArrangementDomainModel>
fun observeDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardArrangementDomainModel>

fun selectDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
arrangement: DashboardArrangementDomainModel,
)
Expand Down
18 changes: 13 additions & 5 deletions ...ain/kotlin/io/github/openflocon/data/core/dashboard/repository/DashboardRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,35 +114,43 @@ class DashboardRepositoryImpl(
}

override suspend fun selectDeviceDashboard(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
dashboardId: DashboardId
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
) {
withContext(dispatcherProvider.data) {
deviceDashboardsDataSource.selectDeviceDashboard(
deviceIdAndPackageName = deviceIdAndPackageName,
dashboardId = dashboardId,
deviceIdAndPackageName = deviceIdAndPackageName,
)
}
}

override fun observeSelectedDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardId?> = deviceDashboardsDataSource.observeSelectedDeviceDashboard(
override fun observeSelectedDeviceDashboard(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardId?> = deviceDashboardsDataSource.observeSelectedDeviceDashboard(
deviceIdAndPackageName = deviceIdAndPackageName,
).flowOn(dispatcherProvider.data)

override fun observeDeviceDashboards(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<List<DashboardId>> = dashboardLocalDataSource.observeDeviceDashboards(
deviceIdAndPackageName = deviceIdAndPackageName,
).flowOn(dispatcherProvider.data)

override fun observeDashboardArrangement(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardArrangementDomainModel> = deviceDashboardsDataSource.observeDashboardArrangement(
override fun observeDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardArrangementDomainModel> = deviceDashboardsDataSource.observeDashboardArrangement(
dashboardId = dashboardId,
deviceIdAndPackageName = deviceIdAndPackageName,
).flowOn(dispatcherProvider.data)

override suspend fun selectDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
arrangement: DashboardArrangementDomainModel
) {
withContext(dispatcherProvider.data) {
deviceDashboardsDataSource.selectDashboardArrangement(
dashboardId = dashboardId,
deviceIdAndPackageName = deviceIdAndPackageName,
arrangement = arrangement,
)
Expand Down
58 changes: 46 additions & 12 deletions ...o/github/openflocon/data/local/dashboard/datasource/DeviceDashboardsDataSourceInMemory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,71 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update

class DeviceDashboardsDataSourceInMemory : DeviceDashboardsDataSource {
private val selectedDeviceDashboards = MutableStateFlow<Map<DeviceIdAndPackageNameDomainModel, DashboardId?>>(emptyMap())
private val selectedDashboardArrangements = MutableStateFlow<Map<DeviceIdAndPackageNameDomainModel, DashboardArrangementDomainModel>>(emptyMap())
private val selectedDeviceDashboards = MutableStateFlow<Map<String, DashboardId?>>(emptyMap())
private val selectedDashboardArrangements = MutableStateFlow<Map<String, DashboardArrangementDomainModel>>(emptyMap())

override fun observeSelectedDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardId?> = selectedDeviceDashboards
.map { it[deviceIdAndPackageName] }
override fun observeSelectedDeviceDashboard(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardId?> = selectedDeviceDashboards
.map {
val dashboardKey = getSelectedDashboardKey(deviceIdAndPackageName)
it[dashboardKey]
}
.distinctUntilChanged()

override fun selectDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel, dashboardId: DashboardId) {
override fun selectDeviceDashboard(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
) {
val dashboardKey = getSelectedDashboardKey(deviceIdAndPackageName)
selectedDeviceDashboards.update {
it + (deviceIdAndPackageName to dashboardId)
it + (dashboardKey to dashboardId)
}
}

override fun deleteDashboard(dashboardId: DashboardId, deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel) {
override fun deleteDashboard(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
) {
val dashboardKey = getSelectedDashboardKey(deviceIdAndPackageName)
selectedDeviceDashboards.update {
if (it[deviceIdAndPackageName] == dashboardId) {
it - deviceIdAndPackageName
if (it[dashboardKey] == dashboardId) {
it - dashboardKey
} else it
}
}

override fun observeDashboardArrangement(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardArrangementDomainModel> = selectedDashboardArrangements
.map { it[deviceIdAndPackageName] ?: DashboardArrangementDomainModel.Adaptive }
override fun observeDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardArrangementDomainModel> = selectedDashboardArrangements
.map {
val dashboardArrangementKey = getDashboardArrangementKey(dashboardId, deviceIdAndPackageName)
it[dashboardArrangementKey] ?: DashboardArrangementDomainModel.Adaptive
}
.distinctUntilChanged()

override fun selectDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
arrangement: DashboardArrangementDomainModel
) {
val dashboardArrangementKey = getDashboardArrangementKey(dashboardId, deviceIdAndPackageName)
selectedDashboardArrangements.update {
it + (deviceIdAndPackageName to arrangement)
it + (dashboardArrangementKey to arrangement)
}
}

private fun getSelectedDashboardKey(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): String {
return deviceIdAndPackageName.packageName
Comment thread
rteyssandier marked this conversation as resolved.
}

private fun getDashboardArrangementKey(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): String {
return "${deviceIdAndPackageName.packageName}_$dashboardId"
Comment thread
rteyssandier marked this conversation as resolved.
}
}
14 changes: 11 additions & 3 deletions ...commonMain/kotlin/io/github/openflocon/domain/dashboard/repository/DashboardRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,20 @@ import kotlinx.coroutines.flow.Flow
interface DashboardRepository {
fun observeDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel, dashboardId: DashboardId): Flow<DashboardDomainModel?>

suspend fun selectDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel, dashboardId: DashboardId)
suspend fun selectDeviceDashboard(dashboardId: DashboardId, deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel)
fun observeSelectedDeviceDashboard(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardId?>
fun observeDeviceDashboards(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<List<DashboardId>>

fun observeDashboardArrangement(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel): Flow<DashboardArrangementDomainModel>
suspend fun selectDashboardArrangement(deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel, arrangement: DashboardArrangementDomainModel)
fun observeDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel
): Flow<DashboardArrangementDomainModel>

suspend fun selectDashboardArrangement(
dashboardId: DashboardId,
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
arrangement: DashboardArrangementDomainModel
)

suspend fun sendClickEvent(
deviceIdAndPackageName: DeviceIdAndPackageNameDomainModel,
Expand Down
14 changes: 11 additions & 3 deletions ...otlin/io/github/openflocon/domain/dashboard/usecase/ObserveDashboardArrangementUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,17 @@ class ObserveDashboardArrangementUseCase(
if (model == null) {
flowOf(DashboardArrangementDomainModel.Adaptive)
} else {
dashboardRepository.observeDashboardArrangement(
deviceIdAndPackageName = model,
)
dashboardRepository.observeSelectedDeviceDashboard(deviceIdAndPackageName = model)
.flatMapLatest { dashboardId ->
if (dashboardId == null) {
flowOf(DashboardArrangementDomainModel.Adaptive)
} else {
dashboardRepository.observeDashboardArrangement(
dashboardId = dashboardId,
deviceIdAndPackageName = model,
)
}
}
}
}
}
3 changes: 3 additions & 0 deletions ...kotlin/io/github/openflocon/domain/dashboard/usecase/SelectDashboardArrangementUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ import io.github.openflocon.domain.device.usecase.GetCurrentDeviceIdAndPackageNa
class SelectDashboardArrangementUseCase(
private val dashboardRepository: DashboardRepository,
private val getCurrentDeviceIdAndPackageNameUseCase: GetCurrentDeviceIdAndPackageNameUseCase,
private val getCurrentDeviceSelectedDashboardUseCase: GetCurrentDeviceSelectedDashboardUseCase,
) {
suspend operator fun invoke(arrangement: DashboardArrangementDomainModel) {
val current = getCurrentDeviceIdAndPackageNameUseCase() ?: return
val currentSelectedDashboard = getCurrentDeviceSelectedDashboardUseCase() ?: return

dashboardRepository.selectDashboardArrangement(
dashboardId = currentSelectedDashboard,
deviceIdAndPackageName = current,
arrangement = arrangement,
)
Expand Down