Skip to content

Commit 2657ee3

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into next
2 parents f2d81ba + 310c28d commit 2657ee3

13 files changed

Lines changed: 24 additions & 13 deletions

adminforth/spa/src/components/ResourceListTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
:key="action.id"
201201
>
202202
<component
203-
v-if="action.customComponent"
203+
v-if="action"
204204
:is="action.customComponent ? getCustomComponent(formatComponent(action.customComponent)) : CallActionWrapper"
205205
:meta="formatComponent(action.customComponent).meta"
206206
:row="row"

dev-demo/Taskfile.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ vars:
3131
- "adminforth-many2many"
3232
- "adminforth-background-jobs"
3333
- "adminforth-auto-remove"
34+
- "adminforth-agent"
3435

3536
ADAPTERS:
3637
- "adminforth-completion-adapter-open-ai-chat-gpt"

dev-demo/resources/adminuser.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import AdminForthAdapterGoogleOauth2 from '../../adapters/adminforth-oauth-adapt
1010
import OpenSignupPlugin from '../../plugins/adminforth-open-signup/index.js';
1111
import OAuthPlugin from '../../plugins/adminforth-oauth/index.js';
1212
import KeyValueAdapterRam from '../../adapters/adminforth-key-value-adapter-ram/index.js';
13+
import AdminForthAgent from '../../plugins/adminforth-agent/index.js';
14+
import CompletionAdapterOpenAIChatGPT from '../../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js';
1315

1416
async function allowedForSuperAdmin({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
1517
return adminUser.dbUser.role === 'superadmin';
@@ -190,6 +192,14 @@ export default {
190192
},
191193
},
192194
}),
195+
new AdminForthAgent({
196+
adapter: new CompletionAdapterOpenAIChatGPT({
197+
openAiApiKey: process.env.OPENAI_API_KEY as string,
198+
model: 'gpt-5',
199+
}),
200+
maxTokens: 10000,
201+
reasoning: 'high',
202+
}),
193203
],
194204
hooks: {
195205
create: {

dev-demo/resources/cars_resources/carsResourseTemplate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
267267
},
268268
]
269269
}),
270-
new Many2ManyPlugin({
271-
linkedResourceId: 'adminuser'
272-
}),
270+
// new Many2ManyPlugin({
271+
// linkedResourceId: 'adminuser'
272+
// }),
273273
/*********************************************************************************
274274
275275
AI Plugins

tests/application/resources/cars_sl_allow_create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
1+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
22
import { AdminForthDataTypes } from 'adminforth'
33

44
const cars_sl = carsResourseTemplate("cars_sl", "sqlite", "id");

tests/application/resources/cars_sl_dont_allow_create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
1+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
22

33

44
export default {

tests/application/resources/cars_sl_dont_allow_create_by_hook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AdminUser } from "../../../adminforth/index.js";
2-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
2+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
33

44

55
export default {

tests/application/resources/cars_sl_dont_allow_delete.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
1+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
22

33

44
export default {

tests/application/resources/cars_sl_dont_allow_delete_by_hook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { before } from "node:test";
22
import { AdminUser } from "../../../adminforth/index.js";
3-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
3+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
44

55

66
export default {

tests/application/resources/cars_sl_dont_allow_edit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import carsResourseTemplate from "../../../dev-demo/resources/carsResourseTemplate.js";
1+
import carsResourseTemplate from "../../../dev-demo/resources/cars_resources/carsResourseTemplate.js";
22

33

44
export default {

0 commit comments

Comments
 (0)