Merge pull request #771 from OpenTrafficCam/task/8376-write-test-to-filter-displayed-trackss

Task/8376 write test to filter displayed trackss

Author: briemla

OTAnalytics/adapter_ui/dummy_viewmodel.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from pathlib import Path
 from time import sleep
-from typing import Any, Dict, Iterable, List, Optional
+from typing import Any, Dict, Iterable, List, Optional, cast
 
 from OTAnalytics.adapter_ui.abstract_button_quick_save_config import (
     AbstractButtonQuickSaveConfig,
@@ -370,7 +370,7 @@ def _update_enabled_general_buttons(self) -> None:
             frame.set_enabled_general_buttons(general_buttons_enabled)
 
     def _get_frames(self) -> list[AbstractFrame | AbstractFrameProject]:
-        return [
+        frames: list[AbstractFrame | AbstractFrameProject] = [
             self.frame_tracks,
             self.frame_offset,
             self.frame_videos,
@@ -379,6 +379,9 @@ def _get_frames(self) -> list[AbstractFrame | AbstractFrameProject]:
             self.frame_flows,
             self.frame_analysis,
         ]
+        if self._frame_filter is not None:
+            frames.append(cast(AbstractFrame, self._frame_filter))
+        return frames
 
     def _update_enabled_track_buttons(self) -> None:
         action_running = self._application.action_state.action_running.get()
@@ -814,7 +817,10 @@ def get_selected_section_ids(self) -> list[str]:
     @action
     async def load_tracks(self) -> None:
         track_files = await self._ui_factory.askopenfilenames(
-            title="Load track files", filetypes=[("tracks file", "*.ottrk")]
+            title="Load track files",
+            filetypes=[
+                ("tracks file", "*.ottrk"),
+            ],
         )
         if not track_files:
             return

OTAnalytics/helpers/file_helpers.py

@@ -12,13 +12,18 @@ def get_all_files_with_correct_file_ending_in_directory(
         for file in files:
             file_to_save = file.expanduser()
             if file_to_save.is_dir():
+                # Treat file_type as a glob pattern (e.g., "*.ottrk", "*.tracks.csv")
                 files_in_directory = file_to_save.rglob(file_type)
                 files_to_save.update(files_in_directory)
                 continue
 
-            if not file_to_save.exists() or file_to_save.suffix != file_type:
+            if not file_to_save.exists():
+                logger().warning(f"File '{file_to_save}' does not exist. Skipping.")
+                continue
+
+            if not file_to_save.match(file_type):
                 logger().warning(
-                    f"Ottrk file'{file_to_save}' does not exist. Skipping file."
+                    f"File '{file_to_save}' does not match expected pattern '{file_type}'. Skipping."  # noqa
                 )
                 continue
 

OTAnalytics/plugin_ui/nicegui_gui/dialogs/file_picker.py

@@ -77,6 +77,8 @@ def __init__(
         # Current selected extension filter from dropdown
         self.current_extension_filter: Optional[List[str]] = None
         self.current_selected_option: str = "All File Endings"
+        if extension_options is not None and "All Files" in self.extension_options:
+            self.current_selected_option = "All Files"
 
         # Set up current_extension_filter based on provided parameters
         if self.show_extension_select:
@@ -97,9 +99,10 @@ def __init__(
                         self.current_selected_option = option_name
                         break
             else:
-                # Apply the default "All File Endings" filter
-                self.current_extension_filter = self.extension_options.get(
-                    "All File Endings"
+                self.current_extension_filter = (
+                    self.extension_options.get("All Files")
+                    if "All Files" in self.extension_options
+                    else self.extension_options.get("All File Endings")
                 )
 
         with self, ui.card().style("max-width: 70%; width: 100%"):
@@ -199,13 +202,12 @@ def update_grid(self) -> None:
         ):
             # Filter based on current_extension_filter (handles all extension filtering)
             # Only apply filter if current_extension_filter is not empty
-            paths = [
-                p
-                for p in paths
-                if p.is_file()
-                and p.suffix in self.current_extension_filter
-                or p.is_dir()
-            ]
+            exts: List[str] = list(self.current_extension_filter)
+
+            def matches_any(file_path: Path) -> bool:
+                return any(file_path.name.endswith(ext) for ext in exts)
+
+            paths = [p for p in paths if (p.is_file() and matches_any(p)) or p.is_dir()]
         paths.sort(key=lambda p: p.name.lower())
         paths.sort(key=lambda p: not p.is_dir())
 
@@ -239,8 +241,15 @@ def handle_double_click(self, e: events.GenericEventArguments) -> None:
             self.submit([self.path])
 
     async def _handle_ok(self) -> None:
-        rows: List[Dict[str, Any]] = await self.grid.get_selected_rows()
-        paths: List[Path] = [self._map_to_domain(r[PATH]) for r in rows]
+        # NiceGUI may return None when nothing is selected; normalize to an empty list
+        rows: List[Dict[str, Any]] | list = await self.grid.get_selected_rows() or []
+
+        # Build paths only from valid row dicts that contain PATH
+        paths: List[Path] = [
+            self._map_to_domain(r[PATH])
+            for r in rows
+            if isinstance(r, dict) and (PATH in r)
+        ]
 
         # If no rows are selected and we're in directory-only mode, use the current directory # noqa
         if not paths and (self.show_only_directories or self.multiple):

OTAnalytics/plugin_ui/nicegui_gui/nicegui/constants.py

@@ -23,3 +23,12 @@ class Alignment:
     center: Literal["center"] = "center"
     baseline: Literal["baseline"] = "baseline"
     stretch: Literal["stretch"] = "stretch"
+
+
+class TestIdAttributes:
+    """
+    Helper class providing constants for test ID attribute names.
+    """
+
+    TEST_ID: str = "test-id"
+    DATA_TESTID: str = "data-testid"

OTAnalytics/plugin_ui/nicegui_gui/nicegui/elements/forms.py

@@ -11,10 +11,10 @@
 from nicegui.elements.select import Select
 from nicegui.events import ValueChangeEventArguments
 
+from OTAnalytics.plugin_ui.nicegui_gui.nicegui.constants import TestIdAttributes
 from OTAnalytics.plugin_ui.nicegui_gui.nicegui.elements.table import (
     MissingInstanceError,
 )
-from OTAnalytics.plugin_ui.nicegui_gui.test_constants import TEST_ID
 
 YEAR_MONTH_DAY_FORMAT = "%Y-%m-%d"
 DAY_MONTH_YEAR_FORMAT = "%d.%m.%Y"
@@ -116,7 +116,13 @@ def _apply_marker(self, element: Element) -> None:
             # so that Playwright-based acceptance tests can reliably select the
             # input elements. This mirrors the pattern used for buttons in the UI.
             element.mark(self.marker)
-            element.props(f"{TEST_ID}={self.marker}")
+            try:
+                element.props(f"{TestIdAttributes.TEST_ID}={self.marker}")
+                element.props(f"{TestIdAttributes.DATA_TESTID}={self.marker}")
+            except Exception:
+                # In case a specific element type doesn't support props, ignore.
+                pass
+            element.props(f"{TestIdAttributes.TEST_ID}={self.marker}")
 
     def validate(self) -> bool:
         """Handles the validation logic for an element.
@@ -746,8 +752,14 @@ def __internal_update(self, event: ValueChangeEventArguments) -> None:
     def build(self) -> None:
         """Builds the UI form element."""
         self._instance = ui.checkbox(text=self._label_text, value=self._initial_value)
+        # Apply marker and data-testid for Playwright's get_by_test_id compatibility
         if self._marker:
             self._instance.mark(self._marker)
+            self._instance.props(f"{TestIdAttributes.DATA_TESTID}={self._marker}")
+        # Apply any additional props passed in
+        if self._props:
+            for prop in self._props:
+                self._instance.props(prop)
         if self._on_value_change:
             self._instance.on_value_change(self._on_value_change)
 

OTAnalytics/plugin_ui/nicegui_gui/pages/add_track_form/container.py

@@ -16,6 +16,7 @@
 from OTAnalytics.plugin_ui.nicegui_gui.test_constants import TEST_ID
 
 MARKER_VIDEO_TAB = "marker-video-tab"
+MARKER_TRACK_TAB = "marker-track-tab"
 
 
 class TrackForm:
@@ -41,7 +42,8 @@ def build(self) -> None:
                     TrackFormKeys.TAB_VIDEO,
                 )
             )
-            # Expose a stable test-id for Playwright to open the Videos tab reliably
+            # Expose stable test-ids for Playwright to open tabs reliably
+            track_tab.props(f"{TEST_ID}={MARKER_TRACK_TAB}")
             video_tab.props(f"{TEST_ID}={MARKER_VIDEO_TAB}")
         with ui.tab_panels(tabs, value=track_tab).classes("w-full"):
             with ui.tab_panel(track_tab):

OTAnalytics/plugin_ui/nicegui_gui/pages/add_track_form/visualization_offset_slider_form.py

@@ -11,8 +11,11 @@
 )
 from OTAnalytics.domain.geometry import RelativeOffsetCoordinate
 from OTAnalytics.plugin_ui.nicegui_gui.forms.offset_slider_form import OffsetSliderForm
+from OTAnalytics.plugin_ui.nicegui_gui.nicegui.constants import TestIdAttributes
 from OTAnalytics.plugin_ui.nicegui_gui.nicegui.elements.button_form import ButtonForm
 
+MARKER_UPDATE_OFFSET = "marker-update-offset"
+
 
 class VisualizationOffSetSliderForm(AbstractFrameOffset, ButtonForm):
     def __init__(
@@ -39,6 +42,10 @@ def build(self) -> Self:
             ),
             on_click=self._view_model.change_track_offset_to_section_offset,
         )
+        self.update_offset_button.mark(MARKER_UPDATE_OFFSET)
+        self.update_offset_button.props(
+            f"{TestIdAttributes.DATA_TESTID}={MARKER_UPDATE_OFFSET}"
+        )
         return self
 
     def on_offset_change(self) -> None:

OTAnalytics/plugin_ui/nicegui_gui/pages/visualization_filters_form/container.py

@@ -16,6 +16,7 @@
 from OTAnalytics.plugin_ui.customtkinter_gui.frame_filter import (
     InvalidDatetimeFormatError,
 )
+from OTAnalytics.plugin_ui.nicegui_gui.nicegui.constants import TestIdAttributes
 from OTAnalytics.plugin_ui.nicegui_gui.nicegui.elements.button_form import ButtonForm
 from OTAnalytics.plugin_ui.nicegui_gui.nicegui.elements.forms import (
     DateTimeForm,
@@ -24,6 +25,23 @@
 )
 
 MARKER_FILTER_BY_DATE_CHECKBOX = "marker-filter-by-date-checkbox"
+MARKER_FILTER_BY_DATE_BUTTON = "marker-filter-by-date-button"
+MARKER_FILTER_BY_DATE_APPLY_BUTTON = "marker-filter-by-date-apply"
+MARKER_FILTER_START_DATE_INPUT = "marker-filter-start-date"
+MARKER_FILTER_START_TIME_INPUT = "marker-filter-start-time"
+MARKER_FILTER_END_DATE_INPUT = "marker-filter-end-date"
+MARKER_FILTER_END_TIME_INPUT = "marker-filter-end-time"
+MARKER_FILTER_RANGE_LABEL = "marker-filter-range-label"
+
+# Additional navigation markers for Playwright tests
+MARKER_PREV_DATE_BUTTON = "marker-prev-date"
+MARKER_NEXT_DATE_BUTTON = "marker-next-date"
+MARKER_PREV_SECONDS_BUTTON = "marker-prev-seconds"
+MARKER_NEXT_SECONDS_BUTTON = "marker-next-seconds"
+MARKER_PREV_FRAMES_BUTTON = "marker-prev-frames"
+MARKER_NEXT_FRAMES_BUTTON = "marker-next-frames"
+MARKER_PREV_EVENT_BUTTON = "marker-prev-event"
+MARKER_NEXT_EVENT_BUTTON = "marker-next-event"
 
 
 class FilterDateRangeForm:
@@ -37,10 +55,14 @@ def __init__(
         self._start_date = DateTimeForm(
             self._resource_manager.get(VisualizationFiltersKeys.LABEL_START_DATE),
             self._resource_manager.get(VisualizationFiltersKeys.LABEL_START_TIME),
+            marker_date=MARKER_FILTER_START_DATE_INPUT,
+            marker_time=MARKER_FILTER_START_TIME_INPUT,
         )
         self._end_date = DateTimeForm(
             self._resource_manager.get(VisualizationFiltersKeys.LABEL_END_DATE),
             self._resource_manager.get(VisualizationFiltersKeys.LABEL_END_TIME),
+            marker_date=MARKER_FILTER_END_DATE_INPUT,
+            marker_time=MARKER_FILTER_END_TIME_INPUT,
         )
 
     def open(self) -> None:
@@ -89,10 +111,15 @@ def open(self) -> None:
             ui.label(first_occurrence_info_text)
             ui.label(last_occurrence_info_text)
             with ui.row():
-                ui.button(
+                apply_button = ui.button(
                     self._resource_manager.get(GeneralKeys.LABEL_APPLY),
                     on_click=self._on_apply_button_clicked,
                 )
+                # marker for Playwright: Apply button inside the filter-by-date dialog
+                apply_button.mark(MARKER_FILTER_BY_DATE_APPLY_BUTTON)
+                apply_button.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_FILTER_BY_DATE_APPLY_BUTTON}"  # noqa
+                )
                 ui.button(
                     self._resource_manager.get(GeneralKeys.LABEL_RESET),
                     on_click=self._on_reset_button_clicked,
@@ -174,26 +201,56 @@ def build(self) -> None:
                         ),
                         on_click=self.open_range_dialog,
                     )
+                    # Attach a stable test marker for Playwright selection
+                    self._filter_by_date_button.mark(MARKER_FILTER_BY_DATE_BUTTON)
+                    self._filter_by_date_button.props(
+                        f"{TestIdAttributes.DATA_TESTID}={MARKER_FILTER_BY_DATE_BUTTON}"
+                    )
                     self._filter_by_date_button.disable()
 
                 self._button_previous_second = ui.button(
                     "<", on_click=self._viewmodel.previous_second
                 )
+                self._button_previous_second.mark(MARKER_PREV_SECONDS_BUTTON)
+                self._button_previous_second.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_PREV_SECONDS_BUTTON}"
+                )
                 self._button_previous_frame = ui.button(
                     "<", on_click=self._viewmodel.previous_frame
                 )
+                self._button_previous_frame.mark(MARKER_PREV_FRAMES_BUTTON)
+                self._button_previous_frame.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_PREV_FRAMES_BUTTON}"
+                )
                 self._button_previous_event = ui.button(
                     "<", on_click=self._viewmodel.previous_event
                 )
+                self._button_previous_event.mark(MARKER_PREV_EVENT_BUTTON)
+                self._button_previous_event.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_PREV_EVENT_BUTTON}"
+                )
             with ui.column():
                 with ui.row():
                     self._filter_by_date_button_left = ui.button(
                         "<", on_click=self._viewmodel.switch_to_prev_date_range
                     )
+                    self._filter_by_date_button_left.mark(MARKER_PREV_DATE_BUTTON)
+                    self._filter_by_date_button_left.props(
+                        f"{TestIdAttributes.DATA_TESTID}={MARKER_PREV_DATE_BUTTON}"
+                    )
                     self._label_filter_by_date = ui.label()
+                    # Expose the current applied date range for Playwright assertions
+                    self._label_filter_by_date.mark(MARKER_FILTER_RANGE_LABEL)
+                    self._label_filter_by_date.props(
+                        f"{TestIdAttributes.DATA_TESTID}={MARKER_FILTER_RANGE_LABEL}"
+                    )
                     self._filter_by_date_button_right = ui.button(
                         ">", on_click=self._viewmodel.switch_to_next_date_range
                     )
+                    self._filter_by_date_button_right.mark(MARKER_NEXT_DATE_BUTTON)
+                    self._filter_by_date_button_right.props(
+                        f"{TestIdAttributes.DATA_TESTID}={MARKER_NEXT_DATE_BUTTON}"
+                    )
                     self._filter_by_date_button_left.disable()
                     self._filter_by_date_button_right.disable()
                 self._input_seconds.build()
@@ -216,12 +273,24 @@ def build(self) -> None:
                 self._button_next_second = ui.button(
                     ">", on_click=self._viewmodel.next_second
                 )
+                self._button_next_second.mark(MARKER_NEXT_SECONDS_BUTTON)
+                self._button_next_second.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_NEXT_SECONDS_BUTTON}"
+                )
                 self._button_next_frame = ui.button(
                     ">", on_click=self._viewmodel.next_frame
                 )
+                self._button_next_frame.mark(MARKER_NEXT_FRAMES_BUTTON)
+                self._button_next_frame.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_NEXT_FRAMES_BUTTON}"
+                )
                 self._button_next_event = ui.button(
                     ">", on_click=self._viewmodel.next_event
                 )
+                self._button_next_event.mark(MARKER_NEXT_EVENT_BUTTON)
+                self._button_next_event.props(
+                    f"{TestIdAttributes.DATA_TESTID}={MARKER_NEXT_EVENT_BUTTON}"
+                )
         self.set_enabled_general_buttons(False)
 
     def change_button_date(self, checkbox_status: bool) -> None:
@@ -275,9 +344,13 @@ def open_range_dialog(self) -> None:
 
     def set_active_color_on_filter_by_date_button(self) -> None:
         self._filter_by_date_button.props("color=orange")
+        # Expose active state for Playwright assertions
+        self._filter_by_date_button.props("data-filter-by-date-active=true")
 
     def set_inactive_color_on_filter_by_date_button(self) -> None:
         self._filter_by_date_button.props("color=primary")
+        # Expose inactive state for Playwright assertions
+        self._filter_by_date_button.props("data-filter-by-date-active=false")
 
     def set_active_color_on_filter_by_class_button(self) -> None:
         self._filter_by_class_button.props("color=orange")