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

Feedback updates and a fix for z-index issue in user side panel

This commit is contained in:
Dean 2023-05-03 11:22:38 +01:00
parent 6c361b50ee
commit 19ed0ec3f5
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
export let rowCount export let rowCount
export let disableSorting = false export let disableSorting = false
export let customPlaceholder = false export let customPlaceholder = false
export let allowClickRows
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
@ -110,6 +111,7 @@
{disableSorting} {disableSorting}
{customPlaceholder} {customPlaceholder}
showAutoColumns={!hideAutocolumns} showAutoColumns={!hideAutocolumns}
{allowClickRows}
on:clickrelationship={e => selectRelationship(e.detail)} on:clickrelationship={e => selectRelationship(e.detail)}
on:sort on:sort
> >

4
packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
View File

@ -555,7 +555,7 @@
{#if filteredUsers?.length} {#if filteredUsers?.length}
<div class="auth-entity-section"> <div class="auth-entity-section">
<div class="auth-entity-header "> <div class="auth-entity-header">
<div class="auth-entity-title">Users</div> <div class="auth-entity-title">Users</div>
<div class="auth-entity-access-title">Access</div> <div class="auth-entity-access-title">Access</div>
</div> </div>
@ -696,7 +696,7 @@
max-width: calc(100vw - 40px); max-width: calc(100vw - 40px);
background: var(--background); background: var(--background);
border-left: var(--border-light); border-left: var(--border-light);
z-index: 3; z-index: 999;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y: auto; overflow-y: auto;

22
packages/builder/src/pages/builder/portal/users/users/index.svelte
View File

@ -88,6 +88,16 @@
}, },
} }
const getPendingSchema = tblSchema => {
if (!tblSchema) {
return {}
}
let pendingSchema = JSON.parse(JSON.stringify(tblSchema))
pendingSchema.email.displayName = "Pending Invites"
return pendingSchema
}
$: pendingSchema = getPendingSchema(schema)
$: userData = [] $: userData = []
$: inviteUsersResponse = { successful: [], unsuccessful: [] } $: inviteUsersResponse = { successful: [], unsuccessful: [] }
$: { $: {
@ -346,22 +356,14 @@
goToNextPage={fetch.nextPage} goToNextPage={fetch.nextPage}
/> />
</div> </div>
</Layout>
<Layout noPadding gap="M">
<Layout gap="XS" noPadding>
<Heading>Pending invitations</Heading>
<Body>A list of all pending user invitations</Body>
</Layout>
<Divider />
<Table <Table
{schema} schema={pendingSchema}
data={parsedInvites} data={parsedInvites}
allowEditColumns={false} allowEditColumns={false}
allowEditRows={false} allowEditRows={false}
{customRenderers} {customRenderers}
loading={!invitesLoaded} loading={!invitesLoaded}
allowClickRows={false}
/> />
</Layout> </Layout>