filter added to history page

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.5.1 - (2025-01-12)
+
+-  filter trigger by status
+-  filter history by status
+
 ## v1.5.0 - (2025-01-11)
 
 -   Adjusted transaction handling for trigger life cycle events

ui/src/history/history.page.tsx

@@ -4,27 +4,25 @@ import useAutoRefresh from "@src/shared/use-auto-refresh";
 import HttpErrorView from "@src/shared/view/http-error.view";
 import PageView from "@src/shared/view/page.view";
 import ReloadButton from "@src/shared/view/reload-button.view";
+import TriggerStatusSelect from "@src/shared/view/triger-status-select.view";
 import TriggerItemView from "@src/shared/view/trigger-list-item.view";
 import TaskSelect from "@src/task/view/task-select.view";
+import { useQuery } from "crossroad";
 import { useState } from "react";
 import { Accordion, Col, Form, Row, Stack } from "react-bootstrap";
 
 const HistoryPage = () => {
-    const [page, setPage] = useState(0);
-    const [taskName, setTaskName] = useState("");
-    const [id, setId] = useState("");
+    const [query, setQuery] = useQuery();
 
     const triggers = useServerObject<PagedModel<Trigger>>(
         "/spring-tasks-api/history"
     );
 
     const doReload = () => {
-        triggers.doGet(
-            "?size=10&page=" + page + "&taskName=" + taskName + "&id=" + id
-        );
+        triggers.doGet("?size=10&" + new URLSearchParams(query).toString());
     };
 
-    useAutoRefresh(10000, doReload, [page, taskName, id]);
+    useAutoRefresh(10000, doReload, [query]);
 
     return (
         <>
@@ -33,25 +31,52 @@ const HistoryPage = () => {
                 <Row>
                     <Col>
                         <Form.Control
+                            defaultValue={query.id || ""}
                             type="text"
                             placeholder="Search..."
                             onKeyUp={(e) =>
                                 e.key == "Enter"
-                                    ? setId(
-                                          (e.target as HTMLInputElement).value
-                                      )
+                                    ? setQuery((prev) => ({
+                                          ...prev,
+                                          id: (e.target as HTMLInputElement)
+                                              .value,
+                                      }))
                                     : null
                             }
                         />
                     </Col>
+                    <Col>
+                        <TriggerStatusSelect
+                            value={query.status}
+                            onTaskChange={(status) =>
+                                setQuery((prev) => ({
+                                    ...prev,
+                                    status,
+                                }))
+                            }
+                        />
+                    </Col>
                 </Row>
                 <Row className="align-items-center mb-2">
                     <Col>
-                        <TaskSelect onTaskChange={setTaskName} />
+                        <TaskSelect
+                            value={query.taskName}
+                            onTaskChange={(taskName) =>
+                                setQuery((prev) => ({
+                                    ...prev,
+                                    taskName: taskName,
+                                }))
+                            }
+                        />
                     </Col>
                     <Col>
                         <PageView
-                            onPage={(p) => setPage(p)}
+                            onPage={(page) =>
+                                setQuery((prev) => ({
+                                    ...prev,
+                                    page: page + "",
+                                }))
+                            }
                             data={triggers.data}
                         />
                     </Col>

ui/src/trigger/triggers.page.tsx

@@ -29,7 +29,7 @@ const TriggersPage = () => {
             <Row>
                 <Col>
                     <Form.Control
-                        value={query.id || ""}
+                        defaultValue={query.id || ""}
                         type="text"
                         placeholder="Search..."
                         onKeyUp={(e) =>