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

merge, UI for managing your own app locks

This commit is contained in:
Martin McKeaveney 2021-05-13 14:04:03 +01:00
parent f4e3e1d196
commit 31901c89f8
5 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/bbui/src/Link/Link.svelte
View File

@ -11,6 +11,7 @@
</script> </script>
<a <a
on:click
{href} {href}
{target} {target}
class:spectrum-Link--primary={primary} class:spectrum-Link--primary={primary}

22
packages/builder/src/components/start/AppCard.svelte
View File

@ -11,27 +11,21 @@
import { gradient } from "actions" import { gradient } from "actions"
import { AppStatus } from "constants" import { AppStatus } from "constants"
import { url } from "@roxi/routify" import { url } from "@roxi/routify"
import { auth } from "stores/backend"
export let app export let app
export let exportApp export let exportApp
export let openApp
export let deleteApp export let deleteApp
export let appStatus export let releaseLock
let href =
appStatus === AppStatus.DEV ? $url(`../../app/${app._id}`) : `/${app._id}`
let target = appStatus === AppStatus.DEV ? "_self" : "_target"
</script> </script>
<div class="wrapper"> <div class="wrapper">
<Layout noPadding gap="XS" alignContent="start"> <Layout noPadding gap="XS" alignContent="start">
<div class="preview" use:gradient={{ seed: app.name }} /> <div class="preview" use:gradient={{ seed: app.name }} />
<div class="title"> <div class="title">
<Link {href} {target}> <Link on:click={() => openApp(app)}>
<Heading size="XS"> <Heading size="XS">
<<<<<<< HEAD
{app._id}
=======
>>>>>>> c3e1b1d30235b8945424cf59a41e112f92942dc6
{app.name} {app.name}
</Heading> </Heading>
</Link> </Link>
@ -43,14 +37,18 @@
<MenuItem on:click={() => deleteApp(app)} icon="Delete"> <MenuItem on:click={() => deleteApp(app)} icon="Delete">
Delete Delete
</MenuItem> </MenuItem>
<MenuItem on:click={() => deleteApp(app)} icon="Code">Develop</MenuItem> {#if app.lockedBy && app.lockedBy?.email === $auth.user?.email}
<MenuItem on:click={() => releaseLock(app._id)} icon="LockOpen">
Release Lock
</MenuItem>
{/if}
</ActionMenu> </ActionMenu>
</div> </div>
<div class="status"> <div class="status">
<Body noPadding size="S"> <Body noPadding size="S">
Edited {Math.floor(1 + Math.random() * 10)} months ago Edited {Math.floor(1 + Math.random() * 10)} months ago
</Body> </Body>
{#if appStatus === AppStatus.DEV && app.lockedBy} {#if app.lockedBy}
<Icon name="LockClosed" /> <Icon name="LockClosed" />
{/if} {/if}
</div> </div>

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

@ -10,6 +10,7 @@
} from "@budibase/bbui" } from "@budibase/bbui"
import { AppStatus } from "constants" import { AppStatus } from "constants"
import { url } from "@roxi/routify" import { url } from "@roxi/routify"
import { auth } from "stores/backend"
export let app export let app
export let openApp export let openApp
@ -17,6 +18,7 @@
export let deleteApp export let deleteApp
export let last export let last
export let appStatus export let appStatus
export let releaseLock
let href = let href =
appStatus === AppStatus.DEV ? $url(`../../app/${app._id}`) : `/${app._id}` appStatus === AppStatus.DEV ? $url(`../../app/${app._id}`) : `/${app._id}`
@ -49,6 +51,11 @@
<Icon hoverable slot="control" name="More" /> <Icon hoverable slot="control" name="More" />
<MenuItem on:click={() => exportApp(app)} icon="Download">Export</MenuItem> <MenuItem on:click={() => exportApp(app)} icon="Download">Export</MenuItem>
<MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem> <MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem>
{#if app.lockedBy && app.lockedBy?.email === $auth.user?.email}
<MenuItem on:click={() => releaseLock(app._id)} icon="LockOpen">
Release Lock
</MenuItem>
{/if}
</ActionMenu> </ActionMenu>
</div> </div>

58
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -23,6 +23,7 @@
import ConfirmDialog from "components/common/ConfirmDialog.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import AppCard from "components/start/AppCard.svelte" import AppCard from "components/start/AppCard.svelte"
import AppRow from "components/start/AppRow.svelte" import AppRow from "components/start/AppRow.svelte"
import { AppStatus } from "constants"
let layout = "grid" let layout = "grid"
let appStatus = "deployed" let appStatus = "deployed"
@ -60,7 +61,11 @@
} }
const openApp = app => { const openApp = app => {
$goto(`../../app/${app._id}`) if (appStatus === AppStatus.DEV) {
$goto(`../../app/${app._id}`)
} else {
window.open(`/${app._id}`, '_blank');
}
} }
const exportApp = app => { const exportApp = app => {
@ -91,6 +96,19 @@
appToDelete = null appToDelete = null
} }
const releaseLock = async appId => {
try {
const response = await del(`/api/dev/${appId}/lock`)
const json = await response.json()
if (json.status !== 200) throw json.message
notifications.success("Lock released")
await apps.load(appStatus)
} catch (err) {
notifications.error(`Error releasing lock: ${err}`)
}
}
onMount(async () => { onMount(async () => {
checkKeys() checkKeys()
await apps.load(appStatus) await apps.load(appStatus)
@ -99,41 +117,6 @@
</script> </script>
<Page wide> <Page wide>
<<<<<<< HEAD
{#if $apps.length}
<Layout noPadding>
<div class="title">
<Heading>Apps</Heading>
<ButtonGroup>
<Button secondary on:click={initiateAppImport}>Import app</Button>
<Button cta on:click={initiateAppCreation}>Create new app</Button>
</ButtonGroup>
</div>
<div class="filter">
<div class="select">
<Select
bind:value={appStatus}
options={[
{ label: "Deployed", value: "deployed" },
{ label: "In Development", value: "dev" },
]}
/>
</div>
<ActionGroup>
<ActionButton
on:click={() => (layout = "grid")}
selected={layout === "grid"}
quiet
icon="ClassicGridView"
/>
<ActionButton
on:click={() => (layout = "table")}
selected={layout === "table"}
quiet
icon="ViewRow"
/>
</ActionGroup>
=======
<Layout noPadding> <Layout noPadding>
<div class="title"> <div class="title">
<Heading>Apps</Heading> <Heading>Apps</Heading>
@ -151,7 +134,6 @@
{ label: "In Development", value: "dev" }, { label: "In Development", value: "dev" },
]} ]}
/> />
>>>>>>> c3e1b1d30235b8945424cf59a41e112f92942dc6
</div> </div>
<ActionGroup> <ActionGroup>
<ActionButton <ActionButton
@ -176,7 +158,7 @@
{#each $apps as app, idx (app._id)} {#each $apps as app, idx (app._id)}
<svelte:component <svelte:component
this={layout === "grid" ? AppCard : AppRow} this={layout === "grid" ? AppCard : AppRow}
{appStatus} {releaseLock}
{app} {app}
{openApp} {openApp}
{exportApp} {exportApp}

2
packages/server/src/api/controllers/dev.js
View File

@ -40,7 +40,7 @@ exports.removeLock = async ctx => {
try { try {
await clearLock(appId, ctx.user) await clearLock(appId, ctx.user)
} catch (err) { } catch (err) {
ctx.throw(400, "Unable to remove lock.") ctx.throw(400, `Unable to remove lock. ${err}`)
} }
ctx.body = { ctx.body = {
message: "Lock removed successfully.", message: "Lock removed successfully.",