From 0af1f22f728b2bb2232f84ace5f4b5f0c3c60c57 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Tue, 14 May 2019 16:43:15 -0700
Subject: Indent actions belonging to a pageview (#14063)

* Proof of concept for grouping actions by the page they occur in.

* Add pageview to goals/ecommerce actionDetails in Live.getLastVisitsDetails.

* Make count of actions to display when collapsed configurable.

* Quick selector fix.

* unfinished commit

* Collapse multiple adjacent content items in the visitor log.

* Get content collapsing to work w/ 3.x-dev changes.

* Forgot to add Live config file.

* Get to work w/ visitor profile and make sure last action does not have border so it looks like it correctly ends.

* Fix some issues from review.

* More styling tweaks.

* another styling tweak

* Update screenshots.

* Show page refreshes and allow expanding them in new implementation.

* Update some screenshots.

* Make sure tooltip is replaced correctly when showing refreshes.

* Another styling tweak.

* Add UI test + fix page refresh issue.

* Fix action group merging logic.

* Fix another actions grouping issue.

* Fixes for ending left border in certain edge cases.

* Another UI tweak.

* comparison threshold, random failure fix, update screenshots + another css tweak

* more css tweaks

* possible bug fix

* Last couple CSS fixes.

* More test fixes.
---
 plugins/Live/templates/_actionsList.twig | 37 +++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'plugins/Live/templates/_actionsList.twig')

diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index 1f6ff3e7c9..78ca780135 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -1,9 +1,40 @@
 {% set previousAction = false %}
-{% for action in actionDetails %}
+{% for actionGroup in actionGroups %}
+    {% if actionGroup.pageviewAction is not empty %}
+    {{ postEvent('Live.renderAction', actionGroup.pageviewAction, previousAction, visitInfo) }}
 
-    {{ postEvent('Live.renderAction', action, previousAction, visitInfo) }}
+    {% set previousAction = actionGroup.pageviewAction %}
+    {% endif %}
 
-{% set previousAction = action %}
+    {% if actionGroup.actionsOnPage is not empty or actionGroup.refreshActions is not empty %}
+    {% if actionGroup.pageviewAction is not empty %}
+    <li class="pageviewActions" data-view-count="{{ actionGroup.refreshActions|length + 1 }}" data-actions-on-page="{{ actionGroup.actionsOnPage|length }}">
+        <ol class="actionList">
+    {% endif %}
+        {% for action in actionGroup.refreshActions %}
+
+            {{ postEvent('Live.renderAction', action, previousAction, visitInfo) }}
+
+            {% set previousAction = action %}
+        {% endfor %}
+        <li class="refresh-divider"></li>
+        {% for action in actionGroup.actionsOnPage %}
+
+            {{ postEvent('Live.renderAction', action, previousAction, visitInfo) }}
+
+        {% set previousAction = action %}
+        {% endfor %}
+    {% if actionGroup.pageviewAction is not empty %}
+        <li class="actionsForPageExpander expanded" style="display:none;">
+            <span>
+                <a class="show-more-actions" href="javascript:" style="display:none;">Show <span class="show-actions-count"></span> more actions that occurred on this page...</a>
+                <a class="show-less-actions" href="javascript:">Show less actions...</a>
+            </span>
+        </li>
+        </ol>
+    </li>
+    {% endif %}
+    {% endif %}
 {% endfor %}
 
 {% if visitInfo.truncatedActionsCount is defined %}
-- 
cgit v1.2.3