Merge develop into main: sync production with staging by ksalamy · Pull Request #510 · mbari-org/dash5

ksalamy · 2026-02-17T21:25:28Z

Syncs main with develop so production (dash5.mbari.org) can deploy the same code as staging (dash5-staging.mbari.org).

Changes

Merges all develop commits into main
main has been stale since PR Revert "Merging various updates that include updating the Overview maps, measurement apps, etc for the Dash5." #333; develop has all recent work

Post-merge

After merge, tag main (e.g. v5.1.0) to trigger production CI build.

…comms-indicators Update comms section to provide accurate ACK times and display the method of communication and cell timeout

…cheduling Fix command scheduling issues

…e default

…-or-partial-mission-names Fix missing or partially displayed mission names

…e word

…es now

…and param in extract overrides

… a param

… mission text

…tomatically

…-assets-for-map Add TrackDB functionality to overview and deployment maps

…ri-org#509) * Display seconds in CommsSection timestamps (fixes mbari-org#491) Extends the full-resolution timestamp display from LogsSection to CommsSection. Command and mission event timestamps now show H:mm:ss for correlation with other datastreams and sources. * Add test for H:mm:ss timestamp format in CommsSection Verifies timestamps include seconds for correlation with other datastreams.

…bari-org#508) - Map.tsx: Merge duplicate top-left Control blocks (Paintbrush, TrackDB, Layers, Center, Fit bounds, Add markers) into a single control group - index.tsx: Add useIsDesktop so only one layout (desktop or mobile) renders - [...deployment].tsx: Add useIsDesktop for same layout fix on Deployment page Prevents duplicate map controls when both desktop and mobile layouts mount.

Copilot

Pull request overview

This PR merges the develop branch into main, syncing production (dash5.mbari.org) with staging (dash5-staging.mbari.org). The changes represent accumulated development work since PR #333, bringing main up to date with the latest features and improvements.

Changes:

Upgraded Next.js from v12 to v15 with static export configuration
Added comprehensive document management system with TipTap editor
Enhanced deployment tracking with improved comms monitoring and time handling

Reviewed changes

