@budibase/server 1.1.22 → 1.1.23

package/dist/utilities/fileSystem/index.js

@@ -99,21 +99,18 @@ exports.apiFileReturn = contents => {
     return fs.createReadStream(path);
 };
 exports.defineFilter = excludeRows => {
+    const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX];
     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));
+        ids.push(TABLE_ROW_PREFIX);
     }
+    return doc => !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr);
 };
 /**
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
  * @param {string} appId The app to backup
  * @param {object} config Config to send to export DB
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} either a string or a stream of the backup
  */
 const backupAppData = (appId, config, includeRows) => __awaiter(void 0, void 0, void 0, function* () {
@@ -131,6 +128,7 @@ exports.performBackup = (appId, backupName) => __awaiter(void 0, void 0, void 0,
 /**
  * Streams a backup of the database state for an app
  * @param {string} appId The ID of the app which is to be backed up.
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} a readable stream of the backup which is written in real time
  */
 exports.streamBackup = (appId, includeRows) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.1.22",
-    "@budibase/client": "^1.1.22",
-    "@budibase/pro": "1.1.21",
-    "@budibase/string-templates": "^1.1.22",
-    "@budibase/types": "^1.1.22",
+    "@budibase/backend-core": "^1.1.23",
+    "@budibase/client": "^1.1.23",
+    "@budibase/pro": "1.1.22",
+    "@budibase/string-templates": "^1.1.23",
+    "@budibase/types": "^1.1.23",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "965a5e6a567effa57cb9a1a27a4691289cc13d47"
+  "gitHead": "7d2c4dd88c0524eeeb8665daad0bb00301f367d9"
 }

package/src/utilities/fileSystem/index.js

@@ -111,20 +111,12 @@ exports.apiFileReturn = contents => {
 }
 
 exports.defineFilter = excludeRows => {
+  const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX]
   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)
-      )
+    ids.push(TABLE_ROW_PREFIX)
   }
+  return doc =>
+    !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr)
 }
 
 /**
@@ -132,6 +124,7 @@ exports.defineFilter = excludeRows => {
  * data or user relationships.
  * @param {string} appId The app to backup
  * @param {object} config Config to send to export DB
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} either a string or a stream of the backup
  */
 const backupAppData = async (appId, config, includeRows) => {
@@ -154,6 +147,7 @@ exports.performBackup = async (appId, backupName) => {
 /**
  * Streams a backup of the database state for an app
  * @param {string} appId The ID of the app which is to be backed up.
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} a readable stream of the backup which is written in real time
  */
 exports.streamBackup = async (appId, includeRows) => {