Skip to content

Commit 25f8c8e

Browse files
committed
update: empty cell count on bigger device.
fix: query limit on fetching relationship items. fix: show no items when load returns 0 items for relationships.
1 parent b7c613b commit 25f8c8e

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"@ai-sdk/svelte": "^1.1.24",
2525
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7747562",
2626
"@appwrite.io/pink-icons": "0.25.0",
27-
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@4a33959",
27+
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@f2198f1",
2828
"@appwrite.io/pink-legacy": "^1.0.3",
29-
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@4a33959",
29+
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@f2198f1",
3030
"@faker-js/faker": "^9.9.0",
3131
"@popperjs/core": "^2.11.8",
3232
"@sentry/sveltekit": "^8.38.0",

pnpm-lock.yaml

Lines changed: 11 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Typography
99
} from '@appwrite.io/pink-svelte';
1010
import { IconCalendar, IconFingerPrint, IconPlus } from '@appwrite.io/pink-icons-svelte';
11-
import { isSmallViewport } from '$lib/stores/viewport';
11+
import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport';
1212
import { SortButton } from '$lib/components';
1313
import type { Column } from '$lib/helpers/types';
1414
import {
@@ -156,7 +156,7 @@
156156
157157
const spreadsheetColumns = $derived(mode === 'rows' ? getRowColumns() : getIndexesColumns());
158158
159-
const emptyCells = $derived(($isSmallViewport ? 14 : 17) + (!$expandTabs ? 2 : 0));
159+
const emptyCells = $derived(($isSmallViewport ? 14 : $isTabletViewport ? 17 : 24) + (!$expandTabs ? 2 : 0));
160160
</script>
161161

162162
<div

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
databaseId,
8888
tableId: column.relatedTable,
8989
// limit `5` as `25` would look too much on sheet!
90-
queries: [Query.select(displayNames), Query.limit(2)]
90+
queries: [Query.select(displayNames), Query.limit(5)]
9191
});
9292
9393
cachedRowsCopyList = rows;
@@ -370,6 +370,7 @@
370370
<!-- Input for adding new items -->
371371
{#if showInput}
372372
{@const availableOptions = getAvailableOptions()}
373+
{@const noAvailableOptions = availableOptions.length <= 0}
373374
{#key availableOptions}
374375
<Layout.Stack direction="row">
375376
<Input.ComboBox
@@ -378,7 +379,10 @@
378379
on:change={addNewItem}
379380
bind:value={newItemValue}
380381
options={availableOptions}
381-
placeholder={`Select ${column.key}`}
382+
disabled={noAvailableOptions}
383+
placeholder={noAvailableOptions
384+
? 'No related items available'
385+
: `Select ${column.key}`}
382386
noResultsOption={searchNoResultsOption}
383387
leadingIcon={!limited ? IconRelationship : undefined} />
384388

@@ -433,14 +437,16 @@
433437
}}
434438
leadingIcon={!limited ? IconRelationship : undefined} />
435439
{:else}
440+
{@const noOptions = options.length <= 0}
436441
<Input.ComboBox
437442
{id}
438443
{options}
439444
autofocus={limited}
440445
bind:value={newItemValue}
441446
required={column.required}
442447
label={limited ? undefined : label}
443-
placeholder={`Select ${column.key}`}
448+
disabled={noOptions}
449+
placeholder={noOptions ? 'No related items available' : `Select ${column.key}`}
444450
noResultsOption={searchNoResultsOption}
445451
on:change={() => {
446452
if (newItemValue === null) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
} from '@appwrite.io/pink-icons-svelte';
8383
import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte';
8484
import SheetOptions from './sheetOptions.svelte';
85-
import { isSmallViewport } from '$lib/stores/viewport';
85+
import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport';
8686
import SpreadsheetContainer from './layout/spreadsheet.svelte';
8787
import EditRowCell from './rows/cell/edit.svelte';
8888
import { copy } from '$lib/helpers/copy';
@@ -111,7 +111,7 @@
111111
const organizationId = data.organization.$id ?? data.project.teamId;
112112
113113
const minimumWidth = 168;
114-
const emptyCellsLimit = $isSmallViewport ? 12 : 18;
114+
const emptyCellsLimit = $spreadsheetLoading ? 30 : $isSmallViewport ? 12 : $isTabletViewport ? 18 : 24;
115115
116116
let selectedRows = [];
117117
let spreadsheetContainer: SpreadsheetContainer;

0 commit comments

Comments
 (0)