@adminforth/upload 2.3.6 → 2.3.8

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 46,940 bytes  received 134 bytes  94,148.00 bytes/sec
-total size is 46,465  speedup is 0.99
+sent 46,937 bytes  received 134 bytes  94,142.00 bytes/sec
+total size is 46,455  speedup is 0.99

package/custom/tsconfig.json

@@ -1,19 +1,27 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }
-  }
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx",
+    "./**/*.vue",
+    "../**/*.ts",
+    "../**/*.tsx",
+    "../**/*.vue",
+    "../*.vue",
+    "../*.ts",
+    "../*.tsx"
+  ]
 }

package/dist/custom/tsconfig.json

@@ -1,19 +1,27 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }
-  }
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx",
+    "./**/*.vue",
+    "../**/*.ts",
+    "../**/*.tsx",
+    "../**/*.vue",
+    "../*.vue",
+    "../*.ts",
+    "../*.tsx"
+  ]
 }

package/dist/index.js

@@ -86,27 +86,6 @@ export default class UploadPlugin extends AdminForthPlugin {
             };
             // define components which will be imported from other components
             this.componentPath('imageGenerator.vue');
-            const virtualColumn = {
-                virtual: true,
-                name: `uploader_${this.pluginInstanceId}`,
-                components: {
-                    edit: {
-                        file: this.componentPath('uploader.vue'),
-                        meta: pluginFrontendOptions,
-                    },
-                    create: {
-                        file: this.componentPath('uploader.vue'),
-                        meta: pluginFrontendOptions,
-                    },
-                },
-                showIn: {
-                    create: true,
-                    edit: true,
-                    list: false,
-                    show: false,
-                    filter: false,
-                },
-            };
             if (!resourceConfig.columns[pathColumnIndex].components) {
                 resourceConfig.columns[pathColumnIndex].components = {};
             }
@@ -122,39 +101,27 @@ export default class UploadPlugin extends AdminForthPlugin {
                     meta: pluginFrontendOptions,
                 };
             }
-            // insert virtual column after path column if it is not already there
-            const virtualColumnIndex = resourceConfig.columns.findIndex((column) => column.name === virtualColumn.name);
-            if (virtualColumnIndex === -1) {
-                resourceConfig.columns.splice(pathColumnIndex + 1, 0, virtualColumn);
-            }
-            // if showIn of path column has 'create' or 'edit' remove it but use it for virtual column
-            if (pathColumn.showIn && (pathColumn.showIn.create !== undefined)) {
-                virtualColumn.showIn = Object.assign(Object.assign({}, virtualColumn.showIn), { create: pathColumn.showIn.create });
-                pathColumn.showIn = Object.assign(Object.assign({}, pathColumn.showIn), { create: false });
-            }
-            if (pathColumn.showIn && (pathColumn.showIn.edit !== undefined)) {
-                virtualColumn.showIn = Object.assign(Object.assign({}, virtualColumn.showIn), { edit: pathColumn.showIn.edit });
-                pathColumn.showIn = Object.assign(Object.assign({}, pathColumn.showIn), { edit: false });
-            }
-            virtualColumn.required = pathColumn.required;
-            virtualColumn.label = pathColumn.label;
-            virtualColumn.editingNote = pathColumn.editingNote;
+            resourceConfig.columns[pathColumnIndex].components.create = {
+                file: this.componentPath('uploader.vue'),
+                meta: pluginFrontendOptions,
+            };
+            resourceConfig.columns[pathColumnIndex].components.edit = {
+                file: this.componentPath('uploader.vue'),
+                meta: pluginFrontendOptions,
+            };
             // ** HOOKS FOR CREATE **//
-            // add beforeSave hook to save virtual column to path column
-            resourceConfig.hooks.create.beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ record }) {
-                if (record[virtualColumn.name]) {
-                    record[pathColumnName] = record[virtualColumn.name];
-                    delete record[virtualColumn.name];
-                }
-                return { ok: true };
-            }));
             // in afterSave hook, aremove tag adminforth-not-yet-used from the file
             resourceConfig.hooks.create.afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ record }) {
                 process.env.HEAVY_DEBUG && console.log('💾💾  after save ', record === null || record === void 0 ? void 0 : record.id);
                 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 };
             }));
@@ -188,7 +155,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
@@ -198,31 +170,33 @@ export default class UploadPlugin extends AdminForthPlugin {
                 return { ok: true };
             }));
             // ** HOOKS FOR EDIT **//
