[C0-3455] Пофиксил ошибки, добавил controls для video, убрал возможность очистить каталог или файл, добавил валидацию для пустого файла

Author: Andrey Erdikov

src/Application/Cms/MediaFile/Service/MediaFilePathResolver.php

@@ -10,7 +10,7 @@
 class MediaFilePathResolver
 {
     private const IMAGE_HTML_MASK = '<img src="%s" title="%s"/>';
-    private const VIDEO_HTML_MASK = '<video><source src="%s"></video>';
+    private const VIDEO_HTML_MASK = '<video controls><source src="%s"></video>';
     private const PDF_HTML_MASK = '<embed src="%s"/>';
 
     /**

src/Application/EventListener/MediaFileUpdatedListener.php

@@ -46,9 +46,15 @@ private function handleEventArgs(LifecycleEventArgs $args): void
             return;
         }
 
-        $object->setType($this->mediaFileTypeResolver->getMediaFileTypeByFile($object->getFile()));
+        if (!$object->getFile()) {
+            return;
+        }
 
+        $object->setType($this->mediaFileTypeResolver->getMediaFileTypeByFile($object->getFile()));
         $mapping = $this->fileMappingFactory->fromField($object, 'file');
-        $object->setStorage(new MediaFileStorage($mapping->getUploadDestination()));
+
+        if ($mapping) {
+            $object->setStorage(new MediaFileStorage($mapping->getUploadDestination()));
+        }
     }
 }

src/Resources/config/validator/validation.yaml

@@ -52,3 +52,6 @@ Skyeng\MarketingCmsBundle\Domain\Entity\MediaFile:
   properties:
     file:
       - File: { maxSize: 20M, mimeTypes: [ image/jpeg, image/png, image/gif, application/pdf, video/mp4 ] }
+      - NotBlank: ~
+    catalog:
+      - NotBlank: ~

src/UI/Controller/Admin/MediaFileCrudController.php

@@ -75,7 +75,11 @@ public function configureCrud(Crud $crud): Crud
 
     public function configureAssets(Assets $assets): Assets
     {
-        return $assets->addJsFile('bundles/marketingcms/ea-copy-actions.js');
+        $hideMediaCatalogSelectorClearButton = '#MediaFile_catalog + .select2 .select2-selection__clear {display:none;}';
+
+        return $assets
+            ->addHtmlContentToHead("<style>$hideMediaCatalogSelectorClearButton</style>")
+            ->addJsFile('bundles/marketingcms/ea-copy-actions.js');
     }
 
     public function configureActions(Actions $actions): Actions
@@ -118,8 +122,10 @@ public function getFileHtml(AdminContext $context)
     public function configureFields(string $pageName): iterable
     {
         $title = TextField::new('title', 'Заголовок файла');
-        $file = VichFileField::new('file', 'Файл');
-        $catalog = AssociationField::new('catalog', 'Каталог');
+        $file = VichFileField::new('file', 'Файл')->setFormTypeOptions([
+            'allow_delete' => false,
+        ]);
+        $catalog = AssociationField::new('catalog', 'Каталог')->setRequired(true);
         $originalName = TextField::new('originalName', 'Название файла');
 
         if (in_array($pageName, [Crud::PAGE_INDEX, Crud::PAGE_DETAIL], true)) {