Fix displaying of actions when loading additional visits in visitor profile (#15750)

* Ensure to group post loaded actions correctly

* Adds ui test for loading additional actions

6 files changed, 21 insertions, 6 deletions

diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index a7af05e8d3..b69b5e658d 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -195,6 +195,8 @@ class Controller extends \Piwik\Plugin\Controller
             return '';
         }
 
+        VisitorLog::groupActionsByPageviewId($nextVisits);
+
         $view = new View('@Live/getVisitList.twig');
         $view->idSite = $this->idSite;
         $view->startCounter = $startCounter < $nextVisits->getRowsCount() ? $nextVisits->getRowsCount() : $startCounter;
diff --git a/plugins/Live/tests/UI/Live_spec.js b/plugins/Live/tests/UI/Live_spec.js
index acbd621f03..9fbe17e9ef 100644
--- a/plugins/Live/tests/UI/Live_spec.js
+++ b/plugins/Live/tests/UI/Live_spec.js
@@ -75,6 +75,16 @@ describe("Live", function () {
         expect(await dialog.screenshot()).to.matchImage('visitor_profile');
     });
 
+    it('should load additional visits in visitor log', async function() {
+
+        await page.click('.visitor-profile-more-info a');
+
+        await page.waitForNetworkIdle();
+
+        var dialog = await page.$('.ui-dialog');
+        expect(await dialog.screenshot()).to.matchImage('visitor_profile_more_visits');
+    });
+
     it('should hide all action details', async function() {
         await page.evaluate(function(){
             $('.visitor-profile-toggle-actions').click();
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
index f4ed9f750e..d58f3b47ba 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:922ac457ffa3b2a0117b8056e66530e01b5165d38b5b3b386c3d47bfa1ef9b38
-size 286501
+oid sha256:9c2167bbdb95c2415908e5e6721d6cc9e23f2a4b71d9cbf000ec4dec59316c5e
+size 294763
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
index be8d08e5d8..a5b6800bef 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaeba2afebc1c74fd8d13d74ea8ccfc7f9cb3dd9418d288ac8e4420ed85f47d4
-size 253276
+oid sha256:3e29bbe67d6d3361acaeb421154428694c0e70502b570b908f1d386af1c99c55
+size 260800
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
new file mode 100644
index 0000000000..4a0c95073e
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a87acf1f5a1e86b8ae95df58fd32e6dd50e2082ed47d896b09bcd58ea2b12c63
+size 444121
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
index 4973b5d61b..44da8d5001 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d935ef09c39f74682a18f6cd285b8efddb93777e249876d2ad245e2aff08eab
-size 263232
+oid sha256:b5b0c3881ec1bff05049533a34203505dbad74e1ffb8011b5c9f03041b882ba8
+size 270434