Browse Source

fix feedback notification panel, prevent MinIO bucket from being deleted

pull/1691/head
Martin McKeaveney 5 years ago
parent
commit
2877648df5
  1. 16
      packages/builder/src/components/deploy/DeployModal.svelte
  2. 4
      packages/builder/src/pages/builder/portal/apps/index.svelte
  3. 3
      packages/server/src/api/controllers/application.js

16
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"

4
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

3
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

Loading…
Cancel
Save