Chore/dependencies update

.gitignore

@@ -127,3 +127,4 @@ affected-apps
 # local parquet files
 *.parquet
 .nx/cache
+.nx/workspace-data

.prettierignore

@@ -3,4 +3,5 @@
 /dist
 /coverage
 
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data

.yarnrc.yml

@@ -14,4 +14,4 @@ supportedArchitectures:
     - darwin
     - linux
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.4.0.cjs

apps/api-portal/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/fishing-map-e2e/cloudbuild.yaml

@@ -31,7 +31,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/fishing-map/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/fishing-map/features/timebar/TimebarSettings.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { IconButton, Radio } from '@globalfishingwatch/ui-components'
 import { DatasetTypes } from '@globalfishingwatch/api-types'
 import { useGetDeckLayers } from '@globalfishingwatch/deck-layer-composer'
-import { VesselLayer } from '@globalfishingwatch/deck-layers'
+import { UserTracksLayer, VesselLayer } from '@globalfishingwatch/deck-layers'
 import useClickedOutside from 'hooks/use-clicked-outside'
 import { TimebarGraphs, TimebarVisualisations } from 'types'
 import {
@@ -69,8 +69,12 @@ const TimebarSettings = ({ loading = false }: { loading: boolean }) => {
   const activeTrackDataviews = useSelector(selectActiveTrackDataviews)
   const isStandaloneVesselLocation = useSelector(selectIsVesselLocation)
   const vesselIds = activeTrackDataviews.map((v) => v.id)
-  const vesselLayers = useGetDeckLayers<VesselLayer>(vesselIds)
-  const hasTracksData = vesselLayers?.some((layer) => layer?.instance.getVesselTracksLayersLoaded())
+  const vesselLayers = useGetDeckLayers<VesselLayer | UserTracksLayer>(vesselIds)
+  const hasTracksData = vesselLayers?.some((layer) =>
+    layer.instance instanceof VesselLayer
+      ? layer.instance?.getVesselTracksLayersLoaded()
+      : layer.instance?.isLoaded
+  )
   const activeVesselsDataviews = useSelector(selectActiveVesselsDataviews)
   const { timebarVisualisation, dispatchTimebarVisualisation } = useTimebarVisualisationConnect()
   const { timebarSelectedEnvId, dispatchTimebarSelectedEnvId } = useTimebarEnvironmentConnect()

apps/fishing-map/package.json

@@ -13,7 +13,7 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "devDependencies": {
-    "i18next-parser": "8.13.0",
+    "i18next-parser": "9.0.1",
     "source-map-explorer": "2.5.3"
   },
   "browserslist": [

apps/fishing-map/project.json

@@ -47,7 +47,8 @@
         "commands": [
           "nx dist:workers deck-loaders",
           "mkdir -p apps/fishing-map/public/workers",
-          "cp dist/libs/deck-loaders/workers/* apps/fishing-map/public/workers/"
+          "cp -R dist/libs/deck-loaders/workers/* apps/fishing-map/public/workers/",
+          "rm -rf apps/fishing-map/public/workers/libs"
         ],
         "parallel": false
       }

apps/fishing-map/public/locales/source/layer-library.json

@@ -64,6 +64,11 @@
     "moreInfoLink": "https://data.marine.copernicus.eu/product/GLOBAL_ANALYSISFORECAST_BGC_001_028/description",
     "name": "Nitrate concentration (NO3)"
   },
+  "offshore-fixed-infrastructure": {
+    "description": "Offshore fixed infrastructure is a global dataset that uses AI and machine learning to detect and classify structures throughout the world’s oceans. Classification labels (oil, wind, and unknown) are provided, as well as confidence levels (high, medium, or low) reflecting our certainty in the assigned label. Detections can be filtered and colored on the map using both label and confidence level. The data is updated on a monthly basis, and new classified detections are added at the beginning of every month. Viewing change using the timebar is simple, and allows anyone to recognize the rapid industrialization of the world’s oceans.",
+    "moreInfoLink": "",
+    "name": "Offshore Fixed Infrastructure (SAR, Optical)"
+  },
   "oxygen": {
     "description": "Dissolved oxygen is the amount of oxygen present in water and is crucial for the growth and survival of marine organisms. Warming ocean temperatures can lead to an expansion of low oxygen zones, which can impact the distribution and abundance of marine life. This dataset is comprised of biogeochemical parameters, including dissolved oxygen, over the global ocean displayed with a 1/4 degree horizontal resolution. ",
     "moreInfoLink": "https://data.marine.copernicus.eu/product/GLOBAL_ANALYSISFORECAST_BGC_001_028/description",
@@ -148,10 +153,5 @@
     "description": "The night lights vessel detections layer, known as visible infrared imaging radiometer suite or VIIRS, shows vessels at sea that satellites have detected by the light they emit at night. Though not exclusively associated with fishing vessels, this activity layer is likely to show vessels associated with activities like squid fishing, which use bright lights and fish at night.",
     "moreInfoLink": "",
     "name": "Night light detections (VIIRS)"
-  },
-  "offshore-fixed-infrastructure": {
-    "description": "Offshore fixed infrastructure is a global dataset that uses AI and machine learning to detect and classify structures throughout the world’s oceans. Classification labels (oil, wind, and unknown) are provided, as well as confidence levels (high, medium, or low) reflecting our certainty in the assigned label. Detections can be filtered and colored on the map using both label and confidence level. The data is updated on a monthly basis, and new classified detections are added at the beginning of every month. Viewing change using the timebar is simple, and allows anyone to recognize the rapid industrialization of the world’s oceans.",
-    "moreInfoLink": "",
-    "name": "Offshore Fixed Infrastructure (SAR, Optical)"
   }
 }

