engine: Add conceal key to trigger conf

This is a bugfix, since the trigger conf is used for validation purposes.
eclipse · Mar 3, 2023 · 385b5e4 · 385b5e4
1 parent 918f795
commit 385b5e4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/engine/src/stack.hpp b/engine/src/stack.hpp
@@ -785,6 +785,7 @@ struct TriggerConf : public PersistentConfable {
   Source source{Source::FILESYSTEM};
   Conf action{};
   Conf event{};
+  bool conceal{false};
   bool sticky{false};
   bool optional{false};
 
@@ -804,6 +805,7 @@ struct TriggerConf : public PersistentConfable {
         {"event", make_schema(&event, EANDA_SCHEMA, "event").require()},
         {"action", make_schema(&action, EANDA_SCHEMA, "action").require()},
         {"sticky", make_schema(&sticky, "whether trigger should be sticky")},
+        {"conceal", make_schema(&conceal, "whether trigger should be concealed in history")},
         {"optional", make_schema(&optional, "whether errors creating event or action should be ignored")},
         {"at", Ignore("time at which trigger was executed", JsonType::string)},
         {"since", Ignore("time since which trigger was in queue", JsonType::string)},

diff --git a/engine/tests/test_engine_json_schema.json b/engine/tests/test_engine_json_schema.json
@@ -1121,6 +1121,10 @@
           "at": {
             "description": "time at which trigger was executed"
           },
+          "conceal": {
+            "description": "whether trigger should be concealed in history",
+            "type": "boolean"
+          },
           "event": {
             "anyOf": [
               {

diff --git a/engine/tests/test_engine_nop_smoketest_dump.json b/engine/tests/test_engine_nop_smoketest_dump.json
@@ -92,27 +92,31 @@
         ],
         "name": "bundle"
       },
+      "conceal": false,
       "event": "start",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "basic/hmi=enable",
+      "conceal": false,
       "event": "next=1",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "basic/hmi=resume",
+      "conceal": false,
       "event": "time=5",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "basic/hmi=!resume",
+      "conceal": false,
       "event": "time=5.5",
       "optional": false,
       "source": "filesystem",
@@ -132,6 +136,7 @@
           }
         ]
       },
+      "conceal": false,
       "event": "time=6",
       "label": "Push and release basic/hmi=plus",
       "optional": false,
@@ -140,13 +145,15 @@
     },
     {
       "action": "fail",
+      "conceal": false,
       "event": "virtue/failure",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "fail",
+      "conceal": false,
       "event": "default_speed/kmph=>0.0",
       "label": "Vehicle default should never move with the nop binding.",
       "optional": false,
@@ -155,20 +162,23 @@
     },
     {
       "action": "log=info: Running nop/basic smoketest.",
+      "conceal": false,
       "event": "start",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "realtime_factor=-1",
+      "conceal": false,
       "event": "start",
       "optional": false,
       "source": "filesystem",
       "sticky": false
     },
     {
       "action": "succeed",
+      "conceal": false,
       "event": "time=60",
       "optional": false,
       "source": "filesystem",