@adminforth/rich-editor 1.2.3 → 1.3.1

package/.woodpecker/release.yml

@@ -15,8 +15,6 @@ steps:
         from_secret: VAULT_TOKEN
     commands:
       - infisical export --domain https://vault.devforth.io/api --format=dotenv-export --env="prod" > /woodpecker/deploy.vault.env
-    secrets:
-      - VAULT_TOKEN
 
   release:
     image: node:20

package/build.log

@@ -10,5 +10,5 @@ custom/package.json
 custom/quillEditor.vue
 custom/tsconfig.json
 
-sent 20,967 bytes  received 115 bytes  42,164.00 bytes/sec
-total size is 20,550  speedup is 0.97
+sent 21,044 bytes  received 115 bytes  42,318.00 bytes/sec
+total size is 20,627  speedup is 0.97

package/custom/quillEditor.vue

@@ -26,7 +26,9 @@ import adminforth from '@/adminforth';
 import AsyncQueue from './async-queue';
 import Quill from "quill";
 import "quill/dist/quill.snow.css";
+import { useI18n } from 'vue-i18n';
 
+const { t } = useI18n();
 function dbg(title: string,...args: any[]) {
   // return; // comment for debug
   console.log(title, ...args.map(a =>JSON.stringify(a, null, 1))); 
@@ -130,7 +132,7 @@ async function saveToServer(file: File) {
 
   if (error) {
     adminforth.alert({
-      message: `File was not uploaded because of error: ${error}`,
+      message: `${t('File was not uploaded because of error:')} ${error}`,
       variant: 'danger'
     });
     return;
@@ -155,7 +157,7 @@ async function saveToServer(file: File) {
   });
   if (!success) {
     adminforth.alert({
-      messageHtml: `<div>Sorry but the file was not uploaded because of S3 Request Error: </div>
+      messageHtml: `<div>${t('Sorry but the file was not uploaded because of S3 Request Error:')} </div>
       <pre style="white-space: pre-wrap; word-wrap: break-word; overflow-wrap: break-word; max-width: 100%;">${
         xhr.responseText.replace(/</g, '&lt;').replace(/>/g, '&gt;')
       }</pre>`,

package/dist/custom/quillEditor.vue

@@ -26,7 +26,9 @@ import adminforth from '@/adminforth';
 import AsyncQueue from './async-queue';
 import Quill from "quill";
 import "quill/dist/quill.snow.css";
+import { useI18n } from 'vue-i18n';
 
+const { t } = useI18n();
 function dbg(title: string,...args: any[]) {
   // return; // comment for debug
   console.log(title, ...args.map(a =>JSON.stringify(a, null, 1))); 
@@ -130,7 +132,7 @@ async function saveToServer(file: File) {
 
   if (error) {
     adminforth.alert({
-      message: `File was not uploaded because of error: ${error}`,
+      message: `${t('File was not uploaded because of error:')} ${error}`,
       variant: 'danger'
     });
     return;
@@ -155,7 +157,7 @@ async function saveToServer(file: File) {
   });
   if (!success) {
     adminforth.alert({
-      messageHtml: `<div>Sorry but the file was not uploaded because of S3 Request Error: </div>
+      messageHtml: `<div>${t('Sorry but the file was not uploaded because of S3 Request Error:')} </div>
       <pre style="white-space: pre-wrap; word-wrap: break-word; overflow-wrap: break-word; max-width: 100%;">${
         xhr.responseText.replace(/</g, '&lt;').replace(/>/g, '&gt;')
       }</pre>`,

package/dist/index.js

@@ -51,9 +51,11 @@ export default class RichEditorPlugin extends AdminForthPlugin {
                 if (!plugin) {
                     throw new Error(`Plugin for attachment field '${this.options.attachments.attachmentFieldName}' not found in resource '${this.options.attachments.attachmentResource}', please check if Upload Plugin is installed on the field ${this.options.attachments.attachmentFieldName}`);
                 }
-                if (plugin.pluginOptions.s3ACL !== 'public-read') {
+                if (!plugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
                     throw new Error(`Upload Plugin for attachment field '${this.options.attachments.attachmentFieldName}' in resource '${this.options.attachments.attachmentResource}' 
-          should have s3ACL set to 'public-read' (in vast majority of cases signed urls inside of HTML text is not desired behavior, so we did not implement it)`);
+          uses adapter which is not configured to store objects in public way, so it will produce only signed private URLs which can not be used in HTML text of blog posts.
+          Please configure adapter in such way that it will store objects publicly (e.g.  for S3 use 'public-read' ACL).  
+        `);
                 }
                 this.uploadPlugin = plugin;
             }

package/index.ts

@@ -57,9 +57,11 @@ export default class RichEditorPlugin extends AdminForthPlugin {
         throw new Error(`Plugin for attachment field '${this.options.attachments!.attachmentFieldName}' not found in resource '${this.options.attachments!.attachmentResource}', please check if Upload Plugin is installed on the field ${this.options.attachments!.attachmentFieldName}`);
       }
 
-      if (plugin.pluginOptions.s3ACL !== 'public-read') {
+      if (!plugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
         throw new Error(`Upload Plugin for attachment field '${this.options.attachments!.attachmentFieldName}' in resource '${this.options.attachments!.attachmentResource}' 
-          should have s3ACL set to 'public-read' (in vast majority of cases signed urls inside of HTML text is not desired behavior, so we did not implement it)`);
+          uses adapter which is not configured to store objects in public way, so it will produce only signed private URLs which can not be used in HTML text of blog posts.
+          Please configure adapter in such way that it will store objects publicly (e.g.  for S3 use 'public-read' ACL).  
+        `);
       }
       this.uploadPlugin = plugin;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/rich-editor",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Rich editor plugin for adminforth",
   "type": "module",
   "main": "dist/index.js",