fix: fixes from PR review

This commit is contained in:
Arman committed 2022-10-31 15:23:21 +01:00
1 parent 46ed9e1d8e
commit dd2d03c99b
5 files changed
+167 -186

No files matched your search

+73 -83
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Button, Form, InputSearch } from '$lib/elements/forms';
import { Button, InputSearch } from '$lib/elements/forms';
import { createEventDispatcher } from 'svelte';
import { sdkForProject } from '$lib/stores/sdk';
import { Query, type Models } from '@aw-labs/appwrite-console';
@@ -58,89 +58,79 @@
}
</script>
{#if show}
<Form noStyle noMargin on:submit={create}>
<Modal bind:show on:close={reset} size="big">
<svelte:fragment slot="header">Select teams</svelte:fragment>
<InputSearch
autofocus
disabled={!results?.teams?.length && !search}
bind:value={search} />
{#if results?.teams?.length}
<div class="table-wrapper">
<table class="table is-table-layout-auto is-remove-outer-styles">
<tbody class="table-tbody">
{#each results.teams as team (team.$id)}
{@const role = `team:${team.$id}`}
{@const exists = $groups.has(role)}
<tr class="table-row">
<td
class="table-col"
data-title="Enabled"
style="--p-col-width:40">
<input
id={team.$id}
type="checkbox"
class="icon-check"
aria-label="Create"
checked={exists || selected.has(role)}
disabled={exists}
on:change={(event) => onSelection(event, role)} />
</td>
<td class="table-col" data-title="Team">
<label class="u-flex u-cross-center u-gap-8" for={team.$id}>
<AvatarInitials size={32} name={team.name} />
<div class="u-line-height-1-5">
<div class="body-text-2">{team.name}</div>
<div class="u-x-small">{team.$id}</div>
</div>
</label>
</td>
</tr>
{/each}
</tbody>
</table>
<Modal bind:show on:submit={create} on:close={reset} size="big">
<svelte:fragment slot="header">Select teams</svelte:fragment>
<InputSearch autofocus disabled={!results?.teams?.length && !search} bind:value={search} />
{#if results?.teams?.length}
<div class="table-wrapper">
<table class="table is-table-layout-auto is-remove-outer-styles">
<tbody class="table-tbody">
{#each results.teams as team (team.$id)}
{@const role = `team:${team.$id}`}
{@const exists = $groups.has(role)}
<tr class="table-row">
<td class="table-col" data-title="Enabled" style="--p-col-width:40">
<input
id={team.$id}
type="checkbox"
class="icon-check"
aria-label="Create"
checked={exists || selected.has(role)}
disabled={exists}
on:change={(event) => onSelection(event, role)} />
</td>
<td class="table-col" data-title="Team">
<label class="u-flex u-cross-center u-gap-8" for={team.$id}>
<AvatarInitials size={32} name={team.name} />
<div class="u-line-height-1-5">
<div class="body-text-2">{team.name}</div>
<div class="u-x-small">{team.$id}</div>
</div>
</label>
</td>
</tr>
{/each}
</tbody>
</table>
</div>
<div class="u-flex u-margin-block-start-32 u-main-space-between">
<p class="text">Total results: {results?.total}</p>
<PaginationInline limit={5} bind:offset sum={results?.total} hidePages />
</div>
{:else if search}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>There are no Teams that match your search.</p>
</div>
<div class="u-flex u-margin-block-start-32 u-main-space-between">
<p class="text">Total results: {results?.total}</p>
<PaginationInline limit={5} bind:offset sum={results?.total} hidePages />
<div class="u-flex u-gap-16 common-section u-main-center">
<Button external href="#/" text>Documentation</Button>
<Button secondary on:click={() => (search = '')}>Clear search</Button>
</div>
{:else if search}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>There are no Teams that match your search.</p>
</div>
<div class="u-flex u-gap-16 common-section u-main-center">
<Button external href="#/" text>Documentation</Button>
<Button secondary on:click={() => (search = '')}>Clear search</Button>
</div>
</div>
</EmptySearch>
{:else}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
</div>
</EmptySearch>
{:else}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>You have no Teams. Create a user to see them here.</p>
<p>
Need a hand? Check out our <a
href="#/"
target="_blank"
rel="noopener noreferrer">
documentation</a
>.
</p>
</div>
</div>
</EmptySearch>
{/if}
<p>You have no Teams. Create a user to see them here.</p>
<p>
Need a hand? Check out our <a
href="#/"
target="_blank"
rel="noopener noreferrer">
documentation</a
>.
</p>
</div>
</div>
</EmptySearch>
{/if}
<svelte:fragment slot="footer">
<Button submit disabled={!hasSelection}>Create</Button>
</svelte:fragment>
</Modal>
</Form>
{/if}
<svelte:fragment slot="footer">
<Button submit disabled={!hasSelection}>Create</Button>
</svelte:fragment>
</Modal>
+90 -94
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Button, Form, InputSearch } from '$lib/elements/forms';
import { Button, InputSearch } from '$lib/elements/forms';
import { createEventDispatcher } from 'svelte';
import { AvatarInitials, EmptySearch, Modal, PaginationInline } from '..';
import { sdkForProject } from '$lib/stores/sdk';
@@ -58,109 +58,105 @@
}
</script>
<Form noStyle noMargin on:submit={create}>
<Modal bind:show on:close={reset} size="big">
<svelte:fragment slot="header">Select users</svelte:fragment>
<InputSearch autofocus disabled={!results?.users?.length && !search} bind:value={search} />
{#if results?.users?.length}
<div class="table-wrapper">
<table class="table is-table-layout-auto is-remove-outer-styles">
<tbody class="table-tbody">
{#each results.users as user (user.$id)}
{@const role = `user:${user.$id}`}
{@const exists = $groups.has(role)}
<tr class="table-row">
<td class="table-col" data-title="Enabled" style="--p-col-width:40">
<input
id={user.$id}
type="checkbox"
class="icon-check"
aria-label="Create"
checked={exists || selected.has(role)}
disabled={exists}
on:change={(event) => onSelection(event, role)} />
</td>
<td class="table-col" data-title="User">
<label class="u-flex u-cross-center u-gap-8" for={user.$id}>
{#if user.email || user.phone}
{#if user.name}
<AvatarInitials size={32} name={user.name} />
<div class="u-line-height-1-5">
<div class="body-text-2">
{user.name}
</div>
<div class="u-x-small">{user.$id}</div>
<Modal bind:show on:submit={create} on:close={reset} size="big">
<svelte:fragment slot="header">Select users</svelte:fragment>
<InputSearch autofocus disabled={!results?.users?.length && !search} bind:value={search} />
{#if results?.users?.length}
<div class="table-wrapper">
<table class="table is-table-layout-auto is-remove-outer-styles">
<tbody class="table-tbody">
{#each results.users as user (user.$id)}
{@const role = `user:${user.$id}`}
{@const exists = $groups.has(role)}
<tr class="table-row">
<td class="table-col" data-title="Enabled" style="--p-col-width:40">
<input
id={user.$id}
type="checkbox"
class="icon-check"
aria-label="Create"
checked={exists || selected.has(role)}
disabled={exists}
on:change={(event) => onSelection(event, role)} />
</td>
<td class="table-col" data-title="User">
<label class="u-flex u-cross-center u-gap-8" for={user.$id}>
{#if user.email || user.phone}
{#if user.name}
<AvatarInitials size={32} name={user.name} />
<div class="u-line-height-1-5">
<div class="body-text-2">
{user.name}
</div>
{:else}
<div class="avatar is-size-small ">
<span
class="icon-minus-sm"
aria-hidden="true" />
</div>
<div class="u-line-height-1-5">
<div class="body-text-2">
{user.email ? user.email : user.phone}
</div>
<div class="u-x-small">{user.$id}</div>
</div>
{/if}
<div class="u-x-small">{user.$id}</div>
</div>
{:else}
<div class="avatar is-size-small ">
<span class="icon-anonymous" aria-hidden="true" />
<span class="icon-minus-sm" aria-hidden="true" />
</div>
<div class="u-line-height-1-5">
<div class="body-text-2">
{user.name ? user.name : '-'}
{user.email ? user.email : user.phone}
</div>
<div class="u-x-small">{user.$id}</div>
</div>
{/if}
</label>
</td>
</tr>
{/each}
</tbody>
</table>
</div>
<div class="u-flex u-margin-block-start-32 u-main-space-between">
<p class="text">Total results: {results?.total}</p>
<PaginationInline limit={5} bind:offset sum={results?.total} hidePages />
</div>
{:else if search}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>There are no Users that match your search.</p>
</div>
<div class="u-flex u-gap-16 common-section u-main-center">
<Button external href="#/" text>Documentation</Button>
<Button secondary on:click={() => (search = '')}>Clear search</Button>
</div>
{:else}
<div class="avatar is-size-small ">
<span class="icon-anonymous" aria-hidden="true" />
</div>
<div class="u-line-height-1-5">
<div class="body-text-2">
{user.name ? user.name : '-'}
</div>
<div class="u-x-small">{user.$id}</div>
</div>
{/if}
</label>
</td>
</tr>
{/each}
</tbody>
</table>
</div>
<div class="u-flex u-margin-block-start-32 u-main-space-between">
<p class="text">Total results: {results?.total}</p>
<PaginationInline limit={5} bind:offset sum={results?.total} hidePages />
</div>
{:else if search}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>There are no Users that match your search.</p>
</div>
</EmptySearch>
{:else}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<p>You have no Users. Create a user to see them here.</p>
<p>
Need a hand? Check out our <a
href="#/"
target="_blank"
rel="noopener noreferrer">
documentation</a
>.
</p>
</div>
<div class="u-flex u-gap-16 common-section u-main-center">
<Button external href="#/" text>Documentation</Button>
<Button secondary on:click={() => (search = '')}>Clear search</Button>
</div>
</EmptySearch>
{/if}
</div>
</EmptySearch>
{:else}
<EmptySearch hidePages>
<div class="common-section">
<div class="u-text-center common-section">
<b class="body-text-2">Sorry we couldn't find "{search}"</b>
<svelte:fragment slot="footer">
<Button submit disabled={!hasSelection}>Create</Button>
</svelte:fragment>
</Modal>
</Form>
<p>You have no Users. Create a user to see them here.</p>
<p>
Need a hand? Check out our <a
href="#/"
target="_blank"
rel="noopener noreferrer">
documentation</a
>.
</p>
</div>
</div>
</EmptySearch>
{/if}
<svelte:fragment slot="footer">
<Button submit disabled={!hasSelection}>Create</Button>
</svelte:fragment>
</Modal>
+2 -7
View File
@@ -28,13 +28,8 @@
let showExitModal = false;
function handleKeydown(event: KeyboardEvent) {
const dialogArray = document.getElementsByTagName['dialog'];
let isModalOpen = false;
dialogArray?.forEach((dialog: HTMLDialogElement) => {
if (dialog.open) {
isModalOpen = true;
}
});
const isModalOpen = document.querySelectorAll('dialog[open]');
if (event.key === 'Escape' && !showExitModal && isModalOpen) {
event.preventDefault();
dispatch('exit');
@@ -37,7 +37,7 @@
await sdkForProject.functions.createVariable(response.$id, v.key, v.value)
);
await invalidate(Dependencies.FUNCTIONS);
await goto(`${base}/console/project-${projectId}/functions/function/${response.$id}`);
goto(`${base}/console/project-${projectId}/functions/function-${response.$id}`);
addNotification({
message: 'Function has been created',
@@ -14,7 +14,7 @@
onMount(async () => {
let runtimes = await sdkForProject.functions.listRuntimes();
options = runtimes.runtimes.map((runtime) => ({
label: runtime.name,
label: `${runtime.name} - ${runtime.version}`,
value: runtime.$id
}));
});