apps/fishing-map/public/locales/source/translations.json

@@ -63,8 +63,8 @@
     "statsDisclaimerStatic": "The average value for your area is {{mean}} {{unit}}. The minimum and maximum are {{min}} {{unit}} and {{max}} {{unit}}.",
     "summary": "<strong>{{vessels}} vessels{{sources}} </strong> had <strong>{{activityQuantity}} {{activityUnit}}</strong> of <strong>{{activityType}}</strong> in the area between <strong>{{start}}</strong> and <strong>{{end}}</strong>",
     "summaryNoVessels": "<strong>{{sources}} {{activityQuantity}}</strong> {{activityUnit}} <strong>{{activityType}}</strong> in the area between <strong>{{start}}</strong> and <strong>{{end}}</strong>",
-    "timeRangeTooLong": "Reports are only allowed for time ranges up to one year",
     "timeoutError": "This is taking more than expected, please wait",
+    "timeRangeTooLong": "Reports are only allowed for time ranges up to one year",
     "title": "Analysis",
     "unknown": "Unknown"
   },
@@ -202,22 +202,22 @@
     "seeDefault": "See default view",
     "seeMore": "See more",
     "send": "Send",
-    "since": "since",
     "setNewPassword": "Set a new password",
     "share": "Share the current view",
+    "since": "since",
     "sources": "Sources",
     "summary": "Summary",
     "timerange": "Time range",
-    "timerangeStatic": "Static ({{start}} - {{end}})",
+    "timerangeDaysFromLatest": "Days from latest data update (1-100)",
     "timerangeDescription": "From {{start}} to {{end}}",
     "timerangeDynamic": "Dynamic",
-    "timerangeDaysFromLatest": "Days from latest data update (1-100)",
+    "timerangeStatic": "Static ({{start}} - {{end}})",
     "timestamp": "Timestamp",
     "to": "to",
     "toggleVisibility": "Toggle visibility",
     "tutorials": "Tutorials",
-    "unit": "unit",
     "unionOf": "Union of",
+    "unit": "unit",
     "unknown": "Unknown",
     "unknownVessel": "Unknown vessel",
     "update": "Update",
@@ -226,6 +226,7 @@
     "value": "value",
     "vessel": "Vessel",
     "vessel_one": "Vessel",
+    "vessel_many": "common.vessel",
     "vessel_other": "Vessels",
     "vesselId": "Vessel id",
     "vessels": "Vessels",
@@ -304,6 +305,7 @@
       "geoJSON": {
         "noValidFeatures": "No valid feature types found in the geoJSON file"
       },
+      "invalidDatesFeatures": "Some of your {{featureType}} don't contain a valid date. They won't appear on the map regardless of time filter.",
       "kml": {
         "invalidData": "KML data does not have a valid geometry type",
         "noLineData": "No line data found in the KML",
@@ -440,8 +442,8 @@
     "generic": "Something went wrong, try again or contact:",
     "genericShort": "Something went wrong",
     "invalidRange": "Min has to be lower than max value",
-    "layerLoading": "There was an error loading the layer",
     "latestCarrierNotFound": "Latest carrier dataset not found",
+    "layerLoading": "There was an error loading the layer",
     "missingLatLng": "No latitude or longitude fields found",
     "pageNotFound": "Page not found",
     "privateProfile": "Your account doesn't have permission to see this vessel",
@@ -587,6 +589,7 @@
     },
     "areasOnScreen": "Areas on screen",
     "color_change": "Change color",
+    "drawPoints": "Draw points",
     "drawPolygon": "Draw a layer",
     "drawPolygonLogin": "Register and login to draw a layer (free, 2 minutes)",
     "editDraw": "Edit draw",
@@ -648,8 +651,8 @@
     "errorAction": "Log an issue at a specific location",
     "errorLabel": "Please describe the error as detailed as possible",
     "errorPlaceholder": "Please describe the error as detailed as possible",
-    "legend_help": "Approximated grid cell area at the Equator",
     "highRes": "See high resolution heatmaps",
+    "legend_help": "Approximated grid cell area at the Equator",
     "loading": "Loading",
     "lowRes": "See low resolution heatmaps",
     "mapLoadingWait": "Please wait until map loads",
