updatePage: dismiss overlay directly from busy_changed callback, not via status_ready chain

Author: gmmcosta15

BlocksScreen/lib/panels/widgets/updatePage.py

@@ -66,6 +66,7 @@ def __init__(self) -> None:
         self._busy: bool = False
         self._update_avail: bool = False
         self._post_update_status_pending: bool = False
+        self._overlay_shown: bool = False
         self._elapsed_time_seconds: int = 0
         self._elapsed_timer: QtCore.QTimer = QtCore.QTimer(self)
         self._elapsed_timer.setSingleShot(False)
@@ -292,10 +293,10 @@ def handle_busy_changed(self, busy: bool) -> None:
             self._elapsed_timer.stop()
             self._elapsed_time_label.hide()
             self._cancel_btn.hide()
-            self._post_update_status_pending = True
+            if self._overlay_shown:
+                self._overlay_shown = False
+                self.call_load_panel.emit(False, "")
             self._request_status_debounced()
-            # Don't dismiss the overlay yet — wait for status_ready to refresh
-            # cards first, then handle_status_ready will emit call_load_panel(False).
 
     @QtCore.pyqtSlot(name="on-update-all-clicked")
     def on_update_all_clicked(self) -> None:
@@ -309,6 +310,7 @@ def _on_cancel_clicked(self) -> None:
 
     @QtCore.pyqtSlot(name="do-update")
     def _do_update(self) -> None:
+        self._overlay_shown = True
         self.request_update.emit("")
         self.call_load_panel.emit(True, "Updating all components ...")
 
@@ -322,6 +324,7 @@ def handle_step_complete(self, name: str, step: int, total: int) -> None:
         else:
             label = self._STEP_LABELS.get(step, "working")
         _log.info("step_complete: %s %d/%d (%s)", name, step, total, label)
+        self._overlay_shown = True
         self.call_load_panel.emit(True, f"{name}: {label} ({step}/{total})")
 
     def _show_toast(self, message: str, *, success: bool = False) -> None:

tests/widgets/test_update_page_unit.py

@@ -278,17 +278,19 @@ def test_true_does_not_emit_request_status(self, page, qtbot):
         with qtbot.assertNotEmitted(page.request_status):
             page.handle_busy_changed(True)
 
-    def test_false_sets_post_update_pending(self, page):
+    def test_false_does_not_emit_call_load_panel_when_no_overlay(self, page, qtbot):
         page.show_loading = MagicMock()
-        page.handle_busy_changed(False)
-        assert page._post_update_status_pending is True
+        page._overlay_shown = False
+        with qtbot.assertNotEmitted(page.call_load_panel, wait=200):
+            page.handle_busy_changed(False)
 
-    def test_false_does_not_emit_call_load_panel(self, page, qtbot):
-        # call_load_panel(False) must NOT fire here — it fires from handle_status_ready
-        # once cards have refreshed (prevents stale UI flash).
+    def test_false_emits_call_load_panel_when_overlay_shown(self, page, qtbot):
         page.show_loading = MagicMock()
-        with qtbot.assertNotEmitted(page.call_load_panel, wait=200):
+        page._overlay_shown = True
+        with qtbot.waitSignal(page.call_load_panel, timeout=200) as blocker:
             page.handle_busy_changed(False)
+        assert blocker.args == [False, ""]
+        assert page._overlay_shown is False
 
     def test_true_starts_elapsed_timer(self, page):
         page.show_loading = MagicMock()
@@ -346,7 +348,9 @@ def test_update_elapsed_time_increments_seconds(self, page):
         assert page._elapsed_time_seconds == 1
 
     def test_update_elapsed_time_formats_display(self, page):
-        page._elapsed_time_seconds = 124  # Will be incremented to 125 (2 minutes, 5 seconds)
+        page._elapsed_time_seconds = (
+            124  # Will be incremented to 125 (2 minutes, 5 seconds)
+        )
         page._update_elapsed_time()
         page._elapsed_time_label.setText.assert_called_with("02:05")
 

updater/service.py

@@ -224,6 +224,7 @@ async def _run_git_update(self, component: ComponentConfig) -> bool:
             elapsed = time.monotonic() - self._last_status_time
 
         try:
+            self._cb("on_step", component.name, 1, 4)
             if elapsed >= 30:
                 self._log.info(
                     "%s: git_fetch (%.0fs since last status)", component.name, elapsed
@@ -239,8 +240,8 @@ async def _run_git_update(self, component: ComponentConfig) -> bool:
                     component.name,
                     elapsed,
                 )
-            self._cb("on_step", component.name, 1, 4)
 
+            self._cb("on_step", component.name, 2, 4)
             if component.reset_mode == "hard":
                 ok, err = await git_reset_to_hash(component.path, "HEAD")
                 if not ok:
@@ -276,15 +277,15 @@ async def _run_git_update(self, component: ComponentConfig) -> bool:
                     self._log.error("%s: git_pull failed: %s", component.name, err)
                     await self._rollback(component, prev_hash, "conflict")
                     return False
-            self._cb("on_step", component.name, 2, 4)
 
+            self._cb("on_step", component.name, 3, 4)
             deps_ok, deps_err = await self._install_dependencies(component)
             if not deps_ok:
                 self._log.warning("dependencies error: %s", deps_err)
                 await self._rollback(component, prev_hash, "deps")
                 return False
-            self._cb("on_step", component.name, 3, 4)
 
+            self._cb("on_step", component.name, 4, 4)
             new_hash = await git_get_hash(component.path)
             hook_ok, hook_err = await run_hook(
                 component.name, component.path, new_hash, prev_hash
@@ -310,7 +311,6 @@ async def _run_git_update(self, component: ComponentConfig) -> bool:
                     await self._rollback(component, prev_hash, "restart_timeout")
                     return False
 
-            self._cb("on_step", component.name, 4, 4)
             self._cb("on_component_done", component.name, True)
             return True
         except asyncio.CancelledError: