add try catch to all environment variable loading

This commit is contained in:
Peter Clement 2023-01-30 16:30:51 +00:00
parent ee94435c06
commit 71352f1ddc
8 changed files with 34 additions and 19 deletions

View File

@ -218,7 +218,11 @@
}
onMount(async () => {
await environment.loadVariables()
try {
await environment.loadVariables()
} catch (error) {
console.error(error)
}
})
</script>

View File

@ -96,10 +96,13 @@
}
onMount(async () => {
await environment.loadVariables()
if ($auth.user) {
await licensing.init()
try {
await environment.loadVariables()
if ($auth.user) {
await licensing.init()
}
} catch (err) {
console.error(err)
}
})
</script>

View File

@ -45,10 +45,13 @@
let formFieldkey
onMount(async () => {
await environment.loadVariables()
if ($auth.user) {
await licensing.init()
try {
await environment.loadVariables()
if ($auth.user) {
await licensing.init()
}
} catch (err) {
console.error(err)
}
if (currentConfig) {

View File

@ -105,7 +105,7 @@
>
{#each fields as field, idx}
<Input
placeholder={"hello"}
placeholder={keyPlaceholder}
readonly={readOnly}
bind:value={field.name}
on:blur={changed}

View File

@ -367,7 +367,7 @@
// load the environment variables
await environment.loadVariables()
} catch (error) {
notifications.error("Error getting environment variables")
notifications.error(`Error getting environment variables - ${error}`)
}
datasource = $datasources.list.find(ds => ds._id === query?.datasourceId)

View File

@ -41,7 +41,7 @@
})
notifications.success("Environment variable saved")
} catch (err) {
notifications.error("Error saving environment variable")
notifications.error(`Error saving environment variable - ${err.message}`)
}
}
</script>

View File

@ -9,8 +9,8 @@
let editVariableModal
let deleteDialog
const save = data => {
environment.updateVariable(data)
const save = async data => {
await environment.updateVariable(data)
editVariableModal.hide()
}
</script>
@ -23,8 +23,8 @@
<ConfirmDialog
bind:this={deleteDialog}
onOk={() => {
environment.deleteVariable(row.name)
onOk={async () => {
await environment.deleteVariable(row.name)
}}
okText="Delete Environment Variable"
title="Confirm Deletion"

View File

@ -10,6 +10,7 @@
Tags,
Tag,
InlineAlert,
notifications,
} from "@budibase/bbui"
import { environment, licensing, auth, admin } from "stores/portal"
import { onMount } from "svelte"
@ -44,9 +45,13 @@
return schema
}
const save = data => {
environment.createVariable(data)
modal.hide()
const save = async data => {
try {
await environment.createVariable(data)
modal.hide()
} catch (err) {
notifications.error(`Error saving variable: ${err.message}`)
}
}
</script>