From 99f0e8b2ec48b320ca1ffbf1b014f38ed59fb9f8 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 27 Aug 2025 19:49:42 +0530 Subject: [PATCH] fix: logic for relationships. update: scroll logic for load next page. --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- .../table-[table]/rows/editRelated.svelte | 20 ++++++++++++------- .../table-[table]/spreadsheet.svelte | 1 - 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index be3e7caca..fced4cab3 100644 --- a/package.json +++ b/package.json @@ -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@4d9e4bf", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff102350f..f0279f5d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -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@4d9e4bf - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@4d9e4bf(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -284,8 +284,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@4d9e4bf': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@4d9e4bf} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3719,7 +3719,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@4d9e4bf(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@98d8dd0(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 diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte index 7a877a3b4..336d77471 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte @@ -41,14 +41,16 @@ loading = true; try { - relatedTable = - page.data.tables?.[tableId] ?? - (await sdk.forProject(page.params.region, page.params.project).tablesDB.getTable({ - databaseId, - tableId: tableId - })); - if (isSingleStore()) { + relatedTable = + page.data.tables?.[tableId] ?? + (await sdk + .forProject(page.params.region, page.params.project) + .tablesDB.getTable({ + databaseId, + tableId: tableId + })); + const fetchedRow = await sdk .forProject(page.params.region, page.params.project) .tablesDB.getRow({ @@ -64,6 +66,8 @@ const processedRows = []; const existingRows = rows as Models.Row[]; + const firstTableId = existingRows[0].$tableId; + const uniqueTableIds = [...new Set(existingRows.map((row) => row.$tableId))]; const missingTableIds = uniqueTableIds.filter((tableId) => { return !page.data.tables?.find((table: Models.Table) => table.$id === tableId); @@ -83,6 +87,8 @@ } const allTables = [...(page.data.tables || []), ...fetchedTables]; + relatedTable = allTables.find((table) => table.$id === firstTableId) || null; + let rowsMissingData = []; for (const row of existingRows) { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte index af2b99515..f9e62c919 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte @@ -718,7 +718,6 @@ on:columnsResize={(resize) => saveColumnsWidth(resize.detail)} bind:currentPage nextPageTriggerOffset={2} - paginationBufferSpace={35} jumpToPageNumber={jumpToPageReactive} loadingMore={$paginatedRowsLoading} itemsPerPage={SPREADSHEET_PAGE_LIMIT}