feat: Add contract editing functionality with form handling and translations
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import db from "@/lib/db";
|
import db from "@/lib/db";
|
||||||
import { NextResponse } from "next/server";
|
import { NextResponse } from "next/server";
|
||||||
import { withReadAuth, withTeamLeadAuth } from "@/lib/middleware/auth";
|
import { withReadAuth, withTeamLeadAuth, withUserAuth } from "@/lib/middleware/auth";
|
||||||
|
|
||||||
async function getContractHandler(req, { params }) {
|
async function getContractHandler(req, { params }) {
|
||||||
const { id } = await params;
|
const { id } = await params;
|
||||||
@@ -21,6 +21,79 @@ async function getContractHandler(req, { params }) {
|
|||||||
return NextResponse.json(contract);
|
return NextResponse.json(contract);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function updateContractHandler(req, { params }) {
|
||||||
|
const { id } = await params;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const body = await req.json();
|
||||||
|
const {
|
||||||
|
contract_number,
|
||||||
|
contract_name,
|
||||||
|
customer_contract_number,
|
||||||
|
customer,
|
||||||
|
investor,
|
||||||
|
date_signed,
|
||||||
|
finish_date,
|
||||||
|
} = body;
|
||||||
|
|
||||||
|
// Check if contract exists
|
||||||
|
const existingContract = db
|
||||||
|
.prepare("SELECT * FROM contracts WHERE contract_id = ?")
|
||||||
|
.get(id);
|
||||||
|
|
||||||
|
if (!existingContract) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Contract not found" },
|
||||||
|
{ status: 404 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the contract
|
||||||
|
const result = db
|
||||||
|
.prepare(
|
||||||
|
`UPDATE contracts
|
||||||
|
SET contract_number = ?,
|
||||||
|
contract_name = ?,
|
||||||
|
customer_contract_number = ?,
|
||||||
|
customer = ?,
|
||||||
|
investor = ?,
|
||||||
|
date_signed = ?,
|
||||||
|
finish_date = ?
|
||||||
|
WHERE contract_id = ?`
|
||||||
|
)
|
||||||
|
.run(
|
||||||
|
contract_number,
|
||||||
|
contract_name || null,
|
||||||
|
customer_contract_number || null,
|
||||||
|
customer || null,
|
||||||
|
investor || null,
|
||||||
|
date_signed || null,
|
||||||
|
finish_date || null,
|
||||||
|
id
|
||||||
|
);
|
||||||
|
|
||||||
|
if (result.changes === 0) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Failed to update contract" },
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch and return the updated contract
|
||||||
|
const updatedContract = db
|
||||||
|
.prepare("SELECT * FROM contracts WHERE contract_id = ?")
|
||||||
|
.get(id);
|
||||||
|
|
||||||
|
return NextResponse.json(updatedContract);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error updating contract:", error);
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Internal server error" },
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function deleteContractHandler(req, { params }) {
|
async function deleteContractHandler(req, { params }) {
|
||||||
const { id } = params;
|
const { id } = params;
|
||||||
|
|
||||||
@@ -61,4 +134,5 @@ async function deleteContractHandler(req, { params }) {
|
|||||||
|
|
||||||
// Protected routes - require authentication
|
// Protected routes - require authentication
|
||||||
export const GET = withReadAuth(getContractHandler);
|
export const GET = withReadAuth(getContractHandler);
|
||||||
|
export const PUT = withUserAuth(updateContractHandler);
|
||||||
export const DELETE = withTeamLeadAuth(deleteContractHandler);
|
export const DELETE = withTeamLeadAuth(deleteContractHandler);
|
||||||
|
|||||||
139
src/app/contracts/[id]/edit/page.js
Normal file
139
src/app/contracts/[id]/edit/page.js
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useParams } from "next/navigation";
|
||||||
|
import ContractForm from "@/components/ContractForm";
|
||||||
|
import PageContainer from "@/components/ui/PageContainer";
|
||||||
|
import PageHeader from "@/components/ui/PageHeader";
|
||||||
|
import Button from "@/components/ui/Button";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { LoadingState } from "@/components/ui/States";
|
||||||
|
import { useTranslation } from "@/lib/i18n";
|
||||||
|
|
||||||
|
export default function EditContractPage() {
|
||||||
|
const params = useParams();
|
||||||
|
const id = params.id;
|
||||||
|
const [contract, setContract] = useState(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState(null);
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
async function fetchContract() {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/contracts/${id}`);
|
||||||
|
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error("Failed to fetch contract");
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await res.json();
|
||||||
|
setContract(data);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching contract:", error);
|
||||||
|
setError("Nie udało się pobrać danych umowy.");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
fetchContract();
|
||||||
|
}
|
||||||
|
}, [id]);
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return (
|
||||||
|
<PageContainer>
|
||||||
|
<PageHeader
|
||||||
|
title={t('contracts.editContract')}
|
||||||
|
description={t('contracts.editContractDescription')}
|
||||||
|
/>
|
||||||
|
<LoadingState message={t('navigation.loading')} />
|
||||||
|
</PageContainer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error || !contract) {
|
||||||
|
return (
|
||||||
|
<PageContainer>
|
||||||
|
<PageHeader
|
||||||
|
title={t('contracts.editContract')}
|
||||||
|
description={t('contracts.editContractDescription')}
|
||||||
|
/>
|
||||||
|
<div className="bg-red-50 border border-red-200 rounded-lg p-4 flex items-start mb-6">
|
||||||
|
<svg
|
||||||
|
className="w-5 h-5 text-red-600 mr-3 mt-0.5 flex-shrink-0"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<div className="flex-1">
|
||||||
|
<p className="text-sm font-medium text-red-800">
|
||||||
|
{error || "Nie znaleziono umowy."}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Link href="/contracts">
|
||||||
|
<Button variant="outline">
|
||||||
|
<svg
|
||||||
|
className="w-4 h-4 mr-2"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M15 19l-7-7 7-7"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{t('contracts.backToContracts')}
|
||||||
|
</Button>
|
||||||
|
</Link>
|
||||||
|
</PageContainer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PageContainer>
|
||||||
|
<PageHeader
|
||||||
|
title={t('contracts.editContract')}
|
||||||
|
description={`${t('contracts.editing')} ${contract.contract_number}`}
|
||||||
|
action={
|
||||||
|
<Link href={`/contracts/${id}`}>
|
||||||
|
<Button variant="outline" size="sm">
|
||||||
|
<svg
|
||||||
|
className="w-4 h-4 mr-2"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M15 19l-7-7 7-7"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{t('contracts.backToContract')}
|
||||||
|
</Button>
|
||||||
|
</Link>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<div className="max-w-2xl">
|
||||||
|
<ContractForm initialData={contract} />
|
||||||
|
</div>
|
||||||
|
</PageContainer>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -113,6 +113,24 @@ export default function ContractDetailsPage() {
|
|||||||
{t('contracts.backToContracts')}
|
{t('contracts.backToContracts')}
|
||||||
</Button>
|
</Button>
|
||||||
</Link>
|
</Link>
|
||||||
|
<Link href={`/contracts/${contractId}/edit`}>
|
||||||
|
<Button variant="outline" size="sm">
|
||||||
|
<svg
|
||||||
|
className="w-4 h-4 mr-2"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{t('contracts.editContract')}
|
||||||
|
</Button>
|
||||||
|
</Link>
|
||||||
<Link href={`/projects/new?contract_id=${contractId}`}>
|
<Link href={`/projects/new?contract_id=${contractId}`}>
|
||||||
<Button variant="primary" size="sm">
|
<Button variant="primary" size="sm">
|
||||||
<svg
|
<svg
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useState } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { Card, CardHeader, CardContent } from "@/components/ui/Card";
|
import { Card, CardHeader, CardContent } from "@/components/ui/Card";
|
||||||
import Button from "@/components/ui/Button";
|
import Button from "@/components/ui/Button";
|
||||||
@@ -8,8 +8,9 @@ import { Input } from "@/components/ui/Input";
|
|||||||
import { formatDateForInput } from "@/lib/utils";
|
import { formatDateForInput } from "@/lib/utils";
|
||||||
import { useTranslation } from "@/lib/i18n";
|
import { useTranslation } from "@/lib/i18n";
|
||||||
|
|
||||||
export default function ContractForm() {
|
export default function ContractForm({ initialData = null }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const isEdit = !!initialData;
|
||||||
const [form, setForm] = useState({
|
const [form, setForm] = useState({
|
||||||
contract_number: "",
|
contract_number: "",
|
||||||
contract_name: "",
|
contract_name: "",
|
||||||
@@ -23,6 +24,21 @@ export default function ContractForm() {
|
|||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
// Update form when initialData changes (for edit mode)
|
||||||
|
useEffect(() => {
|
||||||
|
if (initialData) {
|
||||||
|
setForm({
|
||||||
|
contract_number: initialData.contract_number || "",
|
||||||
|
contract_name: initialData.contract_name || "",
|
||||||
|
customer_contract_number: initialData.customer_contract_number || "",
|
||||||
|
customer: initialData.customer || "",
|
||||||
|
investor: initialData.investor || "",
|
||||||
|
date_signed: initialData.date_signed || "",
|
||||||
|
finish_date: initialData.finish_date || "",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [initialData]);
|
||||||
|
|
||||||
function handleChange(e) {
|
function handleChange(e) {
|
||||||
setForm({ ...form, [e.target.name]: e.target.value });
|
setForm({ ...form, [e.target.name]: e.target.value });
|
||||||
}
|
}
|
||||||
@@ -34,21 +50,32 @@ export default function ContractForm() {
|
|||||||
try {
|
try {
|
||||||
console.log("Submitting form:", form);
|
console.log("Submitting form:", form);
|
||||||
|
|
||||||
const res = await fetch("/api/contracts", {
|
const url = isEdit
|
||||||
method: "POST",
|
? `/api/contracts/${initialData.contract_id}`
|
||||||
|
: "/api/contracts";
|
||||||
|
const method = isEdit ? "PUT" : "POST";
|
||||||
|
|
||||||
|
const res = await fetch(url, {
|
||||||
|
method,
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify(form),
|
body: JSON.stringify(form),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
const contract = await res.json();
|
const contract = await res.json();
|
||||||
router.push(`/contracts/${contract.contract_id}`);
|
router.push(`/contracts/${contract.contract_id || initialData.contract_id}`);
|
||||||
} else {
|
} else {
|
||||||
alert(t('contracts.failedToCreateContract'));
|
const errorMessage = isEdit
|
||||||
|
? t('contracts.failedToUpdateContract')
|
||||||
|
: t('contracts.failedToCreateContract');
|
||||||
|
alert(errorMessage);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error creating contract:", error);
|
console.error(`Error ${isEdit ? 'updating' : 'creating'} contract:`, error);
|
||||||
alert(t('contracts.failedToCreateContract'));
|
const errorMessage = isEdit
|
||||||
|
? t('contracts.failedToUpdateContract')
|
||||||
|
: t('contracts.failedToCreateContract');
|
||||||
|
alert(errorMessage);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -189,7 +216,7 @@ export default function ContractForm() {
|
|||||||
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
{t('common.creating')}
|
{isEdit ? t('common.updating') : t('common.creating')}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
@@ -203,10 +230,10 @@ export default function ContractForm() {
|
|||||||
strokeLinecap="round"
|
strokeLinecap="round"
|
||||||
strokeLinejoin="round"
|
strokeLinejoin="round"
|
||||||
strokeWidth={2}
|
strokeWidth={2}
|
||||||
d="M12 4v16m8-8H4"
|
d={isEdit ? "M5 13l4 4L19 7" : "M12 4v16m8-8H4"}
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
{t('contracts.createContract')}
|
{isEdit ? t('contracts.updateContract') : t('contracts.createContract')}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -287,6 +287,11 @@ const translations = {
|
|||||||
contract: "Umowa",
|
contract: "Umowa",
|
||||||
newContract: "Nowa umowa",
|
newContract: "Nowa umowa",
|
||||||
editContract: "Edytuj umowę",
|
editContract: "Edytuj umowę",
|
||||||
|
editContractDescription: "Edycja szczegółów umowy",
|
||||||
|
editing: "Edycja umowy",
|
||||||
|
backToContract: "Powrót do umowy",
|
||||||
|
updateContract: "Zaktualizuj umowę",
|
||||||
|
failedToUpdateContract: "Nie udało się zaktualizować umowy. Sprawdź dane i spróbuj ponownie.",
|
||||||
deleteContract: "Usuń umowę",
|
deleteContract: "Usuń umowę",
|
||||||
contractNumber: "Numer umowy",
|
contractNumber: "Numer umowy",
|
||||||
contractName: "Nazwa umowy",
|
contractName: "Nazwa umowy",
|
||||||
@@ -940,8 +945,14 @@ const translations = {
|
|||||||
contracts: {
|
contracts: {
|
||||||
title: "Contracts",
|
title: "Contracts",
|
||||||
subtitle: "Manage your contracts and agreements",
|
subtitle: "Manage your contracts and agreements",
|
||||||
|
contract: "Contract",
|
||||||
newContract: "New Contract",
|
newContract: "New Contract",
|
||||||
editContract: "Edit Contract",
|
editContract: "Edit Contract",
|
||||||
|
editContractDescription: "Edit contract details",
|
||||||
|
editing: "Editing contract",
|
||||||
|
backToContract: "Back to Contract",
|
||||||
|
updateContract: "Update Contract",
|
||||||
|
failedToUpdateContract: "Failed to update contract. Please check your data and try again.",
|
||||||
deleteContract: "Delete Contract",
|
deleteContract: "Delete Contract",
|
||||||
contractNumber: "Contract Number",
|
contractNumber: "Contract Number",
|
||||||
contractName: "Contract Name",
|
contractName: "Contract Name",
|
||||||
@@ -968,7 +979,40 @@ const translations = {
|
|||||||
signedOn: "Signed:",
|
signedOn: "Signed:",
|
||||||
finishOn: "Finish:",
|
finishOn: "Finish:",
|
||||||
customerLabel: "Customer:",
|
customerLabel: "Customer:",
|
||||||
investorLabel: "Investor:"
|
investorLabel: "Investor:",
|
||||||
|
loadingContractDetails: "Loading contract details...",
|
||||||
|
contractNotFound: "Contract not found.",
|
||||||
|
backToContracts: "Back to Contracts",
|
||||||
|
addProject: "Add Project",
|
||||||
|
contractInformation: "Contract Information",
|
||||||
|
summary: "Summary",
|
||||||
|
projectsCount: "Projects Count",
|
||||||
|
projects: "projects",
|
||||||
|
contractStatus: "Contract Status",
|
||||||
|
contractDocuments: "Contract Documents",
|
||||||
|
uploadDocument: "Upload Document",
|
||||||
|
associatedProjects: "Associated Projects",
|
||||||
|
noProjectsYet: "No projects yet",
|
||||||
|
getStartedMessage: "Get started by creating the first project for this contract",
|
||||||
|
createFirstProject: "Create First Project",
|
||||||
|
viewDetails: "View Details",
|
||||||
|
createNewContract: "Create New Contract",
|
||||||
|
addNewContractDescription: "Add a new contract to your portfolio",
|
||||||
|
contractDetails: "Contract Details",
|
||||||
|
failedToCreateContract: "Failed to create contract. Please check your data and try again.",
|
||||||
|
uploadDocumentTitle: "Upload Document",
|
||||||
|
descriptionOptional: "Description (optional)",
|
||||||
|
descriptionPlaceholder: "Short description of the document...",
|
||||||
|
uploading: "Uploading...",
|
||||||
|
dropFilesHere: "Drop files here or click to browse",
|
||||||
|
supportedFiles: "PDF, DOC, XLS, Images up to 10MB",
|
||||||
|
chooseFile: "Choose File",
|
||||||
|
failedToUploadFile: "Failed to upload file",
|
||||||
|
loadingFiles: "Loading files...",
|
||||||
|
noDocumentsUploaded: "No documents uploaded",
|
||||||
|
download: "Download",
|
||||||
|
confirmDeleteFile: "Are you sure you want to delete this file?",
|
||||||
|
failedToDeleteFile: "Failed to delete file"
|
||||||
},
|
},
|
||||||
|
|
||||||
tasks: {
|
tasks: {
|
||||||
|
|||||||
Reference in New Issue
Block a user