feat: add client revision tracking and public task visibility toggle in project details
This commit is contained in:
@@ -33,6 +33,7 @@ type TaskRow = {
|
|||||||
status: string | null;
|
status: string | null;
|
||||||
priority: string | null;
|
priority: string | null;
|
||||||
due_at: string | null;
|
due_at: string | null;
|
||||||
|
is_public_to_client: boolean | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
type FinanceRow = {
|
type FinanceRow = {
|
||||||
@@ -60,7 +61,7 @@ export default async function ProjectDetailPage({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const [{ data: projectRow }, { data: sectionRows }, { data: taskRows }, { data: financeRows }] =
|
const [{ data: projectRow }, { data: sectionRows }, { data: taskRows }, { data: financeRows }, { data: revisionRows }] =
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
supabase
|
supabase
|
||||||
.from("projects")
|
.from("projects")
|
||||||
@@ -79,7 +80,7 @@ export default async function ProjectDetailPage({
|
|||||||
.order("created_at", { ascending: true }),
|
.order("created_at", { ascending: true }),
|
||||||
supabase
|
supabase
|
||||||
.from("tasks")
|
.from("tasks")
|
||||||
.select("id, title, status, priority, due_at")
|
.select("id, title, status, priority, due_at, is_public_to_client")
|
||||||
.eq("project_id", id)
|
.eq("project_id", id)
|
||||||
.eq("user_id", user.id)
|
.eq("user_id", user.id)
|
||||||
.order("created_at", { ascending: false }),
|
.order("created_at", { ascending: false }),
|
||||||
@@ -89,6 +90,11 @@ export default async function ProjectDetailPage({
|
|||||||
.eq("project_id", id)
|
.eq("project_id", id)
|
||||||
.eq("user_id", user.id)
|
.eq("user_id", user.id)
|
||||||
.order("transaction_date", { ascending: false }),
|
.order("transaction_date", { ascending: false }),
|
||||||
|
supabase
|
||||||
|
.from("project_revisions")
|
||||||
|
.select("id, description, status, created_at, requested_by")
|
||||||
|
.eq("project_id", id)
|
||||||
|
.order("created_at", { ascending: false }),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (!projectRow) {
|
if (!projectRow) {
|
||||||
@@ -129,7 +135,9 @@ export default async function ProjectDetailPage({
|
|||||||
status: normalizeTaskStatus(task.status),
|
status: normalizeTaskStatus(task.status),
|
||||||
priority: normalizeTaskPriority(task.priority),
|
priority: normalizeTaskPriority(task.priority),
|
||||||
due_at: task.due_at,
|
due_at: task.due_at,
|
||||||
|
is_public_to_client: task.is_public_to_client || false,
|
||||||
}));
|
}));
|
||||||
|
const revisions = revisionRows || [];
|
||||||
const financeTransactions: ProjectFinanceItem[] = ((financeRows || []) as FinanceRow[]).map(
|
const financeTransactions: ProjectFinanceItem[] = ((financeRows || []) as FinanceRow[]).map(
|
||||||
(transaction) => ({
|
(transaction) => ({
|
||||||
id: transaction.id,
|
id: transaction.id,
|
||||||
@@ -148,6 +156,7 @@ export default async function ProjectDetailPage({
|
|||||||
sections={sections}
|
sections={sections}
|
||||||
tasks={tasks}
|
tasks={tasks}
|
||||||
financeTransactions={financeTransactions}
|
financeTransactions={financeTransactions}
|
||||||
|
revisions={revisions}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ export type ProjectDetailTaskItem = {
|
|||||||
status: "todo" | "in_progress" | "done";
|
status: "todo" | "in_progress" | "done";
|
||||||
priority: "low" | "medium" | "high" | "urgent";
|
priority: "low" | "medium" | "high" | "urgent";
|
||||||
due_at: string | null;
|
due_at: string | null;
|
||||||
|
is_public_to_client: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ProjectFinanceItem = {
|
export type ProjectFinanceItem = {
|
||||||
@@ -104,6 +105,7 @@ type ProjectDetailClientProps = {
|
|||||||
sections: ProjectPlanningSectionItem[];
|
sections: ProjectPlanningSectionItem[];
|
||||||
tasks: ProjectDetailTaskItem[];
|
tasks: ProjectDetailTaskItem[];
|
||||||
financeTransactions: ProjectFinanceItem[];
|
financeTransactions: ProjectFinanceItem[];
|
||||||
|
revisions: any[];
|
||||||
};
|
};
|
||||||
|
|
||||||
const typeLabels = {
|
const typeLabels = {
|
||||||
@@ -168,8 +170,9 @@ export function ProjectDetailClient({
|
|||||||
sections,
|
sections,
|
||||||
tasks,
|
tasks,
|
||||||
financeTransactions,
|
financeTransactions,
|
||||||
|
revisions,
|
||||||
}: ProjectDetailClientProps) {
|
}: ProjectDetailClientProps) {
|
||||||
const [activeTab, setActiveTab] = useState<"planning" | "design" | "tasks" | "finance">(
|
const [activeTab, setActiveTab] = useState<"planning" | "design" | "tasks" | "finance" | "revisions">(
|
||||||
"planning",
|
"planning",
|
||||||
);
|
);
|
||||||
const planningSections = sections.filter((section) =>
|
const planningSections = sections.filter((section) =>
|
||||||
@@ -290,6 +293,14 @@ export function ProjectDetailClient({
|
|||||||
<TabButton active={activeTab === "finance"} onClick={() => setActiveTab("finance")}>
|
<TabButton active={activeTab === "finance"} onClick={() => setActiveTab("finance")}>
|
||||||
Finans
|
Finans
|
||||||
</TabButton>
|
</TabButton>
|
||||||
|
{revisions.length > 0 && (
|
||||||
|
<TabButton active={activeTab === "revisions"} onClick={() => setActiveTab("revisions")}>
|
||||||
|
Revizyonlar
|
||||||
|
<Badge variant="secondary" className="ml-2 px-1 py-0 h-4 text-[10px]">
|
||||||
|
{revisions.filter(r => r.status === 'pending').length}
|
||||||
|
</Badge>
|
||||||
|
</TabButton>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{activeTab === "planning" ? (
|
{activeTab === "planning" ? (
|
||||||
@@ -316,10 +327,66 @@ export function ProjectDetailClient({
|
|||||||
<TaskPanel projectId={project.id} clientId={project.client_id} tasks={tasks} />
|
<TaskPanel projectId={project.id} clientId={project.client_id} tasks={tasks} />
|
||||||
) : null}
|
) : null}
|
||||||
{activeTab === "finance" ? <FinancePanel transactions={financeTransactions} /> : null}
|
{activeTab === "finance" ? <FinancePanel transactions={financeTransactions} /> : null}
|
||||||
|
{activeTab === "revisions" ? <RevisionsPanel projectId={project.id} revisions={revisions} /> : null}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function RevisionsPanel({ projectId, revisions }: { projectId: string; revisions: any[] }) {
|
||||||
|
const [isUpdating, setIsUpdating] = useState(false);
|
||||||
|
|
||||||
|
async function handleStatusChange(id: string, status: string) {
|
||||||
|
setIsUpdating(true);
|
||||||
|
try {
|
||||||
|
const { updateRevisionStatus } = await import("@/app/(dashboard)/projects/actions");
|
||||||
|
await updateRevisionStatus(id, projectId, status);
|
||||||
|
} catch (err: any) {
|
||||||
|
console.error(err);
|
||||||
|
} finally {
|
||||||
|
setIsUpdating(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<CardContent className="space-y-4 p-5">
|
||||||
|
<h2 className="text-lg font-semibold">Müşteri Revizyon Talepleri</h2>
|
||||||
|
{revisions.length === 0 ? (
|
||||||
|
<p className="text-muted-foreground text-sm">Bu proje için henüz bir revizyon talebi oluşturulmamış.</p>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{revisions.map(rev => (
|
||||||
|
<div key={rev.id} className="p-4 border rounded-md">
|
||||||
|
<div className="flex justify-between items-start mb-3">
|
||||||
|
<div className="text-sm text-muted-foreground">
|
||||||
|
{new Date(rev.created_at).toLocaleString('tr-TR')}
|
||||||
|
</div>
|
||||||
|
<Select
|
||||||
|
defaultValue={rev.status}
|
||||||
|
onValueChange={(val) => handleStatusChange(rev.id, val)}
|
||||||
|
disabled={isUpdating}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="w-40 h-8 text-xs">
|
||||||
|
<SelectValue />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="pending">Bekliyor</SelectItem>
|
||||||
|
<SelectItem value="in_progress">İşleniyor</SelectItem>
|
||||||
|
<SelectItem value="completed">Tamamlandı</SelectItem>
|
||||||
|
<SelectItem value="rejected">Reddedildi</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm whitespace-pre-wrap">{rev.description}</p>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function SectionGrid({
|
function SectionGrid({
|
||||||
projectId,
|
projectId,
|
||||||
title,
|
title,
|
||||||
@@ -581,6 +648,7 @@ function TaskPanel({
|
|||||||
className="grid gap-4 px-4 py-4 lg:grid-cols-[1.5fr_0.8fr_0.8fr_0.8fr] lg:items-center"
|
className="grid gap-4 px-4 py-4 lg:grid-cols-[1.5fr_0.8fr_0.8fr_0.8fr] lg:items-center"
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
<div
|
<div
|
||||||
className={
|
className={
|
||||||
task.status === "done"
|
task.status === "done"
|
||||||
@@ -590,6 +658,10 @@ function TaskPanel({
|
|||||||
>
|
>
|
||||||
{task.title}
|
{task.title}
|
||||||
</div>
|
</div>
|
||||||
|
{task.is_public_to_client && (
|
||||||
|
<Badge variant="outline" className="h-5 px-1.5 text-[10px] text-emerald-600 border-emerald-200 bg-emerald-50">Müşteriye Açık</Badge>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
<div className="text-sm text-muted-foreground">
|
<div className="text-sm text-muted-foreground">
|
||||||
{task.status === "done"
|
{task.status === "done"
|
||||||
? "Tamamlandı"
|
? "Tamamlandı"
|
||||||
@@ -822,6 +894,27 @@ function ProjectTaskDialog({
|
|||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center space-x-2 border rounded-md p-4 bg-muted/20">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
id="is_public_to_client"
|
||||||
|
name="is_public_to_client"
|
||||||
|
className="h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary"
|
||||||
|
/>
|
||||||
|
<div className="grid gap-1.5 leading-none">
|
||||||
|
<label
|
||||||
|
htmlFor="is_public_to_client"
|
||||||
|
className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
|
||||||
|
>
|
||||||
|
Müşteri Portalında Göster
|
||||||
|
</label>
|
||||||
|
<p className="text-[13px] text-muted-foreground">
|
||||||
|
Eğer müşteri hesabı varsa, bu görev müşteri portalındaki proje detayında da görünür olur.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="grid gap-5 md:grid-cols-3">
|
<div className="grid gap-5 md:grid-cols-3">
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
<Label htmlFor="project-task-due">Son tarih</Label>
|
<Label htmlFor="project-task-due">Son tarih</Label>
|
||||||
|
|||||||
@@ -320,3 +320,19 @@ export async function deleteProjectPlanningSectionRecord(formData: FormData) {
|
|||||||
revalidatePath("/projects");
|
revalidatePath("/projects");
|
||||||
revalidatePath(`/projects/${projectId}`);
|
revalidatePath(`/projects/${projectId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function updateRevisionStatus(id: string, projectId: string, status: string) {
|
||||||
|
const { supabase } = await getCurrentUserId();
|
||||||
|
|
||||||
|
const { error } = await supabase
|
||||||
|
.from("project_revisions")
|
||||||
|
.update({ status })
|
||||||
|
.eq("id", id)
|
||||||
|
.eq("project_id", projectId);
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
throw new Error(`Revizyon durumu güncellenemedi: ${error.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
revalidatePath(`/projects/${projectId}`);
|
||||||
|
}
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ function readPayload(formData: FormData) {
|
|||||||
due_at: cleanText(formData.get("due_at")),
|
due_at: cleanText(formData.get("due_at")),
|
||||||
estimated_minutes: readMinutes(formData.get("estimated_minutes")),
|
estimated_minutes: readMinutes(formData.get("estimated_minutes")),
|
||||||
actual_minutes: readMinutes(formData.get("actual_minutes")),
|
actual_minutes: readMinutes(formData.get("actual_minutes")),
|
||||||
|
is_public_to_client: formData.get("is_public_to_client") === "on",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user