[backend] Fix export tags in scenarios and show expectations (#1129)

OpenBAS-Platform · Jun 25, 2024 · 6655128 · 6655128
1 parent 03ba3d8
commit 6655128
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/rest/inject/output/InjectOutput.java b/openbas-api/src/main/java/io/openbas/rest/inject/output/InjectOutput.java
@@ -52,6 +52,9 @@ public class InjectOutput {
   @JsonProperty("inject_teams")
   private Set<String> teams;
 
+  @JsonProperty("inject_content")
+  private ObjectNode content;
+
   public InjectOutput(
       String id,
       String title,
@@ -85,5 +88,6 @@ public InjectOutput(
     );
     this.injectType = injectType;
     this.teams = teams != null ? new HashSet<>(Arrays.asList(teams)) : new HashSet<>();
+    this.content = content;
   }
 }
diff --git a/openbas-api/src/main/java/io/openbas/rest/scenario/export/ScenarioExportMixins.java b/openbas-api/src/main/java/io/openbas/rest/scenario/export/ScenarioExportMixins.java
@@ -16,7 +16,7 @@ public class ScenarioExportMixins {
       "scenario_message_header",
       "scenario_message_footer",
       "scenario_mail_from",
-      "scenarios_tags",
+      "scenario_tags",
       "scenario_documents",
   })
   public static class Scenario {

diff --git a/openbas-front/src/admin/components/common/injects/InjectIcon.js b/openbas-front/src/admin/components/common/injects/InjectIcon.js
@@ -13,7 +13,7 @@ const iconSelector = (type, isPayload, variant, fontSize, done, disabled, onClic
     height: fontSize === 'small' || variant === 'inline' ? 20 : 24,
     borderRadius: 4,
     cursor: onClick ? 'pointer' : 'default',
-    filter: `${done ? 'filter:hue-rotate(100deg);' : `brightness(${disabled ? '30%' : '100%'})`}`,
+    filter: `${done ? 'filter:hue-rotate(100deg)' : `brightness(${disabled ? '30%' : '100%'})`}`,
   };
   if (!type) {
     return (
@@ -52,7 +52,7 @@ const iconSelector = (type, isPayload, variant, fontSize, done, disabled, onClic
         width: fontSize === 'small' || variant === 'inline' ? 20 : 24,
         height: fontSize === 'small' || variant === 'inline' ? 20 : 24,
         borderRadius: 4,
-        filter: `${done ? 'filter:hue-rotate(100deg);' : `brightness(${disabled ? '30%' : '100%'})`}`,
+        filter: `${done ? 'filter:hue-rotate(100deg)' : `brightness(${disabled ? '30%' : '100%'})`}`,
       }}
     />