Merge branch 'main' of github.com:devforth/adminforth

Author: SerVitasik

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/spa/src/views/ShowView.vue

@@ -14,7 +14,7 @@
 
         <template  v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
           <component
-            :is="getCustomComponent(action.customComponent) || CallActionWrapper"
+            :is="action?.customComponent ? getCustomComponent(action.customComponent) : CallActionWrapper"
             :meta="action.customComponent?.meta"
             @callAction="(payload?) => startCustomAction(action.id, payload)"
             :disabled="actionLoadingStates[action.id]"

dev-demo/resources/users.ts

@@ -4,7 +4,7 @@ import AdminForth, {
   AdminForthResourceColumn,
   AdminForthResourceInput,
   AdminUser,
-} from "../../adminforth";
+} from "../../adminforth"; 
 import ForeignInlineListPlugin from "../../plugins/adminforth-foreign-inline-list";
 import OpenSignupPlugin from "../../plugins/adminforth-open-signup";
 import TwoFactorsAuthPlugin from "../../plugins/adminforth-two-factors-auth";

live-demo/app/package-lock.json

@@ -19,6 +19,7 @@
     "@adminforth/audit-log": "^1.2.3",
     "@adminforth/bulk-ai-flow": "^1.14.5",
     "@adminforth/chat-gpt": "^1.0.20",
+    "@adminforth/clone-row": "^1.1.1",
     "@adminforth/completion-adapter-open-ai-chat-gpt": "^1.0.2",
     "@adminforth/email-password-reset": "^1.1.0",
     "@adminforth/foreign-inline-list": "^1.6.6",

live-demo/app/package.json

@@ -9,6 +9,7 @@ import AdminForthAdapterS3Storage from '@adminforth/storage-adapter-amazon-s3'
 import ImageGenerationAdapterOpenAI from '@adminforth/image-generation-adapter-openai';
 import BulkAiFlowPlugin  from '@adminforth/bulk-ai-flow';
 import AdminForthImageVisionAdapterOpenAi from '@adminforth/image-vision-adapter-openai';
+import CloneRow from "@adminforth/clone-row";
 
 const blockDemoUsers = async ({ record, adminUser, resource }) => {
   if (adminUser.dbUser && adminUser.dbUser.role !== 'superadmin') {
@@ -284,6 +285,7 @@ export default {
       },
       isAllowedToSave: blockDemoUsers,
     }),
+    new CloneRow({}),
   ],
   options: {
     listPageSize: 8,