@adminforth/upload 1.0.20 → 1.0.22

package/custom/uploader.vue

@@ -11,7 +11,7 @@
           <IconMagic class="w-5 h-5"/>
       </button>
 
-      <label for="dropzone-file" 
+      <label :for="inputId" 
         class="flex flex-col px-3 items-center justify-center w-full h-64 border-2  border-dashed rounded-lg cursor-pointer  dark:hover:bg-gray-800 hover:bg-gray-100  dark:hover:border-gray-500 dark:hover:bg-gray-600"
         @dragover.prevent="() => dragging = true"
         @dragleave.prevent="() => dragging = false"
@@ -59,7 +59,7 @@
               </div>
               
           </div>
-          <input id="dropzone-file" type="file" class="hidden" @change="onFileChange" />
+          <input :id="inputId" type="file" class="hidden" @change="onFileChange" ref="uploadInputRef" />
       </label>
   </div> 
 
@@ -70,6 +70,7 @@ import { computed, ref, onMounted, watch } from 'vue'
 import { callAdminForthApi } from '@/utils'
 import { IconMagic } from '@iconify-prerendered/vue-mdi';
 
+const inputId = computed(() => `dropzone-file-${props.meta.pluginInstanceId}`);
 
 import ImageGenerator from '@@/plugins/UploadPlugin/imageGenerator.vue';
 
@@ -85,6 +86,8 @@ const emit = defineEmits([
   'update:emptiness',
 ]);
 
+const uploadInputRef = ref(null);
+
 const showImageGen = ref(false);
 const dragging = ref(false);
 
@@ -136,6 +139,7 @@ function clear() {
   progress.value = 0;
   uploaded.value = false;
   uploadedSize.value = 0;
+  uploadInputRef.value.value = null;
   emit('update:value', null);
 }
 
@@ -154,6 +158,11 @@ function humanifySize(size) {
 
 
 const onFileChange = async (e) => {
+  // if empty then return
+  if (!e.target.files || e.target.files.length === 0) {
+    return;
+  }
+
   imgPreview.value = null;
   progress.value = 0;
   uploaded.value = false;

package/dist/custom/uploader.vue

@@ -11,7 +11,7 @@
           <IconMagic class="w-5 h-5"/>
       </button>
 
-      <label for="dropzone-file" 
+      <label :for="inputId" 
         class="flex flex-col px-3 items-center justify-center w-full h-64 border-2  border-dashed rounded-lg cursor-pointer  dark:hover:bg-gray-800 hover:bg-gray-100  dark:hover:border-gray-500 dark:hover:bg-gray-600"
         @dragover.prevent="() => dragging = true"
         @dragleave.prevent="() => dragging = false"
@@ -59,7 +59,7 @@
               </div>
               
           </div>
-          <input id="dropzone-file" type="file" class="hidden" @change="onFileChange" />
+          <input :id="inputId" type="file" class="hidden" @change="onFileChange" ref="uploadInputRef" />
       </label>
   </div> 
 
@@ -70,6 +70,7 @@ import { computed, ref, onMounted, watch } from 'vue'
 import { callAdminForthApi } from '@/utils'
 import { IconMagic } from '@iconify-prerendered/vue-mdi';
 
+const inputId = computed(() => `dropzone-file-${props.meta.pluginInstanceId}`);
 
 import ImageGenerator from '@@/plugins/UploadPlugin/imageGenerator.vue';
 
@@ -85,6 +86,8 @@ const emit = defineEmits([
   'update:emptiness',
 ]);
 
+const uploadInputRef = ref(null);
+
 const showImageGen = ref(false);
 const dragging = ref(false);
 
@@ -136,6 +139,7 @@ function clear() {
   progress.value = 0;
   uploaded.value = false;
   uploadedSize.value = 0;
+  uploadInputRef.value.value = null;
   emit('update:value', null);
 }
 
@@ -154,6 +158,11 @@ function humanifySize(size) {
 
 
 const onFileChange = async (e) => {
+  // if empty then return
+  if (!e.target.files || e.target.files.length === 0) {
+    return;
+  }
+
   imgPreview.value = null;
   progress.value = 0;
   uploaded.value = false;

package/dist/index.js

@@ -11,7 +11,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
-import { RateLimiter, getClientIp } from "adminforth";
+import { RateLimiter } from "adminforth";
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 export default class UploadPlugin extends AdminForthPlugin {
     constructor(options) {
@@ -329,6 +329,7 @@ export default class UploadPlugin extends AdminForthPlugin {
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
+        this.adminforth = adminforth;
         // called here because modifyResourceConfig can be called in build time where there is no environment and AWS secrets
         this.setupLifecycleRule();
     }
@@ -370,7 +371,6 @@ export default class UploadPlugin extends AdminForthPlugin {
                 let previewUrl;
                 if ((_b = this.options.preview) === null || _b === void 0 ? void 0 : _b.previewUrl) {
                     previewUrl = this.options.preview.previewUrl({ s3Path });
-                    return;
                 }
                 else if (this.options.s3ACL === 'public-read') {
                     previewUrl = `https://${this.options.s3Bucket}.s3.${this.options.s3Region}.amazonaws.com/${s3Path}`;
@@ -418,7 +418,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                 }
                 if ((_d = this.options.generation.rateLimit) === null || _d === void 0 ? void 0 : _d.limit) {
                     // rate limit
-                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_e = this.options.generation.rateLimit) === null || _e === void 0 ? void 0 : _e.limit, getClientIp(headers));
+                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_e = this.options.generation.rateLimit) === null || _e === void 0 ? void 0 : _e.limit, this.adminforth.auth.getClientIp(headers));
                     if (error) {
                         return { error: this.options.generation.rateLimit.errorMessage };
                     }

package/index.ts

@@ -4,13 +4,15 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, ObjectCannedACL, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, AdminForthResourceColumn, AdminForthResourcePages, IAdminForth, IHttpServer, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
-import { RateLimiter, getClientIp } from "adminforth";
+import { RateLimiter } from "adminforth";
 
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 
 export default class UploadPlugin extends AdminForthPlugin {
   options: PluginOptions;
 
+  adminforth!: IAdminForth;
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -363,6 +365,7 @@ export default class UploadPlugin extends AdminForthPlugin {
   }
 
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: any) {
+    this.adminforth = adminforth;
     // called here because modifyResourceConfig can be called in build time where there is no environment and AWS secrets
     this.setupLifecycleRule();
   }
@@ -410,7 +413,6 @@ export default class UploadPlugin extends AdminForthPlugin {
         let previewUrl;
         if (this.options.preview?.previewUrl) {
           previewUrl = this.options.preview.previewUrl({ s3Path });
-          return;
         } else if (this.options.s3ACL === 'public-read') {
           previewUrl = `https://${this.options.s3Bucket}.s3.${this.options.s3Region}.amazonaws.com/${s3Path}`;
         } else {
@@ -464,7 +466,7 @@ export default class UploadPlugin extends AdminForthPlugin {
           const { error } = RateLimiter.checkRateLimit(
             this.pluginInstanceId, 
             this.options.generation.rateLimit?.limit,
-            getClientIp(headers),
+            this.adminforth.auth.getClientIp(headers),
           );
           if (error) {
             return { error: this.options.generation.rateLimit.errorMessage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",