From 677f995bb3728835fea5ec77067db0d431637071 Mon Sep 17 00:00:00 2001 From: Shreya Date: Fri, 9 Jul 2021 20:19:38 +0530 Subject: [PATCH] cc: Change schema for Network configuration tab to decouple info box and blocked IPs' input field --- .../cc/services/config_schema/basic_network.py | 10 +++++++--- .../components/configuration-components/UiSchema.js | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/monkey/monkey_island/cc/services/config_schema/basic_network.py b/monkey/monkey_island/cc/services/config_schema/basic_network.py index 4512a7cc9..46c04284e 100644 --- a/monkey/monkey_island/cc/services/config_schema/basic_network.py +++ b/monkey/monkey_island/cc/services/config_schema/basic_network.py @@ -9,6 +9,13 @@ BASIC_NETWORK = { "title": "Scope", "type": "object", "properties": { + "info_box": { + "title": "", + "type": "object", + "info": 'The Monkey scans its subnet if "Local network scan" is ticked. ' + 'Additionally, the Monkey scans machines according to "Scan ' + 'target list".', + }, "blocked_ips": { "title": "Blocked IPs", "type": "array", @@ -19,9 +26,6 @@ BASIC_NETWORK = { }, "default": [], "description": "List of IPs that the Monkey will not scan.", - "info": 'The Monkey scans its subnet if "Local network scan" is ticked. ' - 'Additionally the monkey scans machines according to "Scan ' - 'target list".', }, "local_network_scan": { "title": "Local network scan", diff --git a/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js b/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js index 684d9d416..aa93445e6 100644 --- a/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js +++ b/monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js @@ -18,8 +18,8 @@ export default function UiSchema(props) { basic_network: { 'ui:order': ['scope', 'network_analysis'], scope: { - blocked_ips: { - 'ui:field': FieldWithInfo + info_box: { + 'ui:field': InfoField }, subnet_scan_list: { format: 'ip-list'