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

Merge pull request #7039 from Budibase/fix/app-row-render 

Fix/app row render
This commit is contained in:
deanhannigan 2022-08-02 17:55:09 +01:00 committed by GitHub
parent a94f28e72b bd9fbb7d90
commit 08a0db5949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/builder/src/components/common/AppLockModal.svelte
View File

@ -6,6 +6,8 @@
Modal, Modal,
notifications, notifications,
ProgressCircle, ProgressCircle,
Layout,
Body,
} from "@budibase/bbui" } from "@budibase/bbui"
import { auth, apps } from "stores/portal" import { auth, apps } from "stores/portal"
import { processStringSync } from "@budibase/string-templates" import { processStringSync } from "@budibase/string-templates"
@ -72,6 +74,8 @@
{/if} {/if}
</div> </div>
{#key app}
<div>
<Modal bind:this={appLockModal}> <Modal bind:this={appLockModal}>
<ModalContent <ModalContent
title={lockedByHeading} title={lockedByHeading}
@ -79,15 +83,15 @@
showConfirmButton={false} showConfirmButton={false}
showCancelButton={false} showCancelButton={false}
> >
<p> <Layout noPadding>
Apps are locked to prevent work from being lost from overlapping changes <Body size="S">
between your team. Apps are locked to prevent work from being lost from overlapping
</p> changes between your team.
</Body>
{#if lockedByYou && getExpiryDuration(app) > 0} {#if lockedByYou && getExpiryDuration(app) > 0}
<span class="lock-expiry-body"> <span class="lock-expiry-body">
{processStringSync( {processStringSync(
"This lock will expire in {{ duration time 'millisecond' }} from now.", "This lock will expire in {{ duration time 'millisecond' }} from now. This lock will expire in This lock will expire in ",
{ {
time: getExpiryDuration(app), time: getExpiryDuration(app),
} }
@ -126,8 +130,11 @@
{/if} {/if}
</ButtonGroup> </ButtonGroup>
</div> </div>
</Layout>
</ModalContent> </ModalContent>
</Modal> </Modal>
</div>
{/key}
<style> <style>
.lock-modal-actions { .lock-modal-actions {

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

@ -30,7 +30,7 @@
{/if} {/if}
</div> </div>
<div class="desktop"> <div class="desktop">
<AppLockModal {app} buttonSize="M" /> <span><AppLockModal {app} buttonSize="M" /></span>
</div> </div>
<div class="desktop"> <div class="desktop">
<div class="app-status"> <div class="app-status">