Merge pull request #123 from Runroom/hotfix/fix-ckeditor-upload

Fix browser page url, hide batch actions and remove add button from no results
Runroom · Mar 1, 2022 · 198b42b · 198b42b
2 parents c7aa2a6 + e695dcb
commit 198b42b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/packages/ckeditor-sonata-media-bundle/src/Admin/MediaAdminExtension.php b/packages/ckeditor-sonata-media-bundle/src/Admin/MediaAdminExtension.php
@@ -30,12 +30,21 @@ final class MediaAdminExtension extends AbstractAdminExtension
      */
     public function configureRoutes(AdminInterface $admin, object $collection): void
     {
-        $collection->add('ckeditor_browser', 'ckeditor_browser', [
+        $collection->add('browser', 'browser', [
             '_controller' => MediaAdminController::class . '::browserAction',
         ]);
 
-        $collection->add('ckeditor_upload', 'ckeditor_upload', [
+        $collection->add('upload', 'upload', [
             '_controller' => MediaAdminController::class . '::uploadAction',
         ]);
     }
+
+    public function configureBatchActions(AdminInterface $admin, array $actions): array
+    {
+        if ($admin->isCurrentRoute('browser')) {
+            return [];
+        }
+
+        return $actions;
+    }
 }
diff --git a/packages/ckeditor-sonata-media-bundle/src/Resources/views/browser.html.twig b/packages/ckeditor-sonata-media-bundle/src/Resources/views/browser.html.twig
@@ -48,13 +48,22 @@ file that was distributed with this source code.
     </tbody>
 {% endblock %}
 
+{% block no_result_content %}
+    <div class="info-box">
+        <span class="info-box-icon bg-aqua"><i class="fas fa-arrow-circle-right" aria-hidden="true"></i></span>
+        <div class="info-box-content">
+            <span class="info-box-text">{{ 'no_result'|trans({}, 'SonataAdminBundle') }}</span>
+            <div class="progress">
+                <div class="progress-bar" style="width: 0%"></div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
 {% block stylesheets %}
     {{ parent() }}
 
     <style>
-        .content {
-            padding: 20px 15px;
-        }
         .wrapper {
             background: #ecf0f5 !important;
         }

diff --git a/packages/ckeditor-sonata-media-bundle/tests/Integration/MediaAdminExtensionTest.php b/packages/ckeditor-sonata-media-bundle/tests/Integration/MediaAdminExtensionTest.php
@@ -24,8 +24,8 @@ class MediaAdminExtensionTest extends SonataAdminTestCase
      */
     public function itDoesNotHaveDisabledRoutes(): void
     {
-        $this->assertAdminRoutesDoesContainRoute('ckeditor_browser');
-        $this->assertAdminRoutesDoesContainRoute('ckeditor_upload');
+        $this->assertAdminRoutesDoesContainRoute('browser');
+        $this->assertAdminRoutesDoesContainRoute('upload');
     }
 
     protected function getAdminClass(): string