Makes visitor log/profile independent from Events plugin (#12047)

* makes profile query independent from events plugin

* move more stuff to event plugin

* update test files

2 files changed, 20 insertions, 1 deletions

diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php
index eee4ce7f52..d3fc8501f1 100644
--- a/plugins/Events/Events.php
+++ b/plugins/Events/Events.php
@@ -263,6 +263,7 @@ class Events extends \Piwik\Plugin
 
     public function provideActionDimensionFields(&$fields, &$joins)
     {
+        $fields[] = 'log_action_event_category.type AS eventType';
         $fields[] = 'log_action_event_category.name AS eventCategory';
         $fields[] = 'log_action_event_action.name as eventAction';
         $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_event_action
diff --git a/plugins/Events/VisitorDetails.php b/plugins/Events/VisitorDetails.php
index 76dfd37806..ecf76847d8 100644
--- a/plugins/Events/VisitorDetails.php
+++ b/plugins/Events/VisitorDetails.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\Events;
 
 use Piwik\Plugins\Live\VisitorDetailsAbstract;
@@ -14,12 +15,29 @@ use Piwik\View;
 
 class VisitorDetails extends VisitorDetailsAbstract
 {
+    const EVENT_VALUE_PRECISION = 3;
+
     public function extendActionDetails(&$action, $nextAction, $visitorDetails)
     {
-        if ($action['type'] == Action::TYPE_EVENT) {
+        if (!empty($action['eventType'])) {
             $action['type'] = 'event';
             $action['icon'] = 'plugins/Morpheus/images/event.png';
+
+            if (strlen($action['pageTitle']) > 0) {
+                $action['eventName'] = $action['pageTitle'];
+            }
+
+            if (isset($action['custom_float']) && strlen($action['custom_float']) > 0) {
+                $action['eventValue'] = round($action['custom_float'], self::EVENT_VALUE_PRECISION);
+            }
+
+            unset($action['pageTitle']);
+            unset($action['custom_float']);
+        } else {
+            unset($action['eventCategory']);
+            unset($action['eventAction']);
         }
+        unset($action['eventType']);
     }
 
     public function extendVisitorDetails(&$visitor)