adjusted trigger cols that the ui does not break

Author: sterlp

core/src/test/java/org/sterl/spring/persistent_tasks/task/TaskTransactionTest.java

@@ -134,7 +134,7 @@ void testRequiresNewHasOwnTransaction() {
 
     @ParameterizedTest
     @ValueSource(strings = {"transactionalClass", "transactionalMethod", "transactionalClosure"})
-    void testTransactionalTask(String task) {
+    void testTransactionalTask(String task) throws InterruptedException {
         // GIVEN
         var t = triggerService.queue(TaskTriggerBuilder
                 .newTrigger(task, "test").build());
@@ -143,7 +143,7 @@ void testTransactionalTask(String task) {
         personRepository.deleteAllInBatch();
         hibernateAsserts.reset();
         triggerService.run(t).get();
-        
+        Thread.sleep(50); // TODO wait for the history running event
         // THEN
         hibernateAsserts.assertTrxCount(2);
         assertThat(personRepository.count()).isEqualTo(2);

example/src/main/java/org/sterl/spring/example_app/vehicle/VehicleService.java

@@ -2,6 +2,7 @@
 
 import java.time.OffsetDateTime;
 import java.util.Random;
+import java.util.UUID;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -34,7 +35,10 @@ void triggerBuildVehicle() {
         v.setId(null);
         v.getEngine().setId(null);
 
-        eventPublisher.publishEvent(TriggerTaskCommand.of(BuildVehicleTask.ID.newUniqueTrigger(v)));
+        eventPublisher.publishEvent(TriggerTaskCommand.of(BuildVehicleTask.ID
+                .newTrigger(v)
+                .id(UUID.randomUUID().toString() + UUID.randomUUID().toString())
+                .build()));
 
         eventPublisher.publishEvent(TriggerTaskCommand.of(BuildVehicleTask.ID.newTrigger().state(v)
                 .runAt(OffsetDateTime.now().plusMinutes(RANDOM.nextInt(10_000))).build()));
@@ -48,6 +52,9 @@ public void buildVehicle(String type) {
         v.getEngine().setId(null);
         v.setType(type);
 
-        persistentTaskService.runOrQueue(BuildVehicleTask.ID.newUniqueTrigger(v));
+        persistentTaskService.runOrQueue(BuildVehicleTask.ID
+                .newTrigger(v)
+                .id(UUID.randomUUID().toString() + UUID.randomUUID().toString())
+                .build());
     }
 }

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

@@ -2,7 +2,7 @@ import TriggerHistoryListView from "@src/history/view/trigger-history.view";
 import { Trigger } from "@src/server-api";
 import LabeledText from "@src/shared/view/labled-text.view";
 import JsonView from "@uiw/react-json-view";
-import { Accordion, Button, Col, Container, Row } from "react-bootstrap";
+import { Accordion, Button, Col, Container, Form, Row } from "react-bootstrap";
 import TriggerStatusView from "../../trigger/views/trigger-staus.view";
 import { formatMs, formatShortDateTime } from "../date.util";
 import { useServerObject } from "../http-request";
@@ -83,21 +83,22 @@ export default TriggerItemView;
 
 const TriggerCompactView = ({ trigger }: { trigger: Trigger }) => (
     <Row className="align-items-center">
-        <Col xs="3" xl="1">
+        <Col className="col-2">
             <TriggerStatusView data={trigger} />
         </Col>
-        <Col>
-            <small className="text-truncate text-muted">{trigger.key.id}</small>
-            <br />
-            {" " + trigger.key.taskName}
+        <Col className="col-5">
+            <Form.Text muted role="label">
+                {trigger.key.id}
+            </Form.Text>
+            <div>{trigger.key.taskName}</div>
         </Col>
-        <Col>
+        <Col className="col-2">
             <LabeledText
                 label="Run at"
                 value={formatShortDateTime(trigger.runAt)}
             />
         </Col>
-        <Col>
+        <Col className="col-3">
             {trigger.runningOn ? (
                 <LabeledText
                     label={`Running on (${trigger.executionCount})`}

ui/src/trigger/triggers.page.tsx

@@ -20,7 +20,6 @@ const TriggersPage = () => {
             "?size=10&" + new URLSearchParams(query).toString()
         );
     };
-    console.info(query);
     useAutoRefresh(10000, doReload, [query]);
 
     return (