From 3d9a6d5c4c3b4ea90dc3b907d8610e8c4e866741 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 6 Jun 2022 15:17:14 +0100 Subject: [PATCH] negate export button --- .../src/components/start/ExportAppModal.svelte | 6 +++--- packages/server/src/api/controllers/backup.js | 6 +++--- .../server/src/utilities/fileSystem/index.js | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte index 19f86b12d8..05a42dfa4a 100644 --- a/packages/builder/src/components/start/ExportAppModal.svelte +++ b/packages/builder/src/components/start/ExportAppModal.svelte @@ -2,15 +2,15 @@ import { ModalContent, Toggle } from "@budibase/bbui" export let app - let includeRows = true + let excludeRows = false const exportApp = () => { const id = app.deployed ? app.prodId : app.devId const appName = encodeURIComponent(app.name) - window.location = `/api/backups/export?appId=${id}&appname=${appName}&includeRows=${includeRows}` + window.location = `/api/backups/export?appId=${id}&appname=${appName}&excludeRows=${excludeRows}` } - + diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js index 586100918d..0ebf01176e 100644 --- a/packages/server/src/api/controllers/backup.js +++ b/packages/server/src/api/controllers/backup.js @@ -1,11 +1,11 @@ const { streamBackup } = require("../../utilities/fileSystem") exports.exportAppDump = async function (ctx) { - let { appId, includeRows } = ctx.query + let { appId, excludeRows } = ctx.query const appName = decodeURI(ctx.query.appname) - includeRows = includeRows === "true" + excludeRows = excludeRows === "true" const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt` ctx.attachment(backupIdentifier) - ctx.body = await streamBackup(appId, includeRows) + ctx.body = await streamBackup(appId, excludeRows) } diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js index bbfeb5b627..ed1cb1923a 100644 --- a/packages/server/src/utilities/fileSystem/index.js +++ b/packages/server/src/utilities/fileSystem/index.js @@ -110,20 +110,20 @@ exports.apiFileReturn = contents => { return fs.createReadStream(path) } -exports.defineFilter = includeRows => { - if (includeRows) { - return doc => - !( - doc._id.includes(USER_METDATA_PREFIX) || - doc._id.includes(LINK_USER_METADATA_PREFIX) - ) - } else if (!includeRows) { +exports.defineFilter = excludeRows => { + if (excludeRows) { return doc => !( doc._id.includes(USER_METDATA_PREFIX) || doc._id.includes(LINK_USER_METADATA_PREFIX) || doc._id.includes(TABLE_ROW_PREFIX) ) + } else if (!excludeRows) { + return doc => + !( + doc._id.includes(USER_METDATA_PREFIX) || + doc._id.includes(LINK_USER_METADATA_PREFIX) + ) } }