@adminforth/upload 1.5.0 → 2.0.0

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 43,165 bytes  received 134 bytes  86,598.00 bytes/sec
+sent 43,158 bytes  received 134 bytes  86,584.00 bytes/sec
 total size is 42,676  speedup is 0.99

package/dist/index.js

@@ -24,7 +24,7 @@ export default class UploadPlugin extends AdminForthPlugin {
     }
     setupLifecycleRule() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.options.storage.adapter.setupLifecycle();
+            this.options.storageAdapter.setupLifecycle();
         });
     }
     genPreviewUrl(record) {
@@ -34,7 +34,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                 record[`previewUrl_${this.pluginInstanceId}`] = this.options.preview.previewUrl({ filePath: record[this.options.pathColumnName] });
                 return;
             }
-            const previewUrl = yield this.options.storage.adapter.getDownloadUrl(record[this.options.pathColumnName], 1800);
+            const previewUrl = yield this.options.storageAdapter.getDownloadUrl(record[this.options.pathColumnName], 1800);
             record[`previewUrl_${this.pluginInstanceId}`] = previewUrl;
         });
     }
@@ -148,7 +148,7 @@ 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.storage.adapter.markKeyForNotDeletation(record[pathColumnName]);
+                    yield this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
                 }
                 return { ok: true };
             }));
@@ -182,7 +182,7 @@ 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.storage.adapter.markKeyForDeletation(record[pathColumnName]);
+                        yield this.options.storageAdapter.markKeyForDeletation(record[pathColumnName]);
                     }
                     catch (e) {
                         // file might be e.g. already deleted, so we catch error
@@ -206,7 +206,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                     if (oldRecord[pathColumnName]) {
                         // put tag to delete old file
                         try {
-                            yield this.options.storage.adapter.markKeyForDeletation(oldRecord[pathColumnName]);
+                            yield this.options.storageAdapter.markKeyForDeletation(oldRecord[pathColumnName]);
                         }
                         catch (e) {
                             // file might be e.g. already deleted, so we catch error
@@ -216,7 +216,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                     if (updates[virtualColumn.name] !== 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.storage.adapter.markKeyForNotDeletation(updates[pathColumnName]);
+                        yield this.options.storageAdapter.markKeyForNotDeletation(updates[pathColumnName]);
                     }
                 }
                 return { ok: true };
@@ -261,13 +261,13 @@ export default class UploadPlugin extends AdminForthPlugin {
                 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.storage.adapter.getUploadSignedUrl(filePath, contentType, 1800);
+                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.storage.adapter.getDownloadUrl(filePath, 1800);
+                    previewUrl = yield this.options.storageAdapter.getDownloadUrl(filePath, 1800);
                 }
                 return {
                     uploadUrl,

package/index.ts

@@ -28,7 +28,7 @@ export default class UploadPlugin extends AdminForthPlugin {
   }
 
   async setupLifecycleRule() {
-    this.options.storage.adapter.setupLifecycle();
+    this.options.storageAdapter.setupLifecycle();
   }
 
   async genPreviewUrl(record: any) {
@@ -36,7 +36,7 @@ export default class UploadPlugin extends AdminForthPlugin {
       record[`previewUrl_${this.pluginInstanceId}`] = this.options.preview.previewUrl({ filePath: record[this.options.pathColumnName] });
       return;
     }
-    const previewUrl = await this.options.storage.adapter.getDownloadUrl(record[this.options.pathColumnName], 1800);
+    const previewUrl = await this.options.storageAdapter.getDownloadUrl(record[this.options.pathColumnName], 1800);
 
     record[`previewUrl_${this.pluginInstanceId}`] = previewUrl;
   }
@@ -161,7 +161,7 @@ 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.storage.adapter.markKeyForNotDeletation(record[pathColumnName]);
+        await this.options.storageAdapter.markKeyForNotDeletation(record[pathColumnName]);
       }
       return { ok: true };
     });
@@ -204,7 +204,7 @@ export default class UploadPlugin extends AdminForthPlugin {
     resourceConfig.hooks.delete.afterSave.push(async ({ record }: { record: any }) => {
       if (record[pathColumnName]) {
         try {
-          await this.options.storage.adapter.markKeyForDeletation(record[pathColumnName]);
+          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);
@@ -233,7 +233,7 @@ export default class UploadPlugin extends AdminForthPlugin {
         if (oldRecord[pathColumnName]) {
           // put tag to delete old file
           try {
-            await this.options.storage.adapter.markKeyForDeletation(oldRecord[pathColumnName]);
+            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);
@@ -242,7 +242,7 @@ export default class UploadPlugin extends AdminForthPlugin {
         if (updates[virtualColumn.name] !== 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. 
-          await  this.options.storage.adapter.markKeyForNotDeletation(updates[pathColumnName]);
+          await  this.options.storageAdapter.markKeyForNotDeletation(updates[pathColumnName]);
         }
       }
       return { ok: true };
@@ -296,12 +296,12 @@ export default class UploadPlugin extends AdminForthPlugin {
         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.storage.adapter.getUploadSignedUrl(filePath, contentType, 1800);
+        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.storage.adapter.getDownloadUrl(filePath, 1800);
+          previewUrl = await this.options.storageAdapter.getDownloadUrl(filePath, 1800);
         }
         
         return {

package/package.json

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

package/types.ts

@@ -155,12 +155,9 @@ export type PluginOptions = {
     
   }
 
-  storage?: {
-    /**
-     * The adapter used to store the files.
-     * For now only S3 adapter is supported.
-     */
-    adapter: StorageAdapter,
-  }
-
+  /**
+   * The adapter used to store the files.
+   * For now only S3 adapter is supported.
+   */
+  storageAdapter: StorageAdapter,
 }