Merge branch 'next' into refactor-showin

Author: Astaldos

adminforth/documentation/docs/tutorial/03-Customization/13-standardPagesTuning.md

@@ -370,6 +370,25 @@ export default {
 
 > `validation` checks are enforced both on frontend and backend.
 
+### Editing note
+
+You can add `editingNote` to a column to show a note below the input field.
+
+```typescript title="./resources/users.ts"
+export default {
+      name: 'users',
+      columns: [
+        ...
+        {
+          name: "password",
+          editingNote: { edit: "Leave empty to keep password unchanged" },
+        },
+      ],
+    },
+    ...
+  ],
+```
+
 ### Foreign resources
 
 [Documentation in progress]

adminforth/modules/configValidator.ts

@@ -386,16 +386,21 @@ export default class ConfigValidator implements IConfigValidator {
         // force required to be object
         col.required = typeof inCol.required === 'boolean' ? { create: inCol.required, edit: inCol.required } : inCol.required;
 
+ 
         // same for editingNote
-        if (col.editingNote && !((typeof col.editingNote === 'string') || (typeof col.editingNote === 'object'))) {
+        if (inCol.editingNote && !((typeof inCol.editingNote === 'string') || (typeof inCol.editingNote === 'object'))) {
           errors.push(`Resource "${res.resourceId}" column "${col.name}" editingNote must be a string or object`);
         }
-        if (typeof col.editingNote === 'object') {
-          const wrongEditingNoteOn = Object.keys(col.editingNote).find((c) => !['create', 'edit'].includes(c));
+        if (typeof inCol.editingNote === 'object') {
+          const wrongEditingNoteOn = Object.keys(inCol.editingNote).find((c) => !['create', 'edit'].includes(c));
           if (wrongEditingNoteOn) {
-            errors.push(`Resource "${res.resourceId}" column "${col.name}" has invalid editingNote value "${wrongEditingNoteOn}", allowed keys are 'create', 'edit']`);
+            errors.push(`Resource "${res.resourceId}" column "${inCol.name}" has invalid editingNote value "${wrongEditingNoteOn}", allowed keys are 'create', 'edit']`);
           }
         }
+        
+        col.editingNote = typeof inCol.editingNote === 'string' ? { create: inCol.editingNote, edit: inCol.editingNote } : inCol.editingNote;
+        
+        col.showIn = col.showIn || Object.values(AdminForthResourcePages);
 
         if (col.foreignResource) {
 

live-demo/deploy/buildSlackNotify.sh

@@ -28,7 +28,7 @@ CODE_BLOCK="\`\`\`$BUILD_LOG\n\`\`\`"
 
 echo "Sending slack message to developers $MESSAGE"
 # Send the message
-curl  -s -X POST -H "Content-Type: application/json" -d '{
+curl  -X POST -H "Content-Type: application/json" -d '{
   "username": "'"$CI_COMMIT_AUTHOR"'",
   "icon_url": "'"$CI_COMMIT_AUTHOR_AVATAR"'",
   "attachments": [