feat: Enhance note creation and project cancellation with user information and translations
This commit is contained in:
@@ -73,6 +73,20 @@ async function createNoteHandler(req) {
|
||||
)
|
||||
.run(project_id || null, task_id || null, note, req.user?.id || null);
|
||||
|
||||
// Get the created note with user info
|
||||
const createdNote = db
|
||||
.prepare(
|
||||
`
|
||||
SELECT n.*,
|
||||
u.name as created_by_name,
|
||||
u.username as created_by_username
|
||||
FROM notes n
|
||||
LEFT JOIN users u ON n.created_by = u.id
|
||||
WHERE n.note_id = ?
|
||||
`
|
||||
)
|
||||
.get(result.lastInsertRowid);
|
||||
|
||||
// Log note creation
|
||||
await logApiActionSafe(
|
||||
req,
|
||||
@@ -85,7 +99,7 @@ async function createNoteHandler(req) {
|
||||
}
|
||||
);
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
return NextResponse.json(createdNote);
|
||||
} catch (error) {
|
||||
console.error("Error creating note:", error);
|
||||
return NextResponse.json(
|
||||
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
AUDIT_ACTIONS,
|
||||
RESOURCE_TYPES,
|
||||
} from "@/lib/auditLogSafe.js";
|
||||
import { getUserLanguage, serverT } from "@/lib/serverTranslations";
|
||||
|
||||
// Make sure the DB is initialized before queries run
|
||||
initializeDatabase();
|
||||
@@ -86,7 +87,8 @@ async function updateProjectHandler(req, { params }) {
|
||||
minute: '2-digit'
|
||||
});
|
||||
|
||||
const cancellationNote = `Projekt został wycofany w dniu ${cancellationDate}`;
|
||||
const language = getUserLanguage();
|
||||
const cancellationNote = `${serverT("Project cancelled on", language)} ${cancellationDate}`;
|
||||
|
||||
try {
|
||||
addNoteToProject(parseInt(id), cancellationNote, userId, true); // true for is_system
|
||||
|
||||
@@ -24,6 +24,11 @@ export default function ProjectViewPage() {
|
||||
const [notes, setNotes] = useState([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
// Helper function to add a new note to the list
|
||||
const addNote = (newNote) => {
|
||||
setNotes(prevNotes => [newNote, ...prevNotes]);
|
||||
};
|
||||
|
||||
// Helper function to check if user can delete a note
|
||||
const canDeleteNote = (note) => {
|
||||
if (!session?.user) return false;
|
||||
@@ -597,7 +602,7 @@ export default function ProjectViewPage() {
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div className="mb-6">
|
||||
<NoteForm projectId={params.id} />
|
||||
<NoteForm projectId={params.id} onNoteAdded={addNote} />
|
||||
</div>
|
||||
{notes.length === 0 ? (
|
||||
<div className="text-center py-12">
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import React, { useState } from "react";
|
||||
import { useTranslation } from "@/lib/i18n";
|
||||
|
||||
export default function NoteForm({ projectId }) {
|
||||
export default function NoteForm({ projectId, onNoteAdded }) {
|
||||
const { t } = useTranslation();
|
||||
const [note, setNote] = useState("");
|
||||
const [status, setStatus] = useState(null);
|
||||
@@ -18,19 +18,33 @@ export default function NoteForm({ projectId }) {
|
||||
});
|
||||
|
||||
if (res.ok) {
|
||||
const newNote = await res.json();
|
||||
setNote("");
|
||||
setStatus(t("common.addNoteSuccess"));
|
||||
window.location.reload();
|
||||
// Call the callback to add the new note to the parent component's state
|
||||
if (onNoteAdded) {
|
||||
onNoteAdded(newNote);
|
||||
}
|
||||
// Clear status message after 3 seconds
|
||||
setTimeout(() => setStatus(null), 3000);
|
||||
} else {
|
||||
setStatus(t("common.addNoteError"));
|
||||
}
|
||||
}
|
||||
|
||||
function handleKeyDown(e) {
|
||||
if (e.ctrlKey && e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
handleSubmit(e);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-2 mb-4">
|
||||
<textarea
|
||||
value={note}
|
||||
onChange={(e) => setNote(e.target.value)}
|
||||
onKeyDown={handleKeyDown}
|
||||
placeholder={t("common.addNotePlaceholder")}
|
||||
className="border p-2 w-full"
|
||||
rows={3}
|
||||
|
||||
@@ -125,9 +125,12 @@ export function createProjectTask(data) {
|
||||
|
||||
// Add system note for task creation
|
||||
if (result.lastInsertRowid) {
|
||||
const language = getUserLanguage();
|
||||
const priority = data.priority || "normal";
|
||||
const status = data.status || "pending";
|
||||
const logMessage = `Task "${taskName}" created with priority: ${priority}, status: ${status}`;
|
||||
const translatedPriority = translatePriority(priority, language);
|
||||
const translatedStatus = translateStatus(status, language);
|
||||
const logMessage = `${serverT("Task created", language)} "${taskName}" ${serverT("with priority", language)}: ${translatedPriority}, ${serverT("status", language)}: ${translatedStatus}`;
|
||||
addNoteToTask(result.lastInsertRowid, logMessage, true, data.created_by);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,10 @@ const serverTranslations = {
|
||||
"Date started": "Data rozpoczęcia",
|
||||
"None": "Brak",
|
||||
"Task updated": "Zadanie zaktualizowane",
|
||||
"Task created": "Zadanie utworzone",
|
||||
"with priority": "z priorytetem",
|
||||
"status": "status",
|
||||
"Project cancelled on": "Projekt został wycofany w dniu",
|
||||
"pending": "oczekujące",
|
||||
"in_progress": "w trakcie",
|
||||
"completed": "ukończone",
|
||||
@@ -31,6 +35,10 @@ const serverTranslations = {
|
||||
"Date started": "Date started",
|
||||
"None": "None",
|
||||
"Task updated": "Task updated",
|
||||
"Task created": "Task created",
|
||||
"with priority": "with priority",
|
||||
"status": "status",
|
||||
"Project cancelled on": "Project cancelled on",
|
||||
"pending": "pending",
|
||||
"in_progress": "in_progress",
|
||||
"completed": "completed",
|
||||
|
||||
Reference in New Issue
Block a user