From 752ea6af105cbc553178797c82086f2dcdf2be01 Mon Sep 17 00:00:00 2001
From: Ilija Lazoroski <ilija.la@live.com>
Date: Fri, 16 Jul 2021 09:31:14 +0200
Subject: [PATCH] ui: Remove title and type from config schema

---
 .../monkey_island/cc/services/config_schema/basic_network.py  | 2 --
 monkey/monkey_island/cc/services/config_schema/ransomware.py  | 4 ----
 .../cc/ui/src/components/configuration-components/TextBox.js  | 4 +---
 .../monkey_island/cc/ui/src/components/pages/ConfigurePage.js | 2 +-
 4 files changed, 2 insertions(+), 10 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 02f87c7cf..eceda4828 100644
--- a/monkey/monkey_island/cc/services/config_schema/basic_network.py
+++ b/monkey/monkey_island/cc/services/config_schema/basic_network.py
@@ -10,8 +10,6 @@ BASIC_NETWORK = {
             "type": "object",
             "properties": {
                 "info_box": {
-                    "title": "",
-                    "type": "text",
                     "info": 'The Monkey scans its subnet if "Local network scan" is checked. '
                     'Additionally, the Monkey scans machines according to "Scan '
                     'target list".',
diff --git a/monkey/monkey_island/cc/services/config_schema/ransomware.py b/monkey/monkey_island/cc/services/config_schema/ransomware.py
index 7ec3d793f..dd77a175d 100644
--- a/monkey/monkey_island/cc/services/config_schema/ransomware.py
+++ b/monkey/monkey_island/cc/services/config_schema/ransomware.py
@@ -23,8 +23,6 @@ RANSOMWARE = {
                     "in the files contained within the target directories.",
                 },
                 "info_box": {
-                    "title": "",
-                    "type": "text",
                     "info": "No files will be encrypted if a directory is not specified or doesn't "
                     "exist on a victim machine.",
                 },
@@ -53,8 +51,6 @@ RANSOMWARE = {
                     },
                 },
                 "text_box": {
-                    "title": "",
-                    "type": "text",
                     "text": "Note: A README.txt will be left in the specified target " "directory.",
                 },
             },
diff --git a/monkey/monkey_island/cc/ui/src/components/configuration-components/TextBox.js b/monkey/monkey_island/cc/ui/src/components/configuration-components/TextBox.js
index f32803195..4d24ddb0a 100644
--- a/monkey/monkey_island/cc/ui/src/components/configuration-components/TextBox.js
+++ b/monkey/monkey_island/cc/ui/src/components/configuration-components/TextBox.js
@@ -4,9 +4,7 @@ class TextBox extends React.Component {
 
   render() {
     return (
-    <>
-      <p>{this.props.schema.text} </p>
-    </>
+      <p>{this.props.schema.text}</p>
     );
   }
 }
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
index 321974b0c..c7c84e327 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
@@ -58,7 +58,7 @@ class ConfigurePageComponent extends AuthComponent {
   }
 
   getSectionsOrder() {
-    let islandMode = 'advanced'
+    let islandMode = this.props.islandMode ? this.props.islandMode : 'advanced'
     return CONFIGURATION_TABS_PER_MODE[islandMode];
   }