widget leantime refactor
This commit is contained in:
parent
ad047327c6
commit
26d453107d
@ -42,20 +42,11 @@ async function fetchTwentyTasks(): Promise<TwentyTask[]> {
|
|||||||
const todayISO = today.toISOString();
|
const todayISO = today.toISOString();
|
||||||
|
|
||||||
// GraphQL query to fetch tasks from Twenty CRM
|
// GraphQL query to fetch tasks from Twenty CRM
|
||||||
// Based on error messages, using correct field names:
|
// Trying simpler query first - tasks may not accept filter/orderBy arguments
|
||||||
// - filter instead of where
|
// We'll filter client-side if needed
|
||||||
// - bodyV2 instead of body
|
|
||||||
// - status field instead of completedAt (need to check what status values mean)
|
|
||||||
// - name instead of firstName/lastName/email for WorkspaceMember
|
|
||||||
const query = `
|
const query = `
|
||||||
query GetOverdueTasks {
|
query GetTasks {
|
||||||
tasks(
|
tasks {
|
||||||
filter: {
|
|
||||||
status: { neq: Done }
|
|
||||||
dueAt: { lt: "${todayISO}" }
|
|
||||||
}
|
|
||||||
orderBy: { dueAt: AscNullsLast }
|
|
||||||
) {
|
|
||||||
edges {
|
edges {
|
||||||
node {
|
node {
|
||||||
id
|
id
|
||||||
@ -148,7 +139,9 @@ async function fetchTwentyTasks(): Promise<TwentyTask[]> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Transform Twenty CRM tasks to match our Task interface
|
// Transform Twenty CRM tasks to match our Task interface
|
||||||
const tasks: TwentyTask[] = activitiesData.map((edge: any) => {
|
// Filter client-side for overdue tasks (dueAt < today) and not completed (status !== 'Done')
|
||||||
|
const tasks: TwentyTask[] = activitiesData
|
||||||
|
.map((edge: any) => {
|
||||||
const node = edge.node || edge; // Handle both edge.node and direct node
|
const node = edge.node || edge; // Handle both edge.node and direct node
|
||||||
|
|
||||||
// Extract text from bodyV2 if it's a rich text object
|
// Extract text from bodyV2 if it's a rich text object
|
||||||
@ -177,6 +170,30 @@ async function fetchTwentyTasks(): Promise<TwentyTask[]> {
|
|||||||
// Store extracted body text for easier access
|
// Store extracted body text for easier access
|
||||||
_bodyText: bodyText,
|
_bodyText: bodyText,
|
||||||
};
|
};
|
||||||
|
})
|
||||||
|
.filter((task: TwentyTask) => {
|
||||||
|
// Filter: only overdue tasks (dueAt < today) and not completed
|
||||||
|
if (task.status === 'Done') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!task.dueAt) {
|
||||||
|
return false; // Exclude tasks without due date
|
||||||
|
}
|
||||||
|
|
||||||
|
const taskDueDate = new Date(task.dueAt);
|
||||||
|
taskDueDate.setHours(0, 0, 0, 0);
|
||||||
|
const today = new Date();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
return taskDueDate < today; // Only overdue tasks
|
||||||
|
})
|
||||||
|
.sort((a: TwentyTask, b: TwentyTask) => {
|
||||||
|
// Sort by dueAt (oldest first)
|
||||||
|
if (!a.dueAt || !b.dueAt) return 0;
|
||||||
|
const dateA = new Date(a.dueAt).getTime();
|
||||||
|
const dateB = new Date(b.dueAt).getTime();
|
||||||
|
return dateA - dateB;
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.debug('[TWENTY_CRM_TASKS] Successfully fetched tasks from Twenty CRM', {
|
logger.debug('[TWENTY_CRM_TASKS] Successfully fetched tasks from Twenty CRM', {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user