fix build (#14183)

* Fixing action segment regression + update UI test files + expected test files.

* Update more test files.

* update submodule

* Fix integration test.

* Update expected screenshot.

* More test fixes.

* Update expected files.

* Update more expected test files.

* Update submodule.

* Update more tests.

* Update some screenshots.

2 files changed, 19 insertions, 16 deletions

diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index ddc088ea7f..16897a109c 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -95,7 +95,7 @@ class API extends \Piwik\Plugin\API
 
         $dataTable = Archive::createDataTableFromArchive('Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable, $depth);
 
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL);
 
         if ($flat) {
             $dataTable->filter(function(DataTable $dataTable) {
@@ -196,7 +196,7 @@ class API extends \Piwik\Plugin\API
         $callBackParameters = array('Actions_actions_url', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $pageUrl, Action::TYPE_PAGE_URL);
         $this->addPageProcessedMetrics($dataTable);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL);
         return $dataTable;
     }
 
@@ -206,7 +206,7 @@ class API extends \Piwik\Plugin\API
 
         $dataTable = Archive::createDataTableFromArchive('Actions_actions', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable);
 
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = true);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE);
 
         return $dataTable;
     }
@@ -246,7 +246,7 @@ class API extends \Piwik\Plugin\API
         $callBackParameters = array('Actions_actions', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $pageName, Action::TYPE_PAGE_TITLE);
         $this->addPageProcessedMetrics($dataTable);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = true);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE);
         return $dataTable;
     }
 
@@ -255,7 +255,7 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasViewAccess($idSite);
 
         $dataTable = Archive::createDataTableFromArchive('Actions_downloads', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_DOWNLOAD);
         return $dataTable;
     }
 
@@ -265,7 +265,7 @@ class API extends \Piwik\Plugin\API
 
         $callBackParameters = array('Actions_downloads', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $downloadUrl, Action::TYPE_DOWNLOAD);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_DOWNLOAD);
         return $dataTable;
     }
 
@@ -274,7 +274,7 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasViewAccess($idSite);
 
         $dataTable = Archive::createDataTableFromArchive('Actions_outlink', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_OUTLINK);
         return $dataTable;
     }
 
@@ -284,7 +284,7 @@ class API extends \Piwik\Plugin\API
 
         $callBackParameters = array('Actions_outlink', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $outlinkUrl, Action::TYPE_OUTLINK);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_OUTLINK);
         return $dataTable;
     }
 
@@ -294,7 +294,7 @@ class API extends \Piwik\Plugin\API
 
         $dataTable = $this->getSiteSearchKeywordsRaw($idSite, $period, $date, $segment);
         $dataTable->deleteColumn(PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT);
-        $this->filterActionsDataTable($dataTable, $isPageTitleType = false);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_SITE_SEARCH);
         $dataTable->filter('ReplaceColumnNames');
         $dataTable->filter('AddSegmentByLabel', array('siteSearchKeyword'));
         $this->addPagesPerSearchColumn($dataTable);
diff --git a/plugins/Actions/DataTable/Filter/Actions.php b/plugins/Actions/DataTable/Filter/Actions.php
index 2001be6385..88b05585d0 100644
--- a/plugins/Actions/DataTable/Filter/Actions.php
+++ b/plugins/Actions/DataTable/Filter/Actions.php
@@ -13,20 +13,21 @@ use Piwik\Config;
 use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\Tracker\Action;
 
 class Actions extends BaseFilter
 {
-    private $isPageTitleType;
+    private $actionType;
     /**
      * Constructor.
      *
      * @param DataTable $table The table to eventually filter.
      * @param bool $isPageTitleType Whether we are handling page title or regular URL
      */
-    public function __construct($table, $isPageTitleType)
+    public function __construct($table, $actionType)
     {
         parent::__construct($table);
-        $this->isPageTitleType = $isPageTitleType;
+        $this->actionType = $actionType;
     }
 
     /**
@@ -40,10 +41,12 @@ class Actions extends BaseFilter
 
             $defaultActionName = Config::getInstance()->General['action_default_name'];
 
+            $isPageTitleType = $this->actionType == Action::TYPE_PAGE_TITLE;
+
             // for BC, we read the old style delimiter first (see #1067)
             $actionDelimiter = @Config::getInstance()->General['action_category_delimiter'];
             if (empty($actionDelimiter)) {
-                if ($this->isPageTitleType) {
+                if ($isPageTitleType) {
                     $actionDelimiter = Config::getInstance()->General['action_title_category_delimiter'];
                 } else {
                     $actionDelimiter = Config::getInstance()->General['action_url_category_delimiter'];
@@ -58,21 +61,21 @@ class Actions extends BaseFilter
                 if ($url) {
                     $row->setMetadata('segmentValue', urldecode($url));
                 } else if ($folderUrlStart) {
-                    $row->setMetadata('segment', 'pageUrl=^' . urlencode($folderUrlStart));
+                    $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($folderUrlStart)));
                 } else if ($pageTitlePath) {
                     if ($row->getIdSubDataTable()) {
                         $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim(urldecode($pageTitlePath)))));
                     } else {
                         $row->setMetadata('segmentValue', trim(urldecode($pageTitlePath)));
                     }
-                } else if ($this->isPageTitleType && !in_array($label, [DataTable::LABEL_SUMMARY_ROW])) {
+                } else if ($isPageTitleType && !in_array($label, [DataTable::LABEL_SUMMARY_ROW])) {
                     // for older data w/o page_title_path metadata
                     if ($row->getIdSubDataTable()) {
                         $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim(urldecode($label)))));
                     } else {
                         $row->setMetadata('segmentValue', trim(urldecode($label)));
                     }
-                } else if (!$this->isPageTitleType && $urlPrefix) { // folder for older data w/ no folder URL metadata
+                } else if ($this->actionType == Action::TYPE_PAGE_URL && $urlPrefix) { // folder for older data w/ no folder URL metadata
                     $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($urlPrefix . '/' . $label)));
                 }