Merge branch 'master' into feat/fast-create-form

Author: didoda

config/app_local.example.php

@@ -670,54 +670,20 @@
 
     /**
      * Upload configurations.
+     *
+     * 'files' and 'media' accept all mimes, so no configuration needed.
      */
     // 'uploadAccepted' => [
     //     'audio' => [
     //         'audio/*',
     //     ],
-    //     'files' => [
-    //         'application/msword', // .doc, .dot
-    //         'application/pdf', // .pdf
-    //         'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // .docx
-    //         'application/vnd.ms-excel', // .xls, .xlt, .xla
-    //         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // .xlsx
-    //         'application/vnd.ms-powerpoint', // .ppt, .pot, .pps, .ppa
-    //         'application/vnd.openxmlformats-officedocument.presentationml.presentation', // .pptx
-    //         'application/x-mpegURL',
-    //         'audio/*',
-    //         'text/csv',
-    //         'text/html',
-    //         'text/plain',
-    //         'text/rtf',
-    //         'text/xml',
-    //         'image/*',
-    //         'video/*',
-    //     ],
     //     'images' => [
     //         'image/*',
     //     ],
     //     'videos' => [
     //         'application/x-mpegURL',
     //         'video/*',
     //     ],
-    //     'media' => [
-    //         'application/msword', // .doc, .dot
-    //         'application/pdf', // .pdf
-    //         'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // .docx
-    //         'application/vnd.ms-excel', // .xls, .xlt, .xla
-    //         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // .xlsx
-    //         'application/vnd.ms-powerpoint', // .ppt, .pot, .pps, .ppa
-    //         'application/vnd.openxmlformats-officedocument.presentationml.presentation', // .pptx
-    //         'application/x-mpegURL',
-    //         'audio/*',
-    //         'image/*',
-    //         'text/csv',
-    //         'text/html',
-    //         'text/plain',
-    //         'text/rtf',
-    //         'text/xml',
-    //         'video/*',
-    //     ],
     // ],
     // 'uploadForbidden' => [
     //     'mimetypes' => [

config/version.ini

@@ -1,2 +1,2 @@
 [Manager]
-version=5.3.2
+version=5.3.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedita-manager",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "BEdita Manager",
   "keywords": [
     "BEdita",

resources/js/app/helpers/view.js

@@ -167,7 +167,7 @@ export default {
             },
 
             acceptMimeTypes(type) {
-                if (!BEDITA.uploadConfig?.accepted?.[type]) {
+                if (['files', 'media'].includes(type) || !BEDITA.uploadConfig?.accepted?.[type]) {
                     return '';
                 }
 
@@ -198,8 +198,9 @@ export default {
 
                 /** accepted mime types check */
                 const mimes = BEDITA.uploadConfig?.accepted;
-                if (mimes?.[objectType] && !this.checkAcceptedMime(mimes[objectType], fileType)) {
-                    const msg = t`File type not accepted` + `: "${fileType}". ` + t`Accepted types` + `: "${mimes[objectType].join('", "')}".`;
+                const ot = objectType === 'media' ? this.getObjectTypeFromMime(fileType) : objectType;
+                if (ot !== 'files' && mimes?.[ot] && !this.checkAcceptedMime(mimes[ot], fileType)) {
+                    const msg = t`File type not accepted` + `: "${fileType}". ` + t`Accepted types` + `: "${mimes[ot].join('", "')}".`;
                     BEDITA.warning(msg);
 
                     return false;

src/View/Helper/SystemHelper.php

@@ -52,12 +52,6 @@ class SystemHelper extends Helper
             'application/x-mpegURL',
             'video/*',
         ],
-        'media' => [
-            'application/x-mpegURL',
-            'audio/*',
-            'image/*',
-            'video/*',
-        ],
     ];
 
     /**

templates/Element/Form/dropupload.twig

@@ -1,5 +1,7 @@
 {# :accepted-drop="[`.from-relation-${relationName}`,isRelationWithMedia && 'from-files']"> #}
+{% set ot = objectTypes|length == 1 ? objectTypes[0] : 'media' %}
 <drop-upload
+    :object-type="{{ ot|json_encode }}"
     placeholder="{{ __('Click or drop new files here') }}"
     @new-relations="appendRelations"
     v-if="isRelationWithMedia"

templates/Element/Form/relation.twig

@@ -139,7 +139,9 @@
         </div>
         <div class="mt-5">
             {% if uploadableNum %}
-                {{ element(Element.dropupload(relationsSchema[relationName]['right'])) }}
+                {{ element(Element.dropupload(relationsSchema[relationName]['right']), {
+                    'objectTypes': relationsSchema[relationName]['right']
+                }) }}
             {% endif %}
             <div>
                 <button v-if="isPanelOpen({{object.id|json_encode}})" @click.prevent.stop="closePanel()">

yarn.lock

@@ -3666,9 +3666,9 @@ koa-router@^9.1.0:
     path-to-regexp "^6.1.0"
 
 koa@^2.13.0:
-  version "2.15.3"
-  resolved "https://registry.npmjs.org/koa/-/koa-2.15.3.tgz#062809266ee75ce0c75f6510a005b0e38f8c519a"
-  integrity sha512-j/8tY9j5t+GVMLeioLaxweJiKUayFhlGqNTzf2ZGwL0ZCQijd2RLHK0SLW5Tsko8YyyqCZC2cojIb0/s62qTAg==
+  version "2.15.4"
+  resolved "https://registry.yarnpkg.com/koa/-/koa-2.15.4.tgz#7000b3d8354558671adb1ba1b1c09bedb5f8da75"
+  integrity sha512-7fNBIdrU2PEgLljXoPWoyY4r1e+ToWCmzS/wwMPbUNs7X+5MMET1ObhJBlUkF5uZG9B6QhM2zS1TsH6adegkiQ==
   dependencies:
     accepts "^1.3.5"
     cache-content-type "^1.0.0"