refactor: update API endpoints and improve company ID handling in various components

2026-02-13 10:40:24 -06:00
parent 6440b79d28
commit dedef1672e
22 changed files with 186 additions and 157 deletions
--- a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte
@@ -122,7 +122,7 @@
 						id="broker_key"
 						bind:value={formData.broker_key}
 						placeholder="Ej: 01001"
-						maxlength="5"
+						maxlength={5}
 						disabled={isEdit}
 					/>
 				</div>
@@ -133,7 +133,7 @@
 						id="concept"
 						bind:value={formData.concept}
 						placeholder="Ej: 001"
-						maxlength="15"
+						maxlength={15}
 						disabled={isEdit}
 					/>
 				</div>
--- a/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte
@@ -5,6 +5,11 @@
 	import { Label } from '$lib/components/ui/label';
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { obtenerAtajosFormularioIdentificadores } from '$lib/config/shortcuts/dashboard/general_catalogs/identifiers/edit';
+	import {
+		createIdentifier,
+		updateIdentifier,
+		type Identifier
+	} from '$lib/api/dashboard/a76/general_catalogs/identifiers';

 	let {
 		open = $bindable(false),
--- a/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte
@@ -1,123 +1,106 @@
 <script lang="ts" generics="TData, TValue">
-	import { onMount } from 'svelte';
 	import {
 		type ColumnDef,
 		getCoreRowModel
 	} from "@tanstack/table-core";
 	import { createSvelteTable, FlexRender } from "$lib/components/ui/data-table/index.js";
 	import * as Table from "$lib/components/ui/table/index.js";
+	import { Button } from "$lib/components/ui/button";
+	import { goto } from "$app/navigation";
+	import { page } from "$app/stores";

 	type DataTableProps<TData, TValue> = {
 		columns: ColumnDef<TData, TValue>[];
 		data: TData[];
-		loading: boolean;
-		hasMore: boolean;
-		loadMore: () => void;
+		pageCount: number;
+		totalItems: number;
 	};

 	let {
 		data,
 		columns,
-		loading,
-		hasMore,
-		loadMore
+		pageCount,
+		totalItems
 	}: DataTableProps<TData, TValue> = $props();

 	const table = createSvelteTable({
-		get data() {
-			return data;
-		},
-		columns,
-		getCoreRowModel: getCoreRowModel()
+		get data() { return data; },
+		get columns() { return columns; },
+		getCoreRowModel: getCoreRowModel(),
+		manualPagination: true,
+		get pageCount() { return pageCount; },
 	});

-	let scrollContainer = $state<HTMLDivElement>();
-	let loadingTrigger = $state<HTMLDivElement>();
+	function handlePageChange(newPage: number) {
+		const url = new URL($page.url);
+		url.searchParams.set('page', newPage.toString());
+		goto(url, { keepFocus: true, noScroll: true });
+	}

-	// Intersection Observer para detectar cuando el usuario llega al final
-	onMount(() => {
-		const observer = new IntersectionObserver(
-			(entries) => {
-				const [entry] = entries;
-				if (entry.isIntersecting && hasMore && !loading) {
-					loadMore();
-				}
-			},
-			{
-				root: scrollContainer,
-				threshold: 0.1
-			}
-		);
-
-		if (loadingTrigger) {
-			observer.observe(loadingTrigger);
-		}
-
-		return () => {
-			observer.disconnect();
-		};
-	});
+	const currentPage = $derived(Number($page.url.searchParams.get('page') || 1));
 </script>

-<div class="w-full">
-	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
-		<Table.Root>
-			<Table.Header class="bg-background">
-				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
-					<Table.Row>
-						{#each headerGroup.headers as header (header.id)}
-							<Table.Head>
-								{#if !header.isPlaceholder}
-									<FlexRender
-										content={header.column.columnDef.header}
-										context={header.getContext()}
-									/>
-								{/if}
-							</Table.Head>
-						{/each}
-					</Table.Row>
-				{/each}
-			</Table.Header>
-			<Table.Body>
-				{#each table.getRowModel().rows as row (row.id)}
-					<Table.Row data-state={row.getIsSelected() && "selected"}>
-						{#each row.getVisibleCells() as cell (cell.id)}
-							<Table.Cell>
+<div class="rounded-md border">
+	<Table.Root>
+		<Table.Header>
+			{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
+				<Table.Row>
+					{#each headerGroup.headers as header (header.id)}
+						<Table.Head>
+							{#if !header.isPlaceholder}
 								<FlexRender
-									content={cell.column.columnDef.cell}
-									context={cell.getContext()}
+									content={header.column.columnDef.header}
+									context={header.getContext()}
 								/>
-							</Table.Cell>
-						{/each}
-					</Table.Row>
-				{:else}
-					<Table.Row>
-						<Table.Cell colspan={columns.length} class="h-24 text-center">
-							No hay resultados.
+							{/if}
+						</Table.Head>
+					{/each}
+				</Table.Row>
+			{/each}
+		</Table.Header>
+		<Table.Body>
+			{#each table.getRowModel().rows as row (row.id)}
+				<Table.Row data-state={row.getIsSelected() && "selected"}>
+					{#each row.getVisibleCells() as cell (cell.id)}
+						<Table.Cell>
+							<FlexRender
+								content={cell.column.columnDef.cell}
+								context={cell.getContext()}
+							/>
 						</Table.Cell>
-					</Table.Row>
-				{/each}
-				
-				<!-- Loading Trigger - Se activa cuando es visible -->
-				{#if hasMore}
-					<Table.Row>
-						<Table.Cell colspan={columns.length} class="h-20 text-center">
-							<div bind:this={loadingTrigger}>
-								{#if loading}
-									<div class="flex items-center justify-center gap-2">
-										<div class="h-4 w-4 animate-spin rounded-full border-2 border-primary border-t-transparent"></div>
-										<span class="text-muted-foreground text-sm">Cargando más...</span>
-									</div>
-								{:else}
-									<div class="text-muted-foreground text-sm">
-										Desplázate para cargar más
-									</div>
-								{/if}
-							</div>
-						</Table.Cell>
-					</Table.Row>
-				{/if}
-			</Table.Body>
-		</Table.Root>
+					{/each}
+				</Table.Row>
+			{:else}
+				<Table.Row>
+					<Table.Cell colspan={columns.length} class="h-24 text-center">
+						No hay resultados.
+					</Table.Cell>
+				</Table.Row>
+			{/each}
+		</Table.Body>
+	</Table.Root>
+</div>
+
+<div class="flex items-center justify-end space-x-2 py-4 px-2">
+	<div class="flex-1 text-sm text-muted-foreground">
+		Total: {totalItems} registros
+	</div>
+	<div class="space-x-2">
+		<Button
+			variant="outline"
+			size="sm"
+			onclick={() => handlePageChange(currentPage - 1)}
+			disabled={currentPage <= 1}
+		>
+			Anterior
+		</Button>
+		<Button
+			variant="outline"
+			size="sm"
+			onclick={() => handlePageChange(currentPage + 1)}
+			disabled={currentPage >= pageCount}
+		>
+			Siguiente
+		</Button>
 	</div>
 </div>
--- a/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.server.ts
@@ -39,7 +39,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
            page_size: pageSize.toString(), 
            ...filters 
        });
-        const response = await authenticatedFetch(`v1/a76/classification-concepts?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
+        const response = await authenticatedFetch(`v1/a76/classification-concepts/?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);

        if (!response.ok) {
            return { error: 'Failed to load', classifications: { items: [], total: 0, page, page_size: pageSize, pages: 0 } };
--- a/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte
@@ -89,7 +89,6 @@
 	/>
 	<CreateDialog
 		bind:open={dialogOpen}
-		title="Crear Nueva Clasificación de Concepto"
 		onSuccess={handleSuccess}
 	/>
 </div>
--- a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts
@@ -59,7 +59,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        });

        const response = await authenticatedFetch(
-            `v1/a76/concepts?${queryParams.toString()}`,
+            `v1/a76/concepts/?${queryParams.toString()}`,
            { method: 'GET' },
            cookies,
            fetch
--- a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts
@@ -2,20 +2,25 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
-        return { error: 'No authenticated', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+        return { error: 'No authenticated', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
    }

    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
-            return { error: 'No company selected', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+            return { error: 'No company selected', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
        }

        const filters: Record<string, string> = {};
@@ -28,22 +33,22 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
-        const response = await authenticatedFetch(`v1/a76/customs-broker-concepts?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
+        const response = await authenticatedFetch(`v1/a76/customs-broker-concepts/?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);

        if (!response.ok) {
-            return { error: 'Failed to load', concepts: { items: [], total: 0, page, page_size: pageSize, pages: 0 }, activeCompanyId: companyId };
+            return { error: 'Failed to load', concepts: { items: [], total: 0, page, page_size: pageSize, pages: 0 } };
        }

        const data = await response.json();
        // Calculate pages if not provided by API
        const pages = data.pages || Math.ceil(data.total / pageSize);
        
-        return { concepts: { ...data, pages }, activeCompanyId: parseInt(companyId) };
+        return { concepts: { ...data, pages } };
    } catch (error) {
        console.error('Error loading customs broker concepts:', error);
-        return { error: 'Error loading', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+        return { error: 'Error loading', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
    }
 };
--- a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
@@ -10,8 +10,11 @@
 	import { browser } from '$app/environment';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
 	import { obtenerAtajosListaConceptosAA } from '$lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list';
+	import { companyStore } from '$lib/stores/company.svelte';

 	let { data } = $props();
+	
+	const activeCompanyId = $derived(companyStore.activeCompany?.id);
 	let dialogOpen = $state(false);

 	// Atajos
@@ -92,9 +95,11 @@
 		/>
 	</div>

-	<CreateEditDialog
-		bind:open={dialogOpen}
-		companyId={data.activeCompanyId}
-		onSuccess={handleSuccess}
-	/>
+	{#if activeCompanyId}
+		<CreateEditDialog
+			bind:open={dialogOpen}
+			companyId={activeCompanyId}
+			onSuccess={handleSuccess}
+		/>
+	{/if}
 </div>
--- a/frontend/src/routes/dashboard/general_catalogs/doda/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/doda/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', dodas: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -26,7 +31,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        const response = await authenticatedFetch(`v1/a76/doda?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
--- a/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', notices: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -28,7 +33,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        const response = await authenticatedFetch(`v1/a76/electronic-notices?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
--- a/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', equivalencies: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -28,7 +33,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        
--- a/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', identifiers: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -28,11 +33,11 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        
-        const response = await authenticatedFetch(`v1/a76/identifiers?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
+        const response = await authenticatedFetch(`v1/a76/identifiers/?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);

        if (!response.ok) {
            return { error: 'Failed to load', identifiers: { items: [], total: 0, page, page_size: pageSize, pages: 0 } };
--- a/frontend/src/routes/dashboard/general_catalogs/inpc/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/inpc/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', inpc: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -28,7 +33,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        
--- a/frontend/src/routes/dashboard/general_catalogs/packages/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/packages/+page.server.ts
@@ -59,7 +59,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        });

        const response = await authenticatedFetch(
-            `v1/a76/packages?${queryParams.toString()}`,
+            `v1/a76/packages/?${queryParams.toString()}`,
            { method: 'GET' },
            cookies,
            fetch
--- a/frontend/src/routes/dashboard/general_catalogs/ports/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/ports/+page.server.ts
@@ -2,7 +2,8 @@ import { getServerApiUrl, getAuthTokens } from '$lib/server/api';
 import type { PageServerLoad } from './$types';
 import { redirect } from '@sveltejs/kit';

-export const load: PageServerLoad = async ({ cookies, fetch, url }) => {
+export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);
    if (!accessToken) {
        throw redirect(302, '/login');
@@ -10,7 +11,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url }) => {

    const page = Number(url.searchParams.get('page')) || 1;
    const pageSize = Number(url.searchParams.get('page_size')) || 50;
-    const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+    
+    // Obtener company_id de la cookie o usar el primero disponible
+    const cookieCompanyId = cookies.get('active_company_id');
+    const companyId = cookieCompanyId 
+        ? parseInt(cookieCompanyId)
+        : parentData.companies?.[0]?.id;

    if (!companyId) {
        return {
@@ -27,7 +33,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url }) => {
    const query = new URLSearchParams({
        page: page.toString(),
        page_size: pageSize.toString(),
-        company_id: companyId
+        company_id: companyId.toString()
    });

    const endpoint = `${apiUrl}v1/a76/ports?${query.toString()}`;
--- a/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', prevalidators: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -28,7 +33,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
        const queryParams = new URLSearchParams({ 
            page: page.toString(), 
            page_size: pageSize.toString(), 
-            company_id: companyId,
+            company_id: companyId.toString(),
            ...filters 
        });
        const response = await authenticatedFetch(`v1/a76/prevalidators?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
--- a/frontend/src/routes/dashboard/general_catalogs/signatures/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/signatures/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-    await parent();
+    const parentData = await parent();
    const { accessToken } = getAuthTokens(cookies);

    if (!accessToken) {
@@ -12,7 +12,12 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
    try {
        const page = Number(url.searchParams.get('page')) || 1;
        const pageSize = Number(url.searchParams.get('pageSize')) || 50;
-        const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+        
+        // Obtener company_id de la cookie o usar el primero disponible
+        const cookieCompanyId = cookies.get('active_company_id');
+        const companyId = cookieCompanyId 
+            ? parseInt(cookieCompanyId)
+            : parentData.companies?.[0]?.id;

        if (!companyId) {
            return { error: 'No company selected', signatures: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
@@ -23,7 +28,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {

        if (code) filters.code = code;

-        const queryParams = new URLSearchParams({ page: page.toString(), page_size: pageSize.toString(), company_id: companyId, ...filters });
+        const queryParams = new URLSearchParams({ page: page.toString(), page_size: pageSize.toString(), company_id: companyId.toString(), ...filters });
        const response = await authenticatedFetch(`v1/a76/signatures?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);

        if (!response.ok) {
--- a/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types';
 import { getAuthTokens, authenticatedFetch } from '$lib/server/api';

 export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
-	await parent();
+	const parentData = await parent();
 	const { accessToken } = getAuthTokens(cookies);

 	if (!accessToken) {
@@ -17,9 +17,11 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
 		const pageSize = Number(url.searchParams.get('pageSize')) || 50;
 		const filters: Record<string, string> = {};

-		// Obtener company_id
+		// Obtener company_id de la cookie o usar el primero disponible
 		const cookieCompanyId = cookies.get('active_company_id');
-		const companyId = cookieCompanyId ? parseInt(cookieCompanyId) : undefined;
+		const companyId = cookieCompanyId 
+			? parseInt(cookieCompanyId)
+			: parentData.companies?.[0]?.id;

 		if (!companyId) {
 			return {
--- a/frontend/src/routes/dashboard/invoices/items/presets/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/items/presets/+page.svelte
@@ -496,7 +496,7 @@
 														onclick={() => handleDeleteItem(i)}
 														class="h-8 w-8 text-zinc-500 hover:text-destructive"
 													>
-														<Trash2 class="h-3.5 h-3.5" />
+														<Trash2 class="h-3.5 w-3.5" />
 													</Button>
 												</div>
 											</Table.Cell>
--- a/frontend/src/routes/dashboard/reference_data/incoterms/+page.server.ts
+++ b/frontend/src/routes/dashboard/reference_data/incoterms/+page.server.ts
@@ -24,7 +24,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {

 		// Usar authenticatedFetch para manejar automáticamente el refresh de tokens
 		const response = await authenticatedFetch(
-			`v1/public/reference_data/incoterms?page=${page}&page_size=${pageSize}`,
+			`v1/public/reference_data/incoterms/?page=${page}&page_size=${pageSize}`,
 			{},
 			cookies,
 			fetch
--- a/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte
@@ -2,7 +2,7 @@
    import { page } from '$app/stores';
    import { goto } from '$app/navigation';
    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/reference_data/incoterms/columns.js';
+    import { createColumns } from '$lib/components/dashboard/reference_data/incoterms/columns';
    import DataTable from '$lib/components/dashboard/reference_data/incoterms/data-table.svelte';
    import CreateEditDialog from '$lib/components/dashboard/reference_data/incoterms/create-edit-dialog.svelte';
    import { Button } from '$lib/components/ui/button';
@@ -59,11 +59,7 @@
            <p class="text-muted-foreground">
                Catálogo de Incoterms
            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Incoterm
-        </Button>
+        </div>        
    </div>

    <div class="flex gap-4 items-end">