diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-11-10 19:14:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 19:14:56 +0300 |
| commit | be724571d2f477b4f553411d41df3fb22408c0a6 (patch) | |
| tree | 385046baeb033a1be7abe9f57139a99c819e9664 /plugins | |
| parent | a4bdd6c9072d9c86e16fa566e129b7313751bdfe (diff) | |
Move performance reports to a new page / category (#16673)
* Move performance reports to new category
* fix tooltips
* updates UI test
* updates expected test files
* updates expected screenshots
* Move Performance category after transitions
* Make page reports wider
* adds nonce to language selector in updater / installation
* updates expected test files
* Update getLanguagesSelector.twig
* change report title to page urls
* Hide performance viz on normal page reports (not in widgets)
* update tests
* updates submodules
* fix ui tests
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Diffstat (limited to 'plugins')
40 files changed, 388 insertions, 284 deletions
diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php index c84f2fd5c6..5a43d58883 100644 --- a/plugins/Actions/Reports/Base.php +++ b/plugins/Actions/Reports/Base.php @@ -34,6 +34,15 @@ abstract class Base extends \Piwik\Plugin\Report $view->requestConfig->filter_limit = Actions::ACTIONS_REPORT_ROWS_DISPLAY; $view->config->show_all_views_icons = false; + if ($view->requestConfig->getRequestParam('performance') === '1') { + $view->requestConfig->filter_limit = 25; + // hide visualization selector + $view->config->footer_icons = [[ + 'class' => 'tableAllColumnsSwitch', + 'buttons' => [], + ]]; + } + if ($view->isViewDataTableId(HtmlTable::ID)) { $view->config->show_embedded_subtable = true; } @@ -87,6 +96,11 @@ abstract class Base extends \Piwik\Plugin\Report ); $this->addExcludeLowPopDisplayProperties($view); + + // hide the performance columns viz in page reports when not displayed as widget + if ($view->requestConfig->getRequestParam('widget') != '1') { + $view->config->show_table_performance = false; + } } protected function addExcludeLowPopDisplayProperties(ViewDataTable $view) diff --git a/plugins/Actions/Reports/GetPageUrls.php b/plugins/Actions/Reports/GetPageUrls.php index 5c434993ac..794848a8a5 100644 --- a/plugins/Actions/Reports/GetPageUrls.php +++ b/plugins/Actions/Reports/GetPageUrls.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\Actions\Reports; use Piwik\DbHelper; use Piwik\Piwik; +use Piwik\Plugin\ReportsProvider; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; @@ -77,5 +78,18 @@ class GetPageUrls extends Base $this->addPageDisplayProperties($view); $this->addBaseDisplayProperties($view); + + // related reports are only shown on performance page + if ($view->requestConfig->getRequestParam('performance') !== '1') { + $view->config->related_reports = []; + } + } + + public function getRelatedReports() + { + return [ + ReportsProvider::factory('Actions', 'getEntryPageUrls'), + ReportsProvider::factory('Actions', 'getExitPageUrls'), + ]; } } diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject 9e95248640de42e36211263879969faa961ecd8 +Subproject cd47cf6d66019d826464a5241f418c4f9bb67dd diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml index b498c355e2..0b90a12870 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml @@ -99,44 +99,6 @@ </row> <row> <category>Visitors</category> - <subcategory>Overview</subcategory> - <name>Performance overview</name> - <module>PagePerformance</module> - <action>get</action> - <onlineGuideUrl>https://matomo.org/faq/how-to/how-do-i-see-page-performance-reports/</onlineGuideUrl> - <metrics> - <avg_time_network>Avg. network time</avg_time_network> - <avg_time_server>Avg. server time</avg_time_server> - <avg_time_transfer>Avg. transfer time</avg_time_transfer> - <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> - <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> - <avg_time_on_load>Avg. on load time</avg_time_on_load> - <avg_page_load_time>Avg. page load time</avg_page_load_time> - </metrics> - <metricsDocumentation> - <avg_time_network>Average time (in seconds) how long it takes to connect to server. This includes the time needed to lookup DNS and establish a TCP connection. This value might be 0 after the first request to a domain as the browser might cache the connection.</avg_time_network> - <avg_time_server>Average time (in seconds) how long it takes the server to generate page. This is the time between the server receiving the request and start serving the response.</avg_time_server> - <avg_time_transfer>Average time (in seconds) how long it takes the browser to download the response from the server. This is the time from receiving the first byte till the response is complete.</avg_time_transfer> - <avg_time_dom_processing>Average time (in seconds) how long the browser spends loading the webpage after the response was fully received until the user can starting interacting with it.</avg_time_dom_processing> - <avg_time_dom_completion>Average time (in seconds) how long it takes for the browser to load media and execute any Javascript code listening for the DOMContentLoaded event after the the webpage was loaded and the user can already interact with it.</avg_time_dom_completion> - <avg_time_on_load>Average time (in seconds) how long it takes the browser to execute Javascript code waiting for the window.load event. This event is triggered once the DOM was completely rendered.</avg_time_on_load> - <avg_page_load_time>Average time (in seconds) how long it takes from requesting a page until the page is fully rendered within the browser</avg_page_load_time> - </metricsDocumentation> - <processedMetrics> - <avg_time_network>Avg. network time</avg_time_network> - <avg_time_server>Avg. server time</avg_time_server> - <avg_time_transfer>Avg. transfer time</avg_time_transfer> - <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> - <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> - <avg_time_on_load>Avg. on load time</avg_time_on_load> - <avg_page_load_time>Avg. page load time</avg_page_load_time> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2012-12-25,2013-01-23</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2012-12-25,2013-01-23</imageGraphEvolutionUrl> - <uniqueId>PagePerformance_get</uniqueId> - </row> - <row> - <category>Visitors</category> <subcategory>Locations</subcategory> <name>Country</name> <module>UserCountry</module> @@ -1154,6 +1116,18 @@ <avg_time_generation>Avg. generation time</avg_time_generation> </processedMetrics> <actionToLoadSubTables>getPageUrls</actionToLoadSubTables> + <relatedReports> + <row> + <name>Entry pages</name> + <module>Actions</module> + <action>getEntryPageUrls</action> + </row> + <row> + <name>Exit pages</name> + <module>Actions</module> + <action>getExitPageUrls</action> + </row> + </relatedReports> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=day&date=2013-01-23</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=day&date=2012-12-25,2013-01-23</imageGraphEvolutionUrl> <uniqueId>Actions_getPageUrls</uniqueId> @@ -1780,6 +1754,44 @@ </row> <row> <category>Actions</category> + <subcategory>Performance</subcategory> + <name>Performance overview</name> + <module>PagePerformance</module> + <action>get</action> + <onlineGuideUrl>https://matomo.org/faq/how-to/how-do-i-see-page-performance-reports/</onlineGuideUrl> + <metrics> + <avg_time_network>Avg. network time</avg_time_network> + <avg_time_server>Avg. server time</avg_time_server> + <avg_time_transfer>Avg. transfer time</avg_time_transfer> + <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> + <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> + <avg_time_on_load>Avg. on load time</avg_time_on_load> + <avg_page_load_time>Avg. page load time</avg_page_load_time> + </metrics> + <metricsDocumentation> + <avg_time_network>Average time (in seconds) how long it takes to connect to server. This includes the time needed to lookup DNS and establish a TCP connection. This value might be 0 after the first request to a domain as the browser might cache the connection.</avg_time_network> + <avg_time_server>Average time (in seconds) how long it takes the server to generate page. This is the time between the server receiving the request and start serving the response.</avg_time_server> + <avg_time_transfer>Average time (in seconds) how long it takes the browser to download the response from the server. This is the time from receiving the first byte till the response is complete.</avg_time_transfer> + <avg_time_dom_processing>Average time (in seconds) how long the browser spends loading the webpage after the response was fully received until the user can starting interacting with it.</avg_time_dom_processing> + <avg_time_dom_completion>Average time (in seconds) how long it takes for the browser to load media and execute any Javascript code listening for the DOMContentLoaded event after the the webpage was loaded and the user can already interact with it.</avg_time_dom_completion> + <avg_time_on_load>Average time (in seconds) how long it takes the browser to execute Javascript code waiting for the window.load event. This event is triggered once the DOM was completely rendered.</avg_time_on_load> + <avg_page_load_time>Average time (in seconds) how long it takes from requesting a page until the page is fully rendered within the browser</avg_page_load_time> + </metricsDocumentation> + <processedMetrics> + <avg_time_network>Avg. network time</avg_time_network> + <avg_time_server>Avg. server time</avg_time_server> + <avg_time_transfer>Avg. transfer time</avg_time_transfer> + <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> + <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> + <avg_time_on_load>Avg. on load time</avg_time_on_load> + <avg_page_load_time>Avg. page load time</avg_page_load_time> + </processedMetrics> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2012-12-25,2013-01-23</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2012-12-25,2013-01-23</imageGraphEvolutionUrl> + <uniqueId>PagePerformance_get</uniqueId> + </row> + <row> + <category>Actions</category> <subcategory>customdimension3</subcategory> <name>MyName3</name> <module>CustomDimensions</module> diff --git a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action.png b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action.png Binary files differindex faabace31f..a3c1f02d34 100644 --- a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action.png +++ b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action.png diff --git a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_insights.png b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_insights.png Binary files differindex c5f04713d0..5446cc46e4 100644 --- a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_insights.png +++ b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_insights.png diff --git a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_subtable.png b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_subtable.png Binary files differindex 9d8438ac29..b98732297b 100644 --- a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_subtable.png +++ b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_action_subtable.png diff --git a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_mainmenu.png b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_mainmenu.png Binary files differindex 41a7494428..6fa45ac9fc 100644 --- a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_mainmenu.png +++ b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_mainmenu.png diff --git a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_rowactions.png b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_rowactions.png Binary files differindex cbf3a10b08..fc7e513d3f 100644 --- a/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_rowactions.png +++ b/plugins/CustomDimensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_rowactions.png diff --git a/plugins/Dashboard/tests/UI/DashboardManager_spec.js b/plugins/Dashboard/tests/UI/DashboardManager_spec.js index 0faeca1c2f..2b23b6575d 100644 --- a/plugins/Dashboard/tests/UI/DashboardManager_spec.js +++ b/plugins/Dashboard/tests/UI/DashboardManager_spec.js @@ -29,7 +29,7 @@ describe("DashboardManager", function () { live = await page.jQuery('.widgetpreview-categorylist>li:contains(Goals)'); await live.hover(); - visitors = await page.jQuery('.widgetpreview-categorylist>li:contains(Visitors - Overview):first'); + visitors = await page.jQuery('.widgetpreview-categorylist>li:contains(Visitors):first'); await visitors.hover(); await visitors.click(); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index 9e3f4654c9..67cf53e8ea 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6059113f6bd3f4e388301d9803059de1544d5021e3fc7caad3761fb18e5562e -size 54571 +oid sha256:76e1d243ec2d998e3df1d1e105c88c3842eb51f41e9e7d42679774a38e66665a +size 52938 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index dd65b5ff03..32b9796c3a 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5de1e4285b701c213440c36fad60f032b22b52ee40fb3246497801613c5d26c9 -size 484482 +oid sha256:b642e64490baa6cd3dc1c8bd4016dab95db9eebdecb44515a472fad9f486f8f0 +size 480461 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index c91f4a2078..66e942016b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1bfecda2a871a869e35b36100bdfb7fbc7838de9aa6a8c1d751dd3545207ad0 -size 59379 +oid sha256:9a722db3c7277f4d261ac07593b525b989128472ff40f941dd28646979ef0442 +size 66489 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index 887edd9e19..f6a2ea19bb 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fadb0a32a0315c3e078d4792387ceb0f9b52dfb25d3fd6000148f8850353eb1 -size 70677 +oid sha256:b909833eac2e5214431f39cb6bff153748dc10fb778b5c435fbc73eef298d9a5 +size 77983 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 1afaf6af53..deb7fdf10c 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8772b0a0875f882449e1994c0f11f90bd6175372f10189dc338657f95b362b1 -size 749741 +oid sha256:10d8eb25ae4aa52a8f5c4a10d931f900942674311b051275c64885856a5ca613 +size 743813 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 6126b2c6f1..7a4c585cb2 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -54,11 +54,6 @@ </a> </li> <li style="font-size:15px;line-height:24px;"> - <a href="#PagePerformance_get" style="text-decoration:none; color: #0d0d0d;"> - Performance overview - </a> - </li> - <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> @@ -294,6 +289,11 @@ </a> </li> <li style="font-size:15px;line-height:24px;"> + <a href="#PagePerformance_get" style="text-decoration:none; color: #0d0d0d;"> + Performance overview + </a> + </li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_get" style="text-decoration:none; color: #0d0d0d;"> Referrers Overview </a> @@ -631,92 +631,6 @@ Back to top ↑ </a></p> -<h2 id="PagePerformance_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Performance overview -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAEfklEQVR4nO3cS1biQABA0ehxJ+x/SayFHtCHTufHE+IHuHckEqoqTuqRCG+n02nYw+FwOB6Pew01DMM9o+24mIebHQC+yPvhcDhv0heTh/f71IDnHfeGTffqLLufFwC8lPefXsD38e4fAO7xMQzD8XhcvKI+fmu+uOMuvne//PL8kvPD8R2HyQHz114Oni/gvM75auezLK4kLmA86WTGxTEXB9yYBQAe0cfaE5ONeXGf3t4jLzcaJkdODhiPOdmeFxew2DfzWcYP136+esrz38/HWRw8zggAD+Tv7YnJ2/rfLG7AO+7T20MtPqsSAHg+/640rN2k+Kxf/g+Jlzy67UwfJa0AYHertyduM7ksf8MB32DjNse237B4APgp/3164uabFM+3g37FGT3fXwmAl7J6pWHxwwtrB4yv+c+3xvGzvUuuLmBjlo3DNj7UsHhGG0uaDFgWCQCP622vb4R8PuX+hU9GAPA6dv6fhkfnsgEArHGlAQBIXuhrpAGAe4gGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBA8gczQRugNvGghAAAAABJRU5ErkJggg==" - height="200" - width="700" - margin="0 auto"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> - <thead style="background-color: #f2f2f2;"> - <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Name - </th> - <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> - Value - </th> - </thead> - <tbody> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. network time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. server time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. transfer time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. DOM processing time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. DOM completion time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. on load time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. page load time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - </tbody> - </table> - <p style="width: 100%; text-align:center;"> - <a style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; text-decoration:none; font-size: 9pt;" href="#reportTop"> - Back to top ↑ - </a></p> - <h2 id="UserCountry_getCountry" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> Country </h2> @@ -4998,6 +4912,92 @@ Back to top ↑ </a></p> +<h2 id="PagePerformance_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> + Performance overview +</h2> + + <img alt="" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAEfklEQVR4nO3cS1biQABA0ehxJ+x/SayFHtCHTufHE+IHuHckEqoqTuqRCG+n02nYw+FwOB6Pew01DMM9o+24mIebHQC+yPvhcDhv0heTh/f71IDnHfeGTffqLLufFwC8lPefXsD38e4fAO7xMQzD8XhcvKI+fmu+uOMuvne//PL8kvPD8R2HyQHz114Oni/gvM75auezLK4kLmA86WTGxTEXB9yYBQAe0cfaE5ONeXGf3t4jLzcaJkdODhiPOdmeFxew2DfzWcYP136+esrz38/HWRw8zggAD+Tv7YnJ2/rfLG7AO+7T20MtPqsSAHg+/640rN2k+Kxf/g+Jlzy67UwfJa0AYHertyduM7ksf8MB32DjNse237B4APgp/3164uabFM+3g37FGT3fXwmAl7J6pWHxwwtrB4yv+c+3xvGzvUuuLmBjlo3DNj7UsHhGG0uaDFgWCQCP622vb4R8PuX+hU9GAPA6dv6fhkfnsgEArHGlAQBIXuhrpAGAe4gGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBA8gczQRugNvGghAAAAABJRU5ErkJggg==" + height="200" + width="700" + margin="0 auto"/> + + <br/> + <br/> + + <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> + <thead style="background-color: #f2f2f2;"> + <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Name + </th> + <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> + Value + </th> + </thead> + <tbody> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. network time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. server time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. transfer time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. DOM processing time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. DOM completion time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. on load time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. page load time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + </tbody> + </table> + <p style="width: 100%; text-align:center;"> + <a style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; text-decoration:none; font-size: 9pt;" href="#reportTop"> + Back to top ↑ + </a></p> + <h2 id="Referrers_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> Referrers Overview </h2> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index 12d5c66dbf..428980ef91 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -54,11 +54,6 @@ </a> </li> <li style="font-size:15px;line-height:24px;"> - <a href="#PagePerformance_get" style="text-decoration:none; color: #0d0d0d;"> - Performance overview - </a> - </li> - <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> @@ -294,6 +289,11 @@ </a> </li> <li style="font-size:15px;line-height:24px;"> + <a href="#PagePerformance_get" style="text-decoration:none; color: #0d0d0d;"> + Performance overview + </a> + </li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_get" style="text-decoration:none; color: #0d0d0d;"> Referrers Overview </a> @@ -617,85 +617,6 @@ Back to top ↑ </a></p> -<h2 id="PagePerformance_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Performance overview -</h2> - - - - <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> - <thead style="background-color: #f2f2f2;"> - <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Name - </th> - <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> - Value - </th> - </thead> - <tbody> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. network time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. server time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. transfer time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. DOM processing time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. DOM completion time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style="background-color: #f2f2f2;"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. on load time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - - <tr style=";"> - <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Avg. page load time </td> - <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 00:00:00 - </td> - </tr> - </tbody> - </table> - <p style="width: 100%; text-align:center;"> - <a style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; text-decoration:none; font-size: 9pt;" href="#reportTop"> - Back to top ↑ - </a></p> - <h2 id="UserCountry_getCountry" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> Country </h2> @@ -4739,6 +4660,85 @@ Back to top ↑ </a></p> +<h2 id="PagePerformance_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> + Performance overview +</h2> + + + + <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> + <thead style="background-color: #f2f2f2;"> + <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Name + </th> + <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> + Value + </th> + </thead> + <tbody> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. network time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. server time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. transfer time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. DOM processing time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. DOM completion time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style="background-color: #f2f2f2;"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. on load time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + + <tr style=";"> + <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + Avg. page load time </td> + <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> + 00:00:00 + </td> + </tr> + </tbody> + </table> + <p style="width: 100%; text-align:center;"> + <a style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; text-decoration:none; font-size: 9pt;" href="#reportTop"> + Back to top ↑ + </a></p> + <h2 id="Referrers_get" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> Referrers Overview </h2> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv index a1bc314a3e..962a01b6b6 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv @@ -7,10 +7,6 @@ Visits Summary nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate 1,5,16,6,3.2,00:22:49,20% -Performance overview -avg_time_network,avg_time_server,avg_time_transfer,avg_time_dom_processing,avg_time_dom_completion,avg_time_on_load,avg_page_load_time -00:00:00,00:00:00,00:00:00,00:00:00,00:00:00,00:00:00,00:00:00 - Country label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate Poland,4,12,"$13,351.11",3,00:25:32,25% @@ -305,6 +301,10 @@ Returning Visits nb_uniq_visitors_new,nb_users_new,nb_visits_new,nb_actions_new,max_actions_new,bounce_rate_new,nb_actions_per_visit_new,avg_time_on_site_new,nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning 1,0,1,4,4,0%,4,00:12:01,1,0,4,12,6,25%,3,00:25:32 +Performance overview +avg_time_network,avg_time_server,avg_time_transfer,avg_time_dom_processing,avg_time_dom_completion,avg_time_on_load,avg_page_load_time +00:00:00,00:00:00,00:00:00,00:00:00,00:00:00,00:00:00,00:00:00 + Referrers Overview Referrers_visitorsFromSearchEngines,Referrers_visitorsFromSocialNetworks,Referrers_visitorsFromDirectEntry,Referrers_visitorsFromWebsites,Referrers_visitorsFromCampaigns,Referrers_distinctSearchEngines,Referrers_distinctSocialNetworks,Referrers_distinctKeywords,Referrers_distinctWebsites,Referrers_distinctCampaigns,Referrers_visitorsFromDirectEntry_percent,Referrers_visitorsFromSearchEngines_percent,Referrers_visitorsFromCampaigns_percent,Referrers_visitorsFromSocialNetworks_percent,Referrers_visitorsFromWebsites_percent 0,0,5,0,0,0,0,0,0,0,100%,0%,0%,0%,0% diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 747ef70315..9d72979a68 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php index 161560fdbd..6e35ae6dfa 100644 --- a/plugins/LanguagesManager/Controller.php +++ b/plugins/LanguagesManager/Controller.php @@ -11,9 +11,9 @@ namespace Piwik\Plugins\LanguagesManager; use Piwik\Common; use Piwik\DbHelper; +use Piwik\Nonce; use Piwik\Piwik; use Piwik\Url; -use Piwik\View; /** */ @@ -26,12 +26,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin public function saveLanguage() { $language = Common::getRequestVar('language'); + $nonce = Common::getRequestVar('nonce', ''); // Prevent CSRF only when piwik is not installed yet (During install user can change language) if (DbHelper::isInstalled()) { $this->checkTokenInUrl(); } + Nonce::checkNonce(LanguagesManager::LANGUAGE_SELECTION_NONCE, $nonce); + LanguagesManager::setLanguageForSession($language); Url::redirectToReferrer(); } diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index b73dfff640..5e7ad7a059 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -16,6 +16,7 @@ use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Cookie; use Piwik\Intl\Locale; +use Piwik\Nonce; use Piwik\Piwik; use Piwik\ProxyHttp; use Piwik\Translation\Translator; @@ -26,6 +27,8 @@ use Piwik\View; */ class LanguagesManager extends \Piwik\Plugin { + const LANGUAGE_SELECTION_NONCE = 'LanguagesManager.selection'; + /** * @see \Piwik\Plugin::registerEvents */ @@ -97,6 +100,7 @@ class LanguagesManager extends \Piwik\Plugin $view->languages = API::getInstance()->getAvailableLanguageNames(); $view->currentLanguageCode = self::getLanguageCodeForCurrentUser(); $view->currentLanguageName = self::getLanguageNameForCurrentUser(); + $view->nonce = Nonce::getNonce(self::LANGUAGE_SELECTION_NONCE); return $view->render(); } diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig index 1cb8fcdd09..ec32eb5ea5 100644 --- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig +++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig @@ -6,13 +6,14 @@ href="https://matomo.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> {% for language in languages %} <a class="item {% if language.code == currentLanguageCode %}active{% endif %}" - value="{{ language.code }}" - title="{{ language.name }} ({{ language.english_name }})">{{ language.name }}</a> + value="{{ language.code|e('html_attr') }}" + title="{{ language.name|e('html_attr') }} ({{ language.english_name|e('html_attr') }})">{{ language.name }}</a> {% endfor %} <form action="index.php?module=LanguagesManager&action=saveLanguage" method="post"> <input type="hidden" name="language" id="language"> + <input type="hidden" name="nonce" id="nonce" value="{{ nonce|e('html_attr') }}"> {# During installation token_auth is not set #} - {% if token_auth is defined %}<input type="hidden" name="token_auth" value="{{ token_auth }}"/>{% endif %} + {% if token_auth is defined %}<input type="hidden" name="token_auth" value="{{ token_auth|e('html_attr') }}"/>{% endif %} </form> </div> diff --git a/plugins/PagePerformance/Categories/PerformanceSubcategory.php b/plugins/PagePerformance/Categories/PerformanceSubcategory.php new file mode 100644 index 0000000000..e8f21cd27e --- /dev/null +++ b/plugins/PagePerformance/Categories/PerformanceSubcategory.php @@ -0,0 +1,19 @@ +<?php +/** + * Matomo - free/libre analytics platform + * + * @link https://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\PagePerformance\Categories; + +use Piwik\Category\Subcategory; + +class PerformanceSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'PagePerformance_Performance'; + protected $order = 47; + +} diff --git a/plugins/PagePerformance/PagePerformance.php b/plugins/PagePerformance/PagePerformance.php index 8655f92472..ba4648f365 100644 --- a/plugins/PagePerformance/PagePerformance.php +++ b/plugins/PagePerformance/PagePerformance.php @@ -23,6 +23,8 @@ class PagePerformance extends \Piwik\Plugin 'getExitPageUrls', 'getPageUrlsFollowingSiteSearch', 'getPageTitles', + 'getEntryPageTitles', + 'getExitPageTitles', 'getPageTitlesFollowingSiteSearch', ]; diff --git a/plugins/PagePerformance/Reports/Get.php b/plugins/PagePerformance/Reports/Get.php index 107159843e..1c313dea61 100644 --- a/plugins/PagePerformance/Reports/Get.php +++ b/plugins/PagePerformance/Reports/Get.php @@ -8,13 +8,12 @@ */ namespace Piwik\Plugins\PagePerformance\Reports; -use Piwik\DataTable; -use Piwik\Metrics\Formatter; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines; use Piwik\Plugins\PagePerformance\Metrics; use Piwik\Plugins\PagePerformance\Visualizations\JqplotGraph\StackedBarEvolution; +use Piwik\Plugins\PagePerformance\Visualizations\PerformanceColumns; use Piwik\Report\ReportWidgetFactory; use Piwik\Widget\WidgetsList; @@ -25,8 +24,8 @@ class Get extends \Piwik\Plugin\Report parent::init(); $this->dimension = null; - $this->categoryId = 'General_Visitors'; - $this->subcategoryId = 'General_Overview'; + $this->categoryId = 'General_Actions'; + $this->subcategoryId = 'PagePerformance_Performance'; $this->order = 5; $this->name = Piwik::translate('PagePerformance_Overview'); @@ -41,7 +40,7 @@ class Get extends \Piwik\Plugin\Report $config = $factory->createWidget(); $config->forceViewDataTable(StackedBarEvolution::ID); $config->setAction('getEvolutionGraph'); - $config->setOrder(20); + $config->setOrder(1); $config->setName('PagePerformance_EvolutionOverPeriod'); $widgetsList->addWidgetConfig($config); @@ -49,7 +48,31 @@ class Get extends \Piwik\Plugin\Report $config->forceViewDataTable(Sparklines::ID); $config->setName(''); $config->setIsNotWidgetizable(); - $config->setOrder(21); + $config->setOrder(2); + $widgetsList->addWidgetConfig($config); + + $config = $factory->createWidget(); + $config->forceViewDataTable(PerformanceColumns::ID); + $config->setModule('Actions'); + $config->setAction('getPageUrls'); + $config->setName('Actions_PageUrls'); + $config->setOrder(3); + // set an additional parameter so we can use that in the report to check if we are in a report on the performance page + $config->addParameters(['performance' => 1]); + $config->setIsNotWidgetizable(); + $config->setIsWide(); + $widgetsList->addWidgetConfig($config); + + $config = $factory->createWidget(); + $config->forceViewDataTable(PerformanceColumns::ID); + $config->setModule('Actions'); + $config->setAction('getPageTitles'); + $config->setName('Actions_SubmenuPageTitles'); + $config->setOrder(4); + // set an additional parameter so we can use that in the report to check if we are in a report on the performance page + $config->addParameters(['performance' => 1]); + $config->setIsWide(); + $config->setIsNotWidgetizable(); $widgetsList->addWidgetConfig($config); } diff --git a/plugins/PagePerformance/Visualizations/PerformanceColumns.php b/plugins/PagePerformance/Visualizations/PerformanceColumns.php index 98298bc6f8..9e6d2d44dc 100644 --- a/plugins/PagePerformance/Visualizations/PerformanceColumns.php +++ b/plugins/PagePerformance/Visualizations/PerformanceColumns.php @@ -33,8 +33,19 @@ class PerformanceColumns extends HtmlTable { $request = $viewDataTable->getRequestArray(); - if (is_array($request) && array_key_exists('module', $request) && array_key_exists('action', $request) && - 'Actions' === $request['module'] && in_array($request['action'], PagePerformance::$availableForMethods)) { + if ($viewDataTable->config->show_table_performance === false) { + return false; + } + + $module = $request['module'] ?? ''; + $action = $request['action'] ?? ''; + + if ($module === 'Widgetize') { + $module = $request['moduleToWidgetize'] ?: $module; + $action = $request['actionToWidgetize'] ?: $action; + } + + if ('Actions' === $module && in_array($action, PagePerformance::$availableForMethods)) { return true; } diff --git a/plugins/PagePerformance/javascripts/jqplotStackedBarEvolutionGraph.js b/plugins/PagePerformance/javascripts/jqplotStackedBarEvolutionGraph.js index 12c5dc9b87..b3f6b20c5b 100644 --- a/plugins/PagePerformance/javascripts/jqplotStackedBarEvolutionGraph.js +++ b/plugins/PagePerformance/javascripts/jqplotStackedBarEvolutionGraph.js @@ -108,10 +108,10 @@ var seriesColor = self.jqplotParams.seriesColors[d]; - dataByAxis[axis].push('<span class="tooltip-series-color" style="background-color: ' + seriesColor + ';"/>' + '<strong>' + value + '</strong> ' + piwikHelper.htmlEntities(series)); + dataByAxis[axis].push('<span class="tooltip-series-color" style="background-color: ' + seriesColor + ';"></span>' + '<strong>' + value + '</strong> ' + piwikHelper.htmlEntities(series)); } - dataByAxis[axis].push('<span class="tooltip-series-color" style="background-color: #000;"/>' + '<strong>' + self.formatY(totalValue, 0) + '</strong> ' + _pk_translate('General_Total')); + dataByAxis[axis].push('<span class="tooltip-series-color" style="background-color: #000;"></span>' + '<strong>' + self.formatY(totalValue, 0) + '</strong> ' + _pk_translate('General_Total')); var xAxisCount = 0; diff --git a/plugins/PagePerformance/lang/en.json b/plugins/PagePerformance/lang/en.json index 3aa08ad71e..174be1d4ae 100644 --- a/plugins/PagePerformance/lang/en.json +++ b/plugins/PagePerformance/lang/en.json @@ -31,6 +31,7 @@ "PluginDescription": "Adds some page performance reports", "PerformanceTable": "Table with performance metrics", "Overview": "Performance overview", + "Performance": "Performance", "HelpNote": "Some of those metrics might not always be available. You can find more information in our %1$sonline guide%2$s.", "RowActionTitle": "Open page performance report", "RowActionDescription": "Show page performance report for this row", diff --git a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js index a92678b740..e7c7281832 100644 --- a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js +++ b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js @@ -23,7 +23,7 @@ describe("PagePerformance", function () { } it("should load page performance overview", async function () { - await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=General_Overview"); + await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=PagePerformance_Performance"); pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('load'); }); @@ -40,8 +40,26 @@ describe("PagePerformance", function () { expect(await pageWrap.screenshot()).to.matchImage('rowactions'); }); + it("should show rowaction for subtable rows", async function () { + const subtablerow = await page.jQuery('tr.subDataTable:eq(1) .label'); + await subtablerow.click(); + + await page.waitForNetworkIdle(); + await page.waitFor(200); + + // hover first row + const row = await page.jQuery('tr.subDataTable:eq(1) + tr'); + await row.hover(); + + pageWrap = await page.$('.pageWrap'); + expect(await pageWrap.screenshot()).to.matchImage('rowactions_subtable'); + }); + it("should load page performance overlay", async function () { // click page performance icon + const row = await page.waitForSelector('.dataTable tbody tr:first-child'); + await row.hover(); + const icon = await page.waitForSelector('.dataTable tbody tr:first-child a.actionPagePerformance'); await icon.click(); @@ -59,45 +77,27 @@ describe("PagePerformance", function () { }); it("should show new table with performance metrics visualization in selection", async function () { - await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=General_Pages"); + await page.goto("?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&" + generalParams); // hover visualization selection const icon = await page.jQuery('.activateVisualizationSelection'); await icon.click(); await page.waitFor(500); // animation - pageWrap = await page.$('.pageWrap'); - expect(await pageWrap.screenshot()).to.matchImage('visualizations'); + expect(await page.screenshot({ fullPage: true })).to.matchImage('visualizations'); }); it("should load new table with performance metrics visualization", async function () { - // hover visualization selection const icon = await page.jQuery('.dropdown-content .icon-page-performance'); await icon.click(); await page.waitForNetworkIdle(); - pageWrap = await page.$('.pageWrap'); + pageWrap = await page.$('.widget'); expect(await pageWrap.screenshot()).to.matchImage('performance_visualization'); }); - it("should show rowaction for subtable rows", async function () { - - const subtablerow = await page.jQuery('tr.subDataTable:eq(1)'); - await subtablerow.click(); - - await page.waitForNetworkIdle(); - await page.waitFor(200); - - // hover first row - const row = await page.jQuery('tr.subDataTable:eq(1) + tr'); - await row.hover(); - - pageWrap = await page.$('.pageWrap'); - expect(await pageWrap.screenshot()).to.matchImage('rowactions_subtable'); - }); - it("performance overlay should work on page titles report", async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=Actions_SubmenuPageTitles"); diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png index 1770987ac3..5631df0372 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c5215962bfcde00fce46e52b4fe3c7ceda56b0672bb31b2598f1b3314c10655 -size 120741 +oid sha256:f8ec7c876d639f0aad0f998eeced67a51198480895420f3fd8db2926f72d0a91 +size 121513 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png index ef24c0b211..fa02298f77 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9825822466b8a733a3886d96410209358239f91051c9d404f77efd0a0661176 -size 31792 +oid sha256:f758598ab3331d661a9c391973993736ea0b929db8a8a72cefd80950c1cad8d5 +size 27851 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png index 1b0e075497..2f45eb4d7a 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08551a65ebc883d6548196070d93d900e8d0499abcda12a4e58c1c8ecd19fb67 -size 32163 +oid sha256:4d3e4999cee03fe42d264f6f43ef34e637ef88fbc1c5ce366a41fc1a90ee882d +size 32410 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png index 29afb2791e..6c74b13cfe 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:496dd454a5e4ba78f9c2f16926eba8b664c1faa49572889985fb2845d5048f70 -size 39128 +oid sha256:42e837a574702c59c838c083de8a4083f21ca43f3db16a551358720019efd4d1 +size 34732 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png index fc543bd529..e5fc974b92 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d5c0c75a39464586b5ee0c750a90630ae3827645a2e8b3fddc85eb466a60d71 -size 40258 +oid sha256:279e3191c246816d9d8e4311f7609175cbc938716b351f1215bf8cbb58f26919 +size 40110 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png index 7790c942dd..03204707cb 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5580aa3511e7adc81b10aa5e7b2e483572041924554b341e0d2d436c24c9b081 -size 134807 +oid sha256:d4a2066a969dd539a4c7440b0c25bd969b149fe945f0b978aec0a98d0993c10d +size 136803 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png index ee2710ad49..32d322ff16 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3064e157e132b5073b43907e184285d416477700443697f85cbbe0234d9b38af -size 7079 +oid sha256:fe1436297ceefb89421746a86e22a17f091ef53365d7dd21b3178ff79281812c +size 7082 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png index 021e244003..1365b16311 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a2d1e16c4c28464d4d3ec20ac9d2eeb97345763dd17f07ca70499cc616656e8 -size 102920 +oid sha256:99493f8d72c4d239a236b0e5c7a7701de8a0b11175bc94abe4b801bb3447dc3d +size 53956 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png index b0cd5f7a2a..7942d6c6f4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:479866c36d9cc765270cd0f6b6d61c74c854b0863522f277ecd044c77a90dc15 -size 143828 +oid sha256:1b7a3f5c09833cdc3efa54641744465aeaaa3c0ed2f9b3952f43e2b08fa4c291 +size 95094 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png index 1fbfb62237..567f6a1769 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cfd26fd54a1c41dccdc5b9261b03e2d14ad967ba90c7a4d2a19bb11a6bee0ea -size 111682 +oid sha256:60f2522898f6406774d8f54c6bf11c5777e7473b54dac6c7d9a56378763cda14 +size 111943 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 7f226744cb86c3b0390f5b27dd00b8c0367d798 +Subproject 67b203762c436bc186b26f820d914fc7aedf37e |
