Merge pull request #544 from devforth/next

Next

Author: yaroslav8765

adminforth/commands/createApp/templates/api.ts.hbs

@@ -2,12 +2,22 @@ import { Express, Request, Response } from "express";
 import { IAdminForth } from "adminforth";
 export function initApi(app: Express, admin: IAdminForth) {
   app.get(`${admin.config.baseUrl}/api/hello/`,
+
+    // you can use data API to work with your database https://adminforth.dev/docs/tutorial/Customization/dataApi/
     async (req: Request, res: Response) => {
+      // req.adminUser to get info about the admin users
       const allUsers = await admin.resource("adminuser").list([]);
       res.json({
-        message: "Hello from AdminForth API!",
+        message: "List of admin users from AdminForth API",
         users: allUsers,
       });
     }
+
+    // you can use admin.express.authorize to get info about the current user
+    admin.express.authorize(
+      async (req: Request, res: Response) => {
+        res.json({ message: "Current adminuser from AdminForth API", adminUser: req.adminUser });
+      }
+    )
   );
 }

adminforth/documentation/docs/tutorial/08-Plugins/14-markdown.md

@@ -205,3 +205,32 @@ plugins: [
 
 >👆 Full list of buttons you can enable or disable via topPanelSettings:
 bold, italic, underline, strike, h1, h2, h3, ul, ol, link, codeBlock 
+
+
+## Change size of show view markdown text
+By default in markdown plugin turned cumpact preview mode, but you can turn it off:
+
+
+```ts
+  new MarkdownPlugin({
+    fieldName: 'description',
+    //diff-add
+    compactShowPreview: false,        
+    ...
+  })
+
+```
+
+## Limiting height of the markdown renderer on show view
+If you have really long markdown text and you don't wan't it to take the whole space on show view page, you can use `maxShowViewContainerHeightPx`, that will add max-height to the markdown renderer and button `show more`, so you can expand it.
+
+```ts
+  new MarkdownPlugin({
+    fieldName: 'description',
+    compactShowPreview: false,       
+    //diff-add
+    maxShowViewContainerHeightPx: 400, 
+    ...
+  })
+
+```

adminforth/package.json

@@ -64,7 +64,7 @@
     }
   },
   "author": "devforth.io",
-  "license": "ISC",
+  "license": "MIT",
   "type": "module",
   "dependencies": {
     "@babel/parser": "^7.27.5",

adminforth/servers/express.ts

@@ -136,7 +136,11 @@ class ExpressServer implements IExpressHttpServer {
               'Pragma': 'public',
             }
           }
-        )
+        , (err) => {
+          if (err && err.message.includes('ENOENT')) {
+            res.status(404).send('Not found');
+          }
+        });
       })
 
       this.expressApp.get(`${prefix}*`, async (req, res) => {

adminforth/spa/src/components/ResourceForm.vue

@@ -162,7 +162,7 @@ const columnError = (column: AdminForthResourceColumnCommon) => {
       return currentValues.value[column.name] && currentValues.value[column.name].reduce((error: any, item: any) => {
         if (column.isArray) {
           return error || validateValue(column.isArray.itemType, item, column) ||
-            (item === null || !item.toString() ? t('Array cannot contain empty items') : null);
+            (item === null || (!item || item.toString() === '') ? t('Array cannot contain empty items') : null);
         } else {
           return error; 
         }

adminforth/spa/src/components/ValueRenderer.vue

@@ -11,6 +11,7 @@
         class="rounded-md m-0.5 bg-lightAnnouncementBG dark:bg-darkAnnouncementBG text-lightAnnouncementText dark:text-darkAnnouncementText py-0.5 px-2.5 text-sm"
       >
         <RouterLink
+          v-if="foreignResource && foreignResource?.pk"
           class="font-medium text-lightSidebarText dark:text-darkSidebarText hover:brightness-110 whitespace-nowrap"
           :to="{
             name: 'resource-show',

adminforth/spa/src/views/EditView.vue

@@ -147,7 +147,7 @@ const editableRecord = computed(() => {
   coreStore.resource.columns.forEach(column => {
     if (column.foreignResource) {
       if (column.isArray?.enabled) {
-        newRecord[column.name] = newRecord[column.name]?.map((fr: { pk: any }) => fr.pk);
+        newRecord[column.name] = newRecord[column.name]?.map((fr: { pk: any }) => fr?.pk);
       } else {
         newRecord[column.name] = newRecord[column.name]?.pk;
       }

dev-demo/resources/cars_resources/carsResourseTemplate.ts

@@ -219,6 +219,7 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
       }),
       new MarkdownPlugin({
         fieldName: 'description',
+        maxShowViewContainerHeightPx: 400,
         attachments: {
           attachmentResource: "cars_description_images",
           attachmentFieldName: "image_path",
@@ -332,6 +333,11 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
           fillPlainFields: {
             description: "Create a desription for the car with name {{model}} and engine type {{engine_type}}. Desription should be HTML formatted.",
             price: "Based on the car model {{model}} and engine type {{engine_type}}, suggest a competitive market price in USD. Return only the numeric value.",
+          },
+          rateLimits: { // bulk generation limits
+            fillFieldsFromImages: "1/1m", // 1 request per minute
+            fillPlainFields: "1/1m",      // 1 request per minute
+            generateImages: "1/1m",       // 1 request per minute
           }
         }),
         new BulkAiFlowPlugin({
@@ -352,6 +358,11 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
             }
             return [`https://tmpbucket-adminforth.s3.eu-central-1.amazonaws.com/${record.promo_picture}`];
           },
+          rateLimits: { // bulk generation limits
+            fillFieldsFromImages: "1/1m", // 1 request per minute
+            fillPlainFields: "1/1m",      // 1 request per minute
+            generateImages: "1/1m",       // 1 request per two minutes
+          }
         }),
         new BulkAiFlowPlugin({
           actionName: 'Generate promo image',
@@ -367,7 +378,11 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
               prompt: "Create a high-quality promotional image for a {{color}} car shown on attached image. Generated image should be in anime style",
             }
           },
-          
+          rateLimits: { // bulk generation limits
+            fillFieldsFromImages: "1/1m", // 1 request per minute
+            fillPlainFields: "1/1m",      // 1 request per minute
+            generateImages: "1/1m",       // 1 request per minute
+          },
           attachFiles: async ({ record }) => {
             if (!record.promo_picture) {
               return [];