Merge branch 'next' of github.com:devforth/adminforth-upload

Author: SerVitasik

README.md

@@ -0,0 +1,2 @@
+
+Ussage guide and documentation: https://adminforth.dev/docs/tutorial/Plugins/upload/

index.ts

@@ -150,38 +150,41 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
         list: false,
         show: false,
         filter: false,
-      }
+      },
     };
 
     if (!resourceConfig.columns[pathColumnIndex].components) {
       resourceConfig.columns[pathColumnIndex].components = {};
     }
+    const pathColumn = resourceConfig.columns[pathColumnIndex];
 
-    if (this.options.preview?.showInList || this.options.preview?.showInList === undefined) {
-      // add preview column to list
-      resourceConfig.columns[pathColumnIndex].components.list = {
-        file: this.componentPath('preview.vue'),
-        meta: pluginFrontendOptions,
-      };
-    }
+    // add preview column to list
+    resourceConfig.columns[pathColumnIndex].components.list = {
+      file: this.componentPath('preview.vue'),
+      meta: pluginFrontendOptions,
+    };
 
-    if (this.options.preview?.showInShow || this.options.preview?.showInShow === undefined) {
-      resourceConfig.columns[pathColumnIndex].components.show = {
-        file: this.componentPath('preview.vue'),
-        meta: pluginFrontendOptions,
-      };
-    }
+    resourceConfig.columns[pathColumnIndex].components.show = {
+      file: this.componentPath('preview.vue'),
+      meta: pluginFrontendOptions,
+    };
 
     // 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);
     }
 
-    // if showIn of path column has 'create' or 'edit' remove it
-    const pathColumn = resourceConfig.columns[pathColumnIndex];
-    if (pathColumn.showIn && (pathColumn.showIn.create || pathColumn.showIn.edit)) {
-      pathColumn.showIn = { ...pathColumn.showIn, create: false, edit: false };
+
+    // 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 };
+    }
+
+    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;
@@ -229,30 +232,33 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
 
 
     // add show hook to get presigned URL
-    resourceConfig.hooks.show.afterDatasourceResponse.push(async ({ response }: { response: any }) => {
-      const record = response[0];
-      if (!record) {
-        return { ok: true };
-      }
-      if (record[pathColumnName]) {
-        const s3 = new S3({
-          credentials: {
-            accessKeyId: this.options.s3AccessKeyId,
-            secretAccessKey: this.options.s3SecretAccessKey,
-          },
+    if (pathColumn.showIn.show) {
 
-          region: this.options.s3Region,
-        });
+      resourceConfig.hooks.show.afterDatasourceResponse.push(async ({ response }: { response: any }) => {
+        const record = response[0];
+        if (!record) {
+          return { ok: true };
+        }
+        if (record[pathColumnName]) {
+          const s3 = new S3({
+            credentials: {
+              accessKeyId: this.options.s3AccessKeyId,
+              secretAccessKey: this.options.s3SecretAccessKey,
+            },
+
+            region: this.options.s3Region,
+          });
 
-        await this.genPreviewUrl(record, s3);
-      }
-      return { ok: true };
-    });
+          await this.genPreviewUrl(record, s3);
+        }
+        return { ok: true };
+      });
+    }
 
     // ** HOOKS FOR LIST **//
 
 
-    if (this.options.preview?.showInList || this.options.preview?.showInList === undefined) {
+    if (pathColumn.showIn.list) {
       resourceConfig.hooks.list.afterDatasourceResponse.push(async ({ response }: { response: any }) => {
         const s3 = new S3({
           credentials: {

package.json

@@ -4,6 +4,7 @@
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "homepage": "https://adminforth.dev/docs/tutorial/Plugins/upload/",
   "repository": {
     "type": "git",
     "url": "https://github.com/devforth/adminforth-upload.git"
@@ -19,6 +20,14 @@
     "@aws-sdk/client-s3": "^3.629.0",
     "@aws-sdk/s3-request-presigner": "^3.629.0"
   },
+  "keywords": [
+    "adminforth",
+    "upload",
+    "plugin",
+    "s3-upload",
+    "aws-s3",
+    "file-upload"
+  ],
   "release": {
     "plugins": [
       "@semantic-release/commit-analyzer",

types.ts

@@ -64,18 +64,6 @@ export type PluginOptions = {
 
   preview: {
 
-    /**
-     * Whether to show preview of image instead of path in list field
-     * By default true
-     */
-    showInList?: boolean,
-
-    /**
-     * Whether to show preview of image instead of path in list field
-     * By default true
-     */
-    showInShow?: boolean,
-
     /**
      * Maximum width of the preview image
      */