@@ -918,8 +921,8 @@
     "noTrackAvailable": "There is no track available",
     "noVoyagesinTimeRange": "There are no voyages fully contained in your timerange.",
     "noVoyagesWithoutPorts": "Please turn on port visits visibility",
-    "origin": "Origin",
     "onScreen": "Vessels on screen",
+    "origin": "Origin",
     "owner": "Owner",
     "owners": "Owners",
     "registeredGearType": "Registered Gear Type",
@@ -944,8 +947,8 @@
     "target_species": "Target species",
     "targetSpecies": "Target species",
     "title": "Vessel profile",
-    "tonnageGt": "Tonnage (Gt)",
     "toggleAllVessels": "Toggle all vessels visibility",
+    "tonnageGt": "Tonnage (Gt)",
     "trackLogin": "One of your selected sources requires you to <1>login</1> to see vessel tracks and events",
     "transmission_other": "Transmissions",
     "transmissionDates": "Transmission dates",
@@ -1016,6 +1019,7 @@
     "emptyStateVessels": "The vessels selected in the search or by clicking on activity grid cells will appear here.",
     "migrationDisclaimer": "Update your workspace to view the latest data and features.",
     "migrationDisclaimerNote": "Note, some vessel identity and activity information may change. <a target='_blank' href='https://globalfishingwatch.org/faqs/2024-aug-new-release-in-our-ais-data-pipeline-version-3'> Learn more.</a>",
+    "migrationMaintain": "Skip",
     "migrationSkip": "Skip",
     "migrationUpdate": "Update",
     "nameInput": "Workspace name",

apps/fishing-map/queries/stats-api.ts

@@ -1,7 +1,5 @@
-import { createApi } from '@reduxjs/toolkit/query/react'
+import { createApi, FetchBaseQueryArgs, SerializeQueryArgs } from '@reduxjs/toolkit/query/react'
 import { stringify } from 'qs'
-import type { BaseQueryArg, BaseQueryFn } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
-import type { SerializeQueryArgs } from '@reduxjs/toolkit/dist/query/defaultSerializeQueryArgs'
 import { gfwBaseQuery } from 'queries/base'
 import { uniq } from 'es-toolkit'
 import { DateTime } from 'luxon'
@@ -16,7 +14,7 @@ type FetchDataviewStatsParams = {
   fields?: StatField[]
 }
 
-interface CustomBaseQueryArg extends BaseQueryArg<BaseQueryFn> {
+interface CustomBaseQueryArg extends FetchBaseQueryArgs {
   dataview: UrlDataviewInstance
   timerange: TimeRange
 }

apps/fourwings-explorer/features/timebar/Timebar.tsx

@@ -15,6 +15,8 @@ import TimebarActivityGraph from './TimebarActivityGraph'
 import TimebarSettings from './TimebarSettings'
 import styles from './Timebar.module.css'
 
+const TimebarComponent = Timebar as any
+
 const TimebarHighlighterWrapper = () => {
   const [highlightTimerange] = useHighlightTimerange()
   // const metadata = useMapInstanceStyle()?.metadata?.generatorsMetadata
@@ -89,7 +91,7 @@ const TimebarWrapper = () => {
   if (!timerange?.start || !timerange?.end) return null
   return (
     <div className={styles.timebarWrapper}>
-      <Timebar
+      <TimebarComponent
         enablePlayback={true}
         start={timerange?.start}
         end={timerange?.end}
@@ -101,7 +103,7 @@ const TimebarWrapper = () => {
       >
         <TimebarActivityGraph />
         <TimebarHighlighterWrapper />
-      </Timebar>
+      </TimebarComponent>
       <TimebarSettings />
     </div>
   )

apps/image-labeler/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/real-time-prototype/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/user-groups-admin/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/vessel-history/Dockerfile

@@ -4,7 +4,7 @@
 
 # Production image, copy all the files and run next
 FROM node:21-alpine AS production
-ENV YARN_VERSION 4.3.1
+ENV YARN_VERSION 4.4.0
 
 RUN yarn set version $YARN_VERSION
 WORKDIR /app

apps/vessel-history/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

apps/vessel-history/cloudbuild_PR_tests.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

cloudbuild.yaml

@@ -21,7 +21,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable
 

libs/deck-layers/package.json

@@ -4,7 +4,8 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@deck.gl-community/editable-layers": "^9.0.0-alpha.1",
+    "@deck.gl-community/editable-layers": "^9.0.2",
+    "@deck.gl-community/layers": "^9.0.2",
     "@deck.gl/core": "^9.0.20",
     "@deck.gl/extensions": "^9.0.20",
     "@deck.gl/geo-layers": "^9.0.20",

libs/i18n-labels/cloudbuild.yaml

@@ -18,7 +18,7 @@ steps:
     waitFor: ['restore_cache']
     name: node:21
     script: |
-      yarn set version 4.3.1
+      yarn set version 4.4.0
       yarn -v
       yarn install --immutable