mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
Merge pull request #2444 from appwrite/fix-dat-772
This commit is contained in:
4 files changed
+174
-21
No files matched your search
@@ -224,6 +224,8 @@ function createPreferences() {
|
||||
delete teamPreferences?.displayNames?.[tableId];
|
||||
delete teamPreferences?.columnOrder?.[tableId];
|
||||
delete teamPreferences?.columnWidths?.[tableId];
|
||||
delete teamPreferences?.columnWidths?.[tableId + '#columns'];
|
||||
delete teamPreferences?.columnWidths?.[tableId + '#indexes'];
|
||||
|
||||
const removeTablePreferences = sdk.forConsole.teams.updatePrefs({
|
||||
teamId: orgId,
|
||||
|
||||
+79
-9
@@ -20,6 +20,7 @@
|
||||
import {
|
||||
columns,
|
||||
type Columns,
|
||||
type ColumnsWidth,
|
||||
indexes,
|
||||
isCsvImportInProgress,
|
||||
reorderItems,
|
||||
@@ -51,6 +52,14 @@
|
||||
import { type Models } from '@appwrite.io/console';
|
||||
import { preferences } from '$lib/stores/preferences';
|
||||
import { page } from '$app/state';
|
||||
import { debounce } from '$lib/helpers/debounce';
|
||||
import type { PageData } from './$types';
|
||||
|
||||
const {
|
||||
data
|
||||
}: {
|
||||
data: PageData;
|
||||
} = $props();
|
||||
|
||||
const updatedColumnsForSheet = $derived.by(() => {
|
||||
const baseAttrs = [
|
||||
@@ -104,8 +113,11 @@
|
||||
let selectedColumn: Columns = $state(null);
|
||||
let columnIndexMap: Record<string, boolean> = $state({});
|
||||
|
||||
let columnsOrder = $state([]);
|
||||
let columnsOrder = $state<string[]>([]);
|
||||
let columnsWidth = $state<ColumnsWidth | null>(null);
|
||||
|
||||
const tableId = page.params.table;
|
||||
const organizationId = data.organization.$id ?? data.project.teamId;
|
||||
|
||||
let showEdit = $state(false);
|
||||
let editColumn: EditColumn;
|
||||
@@ -126,6 +138,7 @@
|
||||
|
||||
onMount(() => {
|
||||
columnsOrder = preferences.getColumnOrder(tableId);
|
||||
columnsWidth = preferences.getColumnWidths(tableId + '#columns');
|
||||
});
|
||||
|
||||
function getColumnStatusBadge(status: string): ComponentProps<Badge>['type'] {
|
||||
@@ -186,8 +199,70 @@
|
||||
return column.key.startsWith('$');
|
||||
}
|
||||
|
||||
function getColumnWidth(columnId: string, defaultWidth: number): number {
|
||||
const savedWidth = columnsWidth?.[columnId];
|
||||
if (!savedWidth) return defaultWidth;
|
||||
|
||||
return savedWidth.resized;
|
||||
}
|
||||
|
||||
function saveColumnsWidth({ columnId, newWidth }: { columnId: string; newWidth: number }) {
|
||||
const existing = columnsWidth?.[columnId];
|
||||
const fixed = existing
|
||||
? typeof existing?.fixed === 'number'
|
||||
? existing.fixed
|
||||
: existing?.fixed?.min
|
||||
: newWidth;
|
||||
|
||||
columnsWidth = {
|
||||
...(columnsWidth ?? {}),
|
||||
[columnId]: {
|
||||
fixed,
|
||||
resized: Math.ceil(newWidth)
|
||||
}
|
||||
};
|
||||
|
||||
saveColumnWidthsToPreferences({ columnId, newWidth, fixedWidth: fixed });
|
||||
}
|
||||
|
||||
const saveColumnWidthsToPreferences = debounce(
|
||||
(column: { columnId: string; newWidth: number; fixedWidth: number }) => {
|
||||
if (!organizationId) return;
|
||||
|
||||
preferences.saveColumnWidths(organizationId, tableId + '#columns', {
|
||||
[column.columnId]: {
|
||||
fixed: column.fixedWidth,
|
||||
resized: Math.ceil(column.newWidth)
|
||||
}
|
||||
});
|
||||
},
|
||||
1000
|
||||
);
|
||||
|
||||
onDestroy(() => ($showCreateColumnSheet.show = false));
|
||||
|
||||
const spreadsheetColumns = $derived([
|
||||
{
|
||||
id: 'key',
|
||||
width: getColumnWidth('key', 300),
|
||||
minimumWidth: 300,
|
||||
resizable: true
|
||||
},
|
||||
{
|
||||
id: 'indexed',
|
||||
width: getColumnWidth('indexed', 150),
|
||||
minimumWidth: 150,
|
||||
resizable: true
|
||||
},
|
||||
{
|
||||
id: 'default',
|
||||
width: getColumnWidth('default', 200),
|
||||
minimumWidth: 200,
|
||||
resizable: true
|
||||
},
|
||||
{ id: 'actions', width: 40, isAction: true, resizable: false }
|
||||
]);
|
||||
|
||||
$effect(() => {
|
||||
if (!$showCreateIndexSheet.show && $showCreateIndexSheet.column) {
|
||||
const columnKey = $showCreateIndexSheet.column;
|
||||
@@ -228,14 +303,9 @@
|
||||
height="100%"
|
||||
emptyCells={emptyCellsCount}
|
||||
bind:selectedRows={selectedColumns}
|
||||
columns={[
|
||||
// more size until we decide if we want a new column!
|
||||
{ id: 'key', width: { min: 300 }, resizable: false },
|
||||
{ id: 'indexed', width: { min: 150 }, resizable: false },
|
||||
{ id: 'default', width: { min: 200 }, resizable: false },
|
||||
{ id: 'actions', width: 40, isAction: true }
|
||||
]}
|
||||
bottomActionClick={() => ($showCreateColumnSheet.show = true)}>
|
||||
columns={spreadsheetColumns}
|
||||
bottomActionClick={() => ($showCreateColumnSheet.show = true)}
|
||||
on:columnsResize={(resize) => saveColumnsWidth(resize.detail)}>
|
||||
<svelte:fragment slot="header" let:root>
|
||||
<Spreadsheet.Header.Cell column="key" {root}>Column name</Spreadsheet.Header.Cell>
|
||||
<Spreadsheet.Header.Cell column="indexed" {root}>Indexed</Spreadsheet.Header.Cell>
|
||||
|
||||
+88
-10
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { Container } from '$lib/layout';
|
||||
import { table } from '../store';
|
||||
import { table, type ColumnsWidth } from '../store';
|
||||
import Delete from './deleteIndex.svelte';
|
||||
import CreateIndex from './createIndex.svelte';
|
||||
import Overview from './overviewIndex.svelte';
|
||||
@@ -8,6 +8,8 @@
|
||||
import { Button } from '$lib/elements/forms';
|
||||
import FailedModal from '../failedModal.svelte';
|
||||
import { canWriteTables } from '$lib/stores/roles';
|
||||
import { preferences } from '$lib/stores/preferences';
|
||||
import { debounce } from '$lib/helpers/debounce';
|
||||
import {
|
||||
ActionMenu,
|
||||
Badge,
|
||||
@@ -26,7 +28,7 @@
|
||||
IconPlus,
|
||||
IconTrash
|
||||
} from '@appwrite.io/pink-icons-svelte';
|
||||
import { type ComponentProps, onDestroy } from 'svelte';
|
||||
import { type ComponentProps, onDestroy, onMount } from 'svelte';
|
||||
import { Click, trackEvent } from '$lib/actions/analytics';
|
||||
import EmptySheet from '../layout/emptySheet.svelte';
|
||||
import SpreadsheetContainer from '../layout/spreadsheet.svelte';
|
||||
@@ -34,6 +36,7 @@
|
||||
import type { PageData } from './$types';
|
||||
import { showCreateColumnSheet } from '../store';
|
||||
import { isSmallViewport } from '$lib/stores/viewport';
|
||||
import { page } from '$app/state';
|
||||
|
||||
let {
|
||||
data
|
||||
@@ -52,15 +55,49 @@
|
||||
let showDelete = $state(false);
|
||||
let showOverview = $state(false);
|
||||
|
||||
let columns = $derived([
|
||||
{ id: 'key', width: { min: $isSmallViewport ? 250 : 200 }, resizable: false },
|
||||
{ id: 'type', width: 120, resizable: false },
|
||||
{ id: 'columns', width: { min: 200 }, resizable: false },
|
||||
let columnsWidth = $state<ColumnsWidth | null>(null);
|
||||
|
||||
const tableId = page.params.table;
|
||||
const organizationId = data.organization.$id ?? data.project.teamId;
|
||||
|
||||
const spreadsheetColumns = $derived([
|
||||
{
|
||||
id: 'key',
|
||||
width: getColumnWidth('key', $isSmallViewport ? 250 : 200),
|
||||
minimumWidth: $isSmallViewport ? 250 : 200,
|
||||
resizable: true
|
||||
},
|
||||
{
|
||||
id: 'type',
|
||||
width: getColumnWidth('type', 120),
|
||||
minimumWidth: 120,
|
||||
resizable: true
|
||||
},
|
||||
{
|
||||
id: 'columns',
|
||||
width: getColumnWidth('columns', 200),
|
||||
minimumWidth: 200,
|
||||
resizable: true
|
||||
},
|
||||
// { id: 'orders' }, // design doesn't have orders atm
|
||||
{ id: 'lengths', width: { min: 180 }, resizable: false },
|
||||
{ id: 'actions', width: 40, isAction: true }
|
||||
{
|
||||
id: 'lengths',
|
||||
width: getColumnWidth('lengths', 180),
|
||||
minimumWidth: 180,
|
||||
resizable: true
|
||||
},
|
||||
{
|
||||
id: 'actions',
|
||||
width: 40,
|
||||
isAction: true,
|
||||
resizable: false
|
||||
}
|
||||
]);
|
||||
|
||||
onMount(() => {
|
||||
columnsWidth = preferences.getColumnWidths(tableId + '#indexes');
|
||||
});
|
||||
|
||||
function getColumnStatusBadge(status: string): ComponentProps<Badge>['type'] {
|
||||
switch (status) {
|
||||
case 'processing':
|
||||
@@ -74,6 +111,46 @@
|
||||
}
|
||||
}
|
||||
|
||||
function getColumnWidth(columnId: string, defaultWidth: number): number {
|
||||
const savedWidth = columnsWidth?.[columnId];
|
||||
if (!savedWidth) return defaultWidth;
|
||||
|
||||
return savedWidth.resized;
|
||||
}
|
||||
|
||||
function saveColumnsWidth({ columnId, newWidth }: { columnId: string; newWidth: number }) {
|
||||
const existing = columnsWidth?.[columnId];
|
||||
const fixed = existing
|
||||
? typeof existing?.fixed === 'number'
|
||||
? existing.fixed
|
||||
: existing?.fixed?.min
|
||||
: newWidth;
|
||||
|
||||
columnsWidth = {
|
||||
...(columnsWidth ?? {}),
|
||||
[columnId]: {
|
||||
fixed,
|
||||
resized: Math.ceil(newWidth)
|
||||
}
|
||||
};
|
||||
|
||||
saveColumnWidthsToPreferences({ columnId, newWidth, fixedWidth: fixed });
|
||||
}
|
||||
|
||||
const saveColumnWidthsToPreferences = debounce(
|
||||
(column: { columnId: string; newWidth: number; fixedWidth: number }) => {
|
||||
if (!organizationId) return;
|
||||
|
||||
preferences.saveColumnWidths(organizationId, tableId + '#indexes', {
|
||||
[column.columnId]: {
|
||||
fixed: column.fixedWidth,
|
||||
resized: Math.ceil(column.newWidth)
|
||||
}
|
||||
});
|
||||
},
|
||||
1000
|
||||
);
|
||||
|
||||
onDestroy(() => ($showCreateColumnSheet.show = false));
|
||||
|
||||
const emptyCellsLimit = $derived($isSmallViewport ? 14 : 17);
|
||||
@@ -108,12 +185,13 @@
|
||||
<SpreadsheetContainer>
|
||||
<Spreadsheet.Root
|
||||
let:root
|
||||
{columns}
|
||||
columns={spreadsheetColumns}
|
||||
height="100%"
|
||||
allowSelection
|
||||
emptyCells={emptyCellsCount}
|
||||
bind:selectedRows={selectedIndexes}
|
||||
bottomActionClick={() => (showCreateIndex = true)}>
|
||||
bottomActionClick={() => (showCreateIndex = true)}
|
||||
on:columnsResize={(resize) => saveColumnsWidth(resize.detail)}>
|
||||
<svelte:fragment slot="header" let:root>
|
||||
<Spreadsheet.Header.Cell column="key" {root}>Key</Spreadsheet.Header.Cell>
|
||||
<Spreadsheet.Header.Cell column="type" {root}>Type</Spreadsheet.Header.Cell>
|
||||
|
||||
+5
-2
@@ -33,9 +33,12 @@ export const tableColumns = writable<Column[]>([]);
|
||||
export const isCsvImportInProgress = writable(false);
|
||||
|
||||
export const columnsOrder = writable<string[]>([]);
|
||||
export const columnsWidth = writable<{
|
||||
|
||||
export type ColumnsWidth = {
|
||||
[columnId: string]: { fixed: number | { min: number }; resized: number };
|
||||
}>();
|
||||
};
|
||||
|
||||
export const columnsWidth = writable<ColumnsWidth>();
|
||||
|
||||
type DatabaseSheetOptions = {
|
||||
show: boolean;
|
||||
|
||||
Reference in new issue
Block a user