Revert to normal tab processing and commit when validating panel.

Author: hategan

tests/installer/panels/basic_info_panel.py

@@ -4,7 +4,7 @@
 
 from .panel import Panel
 from ..log import log
-from ..widgets import ShortcutButton, MInput
+from ..widgets import ShortcutButton
 
 from textual import on
 from textual.containers import Vertical, Horizontal
@@ -17,8 +17,8 @@
 
 class BasicInfoPanel(Panel):
     def _build_widgets(self) -> Widget:
-        self.name_input = MInput(placeholder='Enter machine name', id='name-input')
-        self.email_input = MInput(placeholder='Enter email', id='email-input')
+        self.name_input = Input(placeholder='Enter machine name', id='name-input')
+        self.email_input = Input(placeholder='Enter email', id='email-input')
         return Vertical(
             Label('Some basic information', classes='header'),
             Label('The name should be something descriptive, such as '

tests/installer/panels/batch_scheduler_panel.py

@@ -7,7 +7,7 @@
 from ..dialogs import TestJobsDialog
 from ..log import log
 from ..state import Attr, State
-from ..widgets import MSelect, ShortcutButton, MInput
+from ..widgets import MSelect, ShortcutButton
 
 from textual import on
 from textual.app import ComposeResult
@@ -246,20 +246,20 @@ def _build_widgets(self) -> Widget:
                 ),
                 Vertical(
                     Label('Account/project:', classes='form-label'),
-                    MInput(id='account-input'),
+                    Input(id='account-input'),
                     classes='bs-col-2 form-row batch-valid'
                 ),
                 classes='w-100 form-row', id='batch-system-group-1'
             ),
             Horizontal(
                 Vertical(
                     Label('Queue:', classes='form-label'),
-                    MInput(id='queue-input'),
+                    Input(id='queue-input'),
                     classes='bs-col-1 form-row batch-valid'
                 ),
                 Vertical(
                     Label('Multi-node queue:', classes='form-label'),
-                    MInput(id='mqueue-input'),
+                    Input(id='mqueue-input'),
                     classes='bs-col-2 form-row batch-valid'
                 ),
                 Checkbox('Run [b bright_yellow]t[/b bright_yellow]est job', value=False,
@@ -286,11 +286,20 @@ async def validate(self) -> bool:
         assert isinstance(run_test_job, Checkbox)
         scheduler = self._get_scheduler()
 
+        self.state.update_conf('account', self._get_input('account-input'))
+        self.state.update_conf('queue_name', self._get_input('queue-input'))
+        self.state.update_conf('multi_node_queue_name', self._get_input('mqueue-input'))
+
         if run_test_job.value and scheduler != 'none' and scheduler != 'local':
             return await self.run_test_jobs()
         else:
             return True
 
+    def _get_input(self, id: str) -> str:
+        input = self.get_widget_by_id(id)
+        assert isinstance(input, Input)
+        return input.value
+
     @property
     def label(self) -> str:
         return 'Scheduler'

tests/installer/widgets.py

@@ -52,15 +52,3 @@ def render(self) -> RenderResult:
         text = super().render()
         text.plain = '......'  # type: ignore
         return text
-
-
-class MInput(Input):
-    # A version of input that also runs the submit action when the tab button is pressed (seems
-    # silly from a UI perspective to allow moving the focus from this input without the value being
-    # committed to whatever model is underneath.
-
-    BINDINGS = [('tab', 'tab_pressed')]
-
-
-    async def action_tab_pressed(self) -> None:
-        await self.action_submit()