feat(system): update progress popup with live action log (issue #863) (#872)

Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
M57andM57 authored and GitHub committed 2026-08-10 16:16:34 +03:00
1 parent a9cb89a925
commit 96e43f354f
6 files changed
+605 -4

No files matched your search

@@ -81,6 +81,7 @@ import com.m57.hermescontrol.R
import com.m57.hermescontrol.theme.LocalHermesStatusColors
import com.m57.hermescontrol.theme.LocalSpacing
import com.m57.hermescontrol.ui.chat.MediaImageStore
import com.m57.hermescontrol.ui.common.ActionProgressDialog
import com.m57.hermescontrol.ui.common.EmptyState
import com.m57.hermescontrol.ui.common.ErrorState
import com.m57.hermescontrol.ui.common.HermesScaffold
@@ -192,6 +193,14 @@ fun SystemScreen(
)
}
// Update progress popup (issue #863): replaces the old bottom-of-screen
// action log for the update flow — spinner + log tail while running,
// success/failure state once it exits.
ActionProgressDialog(
controller = viewModel.actionProgress,
title = stringResource(R.string.system_update_progress_title),
)
// Credential remove confirmation
var credToRemove by remember { mutableStateOf<Pair<String, Int>?>(null) }
if (credToRemove != null) {
@@ -21,6 +21,7 @@ import com.m57.hermescontrol.data.remote.ApiClient
import com.m57.hermescontrol.data.remote.NetworkError
import com.m57.hermescontrol.data.remote.NetworkResult
import com.m57.hermescontrol.data.remote.safeApiCall
import com.m57.hermescontrol.ui.common.ActionProgressController
import com.m57.hermescontrol.ui.common.ToastHost
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@@ -97,6 +98,18 @@ class SystemViewModel :
private val _uiState = MutableStateFlow(SystemUiState())
val uiState: StateFlow<SystemUiState> = _uiState.asStateFlow()
/**
* Progress popup for the update flow (issue #863): after the trigger POST
* returns, [ActionProgressController] polls the action status log until
* the update exits, then refreshes the whole screen so the version row
* and update badge reflect the new build.
*/
val actionProgress =
ActionProgressController(
scope = viewModelScope,
onFinished = { loadAll() },
)
private var actionPollingJob: Job? = null
private var downloadJob: Job? = null
@@ -266,11 +279,36 @@ class SystemViewModel :
}
}
/**
* Run the update and surface its progress in [ActionProgressController]'s
* popup: the trigger POST returns immediately (`{ok, name}`) while the
* actual update runs in the background, so the dialog polls the action
* status log until it exits (success/failure + tail shown to the user).
*/
fun applyUpdate() {
runOperation(
apiCall = { safeApiCall { ApiClient.hermesApi.updateHermes() } },
label = "Update",
)
actionProgress.open()
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
safeApiCall { ApiClient.hermesApi.updateHermes() }
}
when (result) {
is NetworkResult.Success -> {
val name = result.data.name
if (name != null) {
actionProgress.markStarted(name)
} else {
actionProgress.fail(
"Update started but the backend did not report an action name",
)
}
}
is NetworkResult.Failure -> {
actionProgress.fail("Failed to start update: ${result.error.message}")
}
}
}
}
fun openUpdateConfirm() {