Skip to content

Commit

Permalink
change implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
hramezani committed Apr 19, 2024
1 parent ffbb486 commit 5048431
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/npm-fastui/src/components/display.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,12 @@ export function renderEvent(event: AnyEvent | undefined, data: DataModel): AnyEv
if (newEvent) {
if (newEvent.type === 'go-to' && newEvent.url) {
// for go-to events with a URL, substitute the row values into the url
const url = subKeys(newEvent.url, data)
let url: string | null = null
try {
url = subKeys(newEvent.url, data)
} catch (e) {
url = null
}
if (url === null) {
newEvent = undefined
} else {
Expand All @@ -218,7 +223,9 @@ const subKeys = (template: string, row: DataModel): string | null => {
let returnNull = false
const r = template.replace(/{(.+?)}/g, (_, key: string): string => {
const v: JsonData | undefined = row[key]
if (v === null || v === undefined) {
if (v === undefined) {
throw new Error(`field "${key}" not found in ${JSON.stringify(row)}`)
} else if (v === null) {
returnNull = true
return 'null'
} else {
Expand Down

0 comments on commit 5048431

Please sign in to comment.