fix(messaging): localize the subscribers columns

When it was global, the state (show values) would persist when switching
between different projects rather than resetting back to the default.
This commit is contained in:
Steven Nguyen committed 2024-02-29 20:33:43 -08:00
1 parent 513c5bfc1b
commit d8a30856f1
3 files changed
+17 -16

No files matched your search

@@ -23,12 +23,21 @@
import UserTargetsModal from '../../userTargetsModal.svelte';
import { onMount } from 'svelte';
import { Filters, hasPageQueries } from '$lib/components/filters';
import { columns } from './store';
import { View } from '$lib/helpers/load';
import { writable } from 'svelte/store';
import type { Column } from '$lib/helpers/types';
export let data: PageData;
let showAdd = false;
let subscribersByTargetId: Record<string, Models.Subscriber> = {};
const columns = writable<Column[]>([
{ id: '$id', title: 'Subscriber ID', type: 'string', show: true, width: 140 },
{ id: 'userName', title: 'Name', type: 'string', show: true, filter: false, width: 100 },
{ id: 'targetId', title: 'Target ID', type: 'string', show: true, width: 140 },
{ id: 'target', title: 'Target', type: 'string', show: true, filter: false, width: 140 },
{ id: 'type', title: 'Type', type: 'string', show: true, width: 80 },
{ id: '$createdAt', title: 'Created', type: 'datetime', show: true, width: 100 }
]);
onMount(() => {
$targetsById = {};
@@ -121,7 +130,7 @@
</div>
</div>
{#if data.subscribers.total}
<Table {data} />
<Table columns={$columns} {data} />
<PaginationWithLimit
name="Subscribers"
@@ -1,7 +1,6 @@
import { derived, writable } from 'svelte/store';
import { derived } from 'svelte/store';
import { page } from '$app/stores';
import type { Models } from '@appwrite.io/console';
import type { Column } from '$lib/helpers/types';
export const topic = derived(
page,
@@ -12,11 +11,3 @@ export const topicTotal = derived(
topic,
($topic) => $topic.emailTotal + $topic.smsTotal + $topic.pushTotal
);
export const columns = writable<Column[]>([
{ id: '$id', title: 'Subscriber ID', type: 'string', show: true, width: 140 },
{ id: 'userName', title: 'Name', type: 'string', show: true, filter: false, width: 100 },
{ id: 'targetId', title: 'Target ID', type: 'string', show: true, width: 140 },
{ id: 'target', title: 'Target', type: 'string', show: true, filter: false, width: 140 },
{ id: 'type', title: 'Type', type: 'string', show: true, width: 80 },
{ id: '$createdAt', title: 'Created', type: 'datetime', show: true, width: 100 }
]);
@@ -18,7 +18,6 @@
} from '$lib/elements/table';
import { addNotification } from '$lib/stores/notifications';
import type { PageData } from './$types';
import { columns } from './store';
import ProviderType from '../../providerType.svelte';
import { toLocaleDateTime } from '$lib/helpers/date';
import { project } from '$routes/console/project-[project]/store';
@@ -26,7 +25,9 @@
import { page } from '$app/stores';
import { targetsById } from '../../store';
import { MessagingProviderType, type Models } from '@appwrite.io/console';
import type { Column } from '$lib/helpers/types';
export let columns: Column[];
export let data: PageData;
let subscribers: Record<string, Models.Subscriber> = {};
@@ -84,7 +85,7 @@
<TableCellHeadCheck
bind:selected={selectedIds}
pageItemsIds={data.subscribers.subscribers.map((d) => d.$id)} />
{#each $columns as column}
{#each columns as column}
{#if column.show}
<TableCellHead width={column.width}>{column.title}</TableCellHead>
{/if}
@@ -97,10 +98,10 @@
href={`${base}/console/project-${$project.$id}/auth/user-${subscriber.target.userId}`}>
<TableCellCheck bind:selectedIds id={subscriber.$id} />
{#each $columns as column}
{#each columns as column}
{#if column.show}
{#if column.id === '$id'}
{#key $columns}
{#key column.id}
<TableCell title="Subscriber ID">
<Id value={subscriber.$id}>
{subscriber.$id}