Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

adminforth/documentation/docs/tutorial/07-Plugins/05-upload.md

@@ -99,7 +99,7 @@ model apartments {
 Migrate prisma schema:
 
 ```bash
-npx prisma migrate dev --name add-apartment-image
+npm run makemigration -- --name add-apartment-image ; npm run migrate:local
 ```
 
 Add column to `aparts` resource configuration:

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

@@ -84,7 +84,7 @@ model adminuser {
 2. Run the migration:
 
 ```bash
-npx prisma migrate dev --name add-email-confirmed-to-adminuser
+npm run makemigration -- --name add-email-confirmed-to-adminuser ; npm run migrate:local
 ```
 
 3. Configure the plugin with `emailConfirmedField`:

adminforth/documentation/docs/tutorial/07-Plugins/16-email-invite.md

@@ -143,7 +143,7 @@ model adminuser {
 Run the migration:
 
 ```bash
-npx prisma migrate dev --name add-email-confirmed
+npm run makemigration -- --name add-email-confirmed ; npm run migrate:local
 ```
 
 Then update your resource configuration:

adminforth/index.ts

@@ -522,6 +522,8 @@ class AdminForth implements IAdminForth {
       return { error: err };
     }
 
+    const recordWithVirtualColumns = { ...record };
+
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.beforeSave)) {
       console.log('🪲 Hook beforeSave', hook);
@@ -563,7 +565,7 @@ class AdminForth implements IAdminForth {
       return { error };
     }
 
-    const primaryKey = record[resource.columns.find((col) => col.primaryKey).name];
+    const primaryKey = createdRecord[resource.columns.find((col) => col.primaryKey).name];
 
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.afterSave)) {
@@ -574,6 +576,7 @@ class AdminForth implements IAdminForth {
         record: createdRecord, 
         adminUser,
         adminforth: this,
+        recordWithVirtualColumns,
         extra,
       });
 

adminforth/spa/src/components/Filters.vue

@@ -18,11 +18,11 @@
     </h5>
 
     <div class="py-4 ">
-      <ul class="space-y-3 font-medium">
+      <ul class="space-y-3 font-medium text-sm">
          <li v-for="c in columnsWithFilter" :key="c">
             <div class="flex flex-col">
               <div class="flex justify-between items-center">
-                <p class="dark:text-gray-400 h-7 my-1">{{ c.label }}</p>
+                <p class="dark:text-gray-400 my-1">{{ c.label }}</p>
                 <Tooltip v-if="filtersStore.filters.find(f => f.field === c.name)">
                 <button 
                   class=" flex items-center justify-center w-7 h-7 my-1 hover:border rounded-md hover:bg-gray-100 dark:hover:bg-gray-700"

adminforth/types/Back.ts

@@ -568,6 +568,7 @@ export type AfterCreateSaveFunction = (params: {
   adminUser: AdminUser, 
   record: any, 
   adminforth: IAdminForth,
+  recordWithVirtualColumns?: any,
   extra?: HttpExtra,
 }) => Promise<{ok: boolean, error?: string}>;