Skip to content

Commit fbf30cd

Browse files
committed
Merge branch 'main' into feat-documentsdb
2 parents cb48a4e + 140bd83 commit fbf30cd

13 files changed

Lines changed: 94 additions & 64 deletions

File tree

src/lib/components/imagePreview.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
style="inline-size: 100%; block-size: 100%;"
1313
target="_blank"
1414
rel="noopener noreferrer"
15+
on:click|stopPropagation
16+
on:mousedown|stopPropagation
1517
aria-label="open file in new window">
1618
<div class="file-preview-image">
1719
<img src={$app.themeInUse === 'dark' ? darkSrc : lightSrc} {alt} />

src/lib/elements/forms/helper.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</script>
66

77
<p
8-
class="helper u-margin-block-start-8 {classes}"
8+
class="helper u-margin-block-start-6 {classes}"
99
class:u-color-text-info={type === 'info'}
1010
class:u-color-text-danger={type === 'error'}
1111
class:u-color-text-success={type === 'success'}

src/lib/layout/responsiveContainerHeader.svelte

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<script lang="ts">
22
import { SearchQuery, ViewSelector } from '$lib/components';
3-
import { FiltersBottomSheet, ParsedTagList, queryParamToMap } from '$lib/components/filters';
3+
import {
4+
FiltersBottomSheet,
5+
ParsedTagList,
6+
queryParamToMap,
7+
Filters
8+
} from '$lib/components/filters';
49
import QuickFilters from '$lib/components/filters/quickFilters.svelte';
510
import Button from '$lib/elements/forms/button.svelte';
611
import { View } from '$lib/helpers/load';
@@ -23,6 +28,7 @@
2328
hasSearch = false,
2429
searchPlaceholder = 'Search by ID',
2530
hasFilters = false,
31+
hasCustomFiltersOnly = false,
2632
analyticsSource = '',
2733
children
2834
}: {
@@ -33,6 +39,7 @@
3339
hasSearch?: boolean;
3440
searchPlaceholder?: string;
3541
hasFilters?: boolean;
42+
hasCustomFiltersOnly?: boolean;
3643
analyticsSource?: string;
3744
children?: Snippet;
3845
} = $props();
@@ -109,7 +116,11 @@
109116
</Layout.Stack>
110117
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
111118
{#if hasFilters && $columns?.length}
112-
<QuickFilters {columns} {analyticsSource} {filterCols} />
119+
{#if hasCustomFiltersOnly}
120+
<Filters query="[]" {columns} {analyticsSource} />
121+
{:else}
122+
<QuickFilters {columns} {analyticsSource} {filterCols} />
123+
{/if}
113124
{/if}
114125
{#if hasDisplaySettings}
115126
<ViewSelector ui="new" {view} {columns} {hideView} {hideColumns} />

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
? (max < 0n ? -max : max) >= LARGE_NUMBER_THRESHOLD
217217
: Math.abs(max) >= LARGE_NUMBER_THRESHOLD_NUM);
218218
if (shouldShowTooltip) {
219-
tooltip = `Min: ${min.toLocaleString()}, Max: ${max.toLocaleString()}`;
219+
tooltip = `Min: ${min.toLocaleString()}\nMax: ${max.toLocaleString()}`;
220220
}
221221
} else if (hasValidMin) {
222222
display = `Min: ${formatLargeNumber(min)}`;
@@ -309,8 +309,8 @@
309309
const spreadsheetColumns = $derived([
310310
{
311311
id: 'key',
312-
width: getColumnWidth('key', 300),
313-
minimumWidth: 300,
312+
width: getColumnWidth('key', 380),
313+
minimumWidth: 380,
314314
resizable: true
315315
},
316316
{
@@ -467,13 +467,15 @@
467467
{@const relationType = getRelationshipTypeForColumn(column)}
468468
{#if minMaxSize}
469469
{#if minMaxSize.tooltip}
470-
<Tooltip portal>
470+
<Tooltip portal maxWidth="fit-content" placement="top">
471471
<Typography.Caption
472472
variant="400"
473473
color="--fgcolor-neutral-tertiary">
474474
{minMaxSize.display}
475475
</Typography.Caption>
476-
<div slot="tooltip">{minMaxSize.tooltip}</div>
476+
<div slot="tooltip" style="white-space: pre-line;">
477+
{minMaxSize.tooltip}
478+
</div>
477479
</Tooltip>
478480
{:else}
479481
<Typography.Caption

src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { page } from '$app/state';
88
</script>
99

10-
<Popover let:toggle padding="none" placement="bottom-start">
10+
<Popover let:toggle padding="none" placement="bottom-end">
1111
<slot {toggle}>
1212
<Button on:click={toggle} event="create_message">
1313
<Icon icon={IconPlus} slot="start" size="s" />

src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
import { MessagingProviderType, type Models } from '@appwrite.io/console';
3-
import { CardGrid, Empty, PaginationInline, EmptySearch } from '$lib/components';
3+
import { CardGrid, Empty, PaginationInline } from '$lib/components';
44
import { onMount } from 'svelte';
55
import { sdk } from '$lib/stores/sdk';
66
import { invalidate } from '$app/navigation';
@@ -12,8 +12,17 @@
1212
import UserTargetsModal from '../userTargetsModal.svelte';
1313
import { isValueOfStringEnum } from '$lib/helpers/types';
1414
import { IconPlus } from '@appwrite.io/pink-icons-svelte';
15-
import { Alert, Icon, Layout, Table, Typography } from '@appwrite.io/pink-svelte';
15+
import {
16+
Alert,
17+
Card,
18+
Empty as PinkEmpty,
19+
Icon,
20+
Layout,
21+
Table,
22+
Typography
23+
} from '@appwrite.io/pink-svelte';
1624
import { page } from '$app/state';
25+
import { Link } from '$lib/elements';
1726
1827
export let message: Models.Message & { data: Record<string, unknown> };
1928
export let selectedTargetsById: Record<string, Models.Target>;
@@ -207,17 +216,17 @@
207216
{:else if isDraft}
208217
<Empty on:click={() => (showTargets = true)}>Add a target</Empty>
209218
{:else if !sum && !hasDeletedUsers}
210-
<EmptySearch hidePagination>
211-
<div class="u-text-center">
212-
No targets have been selected.
213-
<p>
214-
Need a hand? Check out our <Button
215-
href="https://appwrite.io/docs/products/messaging/targets">
216-
documentation</Button
219+
<Card.Base padding="none">
220+
<PinkEmpty type="secondary" title="No targets were selected">
221+
<svelte:fragment slot="description">
222+
Need a hand? Check out our <Link
223+
variant="muted"
224+
href="https://appwrite.io/docs/products/messaging/targets"
225+
external>documentation</Link
217226
>.
218-
</p>
219-
</div>
220-
</EmptySearch>
227+
</svelte:fragment>
228+
</PinkEmpty>
229+
</Card.Base>
221230
{/if}
222231
</svelte:fragment>
223232
<svelte:fragment slot="actions">

src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
view={View.Table}
2424
hideView
2525
hasFilters
26+
hasCustomFiltersOnly
2627
hasSearch
2728
analyticsSource="messaging_providers"
2829
searchPlaceholder="Search by name or ID">

src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
}
201201
</script>
202202

203-
<Wizard title="Create provider" columnSize="l">
203+
<Wizard title="Create provider" columnSize="l" confirmExit>
204204
<Form bind:this={formRef} onSubmit={create} isModal={false}>
205205
<Layout.Stack gap="xxl">
206206
<Fieldset legend="Provider">

src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import { ActionMenu, Popover } from '@appwrite.io/pink-svelte';
1010
</script>
1111

12-
<Popover let:toggle padding="none" placement="bottom-start">
12+
<Popover let:toggle padding="none" placement="bottom-end">
1313
<slot {toggle} />
1414
<ActionMenu.Root slot="tooltip">
1515
{#each Object.entries(providers) as [type, option]}

src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
view={View.Table}
7171
hideView
7272
hasFilters
73+
hasCustomFiltersOnly
7374
hasSearch
7475
analyticsSource="messaging_topics_filter"
7576
searchPlaceholder="Search by name or ID">

0 commit comments

Comments
 (0)