MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2923 from Budibase/develop 

Develop -> Master
This commit is contained in:
Martin McKeaveney 2021-10-07 22:10:08 +01:00 committed by GitHub
parent 0b66a003c5 7f5148a1e1
commit 5e5ee11edf
18 changed files with 93 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"npmClient": "yarn",
"packages": [
"packages/*"

2
packages/auth/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/auth",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"description": "Authentication middlewares for budibase builder and apps",
"main": "src/index.js",
"author": "Budibase",

2
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"license": "AGPL-3.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",

8
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"license": "AGPL-3.0",
"private": true,
"scripts": {
@ -65,10 +65,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^0.9.157",
"@budibase/client": "^0.9.157",
"@budibase/bbui": "^0.9.158-alpha.0",
"@budibase/client": "^0.9.158-alpha.0",
"@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.9.157",
"@budibase/string-templates": "^0.9.158-alpha.0",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

2
packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
View File

@ -68,5 +68,5 @@
{/if}
<ManageAccessButton resourceId={decodeURI(name)} />
<HideAutocolumnButton bind:hideAutocolumns />
<ExportButton {view} />
<ExportButton view={view.name} />
</Table>

2
packages/builder/src/components/design/AppPreview/iframeTemplate.js
View File

@ -64,7 +64,7 @@ export default `
appId,
theme,
customTheme,
previewDevice
previewDevice,
} = parsed
// Set some flags so the app knows we're in the builder

7
packages/builder/src/components/start/TemplateList.svelte
View File

@ -33,7 +33,10 @@
</div>
{/each}
<div class="template start-from-scratch" on:click={() => onSelect(null)}>
<div class="background-icon" style={`background: var(--background);`}>
<div
class="background-icon"
style={`background: rgb(50, 50, 50); color: white;`}
>
<Icon name="Add" />
</div>
<Heading size="XS">Start from scratch</Heading>
@ -74,7 +77,7 @@
align-items: center;
cursor: pointer;
border-radius: 4px;
background: #1a1a1a;
background: var(--background-alt);
padding: 8px 16px;
}

13
packages/builder/src/pages/builder/portal/_layout.svelte
View File

@ -46,11 +46,16 @@
title: "Theming",
href: "/builder/portal/settings/theming",
},
{
title: "Updates",
href: "/builder/portal/settings/update",
},
])
if (!$adminStore.cloud) {
menu = menu.concat([
{
title: "Updates",
href: "/builder/portal/settings/update",
},
])
}
} else {
menu = menu.concat([
{

4
packages/builder/src/pages/builder/portal/settings/update.svelte
View File

@ -10,14 +10,14 @@
Label,
} from "@budibase/bbui"
import api from "builderStore/api"
import { auth } from "stores/portal"
import { auth, admin } from "stores/portal"
import { redirect } from "@roxi/routify"
let version
// Only admins allowed here
$: {
if (!$auth.isAdmin) {
if (!$auth.isAdmin || $admin.cloud) {
$redirect("../../portal")
}
}

2
packages/builder/src/stores/portal/auth.js
View File

@ -56,7 +56,7 @@ export function createAuthStore() {
analytics.identify(user._id, user)
analytics.showChat({
email: user.email,
created_at: user.createdAt || Date.now(),
created_at: (user.createdAt || Date.now()) / 1000,
name: user.name,
user_id: user._id,
tenant: user.tenantId,

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

6
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "^0.9.157",
"@budibase/bbui": "^0.9.158-alpha.0",
"@budibase/standard-components": "^0.9.139",
"@budibase/string-templates": "^0.9.157",
"@budibase/string-templates": "^0.9.158-alpha.0",
"regexparam": "^1.3.0",
"shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5"

42
packages/client/src/components/MadeInBudibase.svelte Normal file
View File

@ -0,0 +1,42 @@
<a
href="https://www.budibase.com/?utm_source=budibase-apps-public-screens&utm_medium=badge&utm_campaign=made-in-budibase"
>
<div>
<img src="https://i.imgur.com/Xhdt1YP.png" alt="Budibase" />
<p>Made In Budibase</p>
</div>
</a>
<style>
div {
position: absolute;
right: 20px;
bottom: 20px;
padding: 10px;
border-radius: 5px;
background: var(--spectrum-alias-background-color-primary);
z-index: 999999 !important;
visibility: visible !important;
display: flex;
justify-content: center;
align-items: center;
border: 1px solid;
border-color: var(--spectrum-global-color-gray-300) !important;
height: 45px;
}
p {
text-decoration: none;
color: var(--spectrum-heading-m-text-color);
}
a:visited {
text-decoration: none;
color: var(--spectrum-heading-m-text-color);
}
img {
height: 20px;
margin-right: 10px;
}
</style>

8
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"description": "Budibase Web Server",
"main": "src/index.js",
"repository": {
@ -66,9 +66,9 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/auth": "^0.9.157",
"@budibase/client": "^0.9.157",
"@budibase/string-templates": "^0.9.157",
"@budibase/auth": "^0.9.158-alpha.0",
"@budibase/client": "^0.9.158-alpha.0",
"@budibase/string-templates": "^0.9.158-alpha.0",
"@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1",

9
packages/server/src/api/controllers/analytics.js
View File

@ -21,9 +21,12 @@ exports.endUserPing = async ctx => {
return
}
posthogClient.capture("budibase:end_user_ping", {
userId: ctx.user && ctx.user._id,
appId: ctx.appId,
posthogClient.capture({
event: "budibase:end_user_ping",
distinctId: ctx.user && ctx.user._id,
properties: {
appId: ctx.appId,
},
})
ctx.body = {

7
packages/server/src/api/controllers/view/utils.js
View File

@ -2,6 +2,8 @@ const {
ViewNames,
generateMemoryViewID,
getMemoryViewParams,
DocumentTypes,
SEPARATOR,
} = require("../../../db/utils")
const env = require("../../../environment")
@ -10,6 +12,11 @@ exports.getView = async (db, viewName) => {
const designDoc = await db.get("_design/database")
return designDoc.views[viewName]
} else {
// This is a table view, don't read the view from the DB
if (viewName.startsWith(DocumentTypes.TABLE + SEPARATOR)) {
return null
}
const viewDoc = await db.get(generateMemoryViewID(viewName))
return viewDoc.view
}

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "0.9.157",
"version": "0.9.158-alpha.0",
"description": "Budibase background service",
"main": "src/index.js",
"repository": {
@ -27,8 +27,8 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/auth": "^0.9.157",
"@budibase/string-templates": "^0.9.157",
"@budibase/auth": "^0.9.158-alpha.0",
"@budibase/string-templates": "^0.9.158-alpha.0",
"@koa/router": "^8.0.0",
"@techpass/passport-openidconnect": "^0.3.0",
"aws-sdk": "^2.811.0",