@adminforth/upload 2.3.7 → 2.4.0

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 47,144 bytes  received 134 bytes  94,556.00 bytes/sec
-total size is 46,662  speedup is 0.99
+sent 48,314 bytes  received 134 bytes  96,896.00 bytes/sec
+total size is 47,825  speedup is 0.99

package/custom/tsconfig.json

@@ -1,17 +1,14 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
         "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/custom/uploader.vue

@@ -103,6 +103,8 @@ const progress = ref(0);
 const uploaded = ref(false);
 const uploadedSize = ref(0);
 
+const downloadFileUrl = ref('');
+
 watch(() => uploaded, (value) => {
   emit('update:emptiness', !value);
 });
@@ -118,9 +120,50 @@ function uploadGeneratedImage(imgBlob) {
   });
 }
 
-onMounted(() => {
+onMounted(async () => {
   const previewColumnName = `previewUrl_${props.meta.pluginInstanceId}`;
-  if (props.record[previewColumnName]) {
+  let queryValues;
+  try { 
+    queryValues = JSON.parse(atob(route.query.values as string));
+  } catch (e) {
+    queryValues = {};
+  }
+
+  if (queryValues[props.meta.pathColumnName]) {
+    downloadFileUrl.value = queryValues[props.meta.pathColumnName];
+
+    const resp = await callAdminForthApi({
+        path: `/plugin/${props.meta.pluginInstanceId}/get-file-download-url`,
+        method: 'POST',
+        body: {
+          filePath: queryValues[props.meta.pathColumnName]
+        },
+    });
+    if (resp.error) {
+        adminforth.alert({
+          message: t('Error getting file url for field {field}:', { field: props.meta.pathColumnName }),
+          variant: 'danger'
+        });
+      return;
+    }
+    const filename = resp.url.split('/').pop()?.split('?')[0] || `file`;
+    const filenameParts = filename.split('.');
+    const extension = filenameParts.length > 1 ? filenameParts.pop() : '';
+    const nameWithoutExt = filenameParts.join('.');
+    const newFileName = extension 
+      ? `${nameWithoutExt}_copy_${Date.now()}.${extension}`
+      : `${filename}_copy_${Date.now()}`;
+
+
+    const res = await fetch(resp.url);
+    const fileBlob = await res.blob();
+    const file = new File([fileBlob], newFileName, { type: fileBlob.type });
+    onFileChange({
+      target: {
+        files: [file],
+      },
+    });
+  } else if (props.record[previewColumnName]) {
     imgPreview.value = props.record[previewColumnName];
     uploaded.value = true;
     emit('update:emptiness', false);

package/dist/custom/tsconfig.json

@@ -1,17 +1,14 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
         "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/dist/custom/uploader.vue

@@ -103,6 +103,8 @@ const progress = ref(0);
 const uploaded = ref(false);
 const uploadedSize = ref(0);
 
+const downloadFileUrl = ref('');
+
 watch(() => uploaded, (value) => {
   emit('update:emptiness', !value);
 });
@@ -118,9 +120,50 @@ function uploadGeneratedImage(imgBlob) {
   });
 }
 
-onMounted(() => {
+onMounted(async () => {
   const previewColumnName = `previewUrl_${props.meta.pluginInstanceId}`;
-  if (props.record[previewColumnName]) {
+  let queryValues;
+  try { 
+    queryValues = JSON.parse(atob(route.query.values as string));
+  } catch (e) {
+    queryValues = {};
+  }
+
+  if (queryValues[props.meta.pathColumnName]) {
+    downloadFileUrl.value = queryValues[props.meta.pathColumnName];
+
+    const resp = await callAdminForthApi({
+        path: `/plugin/${props.meta.pluginInstanceId}/get-file-download-url`,
+        method: 'POST',
+        body: {
+          filePath: queryValues[props.meta.pathColumnName]
+        },
+    });
+    if (resp.error) {
+        adminforth.alert({
+          message: t('Error getting file url for field {field}:', { field: props.meta.pathColumnName }),
+          variant: 'danger'
+        });
+      return;
+    }
+    const filename = resp.url.split('/').pop()?.split('?')[0] || `file`;
+    const filenameParts = filename.split('.');
+    const extension = filenameParts.length > 1 ? filenameParts.pop() : '';
+    const nameWithoutExt = filenameParts.join('.');
+    const newFileName = extension 
+      ? `${nameWithoutExt}_copy_${Date.now()}.${extension}`
+      : `${filename}_copy_${Date.now()}`;
+
+
+    const res = await fetch(resp.url);
+    const fileBlob = await res.blob();
+    const file = new File([fileBlob], newFileName, { type: fileBlob.type });
+    onFileChange({
+      target: {
+        files: [file],
+      },
+    });
+  } else if (props.record[previewColumnName]) {
     imgPreview.value = props.record[previewColumnName];
     uploaded.value = true;
     emit('update:emptiness', false);

package/dist/index.js

@@ -10,6 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { AdminForthPlugin, Filters, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
 import { RateLimiter } from "adminforth";
+import { interpretResource } from 'adminforth';
+import { ActionCheckSource } from 'adminforth';
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 export default class UploadPlugin extends AdminForthPlugin {
     constructor(options) {
@@ -83,6 +85,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                 minShowWidth: (_h = this.options.preview) === null || _h === void 0 ? void 0 : _h.minShowWidth,
                 generationPrompt: (_j = this.options.generation) === null || _j === void 0 ? void 0 : _j.generationPrompt,
                 recorPkFieldName: (_k = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _k === void 0 ? void 0 : _k.name,
+                pathColumnName: this.options.pathColumnName,
             };
             // define components which will be imported from other components
             this.componentPath('imageGenerator.vue');
@@ -116,7 +119,12 @@ export default class UploadPlugin extends AdminForthPlugin {
                 if (record[pathColumnName]) {
                     process.env.HEAVY_DEBUG && console.log('🪥🪥 remove ObjectTagging', record[pathColumnName]);
                     // let it crash if it fails: this is a new file which just was uploaded.
-                    yield this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
+                    if (this.options.storageAdapter.markKeyForNotDeletion !== undefined) {
+                        yield this.options.storageAdapter.markKeyForNotDeletion(record[pathColumnName]);
+                    }
+                    else {
+                        yield this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
+                    }
                 }
                 return { ok: true };
             }));
@@ -150,7 +158,12 @@ export default class UploadPlugin extends AdminForthPlugin {
             resourceConfig.hooks.delete.afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ record }) {
                 if (record[pathColumnName]) {
                     try {
-                        yield this.options.storageAdapter.markKeyForDeletation(record[pathColumnName]);
+                        if (this.options.storageAdapter.markKeyForDeletion !== undefined) {
+                            yield this.options.storageAdapter.markKeyForDeletion(record[pathColumnName]);
+                        }
+                        else {
+                            yield this.options.storageAdapter.markKeyForDeletation(record[pathColumnName]);
+                        }
                     }
                     catch (e) {
                         // file might be e.g. already deleted, so we catch error
@@ -166,7 +179,12 @@ export default class UploadPlugin extends AdminForthPlugin {
                     if (oldRecord[pathColumnName]) {
                         // put tag to delete old file
                         try {
-                            yield this.options.storageAdapter.markKeyForDeletation(oldRecord[pathColumnName]);
+                            if (this.options.storageAdapter.markKeyForDeletion !== undefined) {
+                                yield this.options.storageAdapter.markKeyForDeletion(oldRecord[pathColumnName]);
+                            }
+                            else {
+                                yield this.options.storageAdapter.markKeyForDeletation(oldRecord[pathColumnName]);
+                            }
                         }
                         catch (e) {
                             // file might be e.g. already deleted, so we catch error
@@ -176,7 +194,12 @@ export default class UploadPlugin extends AdminForthPlugin {
                     if (updates[pathColumnName] !== null) {
                         // remove tag from new file
                         // in this case we let it crash if it fails: this is a new file which just was uploaded. 
-                        yield this.options.storageAdapter.markKeyForNotDeletation(updates[pathColumnName]);
+                        if (this.options.storageAdapter.markKeyForNotDeletion !== undefined) {
+                            yield this.options.storageAdapter.markKeyForNotDeletion(updates[pathColumnName]);
+                        }
+                        else {
+                            yield this.options.storageAdapter.markKeyForNotDeletation(updates[pathColumnName]);
+                        }
                     }
                 }
                 return { ok: true };
@@ -354,5 +377,23 @@ export default class UploadPlugin extends AdminForthPlugin {
                 };
             }),
         });
+        server.endpoint({
+            method: 'POST',
+            path: `/plugin/${this.pluginInstanceId}/get-file-download-url`,
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser }) {
+                const { filePath } = body;
+                if (!filePath) {
+                    return { error: 'Missing filePath' };
+                }
+                const allowedActions = yield interpretResource(adminUser, this.resourceConfig, '', ActionCheckSource.CustomActionRequest, this.adminforth);
+                if (allowedActions.allowedActions.create === true || allowedActions.allowedActions.edit === true) {
+                    const url = yield this.options.storageAdapter.getDownloadUrl(filePath, 1800);
+                    return {
+                        url,
+                    };
+                }
+                return { error: 'You do not have permission to download this file' };
+            }),
+        });
     }
 }

package/index.ts

@@ -3,6 +3,8 @@ import { PluginOptions } from './types.js';
 import { AdminForthPlugin, AdminForthResourceColumn, AdminForthResource, Filters, IAdminForth, IHttpServer, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
 import { RateLimiter } from "adminforth";
+import { interpretResource } from 'adminforth';
+import { ActionCheckSource } from 'adminforth'; 
 
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 
@@ -86,6 +88,7 @@ export default class UploadPlugin extends AdminForthPlugin {
       minShowWidth: this.options.preview?.minShowWidth,
       generationPrompt: this.options.generation?.generationPrompt,
       recorPkFieldName: this.resourceConfig.columns.find((column: any) => column.primaryKey)?.name,
+      pathColumnName: this.options.pathColumnName,
     };
     // define components which will be imported from other components
     this.componentPath('imageGenerator.vue');
@@ -128,7 +131,11 @@ export default class UploadPlugin extends AdminForthPlugin {
       if (record[pathColumnName]) {
         process.env.HEAVY_DEBUG && console.log('🪥🪥 remove ObjectTagging', record[pathColumnName]);
         // let it crash if it fails: this is a new file which just was uploaded.
-        await this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
+        if (this.options.storageAdapter.markKeyForNotDeletion !== undefined) {
+          await this.options.storageAdapter.markKeyForNotDeletion(record[pathColumnName]);
+        } else {
+          await this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
+        }
       }
       return { ok: true };
     });
@@ -171,7 +178,11 @@ export default class UploadPlugin extends AdminForthPlugin {
     resourceConfig.hooks.delete.afterSave.push(async ({ record }: { record: any }) => {
       if (record[pathColumnName]) {
         try {
-          await this.options.storageAdapter.markKeyForDeletation(record[pathColumnName]);
+          if (this.options.storageAdapter.markKeyForDeletion !== undefined) {
+            await this.options.storageAdapter.markKeyForDeletion(record[pathColumnName]);
+          } else {
+            await this.options.storageAdapter.markKeyForDeletation(record[pathColumnName]);
+          }
         } catch (e) {
           // file might be e.g. already deleted, so we catch error
           console.error(`Error setting tag ${ADMINFORTH_NOT_YET_USED_TAG} to true for object ${record[pathColumnName]}. File will not be auto-cleaned up`, e);
@@ -192,7 +203,11 @@ export default class UploadPlugin extends AdminForthPlugin {
         if (oldRecord[pathColumnName]) {
           // put tag to delete old file
           try {
-            await this.options.storageAdapter.markKeyForDeletation(oldRecord[pathColumnName]);
+            if (this.options.storageAdapter.markKeyForDeletion !== undefined) {
+              await this.options.storageAdapter.markKeyForDeletion(oldRecord[pathColumnName]);
+            } else {
+              await this.options.storageAdapter.markKeyForDeletation(oldRecord[pathColumnName]);
+            }
           } catch (e) {
             // file might be e.g. already deleted, so we catch error
             console.error(`Error setting tag ${ADMINFORTH_NOT_YET_USED_TAG} to true for object ${oldRecord[pathColumnName]}. File will not be auto-cleaned up`, e);
@@ -201,8 +216,12 @@ export default class UploadPlugin extends AdminForthPlugin {
         if (updates[pathColumnName] !== null) {
           // remove tag from new file
           // in this case we let it crash if it fails: this is a new file which just was uploaded. 
+        if (this.options.storageAdapter.markKeyForNotDeletion !== undefined) {
+          await this.options.storageAdapter.markKeyForNotDeletion(updates[pathColumnName]);
+        } else {
           await  this.options.storageAdapter.markKeyForNotDeletation(updates[pathColumnName]);
         }
+        }
       }
       return { ok: true };
     });
@@ -411,6 +430,26 @@ export default class UploadPlugin extends AdminForthPlugin {
       },
     });
 
+    server.endpoint({
+      method: 'POST',
+      path: `/plugin/${this.pluginInstanceId}/get-file-download-url`,
+      handler: async ({ body, adminUser }) => {
+        const { filePath } = body;
+        if (!filePath) {
+          return { error: 'Missing filePath' };
+        }
+        const allowedActions = await interpretResource( adminUser, this.resourceConfig, '', ActionCheckSource.CustomActionRequest, this.adminforth  )
+        if (allowedActions.allowedActions.create === true || allowedActions.allowedActions.edit === true) {
+          const url = await this.options.storageAdapter.getDownloadUrl(filePath, 1800);
+    
+          return {
+            url,
+          };
+        }
+        return { error: 'You do not have permission to download this file' };
+      },
+    });
+
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.3.7",
+  "version": "2.4.0",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.629.0",
     "@aws-sdk/s3-request-presigner": "^3.629.0",
-    "adminforth": "^2.4.0-next.237"
+    "adminforth": "^2.4.0-next.315"
   },
   "keywords": [
     "adminforth",