Merge branch 'master' into BUDI-9127/track-usage

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/builder/src/components/integration/RestQueryViewer.svelte

@@ -179,7 +179,7 @@
     return newQuery
   }
 
-  async function saveQuery() {
+  async function saveQuery(redirectIfNew = true) {
     const toSave = builtQuery
     saving = true
     try {
@@ -195,7 +195,7 @@
       }
 
       notifications.success(`Request saved successfully`)
-      if (isNew) {
+      if (isNew && redirectIfNew) {
         $goto(`../../${_id}`)
       }
 
@@ -497,7 +497,7 @@
       cancelText: "Discard and continue",
       size: "M",
       onConfirm: async () => {
-        const saveResult = await saveQuery()
+        const saveResult = await saveQuery(false)
         if (!saveResult.ok) {
           // We can't leave as the query was not properly saved
           return false