chore: resolve second wave of merge conflicts, integrate new DODA despacho module and stabilize catalogues

frontend/src/lib/components/sidebar/modules.ts

@@ -13,6 +13,7 @@ import {
 	Hash,
 	LayoutDashboard,
 	Package,
+	PackageCheck,
 	Settings2,
 	Shield,
 	Ship,
@@ -290,10 +291,6 @@ export function getSidebarData(): SidebarData {
 						title: m["sidebar.general_catalogs.customs_warehouses"](),
 						url: "/dashboard/reference_data/customs_warehouses",
 					},
-					{
-						title: m["sidebar.general_catalogs.doda"](),
-						url: "/dashboard/general_catalogs/doda",
-					},
 					{
 						title: m["sidebar.general_catalogs.prevalidators"](),
 						url: "/dashboard/general_catalogs/prevalidators",
@@ -533,10 +530,19 @@ export function getSidebarData(): SidebarData {
 				],
 			},
 			{
-				title: m["sidebar.digitalizacion.title"](),
-				url: "/dashboard/digitalizacion",
-				icon: FolderArchive,
-				items: [],
+				title: m["sidebar.despacho.title"](),
+				url: "#",
+				icon: PackageCheck,
+				items: [
+					{
+						title: m["sidebar.despacho.digitalizacion"](),
+						url: "/dashboard/digitalizacion",
+					},
+					{
+						title: m["sidebar.despacho.doda"](),
+						url: "/dashboard/despacho/doda",
+					},
+				],
 			},
 			{
 				title: m["sidebar.reference_data.configuracion"](),