Skip to content

fix: Panel db #424

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
florent37 merged 1 commit into from
Dec 2, 2025
Merged

fix: Panel db #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions .../src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/database/Navigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@ package io.github.openflocon.flocondesktop.features.database

import androidx.navigation3.runtime.EntryProviderScope
import io.github.openflocon.flocondesktop.app.MenuSceneStrategy
import io.github.openflocon.flocondesktop.features.database.view.DatabaseDetails
import io.github.openflocon.flocondesktop.features.database.view.DatabaseScreen
import io.github.openflocon.flocondesktop.features.database.view.DetailResultItem
import io.github.openflocon.navigation.FloconRoute
import io.github.openflocon.navigation.PanelRoute
import io.github.openflocon.navigation.scene.PanelSceneStrategy
import kotlinx.serialization.Serializable

sealed interface DatabaseRoutes : FloconRoute {

@Serializable
data object Main : DatabaseRoutes

@Serializable
data class Detail(
val result: DetailResultItem,
val columns: List<String>
) : DatabaseRoutes, PanelRoute
}

fun EntryProviderScope<FloconRoute>.databaseRoutes() {
Expand All @@ -18,4 +28,15 @@ fun EntryProviderScope<FloconRoute>.databaseRoutes() {
) {
DatabaseScreen()
}
entry<DatabaseRoutes.Detail>(
metadata = PanelSceneStrategy.panel(
pinnable = false,
closable = true
)
) {
DatabaseDetails(
state = it.result,
columns = it.columns
)
}
}
3 changes: 3 additions & 0 deletions ...otlin/io/github/openflocon/flocondesktop/features/database/model/DatabasesStateUiModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package io.github.openflocon.flocondesktop.features.database.model

import androidx.compose.runtime.Immutable

@Immutable
sealed interface DatabasesStateUiModel {
data object Loading : DatabasesStateUiModel

Expand Down
3 changes: 3 additions & 0 deletions ...n/kotlin/io/github/openflocon/flocondesktop/features/database/model/QueryResultUiModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.github.openflocon.flocondesktop.features.database.model

import kotlinx.serialization.Serializable

sealed interface QueryResultUiModel {
data class Text(
val text: String,
Expand All @@ -11,6 +13,7 @@ sealed interface QueryResultUiModel {
) : QueryResultUiModel
}

@Serializable
data class DatabaseRowUiModel(
val items: List<String?>,
)
17 changes: 17 additions & 0 deletions ...onMain/kotlin/io/github/openflocon/flocondesktop/features/database/view/DatabaseDetail.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package io.github.openflocon.flocondesktop.features.database.view

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier

@Composable
fun DatabaseDetails(
state: DetailResultItem,
columns: List<String>
) {
DatabaseRowDetailView(
modifier = Modifier.fillMaxSize(),
state = state,
columns = columns,
)
}
33 changes: 17 additions & 16 deletions ...in/kotlin/io/github/openflocon/flocondesktop/features/database/view/DatabaseResultView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEachIndexed
import io.github.openflocon.flocondesktop.features.database.DatabaseRoutes
import io.github.openflocon.flocondesktop.features.database.model.DatabaseRowUiModel
import io.github.openflocon.flocondesktop.features.database.model.QueryResultUiModel
import io.github.openflocon.library.designsystem.FloconTheme
import io.github.openflocon.library.designsystem.components.FloconHorizontalDivider
import io.github.openflocon.library.designsystem.components.panel.FloconPanel
import io.github.openflocon.navigation.MainFloconNavigationState
import kotlinx.serialization.Serializable
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.koin.mp.KoinPlatform

@Serializable
data class DetailResultItem(
val index: Int,
val item: DatabaseRowUiModel,
Expand Down Expand Up @@ -113,10 +117,14 @@ fun DatabaseResultView(
selectedItem?.index?.let { i ->
val newIndex = i - 1
result.rows.getOrNull(newIndex)?.let {
selectedItem = DetailResultItem(
val item = DetailResultItem(
index = newIndex,
item = it
)

selectedItem = item
KoinPlatform.getKoin().get<MainFloconNavigationState>()
.navigate(DatabaseRoutes.Detail(item, result.columns))
}
Comment on lines +120 to 128
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic to create a DetailResultItem and navigate is duplicated in three places: here for Key.DirectionUp, for Key.DirectionDown (lines 138-146), and in the onItemSelected callback (lines 189-191). This should be extracted into a single helper function to avoid code duplication and improve maintainability.

Furthermore, using KoinPlatform.getKoin().get<...>() directly within a Composable is a Service Locator pattern. This couples your UI component to your dependency injection framework, making it harder to test and less reusable. A better approach is to pass navigation actions as lambda parameters to your composable (dependency injection).

}

Expand All @@ -127,10 +135,14 @@ fun DatabaseResultView(
selectedItem?.index?.let { i ->
val newIndex = i + 1
result.rows.getOrNull(newIndex)?.let {
selectedItem = DetailResultItem(
val item = DetailResultItem(
index = newIndex,
item = it
)

selectedItem = item
KoinPlatform.getKoin().get<MainFloconNavigationState>()
.navigate(DatabaseRoutes.Detail(item, result.columns))
}
}

Expand Down Expand Up @@ -175,6 +187,8 @@ fun DatabaseResultView(
selected = selected,
onItemSelected = {
selectedItem = it
KoinPlatform.getKoin().get<MainFloconNavigationState>()
.navigate(DatabaseRoutes.Detail(it, result.columns))
}
)

Expand All @@ -186,19 +200,6 @@ fun DatabaseResultView(
}
}
}

FloconPanel(
contentState = selectedItem,
onClose = {
selectedItem = null
}
) {
DatabaseRowDetailView(
modifier = Modifier.fillMaxSize(),
state = it,
columns = result.columns,
)
}
}
}
}
Expand Down