From afbd3789e873e7d5b0fafff03984ac3c9341bce1 Mon Sep 17 00:00:00 2001
From: Ilija Lazoroski <ilija.la@live.com>
Date: Wed, 29 Jun 2022 18:33:38 +0200
Subject: [PATCH] UI: Use the new JSON schema in the Configure page

---
 .../ui/src/components/pages/ConfigurePage.js  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 b59659ba8..a6c36182a 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
@@ -18,6 +18,7 @@ import ConfigImportModal from '../configuration-components/ImportConfigModal';
 import applyUiSchemaManipulators from '../configuration-components/UISchemaManipulators.tsx';
 import HtmlFieldDescription from '../configuration-components/HtmlFieldDescription.js';
 import CONFIGURATION_TABS_PER_MODE from '../configuration-components/ConfigurationTabs.js';
+import {SCHEMA} from '../../services/configuration/config_schema.js';
 
 const CONFIG_URL = '/api/configuration/island';
 export const API_PBA_LINUX = '/api/file-upload/PBAlinux';
@@ -68,24 +69,25 @@ class ConfigurePageComponent extends AuthComponent {
   }
 
   componentDidMount = () => {
-    let urls = [CONFIG_URL];
+    let urls = ['/api/agent-configuration'];
     // ??? Why fetch config here and not in `render()`?
     Promise.all(urls.map(url => this.authFetch(url).then(res => res.json())))
       .then(data => {
         let sections = [];
         let monkeyConfig = data[0];
-        this.setInitialConfig(monkeyConfig.configuration);
+        this.setInitialConfig(monkeyConfig);
         for (let sectionKey of this.getSectionsOrder()) {
           sections.push({
             key: sectionKey,
-            title: monkeyConfig.schema.properties[sectionKey].title
+            title: SCHEMA.properties[sectionKey].title
           });
         }
+
         this.setState({
-          schema: monkeyConfig.schema,
-          configuration: monkeyConfig.configuration,
+          schema: SCHEMA,
+          configuration: monkeyConfig,
           sections: sections,
-          currentFormData: monkeyConfig.configuration[this.state.selectedSection]
+          currentFormData: monkeyConfig[this.state.selectedSection]
         })
       });
   };
@@ -337,10 +339,6 @@ class ConfigurePageComponent extends AuthComponent {
     let formProperties = {};
     formProperties['schema'] = displayedSchema
     formProperties['uiSchema'] = UiSchema({
-      PBA_linux_filename: this.state.configuration.monkey.post_breach.PBA_linux_filename,
-      PBA_windows_filename: this.state.configuration.monkey.post_breach.PBA_windows_filename,
-      setPbaFilenameWindows: this.setPbaFilenameWindows,
-      setPbaFilenameLinux: this.setPbaFilenameLinux,
       selectedSection: this.state.selectedSection
     })
     formProperties['fields'] = {DescriptionField: HtmlFieldDescription};
@@ -391,7 +389,7 @@ class ConfigurePageComponent extends AuthComponent {
                  style={{'marginBottom': '2em'}}
                  className={'config-nav'}>
       {this.state.sections.map(section => {
-        let classProp = section.key.startsWith('basic') ? 'tab-primary' : '';
+        let classProp = section.key.startsWith('propagation') ? 'tab-primary' : '';
         return (
           <Nav.Item key={section.key}>
             <Nav.Link className={classProp} eventKey={section.key}>{section.title}</Nav.Link>