From a7dbada7dc906e4b328d2907b7f82f4404741e3a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 10 Jun 2021 12:07:39 +0100
Subject: [PATCH 1/3] fix feedback notification panel, prevent MinIO bucket
 from being deleted

---
 .../src/components/deploy/DeployModal.svelte     | 16 +++++++++++++---
 .../src/pages/builder/portal/apps/index.svelte   |  4 +++-
 .../server/src/api/controllers/application.js    |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index 400f0dca4f..77f9a67cfe 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -31,9 +31,9 @@
         notifications.success(`Application published successfully`)
       }
 
-      if (analytics.requestFeedbackOnDeploy()) {
-        feedbackModal.show()
-      }
+      // if (analytics.requestFeedbackOnDeploy()) {
+      feedbackModal.show()
+      // }
     } catch (err) {
       analytics.captureException(err)
       notifications.error(`Error publishing app: ${err}`)
@@ -98,6 +98,16 @@
 </script>
 
 <Button secondary on:click={publishModal.show}>Publish</Button>
+<Modal bind:this={feedbackModal}>
+  <ModalContent
+    title="Enjoying Budibase?"
+    size="L"
+    showConfirmButton={false}
+    showCancelButton={false}
+  >
+    <FeedbackIframe on:finished={feedbackModal.hide} />
+  </ModalContent>
+</Modal>
 <Modal bind:this={publishModal}>
   <ModalContent
     title="Publish to Production"
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ac588cdf7d..6c229c1980 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -127,7 +127,9 @@
       return
     }
     try {
-      const response = await del(`/api/applications/${selectedApp.prodId}`)
+      const response = await del(
+        `/api/applications/${selectedApp.prodId}?unpublish=1`
+      )
       if (response.status !== 200) {
         const json = await response.json()
         throw json.message
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index a60df2b9c2..7db8bacd0b 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -245,9 +245,10 @@ exports.update = async function (ctx) {
 
 exports.delete = async function (ctx) {
   const db = new CouchDB(ctx.params.appId)
+
   const result = await db.destroy()
   /* istanbul ignore next */
-  if (!env.isTest()) {
+  if (!env.isTest() && !ctx.query.unpublish) {
     await deleteApp(ctx.params.appId)
   }
   // make sure the app/role doesn't stick around after the app has been deleted

From cbb681e140fcb594c92aa4ee370c26441f926a36 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 10 Jun 2021 12:10:19 +0100
Subject: [PATCH 2/3] re-adding if

---
 packages/builder/src/components/deploy/DeployModal.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index 77f9a67cfe..ea538f8212 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -31,9 +31,9 @@
         notifications.success(`Application published successfully`)
       }
 
-      // if (analytics.requestFeedbackOnDeploy()) {
-      feedbackModal.show()
-      // }
+      if (analytics.requestFeedbackOnDeploy()) {
+        feedbackModal.show()
+      }
     } catch (err) {
       analytics.captureException(err)
       notifications.error(`Error publishing app: ${err}`)

From 0c935fb5fa23af6a6dcd8e6dc0b9b3acb98e7bc4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 10 Jun 2021 12:54:14 +0000
Subject: [PATCH 3/3] v0.9.44

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  6 +++---
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lerna.json b/lerna.json
index 08d06c5808..92f631cceb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.43",
+  "version": "0.9.44",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 96b2a476ff..4d87dbcd75 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4665aa3fa7..8066864af5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 92fcb8537e..229ed14107 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.43",
-    "@budibase/client": "^0.9.43",
+    "@budibase/bbui": "^0.9.44",
+    "@budibase/client": "^0.9.44",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.43",
+    "@budibase/string-templates": "^0.9.44",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5ecc06c31d..ebb2efa9d7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 488de25711..91240d447c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,13 +18,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.9.43",
+    "@budibase/string-templates": "^0.9.44",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.9.43",
+    "@budibase/standard-components": "^0.9.44",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 801ae275a1..180ae5cb02 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -55,9 +55,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.43",
-    "@budibase/client": "^0.9.43",
-    "@budibase/string-templates": "^0.9.43",
+    "@budibase/auth": "^0.9.44",
+    "@budibase/client": "^0.9.44",
+    "@budibase/string-templates": "^0.9.44",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -109,7 +109,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.43",
+    "@budibase/standard-components": "^0.9.44",
     "@jest/test-sequencer": "^24.8.0",
     "babel-jest": "^27.0.2",
     "docker-compose": "^0.23.6",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index df79218aeb..3aca39066c 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.43",
+  "version": "0.9.44",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.43",
+    "@budibase/bbui": "^0.9.44",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
     "apexcharts": "^3.22.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a5aa55a904..d9fbf65bf0 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9388ff7659..0330bfc68a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.43",
-    "@budibase/string-templates": "^0.9.43",
+    "@budibase/auth": "^0.9.44",
+    "@budibase/string-templates": "^0.9.44",
     "@koa/router": "^8.0.0",
     "aws-sdk": "^2.811.0",
     "bcryptjs": "^2.4.3",