Merge pull request #95 from mostafaznv/dev

feat: upgrade nova-video to v6
mostafaznv · Nov 1, 2023 · 8226818 · 8226818
2 parents 42fa7f9 + 56f586c
commit 8226818
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^8.0.2",
         "intervention/image": "^2.5",
-        "mostafaznv/nova-video": "^3.0|^4.0|^5.0",
+        "mostafaznv/nova-video": "^3.0|^4.0|^5.0|^6.0.2",
         "laravel/framework": "^8.40.0|^9.0|^10.0",
         "laravel/nova": "^4.13",
         "nova-kit/nova-packages-tool": "^1.2",

diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
@@ -32,7 +32,7 @@ composer require mostafaznv/nova-ckeditor
 php artisan vendor:publish --provider="Mostafaznv\NovaCkEditor\FieldServiceProvider"
 ```
 
-#### 3. Prepare the migration and models
+#### 3. Prepare the migration, configurations and models
 
 After publishing stubs, essential `Image`, `Video` and `Audio` classes will be created in the `app/Models` and `app/Nova/Resources` directories respectively. These classes are used for the `media-picker` in the CKEditor field.
 

diff --git a/resources/js/components/editor-field.vue b/resources/js/components/editor-field.vue
@@ -5,9 +5,29 @@
 
             <p v-if="currentField.helpText" v-html="currentField.helpText" class="help-text help-text mt-2" />
 
-            <media-browser @select="$options[editorName].execute('imageBrowser', $event)" type="image" :field-key="$options[editorUUID] + '-image'" :multiple="true" />
-            <media-browser @select="$options[editorName].execute('videoBrowser', $event)" type="video" :field-key="$options[editorUUID] + '-video'" :multiple="true" :has-larupload-trait="currentField.videoHasLaruploadTrait" />
-            <media-browser @select="$options[editorName].execute('audioBrowser', $event)" type="audio" :field-key="$options[editorUUID] + '-audio'" :multiple="true" />
+            <media-browser
+                @select="$options[editorName].execute('imageBrowser', $event)"
+                type="image"
+                :field-key="$options[editorUUID] + '-image'"
+                :multiple="true"
+            />
+
+            <media-browser
+                @select="$options[editorName].execute('videoBrowser', $event)"
+                type="video"
+                :field-key="$options[editorUUID] + '-video'"
+                :multiple="true"
+                :has-larupload-trait="currentField.videoHasLaruploadTrait"
+                :nova-video-is-legacy="currentField.novaVideoIsLegacy"
+            />
+
+            <media-browser
+                @select="$options[editorName].execute('audioBrowser', $event)"
+                type="audio"
+                :field-key="$options[editorUUID] + '-audio'"
+                :multiple="true"
+            />
+
             <snippet-browser :field-key="$options[editorUUID]" :snippets="currentField.snippetBrowser" />
         </template>
     </default-field>

diff --git a/resources/js/components/media-browser.vue b/resources/js/components/media-browser.vue
@@ -181,6 +181,10 @@ export default {
             type: Boolean,
             default: false
         },
+        novaVideoIsLegacy: {
+            type: Boolean,
+            default: true
+        },
         type: {
             type: String,
             default: 'image',
@@ -310,10 +314,19 @@ export default {
                     if (this.isVideoPicker) {
                         this.items.map((item) => {
                             if (this.hasLaruploadTrait) {
-                                item.url = item.file_field.cover
-                                item.urls = {
-                                    cover: item.file_field.cover,
-                                    video: item.file_field.original,
+                                if (this.novaVideoIsLegacy) {
+                                    item.url = item.file_field.cover
+                                    item.urls = {
+                                        cover: item.file_field.cover,
+                                        video: item.file_field.original,
+                                    }
+                                }
+                                else {
+                                    item.url = item.file.cover
+                                    item.urls = {
+                                        cover: item.file.cover,
+                                        video: item.file.original,
+                                    }
                                 }
                             }
                             else {
@@ -378,7 +391,12 @@ export default {
                 }
                 else {
                     if (this.hasLaruploadTrait) {
-                        data.file_field = file
+                        if (this.novaVideoIsLegacy) {
+                            data.file_field = file
+                        }
+                        else {
+                            data['file[original]'] = file
+                        }
                     }
                     else {
                         data.file = file

diff --git a/resources/js/components/mixins/interactsWithResources.js b/resources/js/components/mixins/interactsWithResources.js
@@ -7,12 +7,12 @@ export default {
          */
         resourceToObject({fields}) {
             return fields.reduce((obj, item) => {
-                if (item.value) {
-                    obj[item.attribute] = item.value
-                }
-                else if (item.displayedAs) {
+                if (item.displayedAs) {
                     obj[item.attribute] = item.displayedAs
                 }
+                else if (item.value) {
+                    obj[item.attribute] = item.value
+                }
                 else {
                     obj[item.attribute] = null
                 }
@@ -70,6 +70,7 @@ export default {
         async uploadResource(resourceKey, params) {
             const data = new FormData
             Object.entries(params).forEach(([key, value]) => data.append(key, value))
+
             return await Nova.request()
                 .post(`/nova-api/${resourceKey}`, data)
                 .then(({data}) => data.resource)

diff --git a/src/CkEditor.php b/src/CkEditor.php
@@ -6,6 +6,7 @@
 use Laravel\Nova\Fields\Field;
 use Laravel\Nova\Fields\SupportsDependentFields;
 use Mostafaznv\Larupload\Traits\Larupload;
+use Mostafaznv\NovaVideo\Video;
 
 /**
  * @method static static make(mixed $name, string|\Closure|callable|object|null $attribute = null, callable|null $resolveCallback = null)
@@ -299,15 +300,32 @@ public function jsonSerialize(): array
             'shouldNotGroupWhenFull' => $this->shouldNotGroupWhenFull,
             'shouldShow'             => $this->shouldBeExpanded(),
             'videoHasLaruploadTrait' => $this->hasLaruploadTrait(),
+            'novaVideoIsLegacy'      => $this->isLegacyNovaVideo(),
         ]);
     }
 
+    /**
+     * Render Snippets as HTML
+     *
+     * @param array $snippets
+     * @return array
+     */
+    protected function prepareSnippets(array $snippets): array
+    {
+        foreach ($snippets as $key => $snippet) {
+            $snippet['html'] = view($snippet['html'])->render();
+            $snippets[$key] = $snippet;
+        }
+
+        return $snippets;
+    }
+
     /**
      * Check if class has larupload trait
      *
      * @return bool
      */
-    protected function hasLaruploadTrait(): bool
+    private function hasLaruploadTrait(): bool
     {
         if ($this->videoModel) {
             $class = $this->videoModel;
@@ -319,19 +337,17 @@ protected function hasLaruploadTrait(): bool
     }
 
     /**
-     * Render Snippets as HTML
+     * Check whether NovaVideo is legacy
      *
-     * @param array $snippets
-     * @return array
+     * @return bool
      */
-    protected function prepareSnippets(array $snippets): array
+    private function isLegacyNovaVideo(): bool
     {
-        foreach ($snippets as $key => $snippet) {
-            $snippet['html'] = view($snippet['html'])->render();
-            $snippets[$key] = $snippet;
+        if (property_exists(Video::class, 'storeWithLarupload')) {
+            return false;
         }
 
-        return $snippets;
+        return true;
     }
 
     private function prepareToolbar(string $toolbar, array $items = null): void

diff --git a/src/VideoUpload.php b/src/VideoUpload.php
@@ -20,9 +20,19 @@ class VideoUpload extends Video
     public function __construct(string $label, string $fieldName, string $disk = 'video')
     {
         if ($this->hasLaruploadTrait()) {
-            parent::__construct($label, $fieldName . '_field', $disk);
+            # version 6.* and higher
+            if (property_exists($this, 'storeWithLarupload')) {
+                parent::__construct($label, $fieldName, $disk);
+
+                $this->storeWithLarupload();
+            }
+            # older versions
+            else {
+                parent::__construct($label, $fieldName . '_field', $disk);
+
+                $this->storeWithLarupload($fieldName);
+            }
 
-            $this->storeWithLarupload($fieldName);
         }
         else {
             parent::__construct($label, $fieldName, $disk);