From af4f4ed315ad9327c8f7a1ef30f07c9abc913dc7 Mon Sep 17 00:00:00 2001 From: Stephanya Casanova Date: Wed, 16 Oct 2024 17:53:36 +0200 Subject: [PATCH 1/5] [backend] Fix uri definition variables --- .../components/scenarios/scenario/injects/ScenarioInjects.tsx | 2 +- .../simulations/simulation/injects/ExerciseInjects.tsx | 2 +- .../components/simulations/simulation/injects/QuickInject.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbas-front/src/admin/components/scenarios/scenario/injects/ScenarioInjects.tsx b/openbas-front/src/admin/components/scenarios/scenario/injects/ScenarioInjects.tsx index 9eae25a81d..9719b55d95 100644 --- a/openbas-front/src/admin/components/scenarios/scenario/injects/ScenarioInjects.tsx +++ b/openbas-front/src/admin/components/scenarios/scenario/injects/ScenarioInjects.tsx @@ -68,7 +68,7 @@ const ScenarioInjects: FunctionComponent = () => { teams={teams} articles={articles} variables={variables} - uriVariable={`/admin/scenarios/${scenarioId}/definition/variables`} + uriVariable={`/admin/scenarios/${scenarioId}/definition`} allUsersNumber={scenario.scenario_all_users_number} usersNumber={scenario.scenario_users_number} // @ts-expect-error typing diff --git a/openbas-front/src/admin/components/simulations/simulation/injects/ExerciseInjects.tsx b/openbas-front/src/admin/components/simulations/simulation/injects/ExerciseInjects.tsx index 34c225dcc5..4ba4819b64 100644 --- a/openbas-front/src/admin/components/simulations/simulation/injects/ExerciseInjects.tsx +++ b/openbas-front/src/admin/components/simulations/simulation/injects/ExerciseInjects.tsx @@ -94,7 +94,7 @@ const ExerciseInjects: FunctionComponent = () => { teams={teams} articles={articles} variables={variables} - uriVariable={`/admin/exercises/${exerciseId}/definition/variables`} + uriVariable={`/admin/exercises/${exerciseId}/definition`} allUsersNumber={exercise.exercise_all_users_number} usersNumber={exercise.exercise_users_number} // @ts-expect-error typing diff --git a/openbas-front/src/admin/components/simulations/simulation/injects/QuickInject.js b/openbas-front/src/admin/components/simulations/simulation/injects/QuickInject.js index f6dde338b9..2abb7db439 100644 --- a/openbas-front/src/admin/components/simulations/simulation/injects/QuickInject.js +++ b/openbas-front/src/admin/components/simulations/simulation/injects/QuickInject.js @@ -1417,7 +1417,7 @@ class QuickInject extends Component { Date: Wed, 16 Oct 2024 18:17:44 +0200 Subject: [PATCH 2/5] [backend] Fix uri definition variables --- .../simulation/variables/AvailableVariablesDialog.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx b/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx index 3b9c82630b..b72303fd92 100644 --- a/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx +++ b/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx @@ -111,11 +111,11 @@ AvailableVariablesDialogProps label={t('Builtin variables')} value="1" /> - + />} - @@ -193,7 +193,7 @@ AvailableVariablesDialogProps ))} - + } From 833cc049e7d50dc1b4dfc434fea0f4fc03f17fa5 Mon Sep 17 00:00:00 2001 From: Stephanya Casanova Date: Wed, 16 Oct 2024 18:25:11 +0200 Subject: [PATCH 3/5] [backend] Fix uri definition variables --- .../simulation/variables/AvailableVariablesDialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx b/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx index b72303fd92..fad52de4ca 100644 --- a/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx +++ b/openbas-front/src/admin/components/simulations/simulation/variables/AvailableVariablesDialog.tsx @@ -115,7 +115,7 @@ AvailableVariablesDialogProps sx={{ textTransform: 'none' }} label={t('Custom variables')} value="2" - />} + />} + > {t('Please follow this link to')} {/* TODO: validate when migrate to new react router version */} From a2bfc7834c94f4f94190b36aead0e18126211103 Mon Sep 17 00:00:00 2001 From: Stephanya Casanova Date: Thu, 17 Oct 2024 10:07:05 +0200 Subject: [PATCH 4/5] [backend] Clean --- .../main/java/io/openbas/injectors/channel/ChannelExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java index aa700c10d3..f396e7ad55 100644 --- a/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java +++ b/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java @@ -95,7 +95,7 @@ public ExecutionProcess process(@NotNull final Execution execution, @NotNull fin boolean encrypted = content.isEncrypted(); users.forEach(userInjectContext -> { try { - // Put the challenges variables in the injection context + // Put the articles variables in the injection context List articleVariables = articles.stream() .map(article -> new ArticleVariable(article.getId(), article.getName(), buildArticleUri(userInjectContext, article))) From 4997d53b7bcfce30690c16c64e502dad10bae912 Mon Sep 17 00:00:00 2001 From: Marine LM Date: Thu, 17 Oct 2024 16:41:13 +0200 Subject: [PATCH 5/5] [frontend] fix list variables inside email content Signed-off-by: Marine LM --- .../components/common/injects/UpdateInjectDetails.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/openbas-front/src/admin/components/common/injects/UpdateInjectDetails.js b/openbas-front/src/admin/components/common/injects/UpdateInjectDetails.js index 8d6656ad9e..ecf2905511 100644 --- a/openbas-front/src/admin/components/common/injects/UpdateInjectDetails.js +++ b/openbas-front/src/admin/components/common/injects/UpdateInjectDetails.js @@ -162,15 +162,9 @@ const UpdateInjectDetails = ({ && data[field.key] && data[field.key].length > 0 ) { + const regex = /<#list\s+(\w+)\s+as\s+(\w+)>/g; finalData[field.key] = data[field.key] - .replaceAll( - '<#list challenges as challenge>', - '<#list challenges as challenge>', - ) - .replaceAll( - '<#list articles as article>', - '<#list articles as article>', - ) + .replace(regex, (_, listName, identifier) => `<#list ${listName} as ${identifier}>`) .replaceAll('</#list>', ''); } else if (data[field.key] && field.type === 'tuple') { if (field.cardinality && field.cardinality === '1') {