From 2ea0560102ae2a9e04ea3599fd98c6be735f0818 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 8 Aug 2025 18:33:03 +0530 Subject: [PATCH] update: remove primary key; update: row activity sheet; --- package.json | 2 +- pnpm-lock.yaml | 12 +-- src/lib/components/columnSelector.svelte | 6 -- src/lib/components/pagination.svelte | 7 +- src/lib/components/paginationWithLimit.svelte | 30 +++++-- src/lib/layout/activity.svelte | 13 ++- .../database-[database]/subNavigation.svelte | 24 ++++-- .../table-[table]/+layout.svelte | 12 ++- .../table-[table]/columns/+page.svelte | 6 -- .../table-[table]/layout/emptySheet.svelte | 6 +- .../table-[table]/rowActivity.svelte | 86 +++++++++++++++++++ .../table-[table]/spreadsheet.svelte | 19 ++-- .../table-[table]/store.ts | 5 ++ .../table-[table]/subNavigation.svelte | 0 14 files changed, 176 insertions(+), 52 deletions(-) create mode 100644 src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rowActivity.svelte delete mode 100644 src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte diff --git a/package.json b/package.json index 34f45e699..5eb72d1e3 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 63473716a..b32f9913e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383 '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -260,9 +260,9 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d} - version: 1.9.0 + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383} + version: 1.10.0 '@appwrite.io/pink-icons-svelte@2.0.0-RC.1': resolution: {integrity: sha512-iLFlV55hj8mGuAbmxJGenxN5RaZMmVT4GJb9dv/MP1xBAtYibFq7JvBcxm18qV2KU8c31Rntf+Ub4GL7HwqTYg==} @@ -3809,7 +3809,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e64a383': {} '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)': dependencies: diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index a93ee23bf..0bf5bc6aa 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -226,12 +226,6 @@ {column.title} - {#if isNewStyle && column.isPrimary} - - {/if} {/if} diff --git a/src/lib/components/pagination.svelte b/src/lib/components/pagination.svelte index ff338c213..f272f7f66 100644 --- a/src/lib/components/pagination.svelte +++ b/src/lib/components/pagination.svelte @@ -5,6 +5,7 @@ export let sum: number; export let limit: number; export let offset: number; + export let useCreateLink = true; $: currentPage = Math.floor(offset / limit + 1); @@ -18,6 +19,10 @@ return url.toString(); } + + $: paginationProps = useCreateLink + ? ({ type: 'link', createLink: getLink } as const) + : ({ type: 'button', createLink: undefined as never } as const); - + diff --git a/src/lib/components/paginationWithLimit.svelte b/src/lib/components/paginationWithLimit.svelte index 089019adc..7cf78f6b5 100644 --- a/src/lib/components/paginationWithLimit.svelte +++ b/src/lib/components/paginationWithLimit.svelte @@ -3,13 +3,29 @@ import Pagination from './pagination.svelte'; import { Layout } from '@appwrite.io/pink-svelte'; - export let limit: number; - export let offset: number; - export let total: number; - export let name: string; + let { + limit, + offset, + total, + name, + useCreateLink = true + }: { + limit: number; + offset: number; + total: number; + name: string; + useCreateLink?: boolean; + } = $props(); + + const showLimit = $derived(!!useCreateLink); + const direction = $derived(showLimit ? 'row' : 'column'); + const alignItems = $derived(showLimit ? 'center' : 'flex-end'); - - - + + {#if showLimit} + + {/if} + + diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index 6f63424f4..f20c7963d 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -7,10 +7,11 @@ import Button from '$lib/elements/forms/button.svelte'; import type { PinkColumn } from '$lib/helpers/types'; - export let logs: Models.LogList; - export let offset = 0; export let limit = 0; + export let offset = 0; + export let logs: Models.LogList; export let databasesScreen = false; + export let useCreateLinkForPagination = true; const columns: PinkColumn[] = [ { id: 'user' }, @@ -74,7 +75,13 @@ - + {:else} -
-
- -
  • +
  • @@ -213,9 +208,26 @@ .drop-list { flex: 1; padding-left: 4px; + position: relative; font-size: var(--font-size-sm); color: var(--fgcolor-neutral-secondary); + &::before { + content: ''; + right: 99%; + top: 0.2rem; + bottom: 0.2rem; + position: absolute; + border-left: 1px solid var(--border-neutral, #ededf0); + } + + li { + position: relative; + overflow: hidden; + padding-inline-end: 0.5rem; + margin-inline-start: 0.5rem; + } + .is-selected, li:hover { width: 100%; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte index 77094c458..0d686b89e 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte @@ -30,7 +30,8 @@ randomDataModalState, showCreateAttributeSheet, showCreateIndexSheet, - spreadsheetLoading + spreadsheetLoading, + rowActivitySheet } from './store'; import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter'; import CreateColumn from './createColumn.svelte'; @@ -44,6 +45,7 @@ import SideSheet from './layout/sidesheet.svelte'; import EditRow from './editRow.svelte'; import EditColumn from './columns/edit.svelte'; + import RowActivity from './rowActivity.svelte'; import { Dialog, Layout, Typography } from '@appwrite.io/pink-svelte'; import { Button, Seekbar } from '$lib/elements/forms'; import { generateFakeRecords, generateColumns } from '$lib/helpers/faker'; @@ -292,6 +294,7 @@ + + + + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte index bb6ef410a..24b02316c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte @@ -222,12 +222,6 @@ {#if column.key === '$id' || column.key === '$sequence' || column.key === '$createdAt' || column.key === '$updatedAt'} {column['name']} - {#if column.key === '$sequence'} - - {/if} {:else} {column.key} {/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte index deada4a07..ea9a4b1e4 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte @@ -64,7 +64,7 @@ id: '$sequence', title: 'Sequence', type: 'string', - width: 225, + width: 150, isPrimary: true, icon: IconHashtag, ...baseColProps @@ -179,10 +179,6 @@ alignContent="center"> {column.title} - {#if column.isPrimary} - - {/if} - {/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rowActivity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rowActivity.svelte new file mode 100644 index 000000000..93eb1a881 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rowActivity.svelte @@ -0,0 +1,86 @@ + + +{#if loading} +
    + + + User + Event + Location + IP + Date + + + {#each Array(5) as _} + + + + + + + + + + + + + + + + + + + + + + + + + {/each} + +
    +{:else if rowActivityLogs} + +{/if} 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 7361df9bc..901938619 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 @@ -29,7 +29,8 @@ showCreateIndexSheet, type SortState, Deletion, - scrollStore + scrollStore, + rowActivitySheet } from './store'; import RelationshipsModal from './relationshipsModal.svelte'; import type { Column, ColumnType } from '$lib/helpers/types'; @@ -136,8 +137,8 @@ { id: '$sequence', title: 'Sequence', - width: 225, - minimumWidth: 225, + width: 150, + minimumWidth: 150, draggable: false, type: 'integer', icon: IconHashtag, @@ -465,6 +466,11 @@ showDelete = true; selectedRowForDelete = row.$id; } + + if (action === 'activity') { + $rowActivitySheet.row = row; + $rowActivitySheet.show = true; + } } } @@ -596,13 +602,6 @@ alignContent="center"> {column.title} - {#if column.isPrimary} - - {/if} -