Merge remote-tracking branch 'refs/remotes/origin/main'

Author: kirilldorr

README.md

@@ -82,6 +82,9 @@ npm run install-plugins
 npm run install-adapters
 
 npm ci
+
+./run_inventory.sh
+
 npm run migrate:local
 npm start
 ```

adminforth/commands/createApp/templates/package.json.hbs

@@ -31,6 +31,6 @@
     "@types/express": "latest",
     "@types/node": "latest",
     "@prisma/client": "latest",
-    "prisma": "latest"
+    "prisma": "^7.0.0"
   }
 }

adminforth/commands/createApp/templates/prisma.config.ts.hbs

@@ -0,0 +1,8 @@
+import 'dotenv/config'
+import { defineConfig, env } from 'prisma/config'
+
+export default defineConfig({
+  datasource: {
+    url: env('PRISMA_DATABASE_URL'),
+  },
+})

adminforth/commands/createApp/templates/schema.prisma.hbs

@@ -4,7 +4,6 @@ generator client {
 
 datasource db {
   provider = "{{provider}}"
-  url      = env("PRISMA_DATABASE_URL")
 }
 
 model adminuser {

adminforth/commands/createApp/utils.js

@@ -222,6 +222,11 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: { provider },
       condition: Boolean(prismaDbUrl), // only create if prismaDbUrl is truthy
     },
+    {
+      src:  'prisma.config.ts.hbs',
+      dest: 'prisma.config.ts',
+      data: {},
+    },
     {
       src: 'package.json.hbs',
       dest: 'package.json',

adminforth/dataConnectors/baseConnector.ts

@@ -253,13 +253,13 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     resource: AdminForthResource; record: any; adminUser: any;
   }): Promise<{ error?: string; ok: boolean; createdRecord?: any; }> {
     // transform value using setFieldValue and call createRecordOriginalValues
-
+    
     const filledRecord = {...record};
     const recordWithOriginalValues = {...record};
 
     for (const col of resource.dataSourceColumns) {
       if (col.fillOnCreate) {
-        if (filledRecord[col.name] === undefined) {
+        if (filledRecord[col.name] === undefined || (Array.isArray(filledRecord[col.name]) && filledRecord[col.name].length === 0)) {
           filledRecord[col.name] = col.fillOnCreate({
             initialRecord: record, 
             adminUser

adminforth/documentation/docs/tutorial/03-Customization/01-branding.md

@@ -141,6 +141,8 @@ const admin = new AdminForth({
       enabled: true,  // Optional: Enable the collapsible icon-only sidebar feature
   //diff-add
       logo: '@@/logo.svg',  // Optional: Custom logo to display in icon-only mode
+  //diff-add
+      expandedSidebarWidth: '18.5rem', // Optional: sets the expanded sidebar width, defaults to 16.5rem
   //diff-add
     }, 
   },

adminforth/documentation/docs/tutorial/03-Customization/04-hooks.md

@@ -137,7 +137,7 @@ For example we can prevent the user to see Apartments created by other users. Su
         }
 
         // this function will skip existing realtor_id filter if it supplied already from UI or previous hook, and will add new one for realtor_id
-        query.filterTools.replaceOrAddTopFilter(Filters.EQ('realtor_id', adminUser.dbUser.id).
+        query.filterTools.replaceOrAddTopFilter(Filters.EQ('realtor_id', adminUser.dbUser.id)
 
         return { ok: true };
       },

adminforth/documentation/docs/tutorial/03-Customization/07-alert.md

@@ -24,7 +24,6 @@ Next variants are supported:
 * `warning`
 * `info`
 
-// ...existing code...
 ### Making alert responsive
 You can pass buttons in the alert method and receive a response like:
 

adminforth/documentation/docs/tutorial/03-Customization/08-pageInjections.md

@@ -396,6 +396,79 @@ cd custom
 npm i @iconify-prerendered/vue-mdi
 ```
 
+## List table row replace injection
+
+`tableRowReplace` lets you fully control how each list table row is rendered. Instead of the default table `<tr>…</tr>` markup, AdminForth will mount your Vue component per record and use its returned DOM to display the row. Use this when you need custom row layouts, extra controls, or conditional styling that goes beyond column-level customization.
+
+Supported forms:
+- Single component: `pageInjections.list.tableRowReplace = '@@/MyRowRenderer.vue'`
+- Object form with meta: `pageInjections.list.tableRowReplace = { file: '@@/MyRowRenderer.vue', meta: { /* optional */ } }`
+- If an array is provided, the first element is used.
+
+Example configuration:
+
+```ts title="/resources/apartments.ts"
+{
+  resourceId: 'aparts',
+  ...
+  options: {
+    pageInjections: {
+      list: {
+        tableRowReplace: {
+          file: '@@/ApartRowRenderer.vue',
+          meta: {
+            // You can pass any meta your component may read
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+Minimal component example (decorate default row with a border):
+
+```vue title="/custom/ApartRowRenderer.vue"
+<template>
+  <tr class="border border-gray-200 dark:border-gray-700 rounded-sm">
+    <slot />
+  </tr>
+  
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+const props = defineProps<{
+  record: any
+  resource: any
+  meta: any
+  adminUser: any
+}>();
+</script>
+```
+
+Component contract:
+- Inputs
+  - `record`: the current record object
+  - `resource`: the resource config object
+  - `meta`: the meta object passed in the injection config
+- Slots
+  - Default slot: the table’s standard row content (cells) will be projected here. Your component can wrap or style it.
+- Output
+  - Render a full `<tr>…</tr>` fragment. For example, to replace the standard set of cells with a single full‑width cell, render:
+
+```vue
+<tr>
+  <td :colspan="columnsCount">
+    <slot />
+  </td>
+</tr>
+```
+
+Notes and tips:
+- Requirements:
+  - Required `<tr></tr>` structure around `<slot />`
+
 ## List table beforeActionButtons
 
 `beforeActionButtons` allows injecting one or more compact components into the header bar of the list page, directly to the left of the default action buttons (`Create`, `Filter`, bulk actions, three‑dots menu). Use it for small inputs (quick search, toggle, status chip) rather than large panels.