Add event presenter

This presenter will be used in an upcoming MR which adds
rendering of epic events on group activity page.

6 files changed, 10 insertions, 7 deletions

diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder
index d56234e6c1a..406e8a93194 100644
--- a/app/views/events/_event.atom.builder
+++ b/app/views/events/_event.atom.builder
@@ -1,5 +1,7 @@
 return unless event.visible_to_user?(current_user)
 
+event = event.present
+
 xml.entry do
   xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
   xml.link    href: event_feed_url(event)
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 222175c818a..647f0597adb 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,3 +1,5 @@
+- event = event.present
+
 - if event.visible_to_user?(current_user)
   .event-item
     .event-item-timestamp
diff --git a/app/views/events/_event_scope.html.haml b/app/views/events/_event_scope.html.haml
index 98941722434..67e4c538b4a 100644
--- a/app/views/events/_event_scope.html.haml
+++ b/app/views/events/_event_scope.html.haml
@@ -2,6 +2,5 @@
   = event_preposition(event)
   - if event.project
     = link_to_project(event.project)
-  - else
-    = event.project_name
-
+  - elsif event.group
+    = link_to event.resource_parent_name, group_path(event.group)
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index b02fdb4b638..50c5885c648 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -8,7 +8,7 @@
     %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
       = event.action_name
     %span.event-target-type.append-right-4= event.target_type.titleize.downcase
-    = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip event-target-link append-right-4', title: event.target_title do
+    = link_to event.target_link_options, class: 'has-tooltip event-target-link append-right-4', title: event.target_title do
       = event.target.reference_link_text
     - unless event.milestone?
       %span.event-target-title.append-right-4{ dir: "auto" }
@@ -17,4 +17,4 @@
     %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
       = event_action_name(event)
 
-  = render "events/event_scope", event: event
+  = render "events/event_scope", event: event if event.resource_parent.present?
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 2f156603414..606b0febb57 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -10,4 +10,4 @@
   - if event.project
     = link_to_project(event.project)
   - else
-    = event.project_name
+    = event.resource_parent_name
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index 3191eaa1e2c..7516dfe1602 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -27,7 +27,7 @@
             - if event.project
               = link_to_project(event.project)
             - else
-              = event.project_name
+              = event.resource_parent_name
         - else
           made a private contribution
 - else