Fix for page goals visualization showing hits instead of visits (#19618)

* Fix for page goals visualization showing hits instead of visits

* Update UI test screenshots

5 files changed, 13 insertions, 13 deletions

diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php
index dbccd776a1..873f05c67d 100644
--- a/plugins/Goals/Visualizations/Goals.php
+++ b/plugins/Goals/Visualizations/Goals.php
@@ -92,8 +92,8 @@ class Goals extends HtmlTable
         }
 
         if ($this->displayType == self::GOALS_DISPLAY_PAGES) {
-            $this->config->addTranslation('nb_hits', Piwik::translate('General_ColumnUniquePageviews'));
-            $this->config->metrics_documentation['nb_hits'] = Piwik::translate('General_ColumnUniquePageviewsDocumentation');
+            $this->config->addTranslation('nb_visits', Piwik::translate('General_ColumnUniquePageviews'));
+            $this->config->metrics_documentation['nb_visits'] = Piwik::translate('General_ColumnUniquePageviewsDocumentation');
             $this->removeUnusedRevenueColumns();
         }
 
@@ -193,7 +193,7 @@ class Goals extends HtmlTable
         }
 
         if ($this->displayType == self::GOALS_DISPLAY_PAGES) {
-            $this->config->columns_to_display = ['label', 'nb_hits'];
+            $this->config->columns_to_display = ['label', 'nb_visits']; // Should be uniques
             $goalColumnTemplates = [
                 'goal_%s_nb_conversions_attrib',
                 'goal_%s_revenue_attrib',
@@ -265,14 +265,14 @@ class Goals extends HtmlTable
         if ($this->displayType == self::GOALS_DISPLAY_PAGES) {
             if ('all' === $idGoals) {
                 $idGoals = array_keys($allGoals);
-                $this->requestConfig->filter_sort_column = 'nb_hits';
+                $this->requestConfig->filter_sort_column = 'nb_visits';
             } else {
                 // only sort by a goal's conversions if not showing all goals (for FULL_REPORT)
                 $this->requestConfig->filter_sort_column = 'goal_' . reset($idGoals) . '_nb_conversions_attrib';
             }
             $this->requestConfig->filter_sort_order  = 'desc';
 
-            $this->config->columns_to_display = ['label', 'nb_hits'];
+            $this->config->columns_to_display = ['label', 'nb_visits'];
             $goalColumnTemplates = [
                 'goal_%s_nb_conversions_attrib',
                 'goal_%s_revenue_attrib',
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
index 28297ab72c..44947c4c51 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3647306de8d285a7ad73e75fedfc5461e372236be391c63f254e40548e9770
-size 86846
+oid sha256:97b9a1cfd03f727bc5056bf6dbab61ecfe6f252db11520ffe3ee3bd4ad780137
+size 87233
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
index 4141a001a1..2fb3257723 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2006060508df201ef1daa22ca08d7795a0663bd0986122cccb0d0de681070f15
-size 102804
+oid sha256:91258332b45883c4e8b6829277194a187744cdc4e98b2ff16a189672fe06c068
+size 103254
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
index c2bbf287d6..0fd2b38430 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65506cd7f337e4d00ced6fe6325df10ca10df17c274755c9d1b9854b8bb5cafe
-size 53106
+oid sha256:fefbde44b38c03caec44375ba4d9cf72d0cc521b764b43c310450493f765a1a4
+size 53303
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_pages.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_pages.png
index 681cf41bb5..40025b5ec1 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_pages.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_pages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25602984236b51e6c30b63165c0f9f22c838b691168d9cd865228a993894d042
-size 37435
+oid sha256:8f28265909f9644c25687bffaaa56009845dfa4352a071e3631b8bba5d92a4ce
+size 37499