Copilot reviewed 116 out of 328 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
docker/nginx.conf	New nginx configuration for serving Next.js static exports with dynamic route handling
docker/Dockerfile	Docker configuration for nginx-based static deployment
apps/lrauv-dash2/package.json	Next.js upgrade to v15 and TipTap editor dependencies
apps/lrauv-dash2/next.config.js	Updated for Next.js 15 with static export and workspace package transpilation
apps/lrauv-dash2/pages/_app.tsx	Added new context providers for markers, cookies, maps, and vehicle colors
apps/lrauv-dash2/lib/useLastCommsTime.ts	Enhanced to differentiate satellite and cell comms with separate timestamps
apps/lrauv-dash2/components/VehicleAccordion.tsx	Refactored to use millisecond timestamps and improved mission tracking
apps/lrauv-dash2/components/CommsSection.tsx	Updated to use millisecond timestamps and new comms events API
apps/lrauv-dash2/components/docs/*	New document editor/viewer components using TipTap
.github/workflows/build.yml	New GitHub Actions CI/CD workflow replacing CircleCI

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 116 out of 328 changed files in this pull request and generated 9 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-17T21:29:07Z

apps/lrauv-dash2/lib/makeCommand.ts

      }
-      const t = DateTime.fromISO(specifiedTime)
+      const t = DateTime.fromISO(specifiedLocalTime).toUTC()
      const schedDate = `${t.toFormat('yyyyMMdd')}}T${t.toFormat('HHmm')}`


The scheduled date string has an extra } which will generate malformed schedDate values (e.g., 20240320}T2100). Remove the stray brace so the format matches yyyyMMdd'T'HHmm.

Suggested change

const schedDate = `${t.toFormat('yyyyMMdd')}}T${t.toFormat('HHmm')}`

const schedDate = `${t.toFormat('yyyyMMdd')}T${t.toFormat('HHmm')}`

Copilot · 2026-02-17T21:29:08Z

apps/lrauv-dash2/lib/useGoogleElevator.ts

+  // Call this immediately on mount to start initializing the service
+  useState(() => {
+    getElevationService()
+      .then(() => {
+        setElevationAvailable(true)
+        logger.info('👍 Elevation service ready')
+      })
+      .catch(() => {
+        setElevationAvailable(false)
+        logger.warn('⚠️ Elevation service unavailable')
+      })
+  })


This uses useState for side effects, which is not supported and can lead to repeated initialization and warnings. Move this initialization into a useEffect(() => { ... }, []) so it runs once on mount (and is clearly modeled as an effect).

Copilot · 2026-02-17T21:29:08Z

apps/lrauv-dash2/components/VehicleColorsContext.tsx

+export const VehicleColorsContext = createContext<VehicleColorsContextProps>({
+  vehicleColors: {},
+  defaultVehicleColors: DEFAULT_VEHICLE_COLORS,
+  setVehicleColor: () => {},
+  resetVehicleColor: () => {},
+  resetAllVehicleColors: () => {},
+  debug: {
+    providerId: 'default',
+    instanceCount: 0,
+  },
+})


Because the context is created with a non-undefined default value, useVehicleColors() cannot reliably detect 'missing provider' (the if (!context) check will never trigger). Create the context as createContext<VehicleColorsContextProps | undefined>(undefined) and handle the undefined case in the hook.

Copilot · 2026-02-17T21:29:08Z

apps/lrauv-dash2/components/SelectedPlatformContext.tsx

+  const [selectedPlatformIds, setSelectedPlatformIds] = useState<string[]>(
+    () => {
+      try {
+        const stored = localStorage.getItem('selectedTrackingDbAssetIds')
+        return stored ? JSON.parse(stored) : []
+      } catch {
+        return []
+      }
+    }
+  )


This reads from localStorage during state initialization without guarding for non-browser environments. In Next.js this can crash during SSR/build (where localStorage is undefined). Add a typeof window !== 'undefined' guard (and similarly guard the localStorage.setItem(...) effect) so the provider is safe to import/render in SSR.

Copilot · 2026-02-17T21:29:08Z

apps/lrauv-dash2/components/StationSection.tsx

+                  <input
+                    type="checkbox"
+                    className="mr-2"
+                    checked={selectedStations.includes(station)}


selectedStations.includes(station) relies on object reference equality. Since station objects can be re-created from API responses/grouping, this can cause checked states to be wrong even when a station with the same identity is selected. Use an identity comparison (e.g., by station.name or a stable id) such as selectedStations.some(s => s.name === station.name).

Suggested change

checked={selectedStations.includes(station)}

checked={selectedStations.some(

(s) => s.id === station.id

)}

Copilot · 2026-02-17T21:29:09Z

apps/lrauv-dash2/components/CommsSection.test.tsx

+  test('should display timestamps with seconds (H:mm:ss)', async () => {
+    render(
+      <MockProviders queryClient={new QueryClient()}>
+        <CommsSection vehicleName="makai" from="" />


CommsSection now expects from as a number (milliseconds since epoch). Passing an empty string will fail TypeScript checking and can cause runtime issues in date handling. Update the test to pass a numeric timestamp (and optionally to).

Copilot · 2026-02-17T21:29:09Z

.github/workflows/build.yml

+  bump-version:
+    if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'


This job is gated on pull_request.merged == true, but the workflow's pull_request trigger does not specify types: [closed]. As written, this job will never run because merge information is only set on the closed event. Add pull_request: types: [closed] (or move version bumping to a push/release-based trigger) so the condition can ever be true.

Copilot · 2026-02-17T21:29:09Z

apps/lrauv-dash2/components/PlatformsListModal.tsx

+          const group = acc[p.typeName] ?? []
+          group.push(p)
+          return { ...acc, [p.typeName]: group }


This reducer creates a new object on every iteration via { ...acc, ... }, which is unnecessarily expensive for large platform lists. Mutate the accumulator in-place (acc[p.typeName] = ...; return acc) to keep it O(n) without repeated object copies.

Suggested change

const group = acc[p.typeName] ?? []

group.push(p)

return { ...acc, [p.typeName]: group }

if (!acc[p.typeName]) {

acc[p.typeName] = []

}

acc[p.typeName].push(p)

return acc

Copilot · 2026-02-17T21:29:09Z

apps/lrauv-dash2/components/ClickableMapPoint.tsx

@@ -1,24 +1,33 @@
+import { on } from 'events'


This import appears unused and also pulls in Node's events module, which is not intended for browser bundles. Remove the import to avoid unnecessary bundle weight and potential build tooling issues.

Suggested change

import { on } from 'events'

Copilot

Pull request overview

Copilot reviewed 117 out of 334 changed files in this pull request and generated 10 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-17T22:01:53Z

apps/lrauv-dash2/lib/makeCommand.ts

+      const t = DateTime.fromISO(specifiedLocalTime).toUTC()
      const schedDate = `${t.toFormat('yyyyMMdd')}}T${t.toFormat('HHmm')}`
      return {
-        commandText,
+        commandText: resolvedCommandText,
        schedDate,
-        previewSbd: `sched ${schedDate} "${commandText}"`,
+        previewSbd: `sched ${schedDate} "${resolvedCommandText}"`,


The schedDate format string includes an extra } (yyyyMMdd}}T...), which will produce an invalid schedule date (and break the added UTC conversion test). Remove the extra brace so the format becomes yyyyMMddT.....

apps/lrauv-dash2/package.json

Copilot · 2026-02-17T22:01:53Z

apps/lrauv-dash2/components/CommsSection.test.tsx

+    render(
+      <MockProviders queryClient={new QueryClient()}>
+        <CommsSection vehicleName="makai" from="" />
+      </MockProviders>
+    )


CommsSection now requires from: number (millis since epoch), but the test still passes an empty string. This will fail type-checking and doesn’t represent valid runtime usage. Update the test to pass a numeric millis value (e.g., from={0} or a fixed timestamp consistent with the mocks).

@copilot open a new pull request to apply changes based on this feedback

Copilot · 2026-02-17T22:01:54Z

apps/lrauv-dash2/components/ClickableMapPoint.tsx

+import { on } from 'events'
 import { useMapEvents } from 'react-leaflet'
 import { useManagedWaypoints } from 'react-ui/dist'
+import { createLogger } from '@mbari/utils'

-const ClickableMapPoint = () => {
+const logger = createLogger('ClickableMapPoint')
+const ClickableMapPoint: React.FC<{
+  onClick?: (lat: number, lng: number) => void
+}> = ({ onClick }) => {


Importing { on } from Node’s events module will either be unused (lint error) or pull a Node-only dependency into the browser bundle. Additionally, React.FC is referenced but React isn’t imported, which will break TypeScript compilation. Remove the events import and import React types (e.g., import type React from 'react') or switch to FC imported from react.

apps/lrauv-dash2/components/SelectedStationContext.tsx

Copilot · 2026-02-17T22:01:54Z

apps/lrauv-dash2/lib/useGoogleElevator.ts

+  // Call this immediately on mount to start initializing the service
+  useState(() => {
+    getElevationService()
+      .then(() => {
+        setElevationAvailable(true)
+        logger.info('👍 Elevation service ready')
+      })
+      .catch(() => {
+        setElevationAvailable(false)
+        logger.warn('⚠️ Elevation service unavailable')
+      })
+  })


This uses useState to run an initialization side-effect. That initializer runs during render and can cause unexpected behavior (and strict-mode double-invocation issues) while also creating an unused state value. Move this initialization into a useEffect(() => { ... }, []) so it runs after mount, and remove unused imports/refs (useEffect is imported but not used; toast, elevationErrorShown, and depthLoading appear unused in this file).

Copilot · 2026-02-17T22:01:54Z

docker/nginx.conf

+    # No caching for development
+    add_header Cache-Control "no-cache, no-store, must-revalidate";
+    add_header Pragma "no-cache";
+    add_header Expires "0";


The server-level Cache-Control: no-cache, no-store... header will apply to the image and js/css locations (those blocks only set expires). That effectively disables caching even though expires is set. Add explicit add_header Cache-Control ... inside the image and js/css locations (or remove the global no-cache headers) so caching behavior matches intent.

@copilot open a new pull request to apply changes based on this feedback

docker/nginx.conf

Copilot · 2026-02-17T22:01:55Z

apps/lrauv-dash2/components/VehicleDeploymentDropdown.tsx

  const { setTrackedVehicles, trackedVehicles } = useTrackedVehicles()
-  const vehicleNamesQuery = useSortedVehicleNames({ refresh: 'y' })
-  const vehicleNames = vehicleNamesQuery.data ?? []
+  const { data: vehicleNames } = useSortedVehicleNames()


vehicleNames can be undefined while loading; previously this code used a ?? [] fallback. If downstream components assume an array (e.g., doing .map), this can throw at runtime. Consider restoring a safe default (e.g., const vehicleNames = data ?? []) before passing it further.

Suggested change

const { data: vehicleNames } = useSortedVehicleNames()

const { data } = useSortedVehicleNames()

const vehicleNames = data ?? []

apps/lrauv-dash2/components/StationsListModal.tsx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…mports, useGoogleElevator side effect

…dash5 into merge-develop-into-main

…, VehicleDeploymentDropdown vehicleNames fallback

ZackLyon added 30 commits June 2, 2025 18:57

Fix flickering during initial load

09796ed

Merge pull request mbari-org#431 from mbari-org/feature/gh272-update-…

9ca467b

…comms-indicators Update comms section to provide accurate ACK times and display the method of communication and cell timeout

Invalidate scheduling data after scheduling a command

c050778

Provide informative labels for generic fields

6bf4e9f

Resolve Quoted String value as a quoted string

e7c41c8

Source component and element options to match dash4

a34895c

Provide correct value for Universal args

ce5036c

Set up mission options for commands

9e3981f

Remove console log

97e37e3

Sort mission options before displaying them

610c77b

Merge pull request mbari-org#443 from mbari-org/feature/fix-command-s…

dd6bdc6

…cheduling Fix command scheduling issues

Remove fetched vehicles list from useRecentRuns since all vehicles ar…

a2ccc6a

…e default

Add simple loading state for Table and MissionTable

9579c9e

Display full mission string as mission description instead of name

a1e3ccd

Correct regex for extracting mission name to include digits

28e4016

Added documentation to the regex in useRecentRuns

505ea3e

Added additional test coverage for the regex in useRecentRuns test

9ece4a1

Merge pull request mbari-org#444 from mbari-org/feature/gh308-missing…

80873a0

…-or-partial-mission-names Fix missing or partially displayed mission names

Wrap long param names so they do not overflow

3ee1d29

Reserved params filtering should include standard envelope as a singl…

4faca95

…e word

Wrap long default param values

9c2507f

Fix crashing param table on window refocus

907132c

Deduplicate mission and mission category state

9b28af4

Allow Select component to accept custom styles

a09e234

Replace parameter boolean checkbox with dropdown

695fbc5

Refactor and simplify Mission Step; sort persists when category chang…

15f4df5

…es now

Also use script derived waypoint names to determine between waypoint …

13d2d83

…and param in extract overrides

Update useRecentRuns hook to accurately verify between a waypoint and…

e8d3af6

… a param

Apply param and waypoint overrides for recent runs

55fec6b

Strip insert prefix from command names when extracting overrides from…

c0fd862

… mission text

ZackLyon and others added 12 commits January 15, 2026 15:49

Update SelectedPlatformsContext to work similar to dash4

5631072

Create usePlatformSelectionWorkflow hook to manage working selections

05b9106

Implement TrackDB selection functionality in PlatformListModal

35cfc06

Implement showing selected assets on deployment map

547ef6d

Update PlatformPath to use rolling 24 hour time window and refresh au…

ebb0d22

…tomatically

Create usePlatformList hook for platform look ups by id

890758c

Create PlatformPaths component to keep platform functionality modular

e53661a

Implement PlatformPaths in overview and deployement pages

a1e73ba

Merge pull request mbari-org#505 from mbari-org/feature/gh319-trackdb…

070ff59

…-assets-for-map Add TrackDB functionality to overview and deployment maps

Merge develop into main: sync production with staging

4f5c3a0

Copilot AI review requested due to automatic review settings February 17, 2026 21:25

Copilot AI reviewed Feb 17, 2026

View reviewed changes

ksalamy requested a review from Copilot February 17, 2026 21:26

Copilot AI reviewed Feb 17, 2026

View reviewed changes

ksalamy added 4 commits February 17, 2026 13:32

Add baseURL to RequestConfig to fix getPlatforms build error

61dc396

Restore MovingDot.tsx missing from merge

d2f5bf7

Sync remaining files from develop (env, docs, stories, turbo config)

cf81194

Remove deployment docs and local files not intended for production

72c6007

ksalamy requested a review from Copilot February 17, 2026 21:58

Copilot AI reviewed Feb 17, 2026

View reviewed changes

ksalamy and others added 7 commits February 17, 2026 14:07

Update apps/lrauv-dash2/package.json

9995573

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update apps/lrauv-dash2/components/SelectedStationContext.tsx

e8ff103

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update docker/nginx.conf

e03f79e

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update apps/lrauv-dash2/components/StationsListModal.tsx

7c0ecb9

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Fix Copilot review issues: schedDate extra brace, ClickableMapPoint i…

7c5f460

…mports, useGoogleElevator side effect

Merge branch 'merge-develop-into-main' of https://github.com/ksalamy/…

fa753f7

…dash5 into merge-develop-into-main

Fix remaining Copilot review issues: CommsSection test from prop type…

6084692

…, VehicleDeploymentDropdown vehicleNames fallback

ksalamy merged commit d3f4756 into mbari-org:main Feb 17, 2026
2 checks passed

	const schedDate = `${t.toFormat('yyyyMMdd')}}T${t.toFormat('HHmm')}`
	const schedDate = `${t.toFormat('yyyyMMdd')}T${t.toFormat('HHmm')}`

-                    checked={selectedStations.includes(station)}
+                    checked={selectedStations.some(
+                      (s) => s.id === station.id
+                    )}

		bump-version:
		if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'

-          const group = acc[p.typeName] ?? []
-          group.push(p)
-          return { ...acc, [p.typeName]: group }
+          if (!acc[p.typeName]) {
+            acc[p.typeName] = []
+          }
+          acc[p.typeName].push(p)
+          return acc

	const { data: vehicleNames } = useSortedVehicleNames()
	const { data } = useSortedVehicleNames()
	const vehicleNames = data ?? []

Conversation

ksalamy commented Feb 17, 2026

Changes

Post-merge

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

ksalamy Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

ksalamy Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development