feat(assistant): curated cards and undo for the changes of a journal itself

Starting a journal, changing its settings, linking or unlinking a trip,
bringing back its suggestions, the user's own view of it and deleting it
fell back to the generic card, which names ids and offers no way back.
They now share a journeyHeader card: the journal with its trips, the one
the change links or unlinks marked, what a new journal brings in and what
a deletion or an unlink takes, and each setting old to new in the
journal's own words. A new journal is deleted again while nothing was
written, added or laid out in it, changed settings are written back from
what the tool answered, a linked trip is unlinked by its owner while none
of its suggestions was written up, and the own switch flips back.
This commit is contained in:
Maurice
2026-10-24 21:36:20 +02:00
parent cf35dc7afd
commit 48ff1b3a98
39 changed files with 2044 additions and 11 deletions
@@ -0,0 +1,143 @@
/**
* FE-AI-JOURNEYHEADER-001 to FE-AI-JOURNEYHEADER-005
*
* A change of a journal itself in the chat: the settings an update sets by
* the journal's own names, old to new; the trips under the row with the one
* the change links or unlinks marked; what a new journal brings and what a
* deletion or an unlink takes; the receipt that opens the journal.
*/
import type { AssistantApplied, AssistantChangePreview, JourneyHeaderCard } from '@trek/shared';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { fireEvent, render, screen } from '../../../../../tests/helpers/render';
import { useAssistantStore } from '../../../../store/assistantStore';
import AssistantChangeCard from '../../AssistantChangeCard';
import type { ChangeItem } from '../../assistantParts';
import { AssistantViewContext } from '../../assistantViewContext';
import { headerValueKey, settingRows } from './journeyHeaderModel';
const ASSISTANT = useAssistantStore.getState();
afterEach(() => {
useAssistantStore.setState(ASSISTANT, true);
});
const JAPAN: JourneyHeaderCard = {
kind: 'journeyHeader',
journeyId: 12,
title: 'Japan 2026',
subtitle: null,
change: 'changed',
trips: [{ id: 5, title: 'Tokyo days', startDate: '2026-11-02', endDate: '2026-11-08', change: 'kept' }],
entries: 3,
photos: 40,
suggestions: null,
};
function change(
state: ChangeItem['state'],
card: JourneyHeaderCard,
over: Partial<AssistantChangePreview> = {}
): ChangeItem {
const preview: AssistantChangePreview = {
toolCallId: 'h1',
verbKey: 'updateJournalSettings',
subject: 'Japan 2026',
rows: [],
dayId: null,
placeIds: [],
undoable: true,
domain: 'journey',
card,
...over,
};
const applied: AssistantApplied = { toolCallId: 'h1', entity: 'journey', ids: [12], dayId: null, undoUntil: null };
return { toolCallId: 'h1', preview, applied: state === 'applied' ? applied : null, state, card };
}
function shown(item: ChangeItem, onOpen?: (target: unknown) => void) {
return render(
<AssistantViewContext.Provider value={{ tripId: -12, variant: 'window', onOpen }}>
<AssistantChangeCard items={[item]} />
</AssistantViewContext.Provider>
);
}
describe('a change of a journal itself', () => {
it('FE-AI-JOURNEYHEADER-001: an update names each setting by the journal own words, old to new', () => {
const rows: AssistantChangePreview['rows'] = [
{ op: 'change', labelKey: 'name', before: 'Japan', after: 'Japan 2026' },
{ op: 'change', labelKey: 'field', field: 'show_mood', before: '✓', after: '✗' },
{ op: 'change', labelKey: 'field', field: 'status_override', before: '', after: 'live' },
];
shown(change('pending', JAPAN, { rows }));
expect(screen.getByText("Change the journal's settings")).toBeInTheDocument();
expect(screen.getByText('Japan')).toHaveClass('line-through');
expect(screen.getByText('Mood: On')).toHaveClass('line-through');
expect(screen.getByText('Mood: Off')).toBeInTheDocument();
expect(screen.getByText('Shown as: Automatic')).toHaveClass('line-through');
expect(screen.getByText('Shown as: Live')).toBeInTheDocument();
expect(screen.getByText('Tokyo days')).toBeInTheDocument();
});
it('FE-AI-JOURNEYHEADER-002: a new journal shows its subtitle, the trips it links and the places that come in', () => {
const fresh: JourneyHeaderCard = {
...JAPAN,
journeyId: null,
change: 'new',
subtitle: 'Autumn',
trips: [{ ...JAPAN.trips[0], change: 'link' }],
entries: null,
photos: null,
suggestions: 9,
};
shown(change('pending', fresh, { verbKey: 'createJournal', undoable: true }));
expect(screen.getByText('Start a journal')).toBeInTheDocument();
expect(screen.getByText('Autumn')).toBeInTheDocument();
expect(screen.getByText('Will be added')).toBeInTheDocument();
expect(screen.getByText('9 places come in as suggestions')).toBeInTheDocument();
});
it('FE-AI-JOURNEYHEADER-003: a deletion warns that everything goes; an unlink says what stays and what goes', () => {
const first = shown(change('pending', { ...JAPAN, change: 'willDelete' }, { verbKey: 'deleteJournal' }));
expect(screen.getByText('Delete the journal')).toBeInTheDocument();
expect(screen.getByText(/This cannot be undone\./)).toBeInTheDocument();
first.unmount();
const unlink: JourneyHeaderCard = {
...JAPAN,
trips: [{ ...JAPAN.trips[0], change: 'unlink' }],
entries: 1,
suggestions: 4,
};
shown(change('pending', unlink, { verbKey: 'unlinkJournalTrip' }));
expect(screen.getByText('Tokyo days')).toHaveClass('line-through');
expect(screen.getByText('Will be taken out')).toBeInTheDocument();
expect(screen.getByText('1 written entry stays')).toBeInTheDocument();
expect(screen.getByText('4 open suggestions go')).toBeInTheDocument();
});
it('FE-AI-JOURNEYHEADER-004: the receipt opens the journal, a change that failed shows its row alone', () => {
const onOpen = vi.fn();
const applied = shown(change('applied', JAPAN), onOpen);
fireEvent.click(screen.getByRole('button', { name: 'Open the journal' }));
expect(onOpen).toHaveBeenCalledWith({ kind: 'page', path: '/journey/12' });
applied.unmount();
shown(change('failed', JAPAN));
expect(screen.queryByText('Tokyo days')).toBeNull();
});
it('FE-AI-JOURNEYHEADER-005: the model reads a status by its name and a switch as on or off', () => {
expect(headerValueKey('status', 'archived')).toBe('journey.status.archived');
expect(headerValueKey('status_override', null)).toBe('journey.settings.statusAuto');
expect(headerValueKey('show_mood', '✓')).toBe('settings.on');
expect(headerValueKey('cover_gradient', 'linear-gradient(red, blue)')).toBeNull();
expect(headerValueKey('status', 'toString')).toBeNull();
const rows: AssistantChangePreview['rows'] = [
{ op: 'add', labelKey: 'field', field: 'trip', before: null, after: 'Kyoto' },
{ op: 'add', labelKey: 'field', field: 'show_weather', before: null, after: '✓' },
{ op: 'add', labelKey: 'field', field: 'unknown', before: null, after: 'x' },
{ op: 'change', labelKey: 'name', before: 'A', after: 'B' },
];
expect(settingRows(rows).map((row) => row.field)).toEqual(['show_weather']);
});
});
@@ -0,0 +1,148 @@
import type { AssistantChangeRow, JourneyHeaderCard, JourneyHeaderTrip } from '@trek/shared';
import { AlignLeft, Luggage, Type } from 'lucide-react';
import { useTranslation } from '../../../../i18n';
import { type PillTone, SoftPill } from '../../../Planner/planParts';
import type { ChangeItem } from '../../assistantParts';
import { FactChange } from '../parts/CardFacts';
import { useCardFormat } from '../parts/useCardFormat';
import { headerFieldOf, headerValueKey, settingRows } from './journeyHeaderModel';
/**
* What a change row of a journal itself adds to the row it already is (its
* verb and the journal's name): on the faint line the name, subtitle and
* settings it changes, each old to new; under the row the journal's trips,
* the one the change links or unlinks marked, and what the change brings or
* takes along. A change that failed, was discarded or ran out shows the row
* alone.
*/
const GONE: ReadonlySet<ChangeItem['state']> = new Set(['failed', 'discarded', 'expired']);
const WORD_ICONS = { name: Type, description: AlignLeft } as const;
const NOTE = 'm-0 mt-1.5 text-caption';
const TRIP_TONE: Readonly<Record<JourneyHeaderTrip['change'], PillTone>> = {
kept: 'neutral',
link: 'success',
unlink: 'danger',
};
/** One setting a change sets, by its name, old to new. */
function SettingChange({ row }: { row: AssistantChangeRow }) {
const { t } = useTranslation();
const look = headerFieldOf(row.field);
if (!look) return null;
const named = (value: string | null) => {
const key = headerValueKey(row.field, value);
if (key) return t(key);
return value || null;
};
const before = row.op === 'add' ? null : named(row.before);
const after = named(row.after) ?? t('assistant.card.common.removed');
const name = t(look.labelKey);
return (
<FactChange
icon={look.Icon}
before={before === null ? null : t('assistant.card.journeyHeader.setting', { name, value: before })}
after={t('assistant.card.journeyHeader.setting', { name, value: after })}
tone="info"
/>
);
}
/** The journal's new name and subtitle and the settings a change sets. */
export function JourneyHeaderFacts({ item }: { card: JourneyHeaderCard; item: ChangeItem }) {
const { t } = useTranslation();
const rows = item.preview?.rows ?? [];
const words = rows.filter(
(row): row is AssistantChangeRow & { labelKey: keyof typeof WORD_ICONS } =>
row.op === 'change' && row.labelKey in WORD_ICONS
);
return (
<>
{words.map((row) => (
<FactChange
key={row.labelKey}
icon={WORD_ICONS[row.labelKey]}
before={row.before || null}
after={row.after || t('assistant.card.common.removed')}
tone="info"
/>
))}
{settingRows(rows).map((row) => (
<SettingChange key={row.field} row={row} />
))}
</>
);
}
function TripChip({ trip }: { trip: JourneyHeaderTrip }) {
const { t } = useTranslation();
const format = useCardFormat();
const days = trip.startDate ? format.date(trip.startDate) : null;
return (
<SoftPill
tone={TRIP_TONE[trip.change]}
className="max-w-full"
icon={<Luggage size={10} strokeWidth={2.2} aria-hidden="true" className="flex-none" />}
>
{trip.change === 'link' && <span className="sr-only">{t('assistant.card.journeyHeader.tripLink')}</span>}
{trip.change === 'unlink' && <span className="sr-only">{t('assistant.card.journeyHeader.tripUnlink')}</span>}
<bdi className={`truncate ${trip.change === 'unlink' ? 'line-through' : ''}`}>{trip.title}</bdi>
{days && <span className="text-content-faint">{days}</span>}
</SoftPill>
);
}
/** What the change brings along or takes with it, in the journal's words. */
function HeaderNotes({ card }: { card: JourneyHeaderCard }) {
const { t } = useTranslation();
const unlinking = card.trips.some((trip) => trip.change === 'unlink');
if (card.change === 'willDelete') {
return <p className={`${NOTE} text-danger`}>{t('assistant.card.journeyHeader.deletes')}</p>;
}
if (unlinking) {
return (
<>
{card.entries !== null && card.entries > 0 && (
<p className={`${NOTE} text-content-muted`}>
{t('assistant.card.journeyHeader.entriesStay', { count: card.entries })}
</p>
)}
{card.suggestions !== null && card.suggestions > 0 && (
<p className={`${NOTE} text-content-muted`}>
{t('assistant.card.journeyHeader.suggestionsGo', { count: card.suggestions })}
</p>
)}
</>
);
}
if (card.suggestions === null || card.suggestions === 0) return null;
return (
<p className={`${NOTE} text-content-muted`}>
{t('assistant.card.journeyHeader.suggestionsCome', { count: card.suggestions })}
</p>
);
}
/** The journal's trips and what the change brings or takes, under the row. */
export function JourneyHeaderBody({ card, item }: { card: JourneyHeaderCard; item: ChangeItem }) {
if (GONE.has(item.state)) return null;
return (
<div>
{card.subtitle && card.change === 'new' && (
<p className="m-0 text-caption text-content-muted">
<bdi>{card.subtitle}</bdi>
</p>
)}
{card.trips.length > 0 && (
<div className="mt-1 flex flex-wrap items-center gap-1">
{card.trips.map((trip, index) => (
<TripChip key={`${trip.id ?? 'x'}-${index}`} trip={trip} />
))}
</div>
)}
<HeaderNotes card={card} />
</div>
);
}
@@ -0,0 +1,82 @@
import type { AssistantChangeRow } from '@trek/shared';
import {
CircleDot,
CloudSun,
Eye,
EyeOff,
Footprints,
Luggage,
MapPin,
Palette,
Route,
Smile,
Sparkles,
ThumbsUp,
type LucideIcon,
} from 'lucide-react';
/**
* The pure side of a change of a journal itself: the glyph and name of each
* setting a change row names (under the tool's own field names), and how its
* value reads, a status by its name, a switch as on or off, a cleared status
* override as following the trip dates. The names are the journal's own,
* as its settings dialog writes them.
*/
interface FieldLook {
Icon: LucideIcon;
labelKey: string;
}
const FIELDS: Readonly<Record<string, FieldLook>> = {
status: { Icon: CircleDot, labelKey: 'journey.settings.status' },
status_override: { Icon: Eye, labelKey: 'assistant.card.journeyHeader.field.statusOverride' },
show_verdict: { Icon: ThumbsUp, labelKey: 'journey.settings.showVerdict' },
show_mood: { Icon: Smile, labelKey: 'journey.settings.showMood' },
show_weather: { Icon: CloudSun, labelKey: 'journey.settings.showWeather' },
photo_location: { Icon: MapPin, labelKey: 'journey.settings.photoLocation' },
show_trip_tracks: { Icon: Route, labelKey: 'journey.settings.showTripTracks' },
auto_prepare_recordings: { Icon: Footprints, labelKey: 'journey.settings.autoPrepare' },
cover_gradient: { Icon: Palette, labelKey: 'assistant.card.journeyHeader.field.coverGradient' },
trip: { Icon: Luggage, labelKey: 'assistant.card.journeyHeader.field.trip' },
suggestions: { Icon: Sparkles, labelKey: 'assistant.card.journeyHeader.field.suggestions' },
hide_skeletons: { Icon: EyeOff, labelKey: 'journey.skeletons.hide' },
};
const STATUSES: Readonly<Record<string, string>> = {
draft: 'journey.status.draft',
active: 'journey.status.active',
completed: 'journey.status.completed',
archived: 'journey.status.archived',
live: 'journey.frontpage.live',
};
const FLAG_ON = '✓';
const FLAG_OFF = '✗';
function own<T>(table: Readonly<Record<string, T>>, key: string | null | undefined): T | null {
if (!key || !Object.prototype.hasOwnProperty.call(table, key)) return null;
return table[key] ?? null;
}
/** The look of a setting a row names; null for a field the card has no name for. */
export function headerFieldOf(field: string | undefined): FieldLook | null {
return own(FIELDS, field);
}
/**
* The key a value of a setting reads by, or null for one that reads as it is
* (a name, a count). A cleared status override follows the trip dates again.
*/
export function headerValueKey(field: string | undefined, value: string | null): string | null {
if (value === FLAG_ON) return 'settings.on';
if (value === FLAG_OFF) return 'settings.off';
if (field === 'status_override' && !value) return 'journey.settings.statusAuto';
if (field === 'status' || field === 'status_override') return own(STATUSES, value);
return null;
}
/** The setting rows of a change, the trips aside: the card draws those as its own chips. */
export function settingRows(rows: readonly AssistantChangeRow[]): AssistantChangeRow[] {
return rows.filter((row) => row.labelKey === 'field' && row.field !== 'trip' && headerFieldOf(row.field) !== null);
}
@@ -1,4 +1,16 @@
import { BookOpen, BookOpenText, BookPlus, BookX } from 'lucide-react';
import {
BookCheck,
BookOpen,
BookOpenText,
BookPlus,
BookX,
Eye,
Link,
RotateCcw,
Settings2,
Type,
Unlink,
} from 'lucide-react';
import type { PackLook } from '../cardTypes';
import { journalTarget } from './journeyCardModel';
@@ -17,6 +29,19 @@ export const JOURNEY_LOOK = {
addJournalEntry: { Icon: BookPlus, tone: 'success', labelKey: 'assistant.change.verb.addJournalEntry' },
updateJournalEntry: { Icon: BookOpenText, tone: 'info', labelKey: 'assistant.change.verb.updateJournalEntry' },
removeJournalEntry: { Icon: BookX, tone: 'danger', labelKey: 'assistant.change.verb.removeJournalEntry' },
createJournal: { Icon: BookPlus, tone: 'success', labelKey: 'assistant.change.verb.createJournal' },
renameJournal: { Icon: Type, tone: 'info', labelKey: 'assistant.change.verb.renameJournal' },
setJournalStatus: { Icon: BookCheck, tone: 'info', labelKey: 'assistant.change.verb.setJournalStatus' },
updateJournalSettings: { Icon: Settings2, tone: 'info', labelKey: 'assistant.change.verb.updateJournalSettings' },
deleteJournal: { Icon: BookX, tone: 'danger', labelKey: 'assistant.change.verb.deleteJournal' },
linkJournalTrip: { Icon: Link, tone: 'success', labelKey: 'assistant.change.verb.linkJournalTrip' },
unlinkJournalTrip: { Icon: Unlink, tone: 'warning', labelKey: 'assistant.change.verb.unlinkJournalTrip' },
restoreJournalSuggestions: {
Icon: RotateCcw,
tone: 'info',
labelKey: 'assistant.change.verb.restoreJournalSuggestions',
},
setJournalPreferences: { Icon: Eye, tone: 'info', labelKey: 'assistant.change.verb.setJournalPreferences' },
},
tools: {
create_journey: { labelKey: 'assistant.tool.create_journey' },
@@ -40,6 +65,14 @@ export const JOURNEY_LOOK = {
? journalTarget(card.journeyId, applied.ids[0] ?? card.entries[0]?.entryId ?? null, card.tripJournal)
: null,
},
journey: {
Icon: BookOpen,
openLabelKey: 'assistant.card.journeyHeader.open',
open: (applied, card) => {
const journeyId = applied.ids[0] ?? (card?.kind === 'journeyHeader' ? card.journeyId : null);
return journeyId ? journalTarget(journeyId, null, false) : null;
},
},
},
cards: {
journeyEntries: {
@@ -59,5 +92,8 @@ export const JOURNEY_LOOK = {
return readIds.length > 0 && readIds.every((id) => id !== null && touched.has(id));
},
},
journeyHeader: {
entity: () => 'journey',
},
},
} satisfies PackLook<'journeyEntries'>;
} satisfies PackLook<'journeyEntries' | 'journeyHeader'>;
@@ -1,12 +1,14 @@
import type { CardView } from '../cardTypes';
import { JourneyEntryAside, JourneyEntryBody, JourneyEntryFacts } from './JourneyChangeSlots';
import JourneyEntriesBlock from './JourneyEntriesBlock';
import { JourneyHeaderBody, JourneyHeaderFacts } from './JourneyHeaderSlots';
/**
* How the kinds of the journeys draw in the chat: the entries a read found
* as a block of their own, and a change row of an entry with its photo beside
* the subject, its day, time and place and whatever an update changes on the
* faint line, and the start of its text under it. This file only maps each
* faint line, and the start of its text under it; a change of the journal
* itself with its settings on the faint line and its trips under it. This file only maps each
* kind to its view: the components live in sibling files, since a file that
* exports anything besides components breaks fast refresh, and lint:warnings holds
* react-refresh/only-export-components at zero for a new file.
@@ -18,4 +20,8 @@ export const JOURNEY_VIEWS = {
Facts: JourneyEntryFacts,
Body: JourneyEntryBody,
},
} satisfies { [K in 'journeyEntries']: CardView<K> };
journeyHeader: {
Facts: JourneyHeaderFacts,
Body: JourneyHeaderBody,
},
} satisfies { [K in 'journeyEntries' | 'journeyHeader']: CardView<K> };