From 47d37dcdd06812e8941e015408eeed74abe7249f Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Tue, 6 Aug 2019 19:19:00 +0300
Subject: [PATCH] Added title (should be event type) to report data and events
 timeline

---
 monkey/monkey_island/cc/resources/reporting/report.py     | 5 ++++-
 .../report-components/zerotrust/EventsTimeline.js         | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/monkey/monkey_island/cc/resources/reporting/report.py b/monkey/monkey_island/cc/resources/reporting/report.py
index 1b2895f8f..55c7766be 100644
--- a/monkey/monkey_island/cc/resources/reporting/report.py
+++ b/monkey/monkey_island/cc/resources/reporting/report.py
@@ -10,7 +10,7 @@ ZERO_TRUST_REPORT_TYPE = "zero_trust"
 GENERAL_REPORT_TYPE = "general"
 REPORT_TYPES = [GENERAL_REPORT_TYPE, ZERO_TRUST_REPORT_TYPE]
 
-__author__ = "itay.mizeretz"
+__author__ = ["itay.mizeretz", "shay.nehmad"]
 
 
 class Report(flask_restful.Resource):
@@ -30,9 +30,11 @@ class Report(flask_restful.Resource):
                         "events": [
                             {
                                 "timestamp": "2019-08-01 14:48:46.112000",
+                                "title": "Monkey perform an action",
                                 "message": "log1"
                             }, {
                                 "timestamp": "2019-08-01 14:48:42.112000",
+                                "title": "Analysis",
                                 "message": "log2"
                             }]
                     },
@@ -43,6 +45,7 @@ class Report(flask_restful.Resource):
                         "events": [
                             {
                                 "timestamp": "2019-08-01 14:48:46.112000",
+                                "title": "Analysis",
                                 "message": "log3"
                             }]
                     }
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
index 821b6bd00..441a01636 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
@@ -8,7 +8,13 @@ export class EventsTimeline extends Component {
         <Timeline>
           {
             this.props["events"].map(event => (
-              <TimelineEvent key={event.timestamp} createdAt={event.timestamp} title={event.message}>{event.message}</TimelineEvent>
+              <TimelineEvent
+                key={event.timestamp}
+                createdAt={event.timestamp}
+                title={event.title}
+                icon={<i className="fa fa-circle icon-info" />}>
+                  {event.message}
+              </TimelineEvent>
             ))
           }
         </Timeline>