feat(client): open views follow member, settings, tag, atlas and journey changes made elsewhere

This commit is contained in:
Maurice
2026-10-22 12:14:28 +02:00
parent 42ce65708f
commit 8365d77c1d
53 changed files with 1269 additions and 133 deletions
@@ -1,13 +1,26 @@
import { useServerPing } from '../../sync/useServerPing'
/**
* Re-read the bag weights when the server says they moved (#2191).
*
* The ping is content-free by design: totals are summed across every member,
* including people whose items this client may not see, so the event cannot
* carry the new numbers without leaking what produced them. `useServerPing`
* carries the coalescing, the in-flight guard and the reconnect handling.
* The events after which the bags are read again. The totals ping is content-free
* by design (#2191): totals are summed across every member, including people whose
* items this client may not see, so the event cannot carry the new numbers without
* leaking what produced them. A bag created, renamed, deleted or given new members
* elsewhere (a fellow traveller, the assistant) is read back the same way, so the
* bag list has one source instead of a second copy patched from the payloads.
*/
const BAG_RELOAD_EVENTS = [
'packing:bag-totals',
'packing:bag-created',
'packing:bag-updated',
'packing:bag-deleted',
'packing:bag-members-updated',
] as const
/**
* Re-read the bags when the server says they moved. `useServerPing` carries the
* coalescing, the in-flight guard and the reconnect handling, so an assistant step
* that touches several bags is still one read.
*/
export function useBagTotalsPing(enabled: boolean, reload: () => Promise<void>): void {
useServerPing('packing:bag-totals', enabled, reload)
useServerPing(BAG_RELOAD_EVENTS, enabled, reload)
}
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react';
import { useCallback, useEffect, useState } from 'react';
import { packingApi } from '../../api/client';
import { useServerPing } from '../../sync/useServerPing';
import { offlineOr } from '../../utils/needsConnection';
type Translate = (key: string, params?: Record<string, string | number>) => string;
@@ -23,14 +24,24 @@ export interface CategoryAssignee {
export function usePackingCategoryAssignees({ tripId, t, toast }: { tripId: number; t: Translate; toast: Toaster }) {
const [categoryAssignees, setCategoryAssignees] = useState<Record<string, CategoryAssignee[]>>({});
const reload = useCallback(
() =>
packingApi
.getCategoryAssignees(tripId)
.then((data) => setCategoryAssignees(data.assignees || {}))
.catch(() => {
// A failed read leaves the last answer standing; there is nothing to undo.
}),
[tripId]
);
useEffect(() => {
packingApi
.getCategoryAssignees(tripId)
.then((data) => setCategoryAssignees(data.assignees || {}))
.catch(() => {
// A failed read leaves every category unassigned; there is nothing to undo.
});
}, [tripId]);
void reload();
}, [reload]);
// Assignees set elsewhere (a fellow traveller, the assistant) are read back,
// one read per burst, rather than patched in from the event.
useServerPing('packing:assignees', true, reload);
const setAssignees = async (category: string, userIds: number[]) => {
try {
@@ -11,6 +11,7 @@ import { useAuthStore } from '../../store/authStore'
import { useTripStore } from '../../store/tripStore'
import { useAddonStore } from '../../store/addonStore'
import { usePermissionsStore } from '../../store/permissionsStore'
import { addListener } from '../../api/websocket'
import { usePackingList, type PackingListPanelProps } from './usePackingListPanel'
import type { PackingItem } from '../../types'
@@ -84,6 +85,31 @@ describe('usePackingList — members & assignees', () => {
expect(result.current.tripMembers).toEqual([])
})
it('FE-BCAST-024: a traveller added or renamed elsewhere reaches the pickers, one read per burst', async () => {
vi.mocked(addListener).mockClear()
let calls = 0
server.use(
http.get('/api/trips/:id/members', () => {
calls++
return HttpResponse.json({
owner: { id: 1, username: 'owner', avatar_url: null },
members: calls > 1 ? [{ id: 2, username: 'Ana', avatar_url: null, is_guest: 1 }] : [],
})
}),
)
const { result } = renderPanel()
await waitFor(() => expect(result.current.tripMembers).toHaveLength(1))
act(() => {
for (const [listener] of vi.mocked(addListener).mock.calls) {
listener({ type: 'member:added', member: { id: 2 } })
listener({ type: 'member:updated', member: { id: 2, username: 'Ana' } })
}
})
await waitFor(() => expect(result.current.tripMembers.map((m) => m.username)).toEqual(['owner', 'Ana']))
expect(calls).toBe(2)
})
it('FE-W5HOOK-004: an assignee response without a map falls back to an empty record', async () => {
server.use(http.get('/api/trips/:id/packing/category-assignees', () => HttpResponse.json({})))
const { result } = renderPanel()
@@ -1,4 +1,4 @@
import { useState, useMemo, useRef, useEffect } from 'react'
import { useState, useMemo, useRef, useEffect, useCallback } from 'react'
import { useTripStore } from '../../store/tripStore'
import { useCanDo } from '../../store/permissionsStore'
import { useAuthStore } from '../../store/authStore'
@@ -6,6 +6,7 @@ import { useToast } from '../shared/Toast'
import { useTranslation } from '../../i18n'
import { tripsApi } from '../../api/client'
import { useAddonStore } from '../../store/addonStore'
import { useServerPing } from '../../sync/useServerPing'
import type { PackingItem } from '../../types'
import { parseImportLines, sortItemsByName } from './packingListPanel.helpers'
import { groupPackingItems, itemOrderWithCategoryMoved, packingCategoryOrder, packingProgress, packingViewItems } from './packingListModel'
@@ -19,6 +20,9 @@ export type { CategoryAssignee } from './usePackingCategoryAssignees'
const PACKING_SORT_KEY = 'trek:packing-sort'
/** The roster events that change who the pickers offer. */
const MEMBER_EVENTS = ['member:added', 'member:updated', 'member:removed'] as const
export type PackingSort = 'manual' | 'name'
export interface TripMember {
@@ -78,14 +82,19 @@ export function usePackingList({ tripId, items, openImportSignal = 0, addCategor
// Trip members & category assignees
const [tripMembers, setTripMembers] = useState<TripMember[]>([])
const readMembers = useCallback(() => tripsApi.getMembers(tripId).then(data => {
const all: TripMember[] = []
if (data.owner) all.push({ id: data.owner.id, username: data.owner.username, avatar: data.owner.avatar_url, is_guest: false })
if (data.members) all.push(...data.members.map((m: any) => ({ id: m.id, username: m.username, avatar: m.avatar_url, is_guest: !!m.is_guest })))
setTripMembers(all)
}).catch(() => {}), [tripId])
useEffect(() => {
tripsApi.getMembers(tripId).then(data => {
const all: TripMember[] = []
if (data.owner) all.push({ id: data.owner.id, username: data.owner.username, avatar: data.owner.avatar_url, is_guest: false })
if (data.members) all.push(...data.members.map((m: any) => ({ id: m.id, username: m.username, avatar: m.avatar_url, is_guest: !!m.is_guest })))
setTripMembers(all)
}).catch(() => {})
}, [tripId])
void readMembers()
}, [readMembers])
// A traveller or guest added, renamed or removed elsewhere: the pickers read the
// roster again, once per burst (the phone list reads the planner's roster).
useServerPing(MEMBER_EVENTS, true, readMembers)
const { categoryAssignees, setAssignees: handleSetAssignees } = usePackingCategoryAssignees({ tripId, t, toast })