Merge pull request #770 from matomo-org/PG-3196-remove-all-websites

Added code to remove All websites from site selector dropdown, #PG-3196
matomo-org · Mar 22, 2024 · 7bb5635 · 7bb5635
2 parents 5145cda + 550c0c8
commit 7bb5635
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 0 deletions.
diff --git a/templates/manageContainers.twig b/templates/manageContainers.twig
@@ -8,6 +8,7 @@
         <div
             vue-entry="CoreHome.SiteSelector"
             show-selected-site="true"
+            show-all-sites-item="false"
             class="sites_autocomplete"
         ></div>
     </div>

diff --git a/templates/tagmanager.twig b/templates/tagmanager.twig
@@ -26,6 +26,7 @@
             <div
                 vue-entry="CoreHome.SiteSelector"
                 show-selected-site="true"
+                show-all-sites-item="false"
                 class="sites_autocomplete"
             ></div>
         </div>

diff --git a/tests/UI/Container_spec.js b/tests/UI/Container_spec.js
@@ -58,6 +58,13 @@ describe("Container", function () {
         expect(await pageWrap.screenshot()).to.matchImage('site_some_exist');
     });
 
+    it('should show websites dropdown without all websites', async function () {
+        await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click());
+        pageWrap = await page.$('.top_bar_sites_selector .dropdown');
+        expect(await pageWrap.screenshot()).to.matchImage('websites_dropdown_without_all_websites');
+        await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click());
+    });
+
     it('should be able to create a new container', async function () {
         await page.click('.createNewContainer');
         await capture.setTableRowHeight(page);

diff --git a/tests/UI/TagManager_spec.js b/tests/UI/TagManager_spec.js
@@ -51,6 +51,13 @@ describe("TagManager", function () {
         await capture.page(page, 'getting_started');
     });
 
+    it('should show websites dropdown without all websites', async function () {
+        await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click());
+        pageWrap = await page.$('.top_bar_sites_selector .dropdown');
+        expect(await pageWrap.screenshot()).to.matchImage('websites_dropdown_without_all_websites');
+        await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click());
+    });
+
     it('should show top bar list when no container exists', async function () {
         await page.goto(generalParamsSite5 + urlBase + 'gettingStarted');
         await capture.topControls(page, 'top_controls_no_container_exists');

diff --git a/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png b/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png
diff --git a/...s/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png b/...s/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png