wip

Author: pxpm

src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php

@@ -296,13 +296,32 @@ protected function makeSureSubfieldsHaveNecessaryAttributes($field)
                 case 'MorphToMany':
                 case 'BelongsToMany':
                     $pivotSelectorField = static::getPivotFieldStructure($field);
+                    
+                    $pivot = Arr::where($field['subfields'], function($item) use ($pivotSelectorField) {
+                        return $item['name'] === $pivotSelectorField['name'];
+                    });
+
+                    if(!empty($pivot)) {
+                        break;
+                    }
+
                     $this->setupFieldValidation($pivotSelectorField, $field['name']);
                     $field['subfields'] = Arr::prepend($field['subfields'], $pivotSelectorField);
+                    
                     break;
                 case 'MorphMany':
                 case 'HasMany':
                     $entity = isset($field['baseEntity']) ? $field['baseEntity'].'.'.$field['entity'] : $field['entity'];
                     $relationInstance = $this->getRelationInstance(['entity' => $entity]);
+
+                    $localKeyField = Arr::where($field['subfields'], function($item) use ($relationInstance) {
+                        return $item['name'] === $relationInstance->getRelated()->getKeyName();
+                    });
+                    
+                    if(!empty($localKeyField)) {
+                        break;
+                    }
+
                     $field['subfields'] = Arr::prepend($field['subfields'], [
                         'name' => $relationInstance->getRelated()->getKeyName(),
                         'type' => 'hidden',

src/app/Library/Uploaders/Support/RegisterUploadEvents.php

@@ -189,6 +189,8 @@ private function getSubfieldModel(array $subfield, UploaderInterface $uploader)
             case 'BelongsToMany':
                 return app('crud')->getModel()->{$subfield['baseEntity']}()->getPivotClass();
         }
+
+        return $subfield['baseModel'];
     }
 
     private function getRetrieveModel(string $model, UploaderInterface $uploader)

src/app/Library/Uploaders/Support/Traits/HandleRepeatableUploads.php

@@ -119,6 +119,8 @@ private function retrieveRepeatableRelationFiles(Model $entry)
                 $entry->{$pivotFieldName} = $this->retrieveFiles($connectedEntry)->{$this->getName()};
 
                 break;
+            default: 
+                $entry = $this->retrieveFiles($entry);
         }
 
         return $entry;
@@ -149,7 +151,37 @@ private function deleteRepeatableFiles(Model $entry): void
         if ($this->isRelationship) {
             switch($this->getRepeatableRelationType()) {
                 case 'BelongsToMany':
-                    // handle belongs to many deletion
+                    $pivotAttributes = $entry->getAttributes();
+                    $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) {
+                       
+                        $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes));
+                        
+                        return $itemPivotAttributes === $pivotAttributes;
+                       
+                    })->first();
+                    
+                    if(!$connectedPivot) {
+                        return;
+                    }
+
+                    $files = $connectedPivot->getOriginal()['pivot_'.$this->getName()];
+                   
+                    if(!$files) {
+                        return;
+                    }
+
+                    if (is_array($files)) {
+                        foreach ($files as $value) {
+                            $value = Str::start($value, $this->getPath());
+                            Storage::disk($this->getDisk())->delete($value);
+                        }
+    
+                        return;
+                    }
+
+                    $value = Str::start($files, $this->getPath());
+                    Storage::disk($this->getDisk())->delete($value);
+                  
                     return;
             }