@adminforth/upload 2.7.2 → 2.8.1

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 51,379 bytes  received 134 bytes  103,026.00 bytes/sec
-total size is 50,890  speedup is 0.99
+sent 51,375 bytes  received 134 bytes  103,018.00 bytes/sec
+total size is 50,893  speedup is 0.99

package/custom/uploader.vue

@@ -171,7 +171,11 @@ onMounted(async () => {
   const existingFilePath =
     typeof existingValue === 'string' && existingValue.trim() ? existingValue : null;
 
-  if (!uploaded.value && existingFilePath) {
+  if (!uploaded.value && props.record?.[previewColumnName]) {
+    imgPreview.value = props.record[previewColumnName];
+    uploaded.value = true;
+    emit('update:emptiness', false);
+  } else if (!uploaded.value && existingFilePath) {
     const resp = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/get-file-download-url`,
       method: 'POST',
@@ -186,11 +190,6 @@ onMounted(async () => {
     }
   }
 
-  if (!uploaded.value && props.record?.[previewColumnName]) {
-    imgPreview.value = props.record[previewColumnName];
-    uploaded.value = true;
-    emit('update:emptiness', false);
-  }
 });
 
 const allowedExtensionsLabel = computed(() => {

package/dist/custom/uploader.vue

@@ -171,7 +171,11 @@ onMounted(async () => {
   const existingFilePath =
     typeof existingValue === 'string' && existingValue.trim() ? existingValue : null;
 
-  if (!uploaded.value && existingFilePath) {
+  if (!uploaded.value && props.record?.[previewColumnName]) {
+    imgPreview.value = props.record[previewColumnName];
+    uploaded.value = true;
+    emit('update:emptiness', false);
+  } else if (!uploaded.value && existingFilePath) {
     const resp = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/get-file-download-url`,
       method: 'POST',
@@ -186,11 +190,6 @@ onMounted(async () => {
     }
   }
 
-  if (!uploaded.value && props.record?.[previewColumnName]) {
-    imgPreview.value = props.record[previewColumnName];
-    uploaded.value = true;
-    emit('update:emptiness', false);
-  }
 });
 
 const allowedExtensionsLabel = computed(() => {

package/dist/index.js

@@ -29,6 +29,40 @@ export default class UploadPlugin extends AdminForthPlugin {
             }
             return this.options.storageAdapter.getDownloadUrl(path, expiresInSeconds);
         });
+        this.getFileUploadUrl = (originalFilename, contentType, size, originalExtension, recordPk) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (this.options.allowedFileExtensions && !this.options.allowedFileExtensions.includes(originalExtension.toLowerCase())) {
+                return {
+                    error: `File extension "${originalExtension}" is not allowed, allowed extensions are: ${this.options.allowedFileExtensions.join(', ')}`
+                };
+            }
+            let record = undefined;
+            if (recordPk) {
+                // get record by recordPk
+                const pkName = (_a = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _a === void 0 ? void 0 : _a.name;
+                record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(pkName, recordPk)]);
+            }
+            const filePath = this.options.filePath({ originalFilename, originalExtension, contentType, record });
+            if (filePath.startsWith('/')) {
+                throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
+            }
+            const { uploadUrl, uploadExtraParams } = yield this.options.storageAdapter.getUploadSignedUrl(filePath, contentType, 1800);
+            let previewUrl;
+            if ((_b = this.options.preview) === null || _b === void 0 ? void 0 : _b.previewUrl) {
+                previewUrl = this.options.preview.previewUrl({ filePath });
+            }
+            else {
+                previewUrl = yield this.options.storageAdapter.getDownloadUrl(filePath, 1800);
+            }
+            const tagline = `${ADMINFORTH_NOT_YET_USED_TAG}=true`;
+            return {
+                uploadUrl,
+                tagline,
+                filePath,
+                uploadExtraParams,
+                previewUrl,
+            };
+        });
         if ((_b = (_a = this.options.generation) === null || _a === void 0 ? void 0 : _a.rateLimit) === null || _b === void 0 ? void 0 : _b.limit) {
             this.rateLimiter = new RateLimiter((_c = this.options.generation.rateLimit) === null || _c === void 0 ? void 0 : _c.limit);
         }
