Merge pull request #2331 from appwrite/fix-SER-363-fix-messaging-filters

This commit is contained in:
Darshan
2025-09-25 13:15:27 +05:30
committed by GitHub
4 changed files with 65 additions and 8 deletions
+7 -1
View File
@@ -47,7 +47,13 @@ export function addFilterAndApply(
addSizeFilter(value, colId, columns);
} else if (colId === 'statusCode') {
addStatusCodeFilter(value, colId, columns);
} else if (colId === '$createdAt' || colId === '$updatedAt' || colId === 'buildDuration') {
} else if (
colId === '$createdAt' ||
colId === '$updatedAt' ||
colId === 'buildDuration' ||
colId === 'scheduledAt' ||
colId === 'deliveredAt'
) {
addDateFilter(value, colId, columns);
} else if (colId === 'duration') {
addDurationFilter(value, colId, columns);
+6 -1
View File
@@ -20,7 +20,12 @@ export function setFilters(localTags: TagValue[], filterCols: FilterData[], $col
setSizeFilter(filter, $columns);
} else if (id?.includes('statuscode')) {
setStatusCodeFilter(filter, $columns);
} else if (id === '$createdat' || id === '$updatedat') {
} else if (
id === '$createdat' ||
id === '$updatedat' ||
id === 'scheduledat' ||
id === 'deliveredat'
) {
setDateFilter(filter, $columns);
} else {
setFilterData(filter);
+2 -2
View File
@@ -69,8 +69,8 @@
.separator {
height: 1px;
margin-block: 2px;
margin-inline-start: calc(var(--base-4) * -1);
width: calc(100% + var(--base-8));
width: 100%;
margin-inline: 0;
background-color: var(--border-neutral);
}
</style>
@@ -49,10 +49,56 @@
filter: false,
width: { min: 140 }
},
{ id: 'providerType', title: 'Type', type: 'string', width: { min: 100 } },
{ id: 'status', title: 'Status', type: 'string', width: { min: 120 } },
{ id: 'scheduledAt', title: 'Scheduled at', type: 'datetime', width: { min: 120 } },
{ id: 'deliveredAt', title: 'Delivered at', type: 'datetime', width: { min: 120 } }
{
id: 'providerType',
title: 'Type',
type: 'string',
width: { min: 100 },
array: true,
format: 'enum',
elements: [
{ value: 'email', label: 'Email' },
{ value: 'sms', label: 'SMS' },
{ value: 'push', label: 'Push' }
]
},
{
id: 'status',
title: 'Status',
type: 'enum',
width: { min: 120 },
array: true,
format: 'enum',
elements: ['draft', 'scheduled', 'processing', 'sent', 'failed']
},
{
id: 'scheduledAt',
title: 'Scheduled at',
type: 'datetime',
width: { min: 120 },
format: 'datetime',
elements: [
{ value: 5 * 60 * 1000, label: 'last 5 minutes' },
{ value: 60 * 60 * 1000, label: 'last 1 hour' },
{ value: 24 * 60 * 60 * 1000, label: 'last 24 hours' },
{ value: 7 * 24 * 60 * 60 * 1000, label: 'last 7 days' },
{ value: 30 * 24 * 60 * 60 * 1000, label: 'last 30 days' }
]
},
{
id: 'deliveredAt',
title: 'Delivered at',
type: 'datetime',
width: { min: 120 },
format: 'datetime',
elements: [
{ value: 5 * 60 * 1000, label: 'last 5 minutes' },
{ value: 60 * 60 * 1000, label: 'last 1 hour' },
{ value: 24 * 60 * 60 * 1000, label: 'last 24 hours' },
{ value: 7 * 24 * 60 * 60 * 1000, label: 'last 7 days' },
{ value: 30 * 24 * 60 * 60 * 1000, label: 'last 30 days' }
]
}
]);
const region = page.params.region;