hide listing on others tab if corresponding tab is displayed

matomo-org · Jul 31, 2023 · c9d72aa · c9d72aa
1 parent c9bedc3
commit c9d72aa
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 8 deletions.
diff --git a/plugins/SitesManager/SiteContentDetection/Cloudflare.php b/plugins/SitesManager/SiteContentDetection/Cloudflare.php
@@ -62,8 +62,12 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
         return $view->render();
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
+        if ($detector->wasDetected(self::class)) {
+            return ''; // don't show on others page if tab is being displayed
+        }
+
         return sprintf(
             '<p>%s</p>',
             Piwik::translate(

diff --git a/plugins/SitesManager/SiteContentDetection/GoogleTagManager.php b/plugins/SitesManager/SiteContentDetection/GoogleTagManager.php
@@ -81,8 +81,12 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
         return $view->render();
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
+        if ($detector->wasDetected(self::class)) {
+            return ''; // don't show on others page if tab is being displayed
+        }
+
         return sprintf(
             '<p>%s</p>',
             Piwik::translate(

diff --git a/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php b/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php
@@ -53,7 +53,7 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
             <p>' . Piwik::translate( 'SitesManager_SiteWithoutDataMatomoTagManagerNotActive', ['<a href="https://matomo.org/docs/tag-manager/" rel="noreferrer noopener" target="_blank">', '</a>']) . '</p>';
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
         return sprintf(
             '<p>%s</p>',

diff --git a/plugins/SitesManager/SiteContentDetection/ReactJs.php b/plugins/SitesManager/SiteContentDetection/ReactJs.php
@@ -82,8 +82,12 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
 ';
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
+        if ($detector->wasDetected(self::class)) {
+            return ''; // don't show on others page if tab is being displayed
+        }
+
         return sprintf(
             '<p>%s</p>',
             Piwik::translate(

diff --git a/plugins/SitesManager/SiteContentDetection/SiteContentDetectionAbstract.php b/plugins/SitesManager/SiteContentDetection/SiteContentDetectionAbstract.php
@@ -115,9 +115,10 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): ?st
     /**
      * Returns the content that should be displayed in the Others tab on the no data page
      *
+     * @param SiteContentDetector|null $detector
      * @return string|null
      */
-    public function renderOthersInstruction(): ?string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): ?string
     {
         return null;
     }

diff --git a/plugins/SitesManager/SiteContentDetection/SpaPwa.php b/plugins/SitesManager/SiteContentDetection/SpaPwa.php
@@ -45,7 +45,7 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
         return '';
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
         return sprintf(
             '<p>%s</p>',

diff --git a/plugins/SitesManager/SiteContentDetection/VueJs.php b/plugins/SitesManager/SiteContentDetection/VueJs.php
@@ -58,8 +58,12 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
         return $view->render();
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
+        if ($detector->wasDetected(self::class)) {
+            return ''; // don't show on others page if tab is being displayed
+        }
+
         return sprintf(
             '<p>%s</p>',
             Piwik::translate(

diff --git a/plugins/SitesManager/SiteContentDetection/WordPress.php b/plugins/SitesManager/SiteContentDetection/WordPress.php
@@ -74,8 +74,12 @@ public function renderInstructionsTab(SiteContentDetector $detector = null): str
         return $view->render();
     }
 
-    public function renderOthersInstruction(): string
+    public function renderOthersInstruction(SiteContentDetector $detector = null): string
     {
+        if ($detector->wasDetected(self::class)) {
+            return ''; // don't show on others page if tab is being displayed
+        }
+
         return sprintf(
             '<p>%s</p>',
             Piwik::translate(