From 6fb06bc24d825948c92c805618c461e568249519 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 15 Apr 2019 16:01:19 +0300
Subject: [PATCH] Refactored island imports according to latest changes

---
 monkey/monkey_island/cc/app.py                            | 6 +++---
 monkey/monkey_island/cc/services/attack/attack_report.py  | 8 ++++----
 .../cc/services/attack/technique_reports/T1197.py         | 2 +-
 .../cc/services/attack/technique_reports/T1210.py         | 1 -
 .../attack/technique_reports/technique_service.py         | 4 ++--
 .../cc/ui/src/components/pages/AttackReportPage.js        | 1 -
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index a76774079..27b1fdc06 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -31,9 +31,9 @@ from monkey_island.cc.resources.pba_file_download import PBAFileDownload
 from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.resources.pba_file_upload import FileUpload
-from monkey_island.cc.resources.attack_telem import AttackTelem
-from monkey_island.cc.resources.attack_config import AttackConfiguration
-from monkey_island.cc.resources.attack_report import AttackReport
+from monkey_island.cc.resources.attack.attack_telem import AttackTelem
+from monkey_island.cc.resources.attack.attack_config import AttackConfiguration
+from monkey_island.cc.resources.attack.attack_report import AttackReport
 
 __author__ = 'Barak'
 
diff --git a/monkey/monkey_island/cc/services/attack/attack_report.py b/monkey/monkey_island/cc/services/attack/attack_report.py
index ebf280b00..8e4b83858 100644
--- a/monkey/monkey_island/cc/services/attack/attack_report.py
+++ b/monkey/monkey_island/cc/services/attack/attack_report.py
@@ -1,8 +1,8 @@
 import logging
-from cc.services.attack.technique_reports import T1210, T1197
-from cc.services.attack.attack_telem import get_latest_telem
-from cc.services.attack.attack_config import get_technique_values
-from cc.database import mongo
+from monkey_island.cc.services.attack.technique_reports import T1210, T1197
+from monkey_island.cc.services.attack.attack_telem import get_latest_telem
+from monkey_island.cc.services.attack.attack_config import get_technique_values
+from monkey_island.cc.database import mongo
 
 __author__ = "VakarisZ"
 
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1197.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1197.py
index 1b3b9e708..2685540b7 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1197.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1197.py
@@ -1,5 +1,5 @@
 from monkey_island.cc.services.attack.technique_reports.technique_service import *
-from cc.database import mongo
+from monkey_island.cc.database import mongo
 
 __author__ = "VakarisZ"
 
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1210.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1210.py
index b796b93a5..d93652238 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1210.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1210.py
@@ -1,5 +1,4 @@
 from monkey_island.cc.services.attack.technique_reports.technique_service import *
-from cc.services.report import ReportService
 from common.utils.attack_utils import ScanStatus
 
 __author__ = "VakarisZ"
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/technique_service.py b/monkey/monkey_island/cc/services/attack/technique_reports/technique_service.py
index e412bea8f..3538b543d 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/technique_service.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/technique_service.py
@@ -1,6 +1,6 @@
-from cc.database import mongo
+from monkey_island.cc.database import mongo
 from common.utils.attack_utils import ScanStatus
-from cc.services.attack.attack_config import get_technique
+from monkey_island.cc.services.attack.attack_config import get_technique
 
 __author__ = "VakarisZ"
 
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/AttackReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/AttackReportPage.js
index ff3714ef9..6197e47ce 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/AttackReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/AttackReportPage.js
@@ -104,7 +104,6 @@ class AttackReportPageComponent extends AuthComponent {
 
   generateReportContent(){
     let content = [];
-    console.log(this.state.report);
     Object.keys(this.state.report).forEach((tech_id) => {
       content.push(this.getTechniqueCollapse(tech_id))
     });