Add multi-upload and ordered gallery support

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.1']
-        symfony: ['~5.4.0', '~6.2.0']
+        symfony: ['~5.4.0', '~6.4.0']
         deps: ['normal']
         include:
           - php: '8.1'

bundle/Controller/Resource/Upload.php

@@ -28,6 +28,7 @@
 use function is_array;
 use function is_file;
 use function is_readable;
+use function is_string;
 use function preg_match;
 use function strpos;
 use function strrpos;
@@ -68,8 +69,9 @@ public function __invoke(Request $request): Response
         $uploadContext = $request->request->all()['upload_context'] ?? [];
         $uploadContext = is_array($uploadContext) ? $uploadContext : [];
 
-        $folder = $request->request->get('folder') && $request->request->get('folder') !== 'null'
-            ? Folder::fromPath($request->request->get('folder'))
+        $folderPath = $request->request->get('folder');
+        $folder = is_string($folderPath) && !in_array($folderPath, ['', 'null', 'undefined', '(root)'], true)
+            ? Folder::fromPath($folderPath)
             : null;
 
         $visibility = $request->request->get('visibility', RemoteResource::VISIBILITY_PUBLIC);

bundle/Resources/config/services/form.yaml

@@ -4,6 +4,12 @@ services:
         arguments:
             - "@netgen_remote_media.provider"
             - "@netgen_remote_media.service.remote_resource_service"
+            - "@?logger"
+
+    netgen_remote_media.form.data_transformer.remote_media_collection:
+        class: Netgen\RemoteMedia\Form\DataTransformer\RemoteMediaCollectionTransformer
+        arguments:
+            - "@netgen_remote_media.form.data_transformer.remote_media"
 
     netgen_remote_media.form.type.remote_media:
         class: Netgen\RemoteMedia\Form\Type\RemoteMediaType
@@ -13,6 +19,14 @@ services:
         tags:
             - { name: form.type }
 
+    netgen_remote_media.form.type.remote_media_collection:
+        class: Netgen\RemoteMedia\Form\Type\RemoteMediaCollectionType
+        arguments:
+            - "@netgen_remote_media.form.data_transformer.remote_media_collection"
+            - "@netgen_remote_media.provider"
+        tags:
+            - { name: form.type }
+
     netgen_remote_media.form.data_transformer.remote_media_folder:
         class: Netgen\RemoteMedia\Form\DataTransformer\RemoteMediaFolderTransformer
 

bundle/Resources/public/js/ckeditor-plugin/constants.js

@@ -48,6 +48,8 @@ export const defaultValue = {
   },
   config: {
     mode: 'embed',
+    isCollection: false,
+    uploadLimit: 1,
     paths: {
       browse_resources: '/ngremotemedia/ajax/resource/browse',
       upload_resources: '/ngremotemedia/ajax/resource/upload',
@@ -89,6 +91,9 @@ export const defaultValue = {
       'media_gallery_upload_media': 'media_gallery_upload_media',
       'media_gallery_select': 'media_gallery_select',
       'media_gallery_load_more': 'media_gallery_load_more',
+      'multi_select_add_selected': 'multi_select_add_selected',
+      'multi_select_deselect': 'multi_select_deselect',
+      'limit_reached': 'limit_reached',
       'Search for media': 'Search for media',
       'Load more': 'Load more',
       'Upload new media': 'Upload new media',
@@ -171,6 +176,7 @@ export const defaultValue = {
     type: 'image',
     format: '',
     url: '',
+    browseUrl: '',
     browse_url: '',
     previewUrl: '',
     alternateText: '',

bundle/Resources/public/js/ckeditor-plugin/conversion/editing-downcast-utils/render-field.js

@@ -22,8 +22,8 @@ const renderField = ({ domElement, model, editor }) => {
       [
         createElement(domElement.ownerDocument, 'interactions', {
           'field-id': fieldId,
-          ':selected-image': selectedImage,
-          ':config': config,
+          ':selected-image': 'selectedImage',
+          ':config': 'config',
         }),
       ],
     ),

bundle/Resources/translations/ngremotemedia.en.yaml

@@ -90,13 +90,55 @@ ngrm:
                     select: 'Select'
                     create: 'Create'
                     upload: 'Upload'
+                    cancel: 'Cancel'
                 checkbox:
                     overwrite: 'Overwrite'
                 placeholder:
                     new_folder: 'New folder name'
                 error:
                     missing_file: 'Missing file to upload'
                     existing_resource: 'Different resource with same name already exists in this folder! Change folder, filename, use overwrite or use existing resource:'
-                    unsupported_resource_type: 'Resource has been uploaded but it\s type is not supported so it can be used here! Supported types: '
+                    unsupported_resource_type: "Resource has been uploaded but it's type is not supported so it can't be used here! Supported types: "
                     invalid_visibility: 'Invalid visibility option "%visibility%", supported options: "%supported_visibilities%"'
                     file_upload_failed: 'File upload failed; the file might be too big or corrupted. Check your server file upload size settings.'
+            multi_upload:
+                title: 'Upload multiple files'
+                drop_zone: 'Drop files here or click to browse'
+                drop_zone_single: 'Drop file here or click to browse'
+                browse: 'Browse Files'
+                browse_single: 'Browse File'
+                files_pending: 'pending'
+                files_success: 'uploaded'
+                files_error: 'failed'
+                uploading: 'Uploading...'
+                button_upload_all: 'Upload All'
+                clear_completed: 'Clear Completed'
+                global_folder: 'Default folder for all files:'
+                global_visibility: 'Default visibility for all files:'
+                global_apply_to_all: 'apply to all files'
+                use_existing: 'Use existing file'
+                table:
+                    preview: 'Preview'
+                    filename: 'Filename'
+                    folder: 'Folder'
+                    visibility: 'Visibility'
+                    status: 'Status'
+                    actions: 'Actions'
+                    upload_file: 'Upload this file'
+                    remove_file: 'Remove file'
+                status:
+                    pending: 'Pending'
+                    uploading: 'Uploading'
+                    success: 'Success'
+                    error: 'Error'
+            multi_gallery_remove: 'Remove'
+            multi_select_add_selected: 'Add %count% Selected Item(s)'
+            multi_select_deselect: 'Deselect'
+            reorder:
+                drag: 'Drag to reorder'
+                move_previous: 'Move to previous position'
+                move_next: 'Move to next position'
+            limit_reached: 'File limit reached (%limit% maximum)'
+            limit_exceeded: 'Too many files! Maximum %limit% allowed'
+            limit_remaining: '%remaining% slot(s) remaining'
+            limit_info: '%count% of %limit% files'