@@ -33,4 +70,48 @@
/* Fix layout due to LH 0 on heading */
margin-bottom: 16px;
}
+
+ .dropzone {
+ text-align: center;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ border-radius: 10px;
+ transition: all 0.3s;
+ }
+
+ .uploaded {
+ color: var(--blue);
+ }
+
+ input[type="file"] {
+ display: none;
+ }
+
+ label {
+ font-family: var(--font-sans);
+ cursor: pointer;
+ font-weight: 500;
+ box-sizing: border-box;
+ overflow: hidden;
+ border-radius: var(--border-radius-s);
+ color: var(--ink);
+ padding: var(--spacing-m) var(--spacing-l);
+ transition: all 0.2s ease 0s;
+ display: inline-flex;
+ text-rendering: optimizeLegibility;
+ min-width: auto;
+ outline: none;
+ font-feature-settings: "case" 1, "rlig" 1, "calt" 0;
+ -webkit-box-align: center;
+ user-select: none;
+ flex-shrink: 0;
+ align-items: center;
+ justify-content: center;
+ width: 100%;
+ background-color: var(--grey-2);
+ font-size: var(--font-size-xs);
+ line-height: normal;
+ border: var(--border-transparent);
+ }
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 7de3a2bb35..5aa99be35b 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -4,7 +4,7 @@
import AppList from "components/start/AppList.svelte"
import { get } from "builderStore/api"
import CreateAppModal from "components/start/CreateAppModal.svelte"
- import { Button, Heading, Modal } from "@budibase/bbui"
+ import { Button, Heading, Modal, Spacer } from "@budibase/bbui"
import TemplateList from "components/start/TemplateList.svelte"
import analytics from "analytics"
@@ -43,13 +43,22 @@
modal.show()
}
+ function initiateAppImport() {
+ template = { fromFile: true }
+ modal.show()
+ }
+
checkIfKeysAndApps()
@@ -103,4 +112,9 @@
color: white;
font-weight: 500;
}
+
+ .button-group {
+ display: flex;
+ flex-direction: row;
+ }
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index fb269dda5e..803b961fcd 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -2995,6 +2995,11 @@ dotenv@^8.2.0:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
+downloadjs@^1.4.7:
+ version "1.4.7"
+ resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
+ integrity sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw=
+
duplexer@~0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js
index d74c5c2a82..817f14896c 100644
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.js
@@ -18,15 +18,12 @@ const handleError = error => {
const makeApiCall = async ({ method, url, body, json = true }) => {
try {
const requestBody = json ? JSON.stringify(body) : body
- let headers = {
+ const inBuilder = window["##BUDIBASE_IN_BUILDER##"]
+ const headers = {
Accept: "application/json",
"x-budibase-app-id": window["##BUDIBASE_APP_ID##"],
- }
- if (json) {
- headers["Content-Type"] = "application/json"
- }
- if (!window["##BUDIBASE_IN_BUILDER##"]) {
- headers["x-budibase-type"] = "client"
+ ...(json && { "Content-Type": "application/json" }),
+ ...(!inBuilder && { "x-budibase-type": "client" }),
}
const response = await fetch(url, {
method,
diff --git a/packages/server/package.json b/packages/server/package.json
index 2ee2c79e22..56e4d17627 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -22,7 +22,8 @@
"maintainer": "Budibase",
"icon": "./build/icons/",
"target": [
- "deb"
+ "deb",
+ "AppImage"
],
"category": "Development"
},
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 91c79f1961..e899a2dca9 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -105,10 +105,16 @@ async function createInstance(template) {
// replicate the template data to the instance DB
if (template) {
- const templatePath = await downloadTemplate(...template.key.split("/"))
- const dbDumpReadStream = fs.createReadStream(
- join(templatePath, "db", "dump.txt")
- )
+ let dbDumpReadStream
+
+ if (template.fileImportPath) {
+ dbDumpReadStream = fs.createReadStream(template.fileImportPath)
+ } else {
+ const templatePath = await downloadTemplate(...template.key.split("/"))
+ dbDumpReadStream = fs.createReadStream(
+ join(templatePath, "db", "dump.txt")
+ )
+ }
const { ok } = await db.load(dbDumpReadStream)
if (!ok) {
throw "Error loading database dump from template."
diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js
new file mode 100644
index 0000000000..d021dca91f
--- /dev/null
+++ b/packages/server/src/api/controllers/backup.js
@@ -0,0 +1,41 @@
+const { performDump } = require("../../utilities/templates")
+const path = require("path")
+const os = require("os")
+const fs = require("fs-extra")
+
+exports.exportAppDump = async function(ctx) {
+ const { appId } = ctx.query
+
+ const backupsDir = path.join(os.homedir(), ".budibase", "backups")
+ fs.ensureDirSync(backupsDir)
+
+ const backupIdentifier = `${appId} Backup: ${new Date()}.txt`
+
+ await performDump({
+ dir: backupsDir,
+ appId,
+ name: backupIdentifier,
+ })
+
+ ctx.status = 200
+
+ const backupFile = path.join(backupsDir, backupIdentifier)
+
+ ctx.attachment(backupIdentifier)
+ ctx.body = fs.createReadStream(backupFile)
+ // ctx.body = {
+ // url: `/api/backups/download/${backupIdentifier}`,
+ // }
+}
+
+// exports.downloadAppDump = async function(ctx) {
+// const fileName = ctx.params.fileName
+
+// const backupsDir = path.join(os.homedir(), ".budibase", "backups")
+// fs.ensureDirSync(backupsDir)
+
+// const backupFile = path.join(backupsDir, fileName)
+
+// ctx.attachment(fileName)
+// ctx.body = fs.createReadStream(backupFile)
+// }
diff --git a/packages/server/src/api/controllers/view/index.js b/packages/server/src/api/controllers/view/index.js
index 0b5b18a93c..c4e8c1e372 100644
--- a/packages/server/src/api/controllers/view/index.js
+++ b/packages/server/src/api/controllers/view/index.js
@@ -83,7 +83,7 @@ const controller = {
ctx.message = `View ${ctx.params.viewName} saved successfully.`
},
exportView: async ctx => {
- const view = ctx.request.body
+ const view = ctx.query.view
const format = ctx.query.format
// Fetch view rows
@@ -102,14 +102,6 @@ const controller = {
const filename = `${view.name}.${format}`
fs.writeFileSync(join(os.tmpdir(), filename), exportedFile)
- ctx.body = {
- url: `/api/views/export/download/${filename}`,
- name: view.name,
- }
- },
- downloadExport: async ctx => {
- const filename = ctx.params.fileName
-
ctx.attachment(filename)
ctx.body = fs.createReadStream(join(os.tmpdir(), filename))
},
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index c76eb82643..ea0ed4b875 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -5,6 +5,7 @@ const zlib = require("zlib")
const { budibaseAppsDir } = require("../utilities/budibaseDir")
const { isDev } = require("../utilities")
const { mainRoutes, authRoutes, staticRoutes } = require("./routes")
+const pkg = require("../../package.json")
const router = new Router()
const env = require("../environment")
@@ -32,6 +33,7 @@ router
await next()
})
.use("/health", ctx => (ctx.status = 200))
+ .use("/version", ctx => (ctx.body = pkg.version))
.use(authenticated)
// error handling middleware
diff --git a/packages/server/src/api/routes/backup.js b/packages/server/src/api/routes/backup.js
new file mode 100644
index 0000000000..283bec39a4
--- /dev/null
+++ b/packages/server/src/api/routes/backup.js
@@ -0,0 +1,15 @@
+const Router = require("@koa/router")
+const controller = require("../controllers/backup")
+const authorized = require("../../middleware/authorized")
+const { BUILDER } = require("../../utilities/security/permissions")
+
+const router = Router()
+
+router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump)
+// .get(
+// "/api/backups/download/:fileName",
+// authorized(BUILDER),
+// controller.downloadAppDump
+// )
+
+module.exports = router
diff --git a/packages/server/src/api/routes/index.js b/packages/server/src/api/routes/index.js
index 68b0c3fc2b..002d2ec805 100644
--- a/packages/server/src/api/routes/index.js
+++ b/packages/server/src/api/routes/index.js
@@ -21,6 +21,7 @@ const permissionRoutes = require("./permission")
const datasourceRoutes = require("./datasource")
const queryRoutes = require("./query")
const hostingRoutes = require("./hosting")
+const backupRoutes = require("./backup")
exports.mainRoutes = [
deployRoutes,
@@ -42,6 +43,7 @@ exports.mainRoutes = [
datasourceRoutes,
queryRoutes,
hostingRoutes,
+ backupRoutes,
// these need to be handled last as they still use /api/:tableId
// this could be breaking as koa may recognise other routes as this
tableRoutes,
diff --git a/packages/server/src/api/routes/view.js b/packages/server/src/api/routes/view.js
index 17277b346c..4a32b4c592 100644
--- a/packages/server/src/api/routes/view.js
+++ b/packages/server/src/api/routes/view.js
@@ -26,10 +26,5 @@ router
)
.post("/api/views", authorized(BUILDER), usage, viewController.save)
.post("/api/views/export", authorized(BUILDER), viewController.exportView)
- .get(
- "/api/views/export/download/:fileName",
- authorized(BUILDER),
- viewController.downloadExport
- )
module.exports = router
diff --git a/packages/server/src/utilities/templates.js b/packages/server/src/utilities/templates.js
index d5b5d5e257..7383e3115d 100644
--- a/packages/server/src/utilities/templates.js
+++ b/packages/server/src/utilities/templates.js
@@ -10,7 +10,6 @@ const streamPipeline = promisify(stream.pipeline)
const { budibaseAppsDir } = require("./budibaseDir")
const env = require("../environment")
const CouchDB = require("../db")
-const { DocumentTypes } = require("../db/utils")
const DEFAULT_TEMPLATES_BUCKET =
"prod-budi-templates.s3-eu-west-1.amazonaws.com"
@@ -56,6 +55,15 @@ exports.downloadTemplate = async function(type, name) {
return dirName
}
+async function performDump({ dir, appId, name = "dump.txt" }) {
+ const writeStream = fs.createWriteStream(join(dir, name))
+ // perform couch dump
+ const instanceDb = new CouchDB(appId)
+ await instanceDb.dump(writeStream, {})
+}
+
+exports.performDump = performDump
+
exports.exportTemplateFromApp = async function({ templateName, appId }) {
// Copy frontend files
const templatesDir = join(
@@ -67,13 +75,6 @@ exports.exportTemplateFromApp = async function({ templateName, appId }) {
"db"
)
fs.ensureDirSync(templatesDir)
- const writeStream = fs.createWriteStream(join(templatesDir, "dump.txt"))
- // perform couch dump
- const instanceDb = new CouchDB(appId)
- await instanceDb.dump(writeStream, {
- filter: doc => {
- return !doc._id.startsWith(DocumentTypes.USER)
- },
- })
+ await performDump({ dir: templatesDir, appId })
return templatesDir
}
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index eec67a7ff4..f5ca16fc96 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -40,7 +40,7 @@
"gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.1.0",
- "@budibase/bbui": "^1.52.4",
+ "@budibase/bbui": "^1.55.1",
"@budibase/svelte-ag-grid": "^0.0.16",
"@spectrum-css/actionbutton": "^1.0.0-beta.1",
"@spectrum-css/button": "^3.0.0-beta.6",
diff --git a/packages/standard-components/src/grid/Component.svelte b/packages/standard-components/src/grid/Component.svelte
index 3492301082..3004622bfd 100644
--- a/packages/standard-components/src/grid/Component.svelte
+++ b/packages/standard-components/src/grid/Component.svelte
@@ -135,8 +135,7 @@
}
const updateRow = async row => {
- const schema = (await API.fetchTableDefinition(row.tableId)).schema
- await API.updateRow(schema, { data: row })
+ await API.updateRow(row)
}
const deleteRows = async () => {
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock
index cd03e685b9..3e5d933b3b 100644
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@@ -44,10 +44,10 @@
lodash "^4.17.19"
to-fast-properties "^2.0.0"
-"@budibase/bbui@^1.52.4":
- version "1.52.4"
- resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.52.4.tgz#ae3c17e1f49f14e65831703958bcddc6e64afd24"
- integrity sha512-/wiv5dSyvXLgy2/zGEslnCsjwE8qqng1D8k5ScSOPEyMab8tzzd1XxfZAN9rp84zIMgAXeH6s5a4j4riR+jVkg==
+"@budibase/bbui@^1.55.1":
+ version "1.55.1"
+ resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.1.tgz#291fb6fa10479b49f078d3a911ad0ed42c2e6b12"
+ integrity sha512-bxsHBwkOqCtuFz89e0hAXwvwycfS4xPPrEge5PxK1Lh3uqetO4bXoIxYaIDjfi2Ku7CYIzEmOwSloNaQWeTF4g==
dependencies:
markdown-it "^12.0.2"
quill "^1.3.7"
