Add code to make MTM as recommended install by default instead of JS code

plugins/SitesManager/Controller.php

@@ -16,6 +16,7 @@
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\SitesManager\SiteContentDetection\Matomo;
+use Piwik\Plugins\SitesManager\SiteContentDetection\MatomoTagManager;
 use Piwik\Plugins\SitesManager\SiteContentDetection\SiteContentDetectionAbstract;
 use Piwik\Plugins\SitesManager\SiteContentDetection\WordPress;
 use Piwik\SiteContentDetector;
@@ -251,6 +252,7 @@ public function getTrackingMethodsForSite()
 
         $recommendedMethod = null;
         $matomoIndex = null;
+        $matomoTagManagerIndex = null;
 
         foreach ($trackingMethods as $index => $tab) {
             // Note: We recommend the first method that is recommended (after sorting by priority)
@@ -263,12 +265,20 @@ public function getTrackingMethodsForSite()
             if ($tab['id'] === Matomo::getId()) {
                 $matomoIndex = $index;
             }
+
+            if ($tab['id'] === MatomoTagManager::getId()) {
+                $matomoTagManagerIndex = $index;
+            }
         }
 
-        // fall back to javascript code recommendation if nothing was detected
+        // fall back to TagManager if plugin is active else fallback to javascript code recommendation if nothing was detected
         if (null === $recommendedMethod && null !== $matomoIndex) {
-            $recommendedMethod = $trackingMethods[$matomoIndex];
-            unset($trackingMethods[$matomoIndex]);
+            $index = $matomoIndex;
+            if (null !== $matomoTagManagerIndex && Manager::getInstance()->isPluginActivated('TagManager')) {
+                $index = $matomoTagManagerIndex;
+            }
+            $recommendedMethod = $trackingMethods[$index];
+            unset($trackingMethods[$index]);
         }
 
         Json::sendHeaderJSON();

plugins/SitesManager/SiteContentDetection/MatomoTagManager.php

@@ -47,6 +47,15 @@ public function isDetected(?string $data = null, ?array $headers = null): bool
         return false;
     }
 
+    public function getRecommendationDetails(SiteContentDetector $detector): array
+    {
+        $details = parent::getRecommendationDetails($detector);
+        if (!$detector->wasDetected(self::getId())) {
+            $details['text'] = Piwik::translate('SitesManager_SetupMatomoTracker');
+        }
+        return $details;
+    }
+
     public function renderInstructionsTab(SiteContentDetector $detector): string
     {
         return '<h3>' . Piwik::translate('SitesManager_SiteWithoutDataMatomoTagManager') . '</h3>

tests/UI/specs/EmptySite_spec.js

@@ -51,7 +51,7 @@ describe("EmptySite", function () {
   });
 
   it('should show the tracking code when selected', async function () {
-    await page.evaluate(() => $('#start-tracking-detection a[href="#matomo"]')[0].click());
+    await page.evaluate(() => $('#start-tracking-detection a[href="#matomotagmanager"]')[0].click());
 
     // wait till url check field is filled with data, which means loading has finished.
     await page.waitForFunction(() => $('#baseUrl').val());
@@ -61,6 +61,16 @@ describe("EmptySite", function () {
     expect(await pageElement.screenshot()).to.matchImage('trackingCode');
   });
 
+  it('should show the JS tracking code', async function () {
+     await page.click('#start-tracking-back');
+     await page.evaluate(() => $('#start-tracking-method-list a[href="#matomo"]')[0].click());
+
+     await makeTrackingCodeStatic();
+
+     const pageElement = await page.$('.page');
+     expect(await pageElement.screenshot()).to.matchImage('trackingCodeJS');
+   });
+
   it('should show the advanced tracking options when clicked', async function () {
     await page.evaluate(() => $('.advance-option a').click());
 
@@ -176,7 +186,7 @@ describe("EmptySite", function () {
     await page.goto(urlToTest);
     await page.waitForSelector('#start-tracking-method-list'); // wait till list is shown
 
-    await page.evaluate(() => $('#start-tracking-detection a[href="#matomo"]')[0].click());
+    await page.evaluate(() => $('#start-tracking-method-list a[href="#matomo"]')[0].click());
 
     // wait till url check field is filled with data, which means loading has finished.
     await page.waitForFunction(() => $('#baseUrl').val());