Merge pull request #9075 from piwik/report_generated_tooltip

Display 'Report generated Xs ago' in help tooltip

6 files changed, 14 insertions, 4 deletions

diff --git a/core/Archive.php b/core/Archive.php
index 80ef151f38..2efe230318 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -619,7 +619,7 @@ class Archive
             if ($isNumeric) {
                 $row['value'] = $this->formatNumericValue($row['value']);
             } else {
-                $result->addMetadata($row['idsite'], $periodStr, 'ts_archived', $row['ts_archived']);
+                $result->addMetadata($row['idsite'], $periodStr, DataTable::ARCHIVED_DATE_METADATA_NAME, $row['ts_archived']);
             }
 
             $result->set($row['idsite'], $periodStr, $row['name'], $row['value']);
diff --git a/core/DataTable.php b/core/DataTable.php
index f55bc42a1a..221af5315a 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -170,7 +170,7 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
     const MAX_DEPTH_DEFAULT = 15;
 
     /** Name for metadata that describes when a report was archived. */
-    const ARCHIVED_DATE_METADATA_NAME = 'archived_date';
+    const ARCHIVED_DATE_METADATA_NAME = 'ts_archived';
 
     /** Name for metadata that describes which columns are empty and should not be shown. */
     const EMPTY_COLUMNS_METADATA_NAME = 'empty_column';
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index b4ff042932..0fbe859dd0 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -359,7 +359,7 @@ class Visualization extends ViewDataTable
             $this->metadata = $this->dataTable->getAllTableMetadata();
 
             if (isset($this->metadata[DataTable::ARCHIVED_DATE_METADATA_NAME])) {
-                $this->config->report_last_updated_message = $this->makePrettyArchivedOnText();
+                $this->reportLastUpdatedMessage = $this->makePrettyArchivedOnText();
             }
         }
 
diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 6bc35bca9e..697af2c9b6 100644
--- a/plugins/CoreHome/templates/_dataTable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -12,7 +12,7 @@
      data-params="{% if clientSideParameters is empty %}{}{% else %}{{ clientSideParameters|json_encode }}{% endif %}">
     <div class="reportDocumentation">
         {% if properties.documentation|default is not empty %}<p>{{ properties.documentation|raw }}</p>{% endif %}
-        {% if reportLastUpdatedMessage is defined %}<span class='helpDate'>{{ reportLastUpdatedMessage }}</span>{% endif %}
+        {% if reportLastUpdatedMessage is defined %}<span class='helpDate'>{{ reportLastUpdatedMessage|raw }}</span>{% endif %}
     </div>
     <div class="dataTableWrapper">
         {% if error is defined %}
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
-Subproject 9e9171f36c5cea6d7b7a82516e58f760f923c14
+Subproject bbac0d8bbe80351cde00e8410e5535e70c90fde
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index e1dee1f090..6dbb750f67 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -41,6 +41,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
         testEnvironment.save();
     });
 
+
     // dashboard tests
     it("should load dashboard1 correctly", function (done) {
         expect.screenshot("dashboard1").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
@@ -155,6 +156,15 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
         }, done);
     });
 
+    // actions pages
+    it('should load the actions > pages help tooltip, including the "Report generated time"', function (done) {
+        expect.screenshot('actions_pages_tooltip_help').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageUrls");
+            page.mouseMove('h2[piwik-enriched-headline]');
+            page.click(".helpIcon");
+        }, done);
+    });
+
     it('should load the actions > entry pages page correctly', function (done) {
         expect.screenshot('actions_entry_pages').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
             page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetEntryPageUrls");