np-dms/lcbp3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

690327:0024 Fixing Refactor ADR-019 Naming convention uuid #11
CI / CD Pipeline / build (push) Successful in 6m35s
Details
CI / CD Pipeline / deploy (push) Failing after 12m21s
Details

Browse Source
This commit is contained in:
admin
2026-03-27 00:24:16 +07:00
parent 50b6a0f901
commit 9c5ac74ce5
15 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/app/(admin)/admin/doc-control/numbering/[id]/edit/page.tsx
+6 -3
View File
@@ -24,12 +24,15 @@ export default function EditTemplatePage() {
const { data: correspondenceTypes = [] } = useCorrespondenceTypes();
const { data: projects = [] } = useProjects();
const projectId = template?.projectId || 1;
const { data: contracts = [] } = useContracts(projectId);
const contractId = contracts[0]?.id;
const { data: contractsData } = useContracts(projectId);
const contracts = Array.isArray(contractsData) ? contractsData : [];
const firstContract = contracts[0] as { id?: number; publicId?: string } | undefined;
const contractId = firstContract?.publicId ?? firstContract?.id;
const { data: disciplines = [] } = useDisciplines(contractId);
const selectedProjectName =
projects.find((p: { id?: number; uuid?: string; projectCode: string; projectName: string }) => p.id === projectId)
projects.find((p: { id?: number; publicId?: string; projectCode: string; projectName: string }) =>
String(p.publicId ?? p.id) === String(projectId))
?.projectName || 'LCBP3';
useEffect(() => {
frontend/app/(admin)/admin/doc-control/numbering/new/page.tsx
+6 -3
View File
@@ -14,12 +14,15 @@ export default function NewTemplatePage() {
const { data: correspondenceTypes = [] } = useCorrespondenceTypes();
const { data: projects = [] } = useProjects();
const projectId = 1; // Default or sync with selection
const { data: contracts = [] } = useContracts(projectId);
const contractId = contracts[0]?.id;
const { data: contractsData } = useContracts(projectId);
const contracts = Array.isArray(contractsData) ? contractsData : [];
const firstContract = contracts[0] as { id?: number; publicId?: string } | undefined;
const contractId = firstContract?.publicId ?? firstContract?.id;
const { data: disciplines = [] } = useDisciplines(contractId);
const selectedProjectName =
projects.find((p: { id: number; projectName: string }) => p.id === projectId)?.projectName || 'LCBP3';
projects.find((p: { id?: number; publicId?: string; projectName: string }) =>
String(p.publicId ?? p.id) === String(projectId))?.projectName || 'LCBP3';
const handleSave = async (data: Partial<NumberingTemplate>) => {
try {
frontend/app/(admin)/admin/doc-control/numbering/page.tsx
+3 -3
View File
@@ -53,7 +53,8 @@ export default function NumberingPage() {
// Master Data
const { data: correspondenceTypes = [] } = useCorrespondenceTypes();
const { data: contracts = [] } = useContracts(selectedProjectId);
const { data: contractsData } = useContracts(selectedProjectId);
const contracts = Array.isArray(contractsData) ? contractsData : [];
const firstContract = contracts[0] as { id?: number; publicId?: string } | undefined;
const contractId = firstContract?.publicId ?? firstContract?.id;
const { data: disciplines = [] } = useDisciplines(contractId);
@@ -147,8 +148,7 @@ export default function NumberingPage() {
.filter(
(t) =>
!t.projectId ||
String(t.project?.id ?? t.project?.publicId) === selectedProjectId ||
t.project?.publicId === selectedProjectId
String(t.project?.publicId) === selectedProjectId
)
.map((template) => (
<Card key={template.id} className="p-6 hover:shadow-md transition-shadow">