@@ -319,39 +353,8 @@ export default class UploadPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_file_upload_url`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body }) {
-                var _b, _c;
                 const { originalFilename, contentType, size, originalExtension, recordPk } = body;
-                if (this.options.allowedFileExtensions && !this.options.allowedFileExtensions.includes(originalExtension.toLowerCase())) {
-                    return {
-                        error: `File extension "${originalExtension}" is not allowed, allowed extensions are: ${this.options.allowedFileExtensions.join(', ')}`
-                    };
-                }
-                let record = undefined;
-                if (recordPk) {
-                    // get record by recordPk
-                    const pkName = (_b = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _b === void 0 ? void 0 : _b.name;
-                    record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(pkName, recordPk)]);
-                }
-                const filePath = this.options.filePath({ originalFilename, originalExtension, contentType, record });
-                if (filePath.startsWith('/')) {
-                    throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
-                }
-                const { uploadUrl, uploadExtraParams } = yield this.options.storageAdapter.getUploadSignedUrl(filePath, contentType, 1800);
-                let previewUrl;
-                if ((_c = this.options.preview) === null || _c === void 0 ? void 0 : _c.previewUrl) {
-                    previewUrl = this.options.preview.previewUrl({ filePath });
-                }
-                else {
-                    previewUrl = yield this.options.storageAdapter.getDownloadUrl(filePath, 1800);
-                }
-                const tagline = `${ADMINFORTH_NOT_YET_USED_TAG}=true`;
-                return {
-                    uploadUrl,
-                    tagline,
-                    filePath,
-                    uploadExtraParams,
-                    previewUrl,
-                };
+                return this.getFileUploadUrl(originalFilename, contentType, size, originalExtension, recordPk);
             })
         });
         // generation: {

package/index.ts

@@ -23,6 +23,8 @@ export default class UploadPlugin extends AdminForthPlugin {
 
   getFileDownloadUrl: ((path: string) => Promise<string>); 
 
+  getFileUploadUrl: ( originalFilename, contentType, size, originalExtension, recordPk ) => Promise<{ uploadUrl: string, tagline?: string, filePath?: string, uploadExtraParams?: Record<string, string>, previewUrl?: string, error?: string } | {error: string}>;
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -36,6 +38,46 @@ export default class UploadPlugin extends AdminForthPlugin {
       }
       return this.options.storageAdapter.getDownloadUrl(path, expiresInSeconds);
     }
+
+    this.getFileUploadUrl = async ( originalFilename, contentType, size, originalExtension, recordPk ) : Promise<{ uploadUrl: string, tagline?: string, filePath?: string, uploadExtraParams?: Record<string, string>, previewUrl?: string, error?: string } | {error: string}> => {
+
+        if (this.options.allowedFileExtensions && !this.options.allowedFileExtensions.includes(originalExtension.toLowerCase())) {
+          return {
+            error: `File extension "${originalExtension}" is not allowed, allowed extensions are: ${this.options.allowedFileExtensions.join(', ')}`
+          };
+        }
+
+        let record = undefined;
+        if (recordPk) {
+          // get record by recordPk
+          const pkName = this.resourceConfig.columns.find((column: any) => column.primaryKey)?.name;
+          record = await this.adminforth.resource(this.resourceConfig.resourceId).get(
+            [Filters.EQ(pkName, recordPk)]
+          )
+        }
+
+        const filePath: string = this.options.filePath({ originalFilename, originalExtension, contentType, record });
+        if (filePath.startsWith('/')) {
+          throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
+        }
+        const { uploadUrl, uploadExtraParams } = await this.options.storageAdapter.getUploadSignedUrl(filePath, contentType, 1800);
+        let previewUrl;
+        if (this.options.preview?.previewUrl) {
+          previewUrl = this.options.preview.previewUrl({ filePath });
+        } else {
+          previewUrl = await this.options.storageAdapter.getDownloadUrl(filePath, 1800);
+        }
+        const tagline = `${ADMINFORTH_NOT_YET_USED_TAG}=true`;
+        
+        return {
+          uploadUrl,
+          tagline,
+          filePath,
+          uploadExtraParams,
+          previewUrl,
+        };
+    };
+
     if (this.options.generation?.rateLimit?.limit) {
       this.rateLimiter = new RateLimiter(this.options.generation.rateLimit?.limit)
     }
@@ -369,41 +411,8 @@ export default class UploadPlugin extends AdminForthPlugin {
       handler: async ({ body }) => {
         const { originalFilename, contentType, size, originalExtension, recordPk } = body;
 
-        if (this.options.allowedFileExtensions && !this.options.allowedFileExtensions.includes(originalExtension.toLowerCase())) {
-          return {
-            error: `File extension "${originalExtension}" is not allowed, allowed extensions are: ${this.options.allowedFileExtensions.join(', ')}`
-          };
-        }
-
-        let record = undefined;
-        if (recordPk) {
-          // get record by recordPk
-          const pkName = this.resourceConfig.columns.find((column: any) => column.primaryKey)?.name;
-          record = await this.adminforth.resource(this.resourceConfig.resourceId).get(
-            [Filters.EQ(pkName, recordPk)]
-          )
-        }
-
-        const filePath: string = this.options.filePath({ originalFilename, originalExtension, contentType, record });
-        if (filePath.startsWith('/')) {
-          throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
-        }
-        const { uploadUrl, uploadExtraParams } = await this.options.storageAdapter.getUploadSignedUrl(filePath, contentType, 1800);
-        let previewUrl;
-        if (this.options.preview?.previewUrl) {
-          previewUrl = this.options.preview.previewUrl({ filePath });
-        } else {
-          previewUrl = await this.options.storageAdapter.getDownloadUrl(filePath, 1800);
-        }
-        const tagline = `${ADMINFORTH_NOT_YET_USED_TAG}=true`;
+        return this.getFileUploadUrl( originalFilename, contentType, size, originalExtension, recordPk );
         
-        return {
-          uploadUrl,
-          tagline,
-          filePath,
-          uploadExtraParams,
-          previewUrl,
-        };
       }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.7.2",
+  "version": "2.8.1",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",