This commit is contained in:
Darshan committed 2025-08-12 15:31:24 +05:30
1 parent e93d4984da
commit 2163f46098
16 files changed
+173 -108

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
"@appwrite.io/pink-legacy": "^1.0.3",
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951",
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8",
"@faker-js/faker": "^9.9.0",
"@popperjs/core": "^2.11.8",
"@sentry/sveltekit": "^8.38.0",
+5 -5
View File
@@ -24,8 +24,8 @@ importers:
specifier: ^1.0.3
version: 1.0.3
'@appwrite.io/pink-svelte':
specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951
version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951(svelte@5.25.3)
specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8
version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8(svelte@5.25.3)
'@faker-js/faker':
specifier: ^9.9.0
version: 9.9.0
@@ -287,8 +287,8 @@ packages:
'@appwrite.io/pink-legacy@1.0.3':
resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
'@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951':
resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951}
'@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8':
resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8}
version: 2.0.0-RC.2
peerDependencies:
svelte: ^4.0.0
@@ -3831,7 +3831,7 @@ snapshots:
'@appwrite.io/pink-icons': 1.0.0
the-new-css-reset: 1.11.3
'@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@b023951(svelte@5.25.3)':
'@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c467db8(svelte@5.25.3)':
dependencies:
'@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3)
'@floating-ui/dom': 1.6.13
+1 -1
View File
@@ -33,7 +33,7 @@
let search = $state('');
let filteredColumns = $derived(
$columns
.filter((column) => !column.isAction)
.filter((column) => !column.isAction && column.id !== '$sequence')
.filter(
(col) =>
!col.exclude &&
+1 -1
View File
@@ -47,7 +47,7 @@
}
</script>
<Button extraCompact on:click={sort} class="hoverable-compact" {disabled}>
<Button extraCompact on:click={sort} class="hoverable-compact {$state?.direction}" {disabled}>
<Icon
size="s"
icon={$state?.column !== column || $state?.direction === 'default'
+34 -19
View File
@@ -1,6 +1,6 @@
import { faker } from '@faker-js/faker';
import type { Columns } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store';
import type { Models } from '@appwrite.io/console';
import { ID, type Models } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
export async function generateColumns(
@@ -20,31 +20,46 @@ export async function generateColumns(
]);
}
export function generateFakeRecords(columns: Columns[], count: number): object[] {
if (count <= 0) return [];
export function generateFakeRecords(
columns: Columns[],
count: number
): {
ids: string[];
rows: Models.Row[];
} {
if (count <= 0) return { ids: [], rows: [] };
const filteredColumns = columns.filter((col) => col.type !== 'relationship');
if (filteredColumns.length === 0) {
return Array.from({ length: count }, () => ({
name: faker.person.fullName(),
email: faker.internet.email(),
age: faker.number.int({ min: 18, max: 80 }),
city: faker.location.city(),
description: faker.lorem.sentence(),
active: faker.datatype.boolean()
}));
}
const ids: string[] = [];
const rows: Models.Row[] = [];
return Array.from({ length: count }, () => {
const document: object = {};
for (let i = 0; i < count; i++) {
const id = ID.unique();
ids.push(id);
for (const column of filteredColumns) {
document[column.key] = generateValueForColumn(column);
let row: Record<string, string | number | boolean> = { $id: id };
if (filteredColumns.length === 0) {
row = {
$id: id,
name: faker.person.fullName(),
email: faker.internet.email(),
age: faker.number.int({ min: 18, max: 80 }),
city: faker.location.city(),
description: faker.lorem.sentence(),
active: faker.datatype.boolean()
};
} else {
for (const column of filteredColumns) {
row[column.key] = generateValueForColumn(column);
}
}
return document;
});
rows.push(row as unknown as Models.Row);
}
return { ids, rows };
}
function generateStringValue(key: string, maxLength: number): string {
+3 -1
View File
@@ -30,7 +30,9 @@
inline={$isTabletViewport}
justifyContent="flex-start">
<Typography.Caption variant="400">
ⓒ {currentYear} Appwrite. All rights reserved.
<span style:white-space="nowrap">
ⓒ {currentYear} Appwrite. All rights reserved.
</span>
</Typography.Caption>
<span class="divider-wrapper">
<Divider vertical />
+10 -16
View File
@@ -3,7 +3,6 @@ import type { View } from '$lib/helpers/load';
import type { Page } from '@sveltejs/kit';
import { get, writable } from 'svelte/store';
import { sdk } from './sdk';
import type { Models } from '@appwrite.io/console';
import { page } from '$app/state';
import { user } from '$lib/stores/user';
import deepEqual from 'deep-equal';
@@ -88,7 +87,7 @@ function createPreferences() {
async function loadTeamPreferences(orgId: string) {
try {
const teamPrefs = await sdk.forConsole.teams.getPrefs(orgId);
const teamPrefs = await sdk.forConsole.teams.getPrefs({ teamId: orgId });
teamPreferences = teamPrefs ?? {};
return teamPreferences;
} catch (error) {
@@ -189,25 +188,16 @@ function createPreferences() {
getDisplayNames: () => {
return preferences?.displayNames ?? {};
},
setDisplayNames: async (
orgId: string,
tableId: string,
names: TeamPreferences['names']
) => {
let teamPrefs: Models.Preferences;
setDisplayNames: async (tableId: string, names: TeamPreferences['names']) => {
await updateAndSync((n) => {
if (!n?.displayNames) {
n ??= {};
n.displayNames ??= {};
}
teamPrefs = n;
n.displayNames[tableId] = names;
return n;
});
await sdk.forConsole.teams.updatePrefs(orgId, teamPrefs);
},
getColumnOrder(collectionId: string): TeamPreferences['order'] {
@@ -225,7 +215,10 @@ function createPreferences() {
teamPreferences.columnOrder[collectionId] = columnIds;
await sdk.forConsole.teams.updatePrefs(orgId, teamPreferences);
await sdk.forConsole.teams.updatePrefs({
teamId: orgId,
prefs: teamPreferences
});
},
getColumnWidths(collectionId: string): TeamPreferences['widths'] {
@@ -246,11 +239,12 @@ function createPreferences() {
...width
};
await sdk.forConsole.teams.updatePrefs(orgId, teamPreferences);
await sdk.forConsole.teams.updatePrefs({
teamId: orgId,
prefs: teamPreferences
});
}
};
}
export const preferences = createPreferences();
export type PreferencesType = ReturnType<typeof createPreferences>;
@@ -31,7 +31,8 @@
showCreateAttributeSheet,
showCreateIndexSheet,
spreadsheetLoading,
rowActivitySheet
rowActivitySheet,
spreadsheetRenderKey
} from './store';
import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
import CreateColumn from './createColumn.svelte';
@@ -52,6 +53,7 @@
import { addNotification } from '$lib/stores/notifications';
import { sleep } from '$lib/helpers/promises';
import CreateIndex from './indexes/createIndex.svelte';
import { hash } from '$lib/helpers/string';
let editRow: EditRow;
let createIndex: CreateIndex;
@@ -258,11 +260,17 @@
/* let the attributes be processed! */
await sleep(1250);
let rowIds = [];
try {
const records = generateFakeRecords(attributes, $randomDataModalState.value);
await sdk
.forProject(page.params.region, page.params.project)
.grids.createRows(page.params.database, page.params.table, records);
const { rows, ids } = generateFakeRecords(attributes, $randomDataModalState.value);
rowIds = ids;
await sdk.forProject(page.params.region, page.params.project).grids.createRows({
databaseId: page.params.database,
tableId: page.params.table,
rows
});
addNotification({
type: 'success',
@@ -284,6 +292,8 @@
// await sleep(1250);
$spreadsheetLoading = false;
isWaterfallFromFaker = false;
spreadsheetRenderKey.set(hash(rowIds));
}
</script>
@@ -69,11 +69,11 @@
try {
await sdk
.forProject(page.params.region, page.params.project)
.migrations.createCsvMigration(
file.bucketId,
file.$id,
`${page.params.database}:${page.params.table}`
);
.migrations.createCsvMigration({
bucketId: file.bucketId,
fileId: file.$id,
resourceId: `${page.params.database}:${page.params.table}`
});
addNotification({
type: 'success',
@@ -99,7 +99,6 @@
<Container expanded expandHeightButton style="background: var(--bgcolor-neutral-primary)">
<Layout.Stack direction="column" gap="xl">
<Layout.Stack direction="row" justifyContent="space-between">
<!-- TODO: verify later - columns={tableColumns} -->
<Layout.Stack direction="row" gap="s">
<ViewSelector
onlyIcon
@@ -25,6 +25,7 @@
} = $props();
let isSubmitting = $state(false);
let columnFormWrapper: HTMLDivElement | null = $state(null);
type CreateRow = {
id?: string;
@@ -52,12 +53,6 @@
let createRow = createRowWritable();
$effect(() => {
if (showSheet) {
createRow = createRowWritable();
}
});
async function create() {
isSubmitting = true;
@@ -92,6 +87,21 @@
isSubmitting = false;
}
}
function focusFirstInput() {
const firstInput = columnFormWrapper?.querySelector<HTMLInputElement | HTMLTextAreaElement>(
'input:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])'
);
firstInput?.focus({ preventScroll: true });
}
$effect(() => {
if (showSheet) {
focusFirstInput();
createRow = createRowWritable();
}
});
</script>
{#if $createRow}
@@ -108,10 +118,12 @@
onClick: () => create()
}}>
<Layout.Stack gap="xxl">
<ColumnForm
columns={$createRow.columns}
bind:customId={$createRow.id}
bind:formValues={$createRow.row} />
<div bind:this={columnFormWrapper}>
<ColumnForm
columns={$createRow.columns}
bind:customId={$createRow.id}
bind:formValues={$createRow.row} />
</div>
<Layout.Stack gap="xl">
<Typography.Text>
@@ -1,9 +1,9 @@
<script lang="ts">
import { onDestroy, onMount } from 'svelte';
import deepEqual from 'deep-equal';
import type { Columns } from './store';
import type { Models } from '@appwrite.io/console';
import ColumnItem from './row-[row]/columnItem.svelte';
import deepEqual from 'deep-equal';
import { createEventDispatcher, onDestroy, onMount } from 'svelte';
let {
column,
@@ -17,6 +17,7 @@
let original: Models.Row;
let wrapperEl: HTMLDivElement;
const dispatch = createEventDispatcher();
onMount(() => {
original = structuredClone(row);
@@ -37,9 +38,16 @@
const accepted = await onRowStructureUpdate(row);
if (!accepted) {
row = original;
dispatch('revert', original);
}
}
});
$effect(() => {
if (!deepEqual(original, row)) {
dispatch('change', row);
}
});
</script>
<div style:width="100%" bind:this={wrapperEl}>
@@ -54,9 +54,10 @@
const getCustomColumns = (): Column[] =>
customColumns.map((col: Column) => ({
...baseColProps,
...col,
width: 180,
...col
hide: false,
...baseColProps
}));
const getRowColumns = (): Column[] => [
@@ -128,6 +129,10 @@
const emptyCells = $derived($isSmallViewport ? 14 : 17);
const fixedHeight = $derived($isSmallViewport ? '60.75vh' : '74.75vh');
$effect(() => {
console.log(JSON.stringify(spreadsheetColumns, null, 2));
});
</script>
<div class="spreadsheet-container-outer" data-mode={mode}>
@@ -85,7 +85,7 @@
}
& :global(.sheet-content) {
overflow-y: auto;
// overflow-y: auto;
padding-bottom: 5rem;
}
}
@@ -12,7 +12,6 @@
import { page } from '$app/state';
import { Icon, Layout } from '@appwrite.io/pink-svelte';
import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
import { organization } from '$lib/stores/organization';
const tableId = page.params.table;
@@ -30,7 +29,7 @@
// structuredClone doesn't work
const regularArray = [...names];
await preferences.setDisplayNames($organization.$id, tableId, regularArray);
await preferences.setDisplayNames(tableId, regularArray);
names = getDisplayNames();
await invalidate(Dependencies.TEAM);
@@ -31,7 +31,8 @@
Deletion,
rowActivitySheet,
paginatedRows,
paginatedRowsLoading
paginatedRowsLoading,
spreadsheetRenderKey
} from './store';
import RelationshipsModal from './relationshipsModal.svelte';
import type { Column, ColumnType } from '$lib/helpers/types';
@@ -53,28 +54,27 @@
import {
IconCalendar,
IconDotsHorizontal,
IconPlus,
IconRelationship,
IconFingerPrint,
IconHashtag,
IconLink,
IconLocationMarker,
IconMail,
IconPlus,
IconRelationship,
IconText,
IconToggle,
IconViewList
} from '@appwrite.io/pink-icons-svelte';
import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte';
import SheetOptions from './sheetOptions.svelte';
import { isSmallViewport } from '$lib/stores/viewport';
import SpreadsheetContainer from './layout/spreadsheet.svelte';
import EditCellRow from './editRowCell.svelte';
import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte';
import EditRowCell from './editRowCell.svelte';
import { copy } from '$lib/helpers/copy';
import { debounce } from '$lib/helpers/debounce';
import { hash } from '$lib/helpers/string';
import { writable } from 'svelte/store';
import { pageToOffset } from '$lib/helpers/load';
import { sleep } from '$lib/helpers/promises';
import { debounce } from '$lib/helpers/debounce';
import { hash } from '$lib/helpers/string';
export let data: PageData;
export let showRecordsCreateSheet: {
@@ -376,6 +376,14 @@
type: 'success',
message: `${selectedRows.length ? selectedRows.length : 1} row${selectedRows.length > 1 ? 's' : ''} deleted`
});
spreadsheetRenderKey.set(
hash([
data.rows.total.toString(),
...(selectedRows as string[]),
selectedRowForDelete
])
);
} catch (error) {
addNotification({ type: 'error', message: error.message });
trackError(error, Submit.RowDelete);
@@ -533,19 +541,11 @@
}
async function loadPage(pageNumber: number): Promise<boolean> {
const totalPages = Math.ceil(data.rows.total / SPREADSHEET_PAGE_LIMIT);
if (
pageNumber < 1 ||
pageNumber === currentPage ||
paginatedRows.hasPage(pageNumber) ||
pageNumber > totalPages
)
if (pageNumber < 1 || pageNumber > totalPages || $paginatedRows.hasPage(pageNumber)) {
return false;
console.log(`pageNumber: ${pageNumber}`);
}
$paginatedRowsLoading = true;
await sleep(500);
const loadedRows = await sdk
.forProject(page.params.region, page.params.project)
.grids.listRows({
@@ -564,12 +564,16 @@
return true;
}
console.log(`$paginatedRowsLoading: ${$paginatedRowsLoading}`);
async function handleGoToPage(targetPageNum: number): Promise<void> {
if ($paginatedRows.hasPage(targetPageNum) || $paginatedRows.hasPage(targetPageNum + 1)) {
scrollToIndexOffset = 0;
} else {
scrollToIndexOffset = 16;
}
if (targetPageNum < 1 || targetPageNum > totalPages) return;
if (!paginatedRows.hasPage(targetPageNum)) {
if (!$paginatedRows.hasPage(targetPageNum)) {
paginatedRows.setMaxPage(targetPageNum);
$paginatedRowsLoading = true;
@@ -635,19 +639,22 @@
tick().then(() => spreadsheetContainer?.resizeSheet());
}
$: spreadsheetKey = hash($paginatedRows.items.map((item) => item.$id).toString(), '#');
$: totalPages = Math.ceil($rows.total / SPREADSHEET_PAGE_LIMIT) || 1;
$: rowSelection = !$spreadsheetLoading && !$paginatedRowsLoading ? true : ('disabled' as const);
$: scrollToIndexOffset = 16;
</script>
<SpreadsheetContainer observeExpand bind:this={spreadsheetContainer}>
{#key spreadsheetKey}
{#key $spreadsheetRenderKey}
<Spreadsheet.Root
height="100%"
allowSelection
useVirtualizer
keyboardNavigation
bind:selectedRows
selection={rowSelection}
bind:columns={$tableColumns}
loading={$spreadsheetLoading}
emptyCells={emptyCellsCount}
@@ -656,6 +663,7 @@
on:columnsSwap={(order) => saveColumnsOrder(order.detail)}
on:columnsResize={(resize) => saveColumnsWidth(resize.detail)}
bind:currentPage
{scrollToIndexOffset}
nextPageTriggerOffset={2}
paginationBufferSpace={35}
jumpToPageNumber={jumpToPageReactive}
@@ -716,17 +724,27 @@
<svelte:fragment slot="rows" let:root let:item let:index>
{@const row = $paginatedRows.getItemAtVirtualIndex(index)}
{#if row === null}
<Spreadsheet.Row.Base {root} virtualItem={item} {index} id={`loading-${index}`}>
<Spreadsheet.Row.Base
{root}
virtualItem={item}
{index}
id={`loading-${index}`}
select={rowSelection}>
{#each $tableColumns as col}
<Spreadsheet.Cell
column={col.id}
isEditable={false}
root={{ ...root, loading: true }}
id={`loading-${index}-${col.id}`} />
column={col.id}
id={`loading-${index}-${col.id}`}
isEditable={false} />
{/each}
</Spreadsheet.Row.Base>
{:else}
<Spreadsheet.Row.Base {root} {index} id={row?.$id} virtualItem={item}>
<Spreadsheet.Row.Base
{root}
{index}
id={row?.$id}
virtualItem={item}
select={rowSelection}>
{#each $tableColumns as { id: columnId, isEditable } (columnId)}
{@const rowColumn = $columns.find((col) => col.key === columnId)}
<Spreadsheet.Cell {root} {isEditable} column={columnId}>
@@ -845,11 +863,14 @@
{/if}
<svelte:fragment slot="cell-editor">
<!-- TODO: cannot bind here as well, this is breaking -->
<EditCellRow
<EditRowCell
column={rowColumn}
row={$paginatedRows.items[index]}
onRowStructureUpdate={updateRowContents} />
row={paginatedRows.items[index]}
onRowStructureUpdate={updateRowContents}
on:change={(row) =>
paginatedRows.update(index, row.detail)}
on:revert={(row) =>
paginatedRows.update(index, row.detail)} />
</svelte:fragment>
</Spreadsheet.Cell>
{/each}
@@ -945,9 +966,9 @@
<RelationshipsModal bind:show={showRelationships} {selectedRelationship} data={relationshipData} />
<Confirm
title={selectedRows.length === 1 ? 'Delete Row' : 'Delete Rows'}
bind:open={showDelete}
onSubmit={handleDelete}>
onSubmit={handleDelete}
title={selectedRows.length === 1 ? 'Delete Row' : 'Delete Rows'}>
{@const isSingle = selectedRowForDelete !== null}
<div>
@@ -152,7 +152,7 @@ export const rowActivitySheet = writable({
});
export const expandTabs = writable(true);
export const spreadsheetRenderKey = writable('initial');
// Paginated rows stores
export const paginatedRowsLoading = writable(false);
export const paginatedRows = createSparsePagedDataStore<Models.DefaultRow>(SPREADSHEET_PAGE_LIMIT);