Merge pull request #59 from Zaloog/lg/bugfix-setting-screen-refresh

Fix SettingScreen Refresh Bug

Author: Zaloog

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## v0.9.1 (unreleased)
+## v0.10.1 (unreleased)
+### Fixed
+- Fixed bug, that column.status_update selection values do not update, when the column order is changed
+- Fixed bug, that ColumnSelector is not updated, when the active board is changed
+
+## v0.10.0
 ### Added
 - Added option to change the column order via the SettingScreen
 - Reworked the ColumnListView UI

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kanban-tui"
-version = "0.10.0"
+version = "0.10.1"
 description = "customizable task tui powered by textual"
 authors = [
     { name = "Zaloog", email = "[email protected]" }

src/kanban_tui/app.py

@@ -141,12 +141,15 @@ def update_board_list(self):
     def watch_board_list(self):
         self.active_board = self.backend.active_board
 
-    def watch_active_board(self):
+    def watch_active_board(self, old_board: Board | None, new_board: Board):
         if self.active_board:
             self.app.config.set_active_board(
                 new_active_board_id=self.active_board.board_id
             )
         self.update_column_list()
+        # If updating Board, refresh setting screen
+        if old_board:
+            self.get_screen("settings", SettingsScreen).needs_refresh = True
 
     def watch_column_list(self):
         self.update_task_list()
@@ -169,10 +172,9 @@ def action_show_backend_selector(self):
 
     def action_refresh(self):
         self.update_board_list()
-        self.watch_active_board()
         self.watch_column_list()
         # used a worker here, so no await
-        self.screen.load_kanban_board()
+        self.get_screen("board", BoardScreen).load_kanban_board()
 
     def update_task_list(self):
         self.task_list = self.backend.get_tasks_on_active_board()

src/kanban_tui/screens/settings_screen.py

@@ -2,6 +2,8 @@
 
 from textual import on
 from textual.binding import Binding
+from textual.events import ScreenResume
+from textual.reactive import reactive
 from textual.widget import Widget
 from textual.widgets import Header, Input, Switch, Button, Select
 from textual.screen import Screen
@@ -12,6 +14,8 @@
 
 
 class SettingsScreen(Screen):
+    needs_refresh: reactive[bool] = reactive(False, init=False)
+
     BINDINGS = [Binding("ctrl+o", "show_overlay", "Jump", priority=True)]
 
     def compose(self) -> Iterable[Widget]:
@@ -33,8 +37,14 @@ def compose(self) -> Iterable[Widget]:
     @on(Switch.Changed)
     @on(Button.Pressed)
     @on(Select.Changed)
-    def config_changes(self):
+    def config_changes(self, event):
         self.app.needs_refresh = True
 
+    @on(ScreenResume)
+    def update_settings(self):
+        if self.needs_refresh:
+            self.query_one(SettingsView).refresh(recompose=True)
+            self.needs_refresh = False
+
     def action_show_overlay(self) -> None:
         self.query_one(Jumper).show()

src/kanban_tui/widgets/settings_widgets.py

@@ -82,23 +82,32 @@ class BoardColumnsInView(Horizontal):
 
     def on_mount(self):
         self.border_title = "board.columns_in_view"
+        self.set_initial_select_value()
 
     def compose(self) -> Iterable[Widget]:
         yield Label("Columns in view")
         with self.prevent(Select.Changed):
             column_select = VimSelect.from_values(
                 [i + 1 for i in range(len(self.app.column_list))],
-                value=self.app.config.board.columns_in_view,
                 id="select_columns_in_view",
                 allow_blank=False,
             )
-            column_select.jump_mode = "focus"
-            yield column_select
+        column_select.jump_mode = "focus"
+        yield column_select
 
     @on(Select.Changed)
     def update_config(self, event: Select.Changed):
         self.app.config.set_columns_in_view(event.select.value)
 
+    def set_initial_select_value(self):
+        select = self.query_one(Select)
+        amount_cols = len(self.app.column_list)
+        if self.app.config.board.columns_in_view > amount_cols:
+            select.value = amount_cols
+        else:
+            with self.prevent(Select.Changed):
+                select.value = self.app.config.board.columns_in_view
+
 
 class TaskAlwaysExpandedSwitch(Horizontal):
     app: "KanbanTui"
@@ -481,6 +490,7 @@ async def move_column_position(
         )
         # Update state and Widgets
         await self.update_columns()
+        await self.update_dependent_widgets()
         # Trigger Update on tab Switch
         self.app.needs_refresh = True
         self.index = new_position
@@ -605,6 +615,8 @@ def get_select_widget_values(self):
 
 
 class SettingsView(Vertical):
+    app: "KanbanTui"
+
     def compose(self) -> Iterable[Widget]:
         yield DataBasePathInput(classes="setting-block")
         with Horizontal(classes="setting-horizontal"):

tests/app_tests/test_settings_screen.py

@@ -530,3 +530,82 @@ async def test_column_position_change_up(test_app: KanbanTui):
             ).highlighted_child.column.position
             == 1
         )
