Merge pull request #72 from BBS-Lab/develop

feat(flexible): add flexible content support
oneduo · Sep 9, 2022 · 49b0410 · 49b0410
2 parents 7f83d7e + a340c17
commit 49b0410
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -31,11 +31,12 @@
   ],
   "require": {
     "php": "^8.0",
+    "ext-json": "*",
     "james-heinrich/getid3": "^1.9",
-    "pion/laravel-chunk-upload": "^1.5",
     "laravel/nova": "^4.0",
     "nova-kit/nova-packages-tool": "^1.3.1",
-    "ext-json": "*"
+    "pion/laravel-chunk-upload": "^1.5",
+    "spatie/invade": "^1.1"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^7.0.1",

diff --git a/composer.lock b/composer.lock
diff --git a/dist/js/tool.js b/dist/js/tool.js
diff --git a/resources/js/fields/FormField.vue b/resources/js/fields/FormField.vue
@@ -116,12 +116,14 @@ export default {
         drag: false,
         displayModal: false,
         value: [],
+        flexibleGroup: [],
     }),
 
     mounted() {
         this.init()
 
         this.value = (this.field.value || []).map(file => this.mapEntity(file))
+        this.flexibleGroup = this.resolveFlexible(this)
     },
 
     computed: {
@@ -167,9 +169,10 @@ export default {
                 limit: this.field.limit ?? null,
                 resource: this.resourceName,
                 resourceId: this.resourceId,
-                attribute: this.field.attribute,
+                attribute: this.flexibleGroup.length ? this.field.sortableUriKey : this.field.attribute,
                 customDisk: this.field.customDisk,
                 permissions: this.field.permissions,
+                flexibleGroup: this.flexibleGroup,
                 callback: selection => {
                     this.value = selection.map(f => this.mapEntity(f))
                 },
@@ -199,6 +202,20 @@ export default {
                 file.exists,
                 file.disk
             ),
+
+        resolveFlexible(component) {
+            let elements = []
+
+            let group = component.$parent
+            let parent = component.$parent?.$parent?.$parent?.$parent
+
+            if (parent?.field?.component === 'nova-flexible-content') {
+                elements.unshift(...this.resolveFlexible(parent))
+                elements.push(`${group?.group?.name}:${parent.field.sortableUriKey}`)
+            }
+
+            return elements
+        },
     },
 
     watch: {

diff --git a/resources/js/store/actions.js b/resources/js/store/actions.js
@@ -12,6 +12,10 @@ const buildPayload = (state, params) => {
         ...(!state.customDisk && {
             disk: state.disk,
         }),
+        ...(state.isFieldMode &&
+      state.flexibleGroup?.length && {
+            flexible: state.flexibleGroup.join('.'),
+        }),
     }
 }
 
@@ -424,6 +428,7 @@ const actions = {
             attribute,
             customDisk,
             permissions,
+            flexibleGroup,
             callback,
         }
     ) => {
@@ -434,6 +439,7 @@ const actions = {
         commit('setResourceId', resourceId)
         commit('setAttribute', attribute)
         commit('setCustomDisk', customDisk)
+        commit('setFlexibleGroup', flexibleGroup)
         commit('setCallback', callback)
         commit('setSelection', [...initialFiles])
         dispatch('setPermissions', permissions)
@@ -456,6 +462,7 @@ const actions = {
         commit('setResourceId', null)
         commit('setAttribute', null)
         commit('setCustomDisk', false)
+        commit('setFlexibleGroup', [])
         commit('setDisk', null)
         commit('setSelection', null)
 

diff --git a/resources/js/store/mutations.js b/resources/js/store/mutations.js
@@ -190,6 +190,10 @@ const mutations = {
         state.customDisk = customDisk
     },
 
+    setFlexibleGroup(state, flexibleGroup) {
+        state.flexibleGroup = flexibleGroup
+    },
+
     /*
     |--------------------------------------------------------------------------
     | Setters

diff --git a/resources/js/store/store.js b/resources/js/store/store.js
@@ -47,6 +47,7 @@ const store = {
             resourceId: null,
             attribute: null,
             customDisk: false,
+            flexibleGroup: [],
 
             // permissions
             showCreateFolder: true,

diff --git a/src/FileManager.php b/src/FileManager.php
@@ -113,6 +113,14 @@ protected function resolveAttribute($resource, $attribute = null): ?array
             $value = collect([$value]);
         }
 
+        if (is_array($value)) {
+            if ($this->multiple) {
+                $value = collect($value)->map(fn (array $asset) => new Asset(...$asset));
+            } else {
+                $value = collect([new Asset(...$value)]);
+            }
+        }
+
         return $value
             ->map(function (Asset $asset) {
                 $disk = $this->resolveFilesystem(app(NovaRequest::class)) ?? $asset->disk;

diff --git a/src/Filesystem/Upload/Uploader.php b/src/Filesystem/Upload/Uploader.php
@@ -21,7 +21,7 @@ class Uploader implements UploaderContract
      */
     public function handle(UploadFileRequest $request, string $index = 'file'): array
     {
-        if (! $request->validateUpload()) {
+        if (!$request->validateUpload()) {
             throw ValidationException::withMessages([
                 'file' => [__('nova-file-manager::errors.file.upload_validation')],
             ]);
@@ -49,7 +49,7 @@ public function handle(UploadFileRequest $request, string $index = 'file'): arra
 
     public function saveFile(UploadFileRequest $request, UploadedFile $file): array
     {
-        if (! $request->validateUpload($file, true)) {
+        if (!$request->validateUpload($file, true)) {
             throw ValidationException::withMessages([
                 'file' => [__('nova-file-manager::errors.file.upload_validation')],
             ]);

diff --git a/src/Http/Requests/BaseRequest.php b/src/Http/Requests/BaseRequest.php
@@ -9,8 +9,10 @@
 use BBSLab\NovaFileManager\FileManager;
 use BBSLab\NovaFileManager\NovaFileManager;
 use Illuminate\Validation\ValidationException;
+use Laravel\Nova\Fields\FieldCollection;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Nova;
+use Laravel\Nova\Resource;
 use Laravel\Nova\Tool;
 
 /**
@@ -51,13 +53,61 @@ public function resolveField(): ?InteractsWithFilesystem
     {
         $resource = $this->resourceId ? $this->findResourceOrFail() : $this->newResource();
 
-        return $resource->availableFields($this)
+        $fields = $this->has('flexible')
+            ? $this->flexibleAvailableFields($resource)
+            : $resource->availableFields($this);
+
+        return $fields
             ->whereInstanceOf(FileManager::class)
             ->findFieldByAttribute($this->attribute, function () {
                 abort(404);
             });
     }
 
+    public function flexibleAvailableFields(Resource $resource): FieldCollection
+    {
+        $path = $this->input('flexible');
+
+        abort_if(blank($path), 404);
+
+        $tree = collect(explode('.', $path))
+            ->map(function (string $item) {
+                [$layout, $attribute] = explode(':', $item);
+
+                return ['attribute' => $attribute, 'layout' => $layout];
+            });
+
+        $fields = $resource->availableFields($this);
+
+        while ($tree->isNotEmpty()) {
+            $current = $tree->shift();
+
+            $fields = $this->flexibleFieldCollection($fields, $current['attribute'], $current['layout']);
+        }
+
+        return $fields;
+    }
+
+    public function flexibleFieldCollection(FieldCollection $fields, string $attribute, string $name): FieldCollection
+    {
+        /** @var \Whitecube\NovaFlexibleContent\Flexible $field */
+        $field = $fields
+            ->whereInstanceOf('Whitecube\NovaFlexibleContent\Flexible')
+            ->findFieldByAttribute($attribute, function () {
+                abort(404);
+            });
+
+        /** @var \Whitecube\NovaFlexibleContent\Layouts\Collection $layouts */
+        abort_unless($layouts = invade($field)->layouts, 404);
+
+        /** @var \Whitecube\NovaFlexibleContent\Layouts\Layout $layout */
+        $layout = $layouts->first(fn ($layout) => $layout->name() === $name);
+
+        abort_if($layout === null, 404);
+
+        return new FieldCollection($layout->fields());
+    }
+
     public function resolveTool(): ?InteractsWithFilesystem
     {
         return tap(once(function () {