From a5b635b2cd91f97f92322bafcff8fb915a972fd9 Mon Sep 17 00:00:00 2001 From: Alexandre Phiev Date: Wed, 12 Mar 2025 14:25:17 +0100 Subject: [PATCH 1/3] fix: test build fix with tsconfig --- frontend/components/core/map/layers/use-zones-layer.ts | 5 ----- frontend/services/backend-rest-client.ts | 1 - frontend/tsconfig.json | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend/components/core/map/layers/use-zones-layer.ts b/frontend/components/core/map/layers/use-zones-layer.ts index 1c5de578..24d1f044 100644 --- a/frontend/components/core/map/layers/use-zones-layer.ts +++ b/frontend/components/core/map/layers/use-zones-layer.ts @@ -38,11 +38,6 @@ export const useZonesLayer = ({ ? true : displayedZones.includes(ZoneCategory.FISHING_COASTAL_WATERS) - console.log("zones", zones) - console.log("isAmpDisplayed", isAmpDisplayed) - console.log("isTerritorialDisplayed", isTerritorialDisplayed) - console.log("isFishingDisplayed", isFishingDisplayed) - const ampMultiZones = useMemo(() => { const filteredZones = isAmpDisplayed ? zones diff --git a/frontend/services/backend-rest-client.ts b/frontend/services/backend-rest-client.ts index 58293271..32a3e4e1 100644 --- a/frontend/services/backend-rest-client.ts +++ b/frontend/services/backend-rest-client.ts @@ -159,7 +159,6 @@ export async function getZoneDetails( const url = `${BASE_URL}/metrics/zones/${zoneId}/visiting-time-by-vessel?start_at=${startAt}&end_at=${endAt}&order=DESC&limit=10` console.log(`GET ${url}`) const response = await axios.get(url) - console.log(response) return response } diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index f8972062..ae237b45 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "target": "ES2017", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, @@ -9,12 +10,10 @@ "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "node", - // "moduleResolution": "bundler", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", - "jsxImportSource": "react", "baseUrl": ".", "paths": { "@/*": ["./*"] From 6064f80b9e1f173bfd265dd0ddd638ab997a5970 Mon Sep 17 00:00:00 2001 From: marthevienne <123016211+marthevienne@users.noreply.github.com> Date: Wed, 12 Mar 2025 15:06:21 +0100 Subject: [PATCH 2/3] fix: moduleResolution to node --- frontend/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index ae237b45..7da3e5f9 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -10,7 +10,7 @@ "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "bundler", + "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", From 012849ffaff831a050a983d94cf0ac68900ea8e7 Mon Sep 17 00:00:00 2001 From: Alexandre Phiev Date: Wed, 12 Mar 2025 16:54:49 +0100 Subject: [PATCH 3/3] fix: move to motion instead of old framer-motion --- frontend/components/core/left-panel/main.tsx | 6 +++--- frontend/components/core/map/position-preview.tsx | 2 +- frontend/components/ui/custom/sidebar-expander.tsx | 2 +- frontend/package.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/components/core/left-panel/main.tsx b/frontend/components/core/left-panel/main.tsx index 809f69a4..44e6a045 100644 --- a/frontend/components/core/left-panel/main.tsx +++ b/frontend/components/core/left-panel/main.tsx @@ -4,8 +4,8 @@ import { useEffect } from "react" import Image from "next/image" import TrawlWatchLogo from "@/public/trawlwatch.svg" import { ChartBarIcon } from "@heroicons/react/24/outline" -import { motion, useAnimationControls } from "framer-motion" import { ChevronRightIcon } from "lucide-react" +import { motion, useAnimationControls } from "motion/react" import { useShallow } from "zustand/react/shallow" import { useLoaderStore } from "@/libs/stores/loader-store" @@ -14,8 +14,8 @@ import NavigationLink from "@/components/ui/navigation-link" import { VesselFinderDemo } from "@/components/core/command/vessel-finder" import Spinner from "../../ui/custom/spinner" -import TrackedVesselsPanel from "./tracked-vessel/tracked-vessels-panel" import PartnerCredits from "../map/partner-credits" +import TrackedVesselsPanel from "./tracked-vessel/tracked-vessels-panel" const containerVariants = { close: { @@ -93,7 +93,7 @@ export default function LeftPanel() { initial="close" className="absolute left-0 top-0 z-10 flex max-h-screen flex-col gap-3 rounded-br-lg bg-color-3 shadow-lg" > -
+