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

690327:1118 Fixing Refactor ADR-019 Naming convention uuid #14
CI / CD Pipeline / build (push) Successful in 5m40s
Details
CI / CD Pipeline / deploy (push) Failing after 7m13s
Details

Browse Source
This commit is contained in:
admin
2026-03-27 11:18:04 +07:00
parent 63d906a02a
commit 2eab2e73d6
15 changed files with 319 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/app/(admin)/admin/doc-control/numbering/[id]/edit/page.tsx
+4 -3
View File
@@ -12,6 +12,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { useCorrespondenceTypes, useContracts, useDisciplines } from '@/hooks/use-master-data';
import { useProjects } from '@/hooks/use-projects';
import { toast } from 'sonner';
import { Contract, getContractPublicId } from '@/types/contract';
export default function EditTemplatePage() {
const params = useParams();
@@ -25,9 +26,9 @@ export default function EditTemplatePage() {
const { data: projects = [] } = useProjects();
const projectId = template?.projectId || 1;
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 contracts = (Array.isArray(contractsData) ? contractsData : []) as Contract[];
const firstContract = contracts[0];
const contractId = getContractPublicId(firstContract);
const { data: disciplines = [] } = useDisciplines(contractId);
const selectedProjectName =
frontend/app/(admin)/admin/doc-control/numbering/new/page.tsx
+4 -3
View File
@@ -6,6 +6,7 @@ import { useRouter } from 'next/navigation';
import { useCorrespondenceTypes, useContracts, useDisciplines } from '@/hooks/use-master-data';
import { useProjects } from '@/hooks/use-projects';
import { toast } from 'sonner';
import { Contract, getContractPublicId } from '@/types/contract';
export default function NewTemplatePage() {
const router = useRouter();
@@ -15,9 +16,9 @@ export default function NewTemplatePage() {
const { data: projects = [] } = useProjects();
const projectId = 1; // Default or sync with selection
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 contracts = (Array.isArray(contractsData) ? contractsData : []) as Contract[];
const firstContract = contracts[0];
const contractId = getContractPublicId(firstContract);
const { data: disciplines = [] } = useDisciplines(contractId);
const selectedProjectName =
frontend/app/(admin)/admin/doc-control/numbering/page.tsx
+4 -3
View File
@@ -28,6 +28,7 @@ import { AuditLogsTable } from '@/components/numbering/audit-logs-table';
import { VoidReplaceForm } from '@/components/numbering/void-replace-form';
import { CancelNumberForm } from '@/components/numbering/cancel-number-form';
import { BulkImportForm } from '@/components/numbering/bulk-import-form';
import { Contract, getContractPublicId } from '@/types/contract';
export default function NumberingPage() {
const { data: projects = [] } = useProjects();
@@ -54,9 +55,9 @@ export default function NumberingPage() {
// Master Data
const { data: correspondenceTypes = [] } = useCorrespondenceTypes();
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 contracts = (Array.isArray(contractsData) ? contractsData : []) as Contract[];
const firstContract = contracts[0];
const contractId = getContractPublicId(firstContract);
const { data: disciplines = [] } = useDisciplines(contractId);
const { data: templateResponse, isLoading: _isLoadingTemplates } = useTemplates();