From 964a4f5c4b79dace0284f45ca12cc7ae8deeeec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 22 Jan 2021 14:12:24 +0300
Subject: [PATCH] file group partial enhancement

---
 .../AkauntingDropzoneFileUpload.vue           | 42 +++++++++++--------
 .../documents/form/advanced.blade.php         |  2 +-
 .../views/partials/form/file_group.blade.php  | 22 +++++-----
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/components/AkauntingDropzoneFileUpload.vue b/resources/assets/js/components/AkauntingDropzoneFileUpload.vue
index 5ed73aa4b..f2613f9f7 100644
--- a/resources/assets/js/components/AkauntingDropzoneFileUpload.vue
+++ b/resources/assets/js/components/AkauntingDropzoneFileUpload.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="dropzone mb-3 dz-clickable" :class="[isPreviewSingle ? 'dropzone-single': 'dropzone-multiple']">
+    <div class="dropzone mb-3 dz-clickable" :class="[!multiple ? 'dropzone-single': 'dropzone-multiple']">
         <div class="fallback">
             <div class="custom-file">
                 <input type="file" class="custom-file-input" :id="'projectCoverUploads' + _uid" :multiple="multiple">
 
                 <label class="custom-file-label" :for="'projectCoverUploads' + _uid">{{ textChooseFile }}</label>
-          </div>
+            </div>
         </div>
 
-        <div v-if="isPreviewSingle" class="dz-preview dz-preview-single" :class="previewClasses" ref="previewSingle">
+        <div v-if="!multiple" class="dz-preview dz-preview-single" :class="previewClasses" ref="previewSingle">
             <div class="dz-preview-cover">
                 <img class="dz-preview-img" data-dz-thumbnail>
             </div>
@@ -25,12 +25,13 @@
 
                     <div class="col ml--3">
                         <h4 class="mb-1" data-dz-name>...</h4>
+
                         <p class="small text-muted mb-0" data-dz-size>...</p>
                     </div>
 
                     <div class="col-auto">
                         <button data-dz-remove="true" class="btn btn-danger btn-sm">
-                          <i class="fas fa-trash"></i>
+                            <i class="fas fa-trash"></i>
                         </button>
                     </div>
                 </div>
@@ -68,10 +69,6 @@ export default {
             description: 'Multiple file Upload'
         },
         previewClasses: [String, Object, Array],
-        isPreviewSingle: {
-            type: Boolean,
-            default: true
-        },
     },
 
     model: {
@@ -90,7 +87,11 @@ export default {
     methods: {
         async initDropzone() {
             let self = this;
-            let preview = this.isPreviewSingle ? this.$refs.previewSingle : this.$refs.previewMultiple;
+            let preview = !this.multiple ? this.$refs.previewSingle : this.$refs.previewMultiple;
+
+            if (!this.options.maxFiles && !this.multiple) {
+                this.options['maxFiles'] = 1;
+            }
 
             let finalOptions = {
               ...this.options,
@@ -101,7 +102,7 @@ export default {
               previewTemplate: preview.innerHTML,
               autoProcessQueue: false,
               init: function () {
-                this.on("addedfile", function (file) {
+                this.on('addedfile', function (file) {
                     self.files.push(file);
 
                     if (self.options.maxFiles == 1) {
@@ -110,7 +111,8 @@ export default {
                         self.$emit('change', self.files);
                     }
                 }),
-                this.on("removedfile", function (file) {
+ 
+                this.on('removedfile', function (file) {
                     let index = self.files.findIndex(f => f.upload.uuid === file.upload.uuid);
 
                     if (index !== -1) {
@@ -119,23 +121,27 @@ export default {
 
                     self.$emit('change', self.files);
 
-                    if(self.isPreviewSingle == false)
-                        this.enable()
+                    if (self.multiple) {
+                        this.enable();
+                    }
                 }),
-                this.on("maxfilesexceeded", function(file) {
+
+                this.on('maxfilesexceeded', function(file) {
                     this.removeAllFiles('notCancel');
                     this.addFile(file);
                 }),
-                this.on("maxfilesreached", function(file) {
-                    if(self.isPreviewSingle == false)
-                        this.disable()
+
+                this.on('maxfilesreached', function(file) {
+                    if (self.multiple) {
+                        this.disable();
+                    }
                 })
               }
             };
 
             this.dropzone = new Dropzone(this.$el, finalOptions);
 
-            preview.innerHTML = ''
+            preview.innerHTML = '';
         }
     },
 
diff --git a/resources/views/components/documents/form/advanced.blade.php b/resources/views/components/documents/form/advanced.blade.php
index 29fd61854..e8dc9221a 100644
--- a/resources/views/components/documents/form/advanced.blade.php
+++ b/resources/views/components/documents/form/advanced.blade.php
@@ -31,7 +31,7 @@
 
                     @if (!$hideAttachment)
                     <div class="col-md-12">
-                        {{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'options' => ['maxFiles' => '10', ''], 'multiple' => 'multiple', 'isPreviewSingle' => 'false'], null, 'col-md-12') }}
+                        {{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'multiple' => 'multiple'], !empty($document) ? $document->attachment : null , 'col-md-12') }}
                     </div>
                     @endif
                 </div>
diff --git a/resources/views/partials/form/file_group.blade.php b/resources/views/partials/form/file_group.blade.php
index dc808def6..7762dd957 100644
--- a/resources/views/partials/form/file_group.blade.php
+++ b/resources/views/partials/form/file_group.blade.php
@@ -12,23 +12,23 @@
                 @if (!empty($attributes['dropzone-class']))
                 class="{{ $attributes['dropzone-class'] }}"
                 @endif
+
                 @if (!empty($attributes['options']))
-                    @if (isset($attributes['options']['maxFiles']))
-                        :options={{ json_encode($attributes['options']) }}
-                    @else
-                        @php $attributes['options']['maxFiles'] = 1 @endphp
-                        :options={{ json_encode($attributes['options']) }}
-                    @endif
-                @else
-                    @php $attributes['options']['maxFiles'] = 1 @endphp
-                    :options={{ json_encode($attributes['options']) }}
+                :options={{ json_encode($attributes['options']) }}
                 @endif
+
                 @if (!empty($attributes['multiple']))
                 multiple
                 @endif
-                @if (isset($attributes['isPreviewSingle']))
-                :is-preview-single="{{ $attributes['isPreviewSingle'] }}"
+
+                @if (!empty($attributes['previewClasses']))
+                preview-classes="{{ $attributes['previewClasses'] }}"
                 @endif
+
+                @if (!empty($attributes['url']))
+                url="{{ $attributes['url'] }}"
+                @endif
+
                 v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name) }}"
             ></akaunting-dropzone-file-upload>
         </div>