+
+
+# Part 1 test for https://github.com/Zaloog/kanban-tui/issues/58
+async def test_column_position_change_updates_status_values(test_app: KanbanTui):
+    async with test_app.run_test(size=APP_SIZE) as pilot:
+        await pilot.press("ctrl+l")
+
+        await pilot.press("ctrl+o")
+        await pilot.press("c")
+        assert pilot.app.screen.query_exactly_one(ColumnSelector).has_focus_within
+
+        # Go to Doing Item
+        await pilot.press(*"jj")
+
+        # Move Doing Column from position 2 -> 1
+        await pilot.press("K")
+
+        # get Dropdown value at position 1, which should be "Doing at this point"
+        assert (
+            (
+                pilot.app.screen.query_exactly_one(StatusColumnSelector)
+                .query_one("#select_reset", Select)
+                ._options[1][0]
+                ._text[0]
+            )
+            == "Doing"
+        )
+
+
+# Part 2 test for https://github.com/Zaloog/kanban-tui/issues/58
+async def test_column_selector_updates_on_board_change(test_app: KanbanTui):
+    async with test_app.run_test(size=APP_SIZE) as pilot:
+        # Go to Setting Screen to initially load the widgets
+        await pilot.press("ctrl+l")
+
+        # go back to BoardScreen and create a new board
+        await pilot.press("ctrl+j")
+        await pilot.press("B")
+
+        # Open Board Creation Screen
+        await pilot.press("n")
+
+        # Enter new Icon
+        await pilot.press(*"bug")
+
+        # Enter new board name
+        await pilot.click("#input_board_name")
+        await pilot.press(*"Test Board")
+
+        # Add Custom Columns
+        # CustomList visible after switch press
+        await pilot.click("#switch_use_default_columns")
+
+        # Focus input
+        await pilot.press("tab")
+        await pilot.press(*"test_column")
+        # next column input
+        await pilot.press("tab", "tab")
+        await pilot.press(*"test_column2")
+        # delete last column input
+        await pilot.press("shift+tab", "shift+tab", "delete")
+
+        # save board
+        await pilot.click("#btn_continue_new_board")
+        # Click to activate new Board
+        await pilot.press("j", "enter")
+
+        # Move to Setting Screen
+        await pilot.press("ctrl+l")
+        await pilot.press("ctrl+o")
+        await pilot.press("c")
+        assert pilot.app.screen.query_exactly_one(ColumnSelector).has_focus_within
+
+        # Go to test_column2
+        await pilot.press("j")
+        assert pilot.app.focused.highlighted_child.column.name == "test_column2"
+
+        # Columns in View also updates
+        assert pilot.app.screen.query_one("#select_columns_in_view").value == 1