Bugfix: target module was still displayed even if it had no folders after filtering

Author: Volmarg

src/Controller/Files/FileUploadController.php

@@ -36,6 +36,8 @@ class FileUploadController extends AbstractController {
 
     const DEFAULT_KEY_IS_MISSING        = 'Required key is missing in request';
 
+    const KEY_MAIN_FOLDER               = 'Main folder';
+
     const UPLOAD_TYPES = [
         self::TYPE_IMAGES => self::TYPE_IMAGES,
         self::TYPE_FILES  => self::TYPE_FILES
@@ -152,7 +154,7 @@ public static function getSubdirectoriesForUploadType(string $uploadType, $names
         }
 
         if( $include_main_folder ){
-            $subdirectories['Main folder'] = "";
+            $subdirectories[static::KEY_MAIN_FOLDER] = "";
         }
 
         return $subdirectories;

src/Controller/Utils/Dialogs.php

@@ -79,29 +79,44 @@ public function buildDataTransferDialogBody(Request $request) {
             ]);
         }
 
-        #Info: this most likely won't be enough when there will be nested menu
         $subfolder   = basename(dirname($file_current_path));
         $upload_type = FileUploadController::UPLOAD_BASED_MODULES[$module_name];
 
         $all_subdirectories_for_all_types = FileUploadController::getSubdirectoriesForAllUploadTypes(true, true);
+        $all_upload_based_modules         = FileUploadController::UPLOAD_BASED_MODULES;
 
         #Info: filter folder from which dialog was called
-        foreach($all_subdirectories_for_all_types as $type => $subdirectories){
+        foreach( $all_subdirectories_for_all_types as $type => $subdirectories ) {
 
             if( $type === $upload_type ){
 
-                $key = array_search($subfolder, $subdirectories);
-                unset($subdirectories[$key]);
+                $subfolder_key  = array_search($subfolder, $subdirectories);
+                $is_main_folder = !$subfolder_key;
+
+                if( $is_main_folder ){
+                    $subfolder_key = FileUploadController::KEY_MAIN_FOLDER;
+                }
+
+                unset($subdirectories[$subfolder_key]);
+
+                #Info: if we filter folder then we need to make sure that we don't display current module if there are no other folders than current
+                if( empty($subdirectories) ){
+                    $module_key = array_search($upload_type, $all_upload_based_modules);
+                    unset($all_upload_based_modules[$module_key]);
+                    break;
+                }
 
                 $all_subdirectories_for_all_types[$type] = $subdirectories;
                 break;
             }
 
         }
 
-        $form_data = [FilesHandler::KEY_TARGET_SUBDIRECTORY_NAME => $all_subdirectories_for_all_types];
-
-        $form = $this->app->forms->moveSingleFile($form_data);
+        $form_data  = [
+            FilesHandler::KEY_TARGET_SUBDIRECTORY_NAME => $all_subdirectories_for_all_types,
+            FilesHandler::KEY_MODULES_NAMES            => $all_upload_based_modules
+        ];
+        $form       = $this->app->forms->moveSingleFile($form_data);
 
         $template_data = [
             'form' => $form->createView()

src/Form/Files/MoveSingleFileType.php

@@ -18,7 +18,7 @@ class MoveSingleFileType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options) {
         $builder
             ->add(FilesHandler::KEY_TARGET_UPLOAD_TYPE, ChoiceType::class, [
-                'choices' => FileUploadController::UPLOAD_BASED_MODULES,
+                'choices' => $options[FilesHandler::KEY_MODULES_NAMES],
                 'attr'    => [
                     'class'                        => 'form-control listFilterer',
                     'data-dependent-list-selector' => '#move_single_file_target_subdirectory_name'
@@ -40,5 +40,6 @@ public function configureOptions(OptionsResolver $resolver)
             // Configure your form options here
         ]);
         $resolver->setRequired(FilesHandler::KEY_TARGET_SUBDIRECTORY_NAME);
+        $resolver->setRequired(FilesHandler::KEY_MODULES_NAMES);
     }
 }

src/Services/FilesHandler.php

@@ -26,6 +26,7 @@ class FilesHandler {
     const KEY_FILE_NEW_NAME             = 'file_new_name';
     const KEY_FILE_CURRENT_PATH         = 'file_current_location';
     const KEY_FILE_NEW_PATH             = 'file_new_location';
+    const KEY_MODULES_NAMES             = 'modules_names';
 
     const FILE_KEY                      = 'file';
 

src/scss/ui/buttons.scss

@@ -64,7 +64,7 @@ input:checked + .slider:before {
 }
 
 /* Actions on tables */
-.fa-trash, .fa-edit, .fa-save, .fa-copy {
+.fa-trash, .fa-edit, .fa-save, .fa-copy, .fa-random {
   cursor: pointer;
 }