Implementation of Project and Custom Filter categories functionalpull/3258/head
Kevin
4 weeks ago
parent
57e7aa6b2b
commit
674fad445d
@ -0,0 +1,42 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "next-i18next";
|
||||
import { DateTime } from "luxon"; // Import Luxon for timezone conversion
|
||||
|
||||
import useWidgetAPI from "../../../utils/proxy/use-widget-api";
|
||||
import Error from "../../../components/services/widget/error";
|
||||
import Agenda from "../agenda";
|
||||
|
||||
export default function Filter({ widget }) {
|
||||
const { t } = useTranslation();
|
||||
const { data: tasksData, error: tasksError } = useWidgetAPI(widget, "getTasksWithCustomFilter", {
|
||||
refreshInterval: widget.refreshInterval || 300000, // 5 minutes, use default if not provided
|
||||
filter: widget.filter
|
||||
});
|
||||
|
||||
const [tasks, setTasks] = useState([]); // State to hold tasks
|
||||
|
||||
useEffect(() => {
|
||||
if (!tasksError && tasksData && tasksData.length > 0) {
|
||||
// Process label data and set tasks
|
||||
const tasksToAdd = tasksData.slice(0, widget.maxTasks || tasksData.length).map((task) => ({
|
||||
title: task.content || t("Untitled Task by Label"),
|
||||
date: task.due ? DateTime.fromISO(task.due.date, { zone: widget.timeZone }).toJSDate() : null,
|
||||
color: widget.color || task.color || "blue", // Adjust color based on your preference
|
||||
description: task.tags ? task.tags.join(", ") : "",
|
||||
url: task.url,
|
||||
id: task.id,
|
||||
}));
|
||||
|
||||
// Update the tasks state
|
||||
setTasks(tasksToAdd);
|
||||
}
|
||||
}, [tasksData, tasksError, widget, t, setTasks]);
|
||||
|
||||
const error = tasksError ?? tasksData?.error;
|
||||
if (error && !widget.hideErrors) {
|
||||
return <Error error={{ message: `${widget.type}: ${error.message ?? error}` }} />;
|
||||
}
|
||||
|
||||
// Render the Agenda component if tasks is not empty
|
||||
return <Agenda tasks={tasks} />;
|
||||
}
|
||||
@ -1,10 +1,95 @@
|
||||
const groupTasksByProjectId = () => {
|
||||
const groupedTasks = {};
|
||||
tasks.forEach((task) => {
|
||||
if (!groupedTasks[task.project_id]) {
|
||||
groupedTasks[task.project_id] = [];
|
||||
}
|
||||
groupedTasks[task.project_id].push(task);
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "next-i18next";
|
||||
|
||||
import useWidgetAPI from "../../../utils/proxy/use-widget-api";
|
||||
import Error from "../../../components/services/widget/error";
|
||||
import Agenda from "../agenda";
|
||||
import { DateTime } from "luxon";
|
||||
|
||||
export default function Project({ widget }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
// Fetch projects data unconditionally
|
||||
const { data: projectsData, error: projectsError } = useWidgetAPI(widget, "getAllProjects");
|
||||
|
||||
// Fetch tasks for the specific project unconditionally
|
||||
const { data: tasksData, error: tasksError } = useWidgetAPI(widget, "getAllActiveTasks", {
|
||||
refreshInterval: widget.refreshInterval || 300000, // 5 minutes, use default if not provided
|
||||
});
|
||||
return Object.values(groupedTasks);
|
||||
};
|
||||
|
||||
// State to hold tasks
|
||||
const [tasks, setTasks] = useState([]);
|
||||
|
||||
useEffect(() => {
|
||||
// Check for errors
|
||||
if (projectsError) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if projectsData is available
|
||||
if (!projectsData) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Find the project with the given name
|
||||
const project = projectsData.find((project) => project.name === widget.project_name);
|
||||
|
||||
// Check if project exists
|
||||
if (!project) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Extract project ID and color
|
||||
const projectId = project.id;
|
||||
const projectColor = widget.color || project.color || "blue"; // Default color if not provided
|
||||
|
||||
// Check for tasks error
|
||||
if (tasksError) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Process tasks data and set tasks
|
||||
if (tasksData && tasksData.length > 0) {
|
||||
const tasksToAdd = tasksData
|
||||
.filter((task) => task.project_id === projectId) // Filter tasks by project ID
|
||||
.slice(0, widget.maxTasks || tasksData.length)
|
||||
.map((task) => ({
|
||||
title: task.content || t("Untitled Task by Label"),
|
||||
date: task.due ? DateTime.fromISO(task.due.date, { zone: widget.timeZone }).toJSDate() : null,
|
||||
color: projectColor, // Assign project color to task
|
||||
description: task.tags ? task.tags.join(", ") : "",
|
||||
url: task.url,
|
||||
id: task.id,
|
||||
}));
|
||||
|
||||
// Update the tasks state
|
||||
setTasks(tasksToAdd);
|
||||
}
|
||||
}, [projectsData, projectsError, tasksData, tasksError, widget, t]);
|
||||
|
||||
// Check for tasks error and display error component if not hidden
|
||||
if (tasksError && !widget.hideErrors) {
|
||||
return <Error error={{ message: `${widget.type}: ${tasksError.message}` }} />;
|
||||
}
|
||||
|
||||
// Check for projects error and display error component
|
||||
if (projectsError) {
|
||||
return <Error error={{ message: `${widget.type}: ${projectsError.message}` }} />;
|
||||
}
|
||||
|
||||
// If projectsData is not yet available, return null or loading indicator
|
||||
if (!projectsData) {
|
||||
return null; // or return a loading indicator
|
||||
}
|
||||
|
||||
// Find the project with the given name
|
||||
const project = projectsData.find((project) => project.name === widget.project_name);
|
||||
|
||||
// If project does not exist, display error component
|
||||
if (!project) {
|
||||
return <Error error={{ message: `${widget.type}: Project not found` }} />;
|
||||
}
|
||||
|
||||
// Render the Agenda component with tasks
|
||||
return <Agenda tasks={tasks} />;
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue