260318:1401 Fix UUID #05
Build and Deploy / deploy (push) Failing after 11m8s

This commit is contained in:
admin
2026-03-18 14:01:32 +07:00
parent ba642e7e42
commit e5769269a8
37 changed files with 460 additions and 328 deletions
@@ -31,7 +31,7 @@ export default function NumberingPage() {
useEffect(() => {
if (projects.length > 0 && !selectedProjectId) {
const first = projects[0] as any;
setSelectedProjectId(String(first.id || first.uuid));
setSelectedProjectId(String(first.id ?? first.uuid));
}
}, [projects, selectedProjectId]);
@@ -41,7 +41,7 @@ export default function NumberingPage() {
const [isTesting, setIsTesting] = useState(false);
const [testTemplate, setTestTemplate] = useState<NumberingTemplate | null>(null);
const selectedProject = projects.find((p: any) => String(p.id || p.uuid) === selectedProjectId) as any;
const selectedProject = projects.find((p: any) => String(p.id ?? p.uuid) === selectedProjectId) as any;
const selectedProjectName = selectedProject?.projectName || 'Unknown Project';
// Master Data
@@ -109,7 +109,7 @@ export default function NumberingPage() {
</SelectTrigger>
<SelectContent>
{(projects as any[]).map((project) => (
<SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
<SelectItem key={project.id ?? project.uuid} value={String(project.id ?? project.uuid)}>
{project.projectCode} - {project.projectName}
</SelectItem>
))}
@@ -137,7 +137,7 @@ export default function NumberingPage() {
<div className="lg:col-span-2 space-y-4">
<div className="grid gap-4">
{templates
.filter((t: any) => !t.projectId || String(t.projectId) === selectedProjectId || t.project?.uuid === selectedProjectId)
.filter((t: any) => !t.projectId || String(t.project?.id ?? t.project?.uuid) === selectedProjectId || t.project?.uuid === selectedProjectId)
.map((template) => (
<Card key={template.id} className="p-6 hover:shadow-md transition-shadow">
<div className="flex justify-between items-start">
@@ -6,11 +6,11 @@ import { useRFA } from "@/hooks/use-rfa";
import { Loader2 } from "lucide-react";
export default function RFADetailPage() {
const { id } = useParams();
const { uuid } = useParams();
if (!id) notFound();
if (!uuid) notFound();
const { data: rfa, isLoading, isError } = useRFA(String(id));
const { data: rfa, isLoading, isError } = useRFA(String(uuid));
if (isLoading) {
return (
@@ -22,12 +22,12 @@ import { toast } from "sonner";
export default function TransmittalDetailPage() {
const params = useParams();
const id = params.id as string;
const uuid = params.uuid as string;
const { data: transmittal, isLoading, error } = useQuery<Transmittal>({
queryKey: ["transmittal", id],
queryFn: () => transmittalService.getById(id),
enabled: !!id,
queryKey: ["transmittal", uuid],
queryFn: () => transmittalService.getByUuid(uuid),
enabled: !!uuid,
});
const handlePrint = () => {
@@ -100,7 +100,7 @@ export default function TransmittalDetailPage() {
<p className="text-sm text-muted-foreground">Generated From</p>
{transmittal.correspondence ? (
<Link
href={`/correspondences/${transmittal.correspondenceId}`}
href={`/correspondences/${transmittal.correspondence.uuid}`}
className="font-medium text-primary hover:underline"
>
{transmittal.correspondence.correspondence_number}
+38 -2
View File
@@ -1,22 +1,41 @@
"use client";
import { useState } from "react";
import { useQuery } from "@tanstack/react-query";
import { TransmittalList } from "@/components/transmittal/transmittal-list";
import { transmittalService } from "@/lib/services/transmittal.service";
import { projectService } from "@/lib/services/project.service";
import { Button } from "@/components/ui/button";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Plus, RefreshCw } from "lucide-react";
import Link from "next/link";
import { TransmittalListResponse } from "@/types/transmittal";
export default function TransmittalPage() {
// ADR-019: Dynamic project selection via UUID
const [selectedProjectUuid, setSelectedProjectUuid] = useState<string>("");
const { data: projectsData } = useQuery({
queryKey: ["projects-for-transmittals"],
queryFn: () => projectService.getAll(),
});
const projects = projectsData?.data || projectsData || [];
const {
data,
isLoading,
error,
refetch,
} = useQuery<TransmittalListResponse>({
queryKey: ["transmittals"],
queryFn: () => transmittalService.getAll({ projectId: 1 }),
queryKey: ["transmittals", selectedProjectUuid],
queryFn: () => transmittalService.getAll({ projectId: selectedProjectUuid }),
enabled: !!selectedProjectUuid,
});
return (
@@ -47,6 +66,23 @@ export default function TransmittalPage() {
</div>
</div>
{/* ADR-019: Project filter */}
<div className="flex items-center gap-3">
<span className="text-sm font-medium text-muted-foreground">Project:</span>
<Select value={selectedProjectUuid} onValueChange={setSelectedProjectUuid}>
<SelectTrigger className="w-[280px]">
<SelectValue placeholder="Select a project" />
</SelectTrigger>
<SelectContent>
{(Array.isArray(projects) ? projects : []).map((p: { uuid: string; projectName?: string; projectCode?: string }) => (
<SelectItem key={p.uuid} value={p.uuid}>
{p.projectName || p.projectCode}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
{error && (
<div className="bg-destructive/10 text-destructive px-4 py-3 rounded-md">
Failed to load transmittals.