Merge pull request #426 from devforth/next

Next

Author: yaroslav8765

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/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/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.

adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md

@@ -333,6 +333,26 @@ import { IconSearchOutline } from '@iconify-prerendered/vue-flowbite'
   </div>
 </div>
 
+## Textarea
+<div class="split-screen" >
+  <div >
+```ts
+import { Textarea } from '@/afcl'
+```
+
+```ts
+    <Textarea
+      v-model="textAreaInput"
+      placeholder="Enter some text..."
+      class="w-64"
+    />
+```
+  </div>
+  <div>
+    ![AFCL Textarea](textarea.png)
+  </div>
+</div>
+
 ## Tooltip
 
 Wrap an element on which you would like to show a tooltip with the `Tooltip` component and add a `tooltip` slot to it.
@@ -739,6 +759,26 @@ function onBeforeClose() {
 }
 ```
 
+### Ask for extra confirmation before close
+
+If you want dialog to ask user for conformation when he tryes to close dialog, you can add: 
+
+```ts
+<Dialog 
+  ref="confirmDialog" 
+  class="w-96"
+  //diff-add
+  :closable="false"
+  //diff-add
+  :askForCloseConfirmation="true"
+  //diff-add
+  closeConfirmationText='Are you sure you want to close this dialog?',
+>
+  <div class="space-y-4">
+    The dialog content goes here.
+  </div>
+</Dialog>
+```
 
 ## Dropzone
 

adminforth/documentation/docs/tutorial/03-Customization/textarea.png

@@ -546,14 +546,14 @@ First, you need to create a passkeys table in your schema.prisma file:
     //diff-add
   }
 ```
+>☝️Use string data type for credential_id and meta fields
 
 And make migration:
 
 ```bash
 npm run makemigration -- --name add-passkeys ; npm run migrate:local
 ```
 
-
 Next, you need to create a new resource for passkeys:
 
 ```ts title='./resources/passkeys.ts'

adminforth/documentation/docs/tutorial/07-Plugins/02-TwoFactorsAuth.md

@@ -121,7 +121,7 @@ If you need to add default filters for the foreign resource based on your curren
 >👆It also makes sense to modify the table resource and hide the country field from filters, because this value is hardcoded and equals the country from the record:  
 
 
-```ts
+```ts title="./resources/adminuser.ts"
 
   ...
 
@@ -165,3 +165,26 @@ If you need to add default filters for the foreign resource based on your curren
   ...
 
 ```
+
+
+## Show table from another resource without any filters applied
+
+There might be cases when you want to remove the default filter applied by the plugin and then use the `defaultFilters` callback to apply your own custom filters.
+
+```ts title="./resources/adminuser.ts"
+
+plugins: [
+//diff-add
+  new ForeignInlineListPlugin({
+//diff-add
+    foreignResourceId: 'aparts',
+//diff-add
+    disableForeignListResourceRefColumn: true
+//diff-add
+  }),
+//diff-add
+    ],
+
+```
+
+This setup will show, in the show view for each record, the `aparts` resource without any filters. And you don’t have to modify the `aparts` resource.

adminforth/documentation/docs/tutorial/07-Plugins/03-ForeignInlineList.md

@@ -249,7 +249,7 @@ plugins: [
           clientSecret: process.env.KEYCLOAK_CLIENT_SECRET,
           keycloakUrl: process.env.KEYCLOAK_URL,
           realm: process.env.KEYCLOAK_REALM,
-          useOpenID: true,
+          useOpenIdConnect: true,
       }),
     ],
   }),
@@ -292,7 +292,7 @@ plugins: [
       new AdminForthAdapterMicrosoftOauth2({
         clientID: process.env.MICROSOFT_CLIENT_ID,
         clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
-        useOpenID: true,
+        useOpenIdConnect: true,
       }),
     ],
   }),

adminforth/documentation/docs/tutorial/07-Plugins/11-oauth.md

@@ -45,6 +45,11 @@ export default class ConfigValidator implements IConfigValidator {
   }
 
   validateAndListifyInjection(obj, key, errors) {
+    if (key.includes('tableRowReplace')) {
+      if (obj[key].length > 1) {
+        throw new Error(`tableRowReplace injection supports only one element, but received ${obj[key].length}.`);
+      }
+    }
     if (!Array.isArray(obj[key])) {
       // not array
       obj[key] = [obj[key]];
@@ -657,8 +662,10 @@ export default class ConfigValidator implements IConfigValidator {
                 errors.push(`Resource "${res.resourceId}" column "${col.name}" polymorphicOn links to an column that is not of type string`);
               } else {
                 const polymorphicOnColShowIn = this.validateAndNormalizeShowIn(resInput, polymorphicOnInCol, errors, warnings);
-                if (polymorphicOnColShowIn.create || polymorphicOnColShowIn.edit) {
-                  errors.push(`Resource "${res.resourceId}" column "${col.name}" polymorphicOn column should not be changeable manually`);
+                if (typeof polymorphicOnColShowIn.create !== 'function' && typeof polymorphicOnColShowIn.edit !== 'function') {
+                  if (polymorphicOnColShowIn.create || polymorphicOnColShowIn.edit) {
+                    errors.push(`Resource "${res.resourceId}" column "${col.name}" polymorphicOn column should not be changeable manually`);
+                  }
                 }
               }
             }
@@ -869,7 +876,7 @@ export default class ConfigValidator implements IConfigValidator {
       // Validate page-specific allowed injection keys
       const possiblePages = ['list', 'show', 'create', 'edit'];
       const allowedInjectionsByPage: Record<string, string[]> = {
-        list: ['beforeBreadcrumbs', 'afterBreadcrumbs', 'beforeActionButtons', 'bottom', 'threeDotsDropdownItems', 'customActionIcons', 'tableBodyStart'],
+        list: ['beforeBreadcrumbs', 'afterBreadcrumbs', 'beforeActionButtons', 'bottom', 'threeDotsDropdownItems', 'customActionIcons', 'tableBodyStart', 'tableRowReplace'],
         show: ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems'],
         edit: ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems', 'saveButton'],
         create: ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems', 'saveButton'],