Merge branch 'master' into BUDI-9127/track-usage
This commit is contained in:
commit
1dca68344a
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||||
"version": "3.5.3",
|
"version": "3.6.0",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"concurrency": 20,
|
"concurrency": 20,
|
||||||
"command": {
|
"command": {
|
||||||
|
|
|
@ -179,7 +179,7 @@
|
||||||
return newQuery
|
return newQuery
|
||||||
}
|
}
|
||||||
|
|
||||||
async function saveQuery() {
|
async function saveQuery(redirectIfNew = true) {
|
||||||
const toSave = builtQuery
|
const toSave = builtQuery
|
||||||
saving = true
|
saving = true
|
||||||
try {
|
try {
|
||||||
|
@ -195,7 +195,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
notifications.success(`Request saved successfully`)
|
notifications.success(`Request saved successfully`)
|
||||||
if (isNew) {
|
if (isNew && redirectIfNew) {
|
||||||
$goto(`../../${_id}`)
|
$goto(`../../${_id}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -497,7 +497,7 @@
|
||||||
cancelText: "Discard and continue",
|
cancelText: "Discard and continue",
|
||||||
size: "M",
|
size: "M",
|
||||||
onConfirm: async () => {
|
onConfirm: async () => {
|
||||||
const saveResult = await saveQuery()
|
const saveResult = await saveQuery(false)
|
||||||
if (!saveResult.ok) {
|
if (!saveResult.ok) {
|
||||||
// We can't leave as the query was not properly saved
|
// We can't leave as the query was not properly saved
|
||||||
return false
|
return false
|
||||||
|
|
Loading…
Reference in New Issue