added the ability to filter

Author: sterlp

core/src/main/java/org/sterl/spring/persistent_tasks/shared/repository/TriggerDataRepository.java

@@ -39,15 +39,19 @@ default Predicate buildSearch(
             final var value = StringHelper.applySearchWildCard(search.getSearch());
             Predicate pId;
             if (StringHelper.isSqlSearch(value)) {
-                pId = ExpressionUtils.or(
+                pId = ExpressionUtils.anyOf(
                         qData.key.id.like(value),
-                        qData.correlationId.like(value));
+                        qData.correlationId.like(value),
+                        qData.tag.like(value)
+                    );
             } else {
-                pId = ExpressionUtils.or(
+                pId = ExpressionUtils.anyOf(
                         qData.key.id.eq(value),
-                        qData.correlationId.eq(value));
+                        qData.correlationId.eq(value),
+                        qData.tag.eq(value)
+                    );
             }
-            predicate.andAnyOf(pId);
+            predicate.and(pId);
         }
 
         predicate.and(QueryHelper.eqOrLike(qData.key.id, search.getKeyId()));

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerLifeCycleEvent.java

@@ -2,7 +2,6 @@
 
 import java.io.Serializable;
 
-import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.sterl.spring.persistent_tasks.api.event.PersistentTasksEvent;
 import org.sterl.spring.persistent_tasks.shared.model.HasTriggerData;
@@ -17,7 +16,6 @@ default TriggerData getData() {
         return data();
     }
     long id();
-    @NonNull
     TriggerData data();
     @Nullable
     Serializable state();

example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.8</version>
+        <version>3.3.12</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 

ui/src/shared/view/labled-text.view.tsx

@@ -1,18 +1,27 @@
-import { Form } from "react-bootstrap";
 import React, { ReactNode } from "react";
+import { Form } from "react-bootstrap";
 
 interface Props {
     label: string;
     value?: string | number | ReactNode;
     className?: string;
+    onClick?: () => void;
 }
-const LabeledText: React.FC<Props> = ({ label, value, className }) => {
+const LabeledText: React.FC<Props> = ({ label, value, className, onClick }) => {
     return (
         <Form.Group className={className}>
             <Form.Text muted role="label">
                 {label}
             </Form.Text>
-            <div>{value}</div>
+            {onClick ? (
+                <div>
+                    <a onClick={onClick} href="#">
+                        {value}
+                    </a>
+                </div>
+            ) : (
+                <div>{value}</div>
+            )}
         </Form.Group>
     );
 };

ui/src/shared/view/trigger-list-item.view.tsx

@@ -20,12 +20,14 @@ interface TriggerProps {
     trigger: Trigger;
     afterTriggerChanged?: () => void;
     showReRunButton: boolean;
+    onFieldClick: (key: string, value?: string) => void;
 }
 
 const TriggerListItemView = ({
     trigger,
     afterTriggerChanged,
     showReRunButton,
+    onFieldClick,
 }: TriggerProps) => {
     // className="d-flex justify-content-between align-items-center"
     const [url, setUrl] = useUrl();
@@ -112,6 +114,7 @@ const TriggerListItemView = ({
                     key={trigger.id + "-TriggerDetailsView"}
                     trigger={trigger}
                     history={triggerHistory.data}
+                    onClick={onFieldClick}
                 />
             </Accordion.Body>
         </Accordion.Item>

ui/src/shared/view/trigger-search.view.tsx

@@ -9,6 +9,7 @@ import TaskSelect from "@src/task/view/task-select.view";
 import { useQuery } from "crossroad";
 import { Accordion, Col, Form, Row, Stack } from "react-bootstrap";
 import TriggerListItemView from "./trigger-list-item.view";
+import { useEffect, useState } from "react";
 
 interface Props {
     url: string;
@@ -21,8 +22,13 @@ const TriggersSearchView = ({
     showReRunButton,
 }: Props) => {
     const [query, setQuery] = useQuery();
+    const [search, setSearch] = useState(query.search || "");
     const triggers = useServerObject<PagedModel<Trigger>>(url);
 
+    useEffect(() => {
+        setSearch(query.search || "");
+    }, [query]);
+
     const doReload = () => {
         return triggers.doGet(
             "?size=10&" + new URLSearchParams(query).toString()
@@ -44,16 +50,12 @@ const TriggersSearchView = ({
             <Row>
                 <Col>
                     <Form.Control
-                        defaultValue={query.id || ""}
+                        value={search}
+                        onChange={(e) => setSearch(e.target.value)}
                         type="text"
                         placeholder="ID search, '*' any string, '_' any character ..."
                         onKeyUp={(e) =>
-                            e.key == "Enter"
-                                ? doUpdateQuery({
-                                      search: (e.target as HTMLInputElement)
-                                          .value,
-                                  })
-                                : null
+                            e.key == "Enter" ? doUpdateQuery({ search }) : null
                         }
                     />
                 </Col>
@@ -99,6 +101,7 @@ const TriggersSearchView = ({
                         afterTriggerChanged={
                             allowUpdateAnCancel ? doReload : undefined
                         }
+                        onFieldClick={(k, v) => doUpdateQuery({ [k]: v })}
                     />
                 ))}
             </Accordion>

ui/src/shared/view/trigger.view.tsx

@@ -9,18 +9,30 @@ import StackTraceView from "./stacktrace-view";
 const TriggerView = ({
     trigger,
     history,
+    onClick,
 }: {
     trigger: Trigger;
     history?: Trigger[];
+    onClick: (key: string, value?: string) => void;
 }) => {
     return (
         <>
             <Row>
                 <Col md="6" xl="4">
-                    <LabeledText label="Key Id" value={trigger.key.id} />
+                    <LabeledText
+                        label="Key Id"
+                        value={trigger.key.id}
+                        onClick={() => onClick("search", trigger.key.id)}
+                    />
                 </Col>
                 <Col md="6" xl="4">
-                    <LabeledText label="Task" value={trigger.key.taskName} />
+                    <LabeledText
+                        label="Task"
+                        value={trigger.key.taskName}
+                        onClick={() =>
+                            onClick("taskName", trigger.key.taskName)
+                        }
+                    />
                 </Col>
                 <Col md="6" xl="4">
                     <LabeledText label="Priority" value={trigger.priority} />
@@ -31,10 +43,15 @@ const TriggerView = ({
                     <LabeledText
                         label="Correlation Id"
                         value={trigger.correlationId}
+                        onClick={() => onClick("search", trigger.key.id)}
                     />
                 </Col>
                 <Col md="6" xl="4">
-                    <LabeledText label="Tag" value={trigger.tag} />
+                    <LabeledText
+                        label="Tag"
+                        value={trigger.tag}
+                        onClick={() => onClick("search", trigger.key.id)}
+                    />
                 </Col>
                 <Col md="6" xl="4">
                     <LabeledText