Skip to content

Commit 233e377

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into feature/AdminForth/1334/lets-try-to-improve-styles-for
2 parents 3c2dc8b + 6b1dd66 commit 233e377

File tree

114 files changed

+30543
-3680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+30543
-3680
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<a href="https://adminforth.dev"><img src="https://img.shields.io/badge/website-adminforth.dev-blue" style="height:24px"/></a> <a href="https://adminforth.dev"><img src="https://img.shields.io/npm/dw/adminforth" style="height:24px"/></a> <a href="https://devforth.io"><img src="https://raw.githubusercontent.com/devforth/OnLogs/e97944fffc24fec0ce2347b205c9bda3be8de5c5/.assets/df_powered_by.svg" style="height:28px"/></a>
55

6+
[![Ask AI](http://tluma.ai/badge)](http://tluma.ai/ask-ai/devforth/adminforth)
67

78
* [Try live demo](https://demo.adminforth.dev/) (Read-only mode)
89

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"devDependencies": {
4141
"typescript": "5.4.5",
4242
"tsx": "4.11.2",
43-
"@types/express": "latest",
43+
"@types/express": "^4.17.21",
4444
"@types/node": "latest",
4545
"@prisma/client": "latest",
4646
"prisma": "^7.0.0"

adminforth/dataConnectors/baseConnector.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
510510
getRecordByPrimaryKey(resource: AdminForthResource, recordId: string): Promise<any> {
511511
return this.getRecordByPrimaryKeyWithOriginalTypes(resource, recordId).then((record) => {
512512
const newRecord = {};
513+
if (!record) {
514+
return null;
515+
}
513516
for (const col of resource.dataSourceColumns) {
514517
newRecord[col.name] = this.getFieldValue(col, record[col.name]);
515518
}

0 commit comments

Comments
 (0)