several changes to emphasize setup and use of auto-archiving rather than real-time processing (#16603)

* several changes to emphasize setup and use of auto-archiving rather than real-time processing

* apply some pr feedback

* Applying more pr feedback.

* apply review fixes

* ignore ability to archive segments in real time

* another tweak

* update tests

* fix another test

* fix ui tests

* update test

* fix evolution icon bug

* Update TreemapVisualization and update expected screenshots

* update screenshots

4 files changed, 25 insertions, 10 deletions

diff --git a/plugins/Diagnostics/Diagnostic/ConfigInformational.php b/plugins/Diagnostics/Diagnostic/ConfigInformational.php
index 1d3e9ec182..0a6bb5499f 100644
--- a/plugins/Diagnostics/Diagnostic/ConfigInformational.php
+++ b/plugins/Diagnostics/Diagnostic/ConfigInformational.php
@@ -33,7 +33,6 @@ class ConfigInformational implements Diagnostic
         $results = [];
 
         if (SettingsPiwik::isMatomoInstalled()) {
-            $results[] = DiagnosticResult::informationalResult('Browser Archiving Enabled', Rules::isBrowserTriggerEnabled());
             $results[] = DiagnosticResult::informationalResult('Browser Segment Archiving Enabled',  Rules::isBrowserArchivingAvailableForSegments());
             $results[] = DiagnosticResult::informationalResult('Development Mode Enabled', Development::isEnabled());
             $results[] = DiagnosticResult::informationalResult('Internet Enabled',SettingsPiwik::isInternetEnabled());
diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php
index 9500934b42..9d44e1393e 100644
--- a/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php
+++ b/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php
@@ -8,9 +8,11 @@
  */
 namespace Piwik\Plugins\Diagnostics\Diagnostic;
 
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\CliMulti;
 use Piwik\Config;
 use Piwik\Http;
+use Piwik\SettingsPiwik;
 use Piwik\Translation\Translator;
 use Piwik\Url;
 
@@ -31,18 +33,34 @@ class CronArchivingCheck implements Diagnostic
 
     public function execute()
     {
-        $label = $this->translator->translate('Installation_SystemCheckCronArchiveProcess');
-        $comment = $this->translator->translate('Installation_SystemCheckCronArchiveProcessCLI') . ': ';
+        $label = $this->translator->translate('Installation_SystemCheckCronArchiveProcess') . ' (' .
+            $this->translator->translate('Installation_FasterReportLoading') . ')';
 
-        $process = new CliMulti();
+        if (SettingsPiwik::isMatomoInstalled()) {
+            $isBrowserTriggerDisabled = !Rules::isBrowserTriggerEnabled();
+            if (!$isBrowserTriggerDisabled) {
+                $comment = $this->translator->translate('Diagnostics_BrowserTriggeredArchivingEnabled', [
+                    '<a href="https://matomo.org/docs/setup-auto-archiving/" target="_blank" rel="noreferrer noopener">', '</a>']);
+                $result[] = DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment);
+            }
+        }
+
+        $comment = '';
 
+        $process = new CliMulti();
         if ($process->supportsAsync()) {
             $comment .= $this->translator->translate('General_Ok');
+            $status = DiagnosticResult::STATUS_OK;
         } else {
             $comment .= $this->translator->translate('Installation_NotSupported')
                 . ' ' . $this->translator->translate('Goals_Optional');
+            $status = DiagnosticResult::STATUS_INFORMATIONAL;
         }
 
-        return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, $comment));
+        $label = $this->translator->translate('Installation_SystemCheckCronArchiveProcess') . ' - '
+            . $this->translator->translate('Installation_SystemCheckCronArchiveProcessCLI');
+        $result[] = DiagnosticResult::singleResult($label, $status, $comment);
+
+        return $result;
     }
 }
diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
index ec5c8a3f74..cce7f95bcb 100644
--- a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
+++ b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
@@ -49,9 +49,7 @@ class CronArchivingLastRunCheck implements Diagnostic
         // check cron archiving has been enabled
         $isBrowserTriggerDisabled = !Rules::isBrowserTriggerEnabled();
         if (!$isBrowserTriggerDisabled) {
-            $comment = $this->translator->translate('Diagnostics_BrowserTriggeredArchivingEnabled', [
-                '<a href="https://matomo.org/docs/setup-auto-archiving/" target="_blank" rel="noreferrer noopener">', '</a>']);
-            return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment)];
+            return [];
         }
 
         // check archiving has been run
diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
index 581764e419..8bfcb516df 100644
--- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
+++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e35c892601ee82cca7b4927d06cf0b62d695764becaa79f49ce26c993f263886
-size 378134
+oid sha256:e02aaa3d918fb19ef242030fd7888b4122713be93ea4253d29859ff554a32cde
+size 374529