Fix view mode switch in EA bridge

Author: JorickPepin

src/Bridge/EasyAdmin/templates/list.html.twig

@@ -126,11 +126,11 @@
                 <div class="content-header-title">
                     <h1 class="title d-none">{{ 'media_library'|trans }}</h1>
                     <div class="btn-group" role="group" aria-label="Change view mode">
-                        <a href="{{ ea_url().setRoute(route_name, { key: current_key, view_mode: 'list' }) }}" class="btn btn-secondary {{ app.session.get('view_mode', 'grid') == 'list' ? 'active disabled' }}">
+                        <a href="{{ ea_url().setRoute(route_name).set('key', current_key).set('view_mode', 'list') }}" class="btn btn-secondary {{ app.session.get('view_mode', 'grid') == 'list' ? 'active disabled' }}">
                             <span>
                                 <i class="fas fa-list"></i> {{ 'view.list'|trans }}
                             </span>
-                        </a><a href="{{ ea_url().setRoute(route_name, { key: current_key, view_mode: 'grid' }) }}" class="btn btn-secondary {{ app.session.get('view_mode', 'grid') == 'grid' ? 'active disabled' }}">
+                        </a><a href="{{ ea_url().setRoute(route_name).set('key', current_key).set('view_mode', 'grid') }}" class="btn btn-secondary {{ app.session.get('view_mode', 'grid') == 'grid' ? 'active disabled' }}">
                             <span>
                                 <i class="fas fa-th-large"></i> {{ 'view.grid'|trans }}
                             </span>

tests/src/Bridge/EasyAdmin/Controller/MediaAdminControllerTest.php

@@ -38,15 +38,6 @@ protected function setUp(): void
         }
     }
 
-    public function testList(): void
-    {
-        $this->client->request(Request::METHOD_GET, '/admin?routeName=joli_media_easy_admin_explore');
-        $this->assertResponseIsSuccessful();
-
-        $this->assertSelectorExists('a[data-component="media-add"]');
-        $this->assertSelectorCount(5, '.gallery-grid-item');
-    }
-
     public function testDelete(): void
     {
         // MediaDeleteBehavior::RESTRICT
@@ -145,6 +136,37 @@ public function testUploadAtRoot(): void
         $this->assertSame('/media/cache/joli-media-easy-admin/circle-pattern.png', $response['files'][0]['thumbnailUrl']);
     }
 
+    public function testViewMode(): void
+    {
+        // test switching view mode between grid and list
+        $this->client->followRedirects();
+        $crawler = $this->client->request(Request::METHOD_GET, '/admin?routeName=joli_media_easy_admin_explore');
+
+        $gridViewLink = $crawler->selectLink('Grid view');
+        $this->assertStringContainsString('active', (string) $gridViewLink->attr('class')); // grid is default
+        $this->assertSelectorCount(5, '.gallery-grid-item');
+        $this->assertSelectorNotExists('.gallery-list-item');
+
+        $listViewLink = $crawler->selectLink('List view');
+        $this->assertStringNotContainsString('active', (string) $listViewLink->attr('class'));
+
+        $crawler = $this->client->click($listViewLink->link());
+
+        $listViewLink = $crawler->selectLink('List view');
+        $this->assertStringContainsString('active', (string) $listViewLink->attr('class'));
+        $this->assertSelectorNotExists('.gallery-grid-item');
+        $this->assertSelectorCount(5, '.gallery-list-item');
+
+        $gridViewLink = $crawler->selectLink('Grid view');
+        $this->assertStringNotContainsString('active', (string) $gridViewLink->attr('class'));
+
+        $crawler = $this->client->click($gridViewLink->link()); // back to grid
+
+        $this->assertStringContainsString('active', (string) $crawler->selectLink('Grid view')->attr('class'));
+        $this->assertSelectorCount(5, '.gallery-grid-item');
+        $this->assertSelectorNotExists('.gallery-list-item');
+    }
+
     protected static function getKernelClass(): string
     {
         return Kernel::class;