-            // beforeSave
-            resourceConfig.hooks.edit.beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ record }) {
-                // null is when value is removed
-                if (record[virtualColumn.name] || record[virtualColumn.name] === null) {
-                    record[pathColumnName] = record[virtualColumn.name];
-                }
-                return { ok: true };
-            }));
             // add edit postSave hook to delete old file and remove tag from new file
             resourceConfig.hooks.edit.afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ updates, oldRecord }) {
-                if (updates[virtualColumn.name] || updates[virtualColumn.name] === null) {
+                if (updates[pathColumnName] || updates[pathColumnName] === null) {
                     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
                             console.error(`Error setting tag ${ADMINFORTH_NOT_YET_USED_TAG} to true for object ${oldRecord[pathColumnName]}. File will not be auto-cleaned up`, e);
                         }
                     }
-                    if (updates[virtualColumn.name] !== null) {
+                    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 };

package/index.ts

@@ -90,28 +90,6 @@ export default class UploadPlugin extends AdminForthPlugin {
     // define components which will be imported from other components
     this.componentPath('imageGenerator.vue');
 
-    const virtualColumn: AdminForthResourceColumn = {
-      virtual: true,
-      name: `uploader_${this.pluginInstanceId}`,
-      components: {
-        edit: {
-          file: this.componentPath('uploader.vue'),
-          meta: pluginFrontendOptions,
-        },
-        create: {
-          file: this.componentPath('uploader.vue'),
-          meta: pluginFrontendOptions,
-        },
-      },
-      showIn: {
-        create: true,
-        edit: true,
-        list: false,
-        show: false,
-        filter: false,
-      },
-    };
-   
     if (!resourceConfig.columns[pathColumnIndex].components) {
       resourceConfig.columns[pathColumnIndex].components = {};
     }
@@ -130,38 +108,18 @@ export default class UploadPlugin extends AdminForthPlugin {
       };
     }
 
-    // insert virtual column after path column if it is not already there
-    const virtualColumnIndex = resourceConfig.columns.findIndex((column: any) => column.name === virtualColumn.name);
-    if (virtualColumnIndex === -1) {
-      resourceConfig.columns.splice(pathColumnIndex + 1, 0, virtualColumn);
+    resourceConfig.columns[pathColumnIndex].components.create = {
+      file: this.componentPath('uploader.vue'),
+      meta: pluginFrontendOptions,
     }
 
-
-    // if showIn of path column has 'create' or 'edit' remove it but use it for virtual column
-    if (pathColumn.showIn && (pathColumn.showIn.create !== undefined)) {
-      virtualColumn.showIn = { ...virtualColumn.showIn, create: pathColumn.showIn.create };
-      pathColumn.showIn = { ...pathColumn.showIn, create: false };
+    resourceConfig.columns[pathColumnIndex].components.edit = {
+      file: this.componentPath('uploader.vue'),
+      meta: pluginFrontendOptions,
     }
 
-    if (pathColumn.showIn && (pathColumn.showIn.edit !== undefined)) {
-      virtualColumn.showIn = { ...virtualColumn.showIn, edit: pathColumn.showIn.edit };
-      pathColumn.showIn = { ...pathColumn.showIn, edit: false };
-    }
-
-    virtualColumn.required = pathColumn.required;
-    virtualColumn.label = pathColumn.label;
-    virtualColumn.editingNote = pathColumn.editingNote;
-
     // ** HOOKS FOR CREATE **//
 
-    // add beforeSave hook to save virtual column to path column
-    resourceConfig.hooks.create.beforeSave.push(async ({ record }: { record: any }) => {
-      if (record[virtualColumn.name]) {
-        record[pathColumnName] = record[virtualColumn.name];
-        delete record[virtualColumn.name];
-      }
-      return { ok: true };
-    });
 
     // in afterSave hook, aremove tag adminforth-not-yet-used from the file
     resourceConfig.hooks.create.afterSave.push(async ({ record }: { record: any }) => {
@@ -170,7 +128,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 };
     });
@@ -213,7 +175,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);
@@ -225,34 +191,34 @@ export default class UploadPlugin extends AdminForthPlugin {
 
     // ** HOOKS FOR EDIT **//
 
-    // beforeSave
-    resourceConfig.hooks.edit.beforeSave.push(async ({ record }: { record: any }) => {
-      // null is when value is removed
-      if (record[virtualColumn.name] || record[virtualColumn.name] === null) {
-        record[pathColumnName] = record[virtualColumn.name];
-      }
-      return { ok: true };
-    })
 
 
     // add edit postSave hook to delete old file and remove tag from new file
     resourceConfig.hooks.edit.afterSave.push(async ({ updates, oldRecord }: { updates: any, oldRecord: any }) => {
 
-      if (updates[virtualColumn.name] || updates[virtualColumn.name] === null) {
+      if (updates[pathColumnName] || updates[pathColumnName] === null) {
         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);
           }
         }
-        if (updates[virtualColumn.name] !== null) {
+        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 };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "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",