Ghosted memorial birds
Deploy / deploy-prod (push) Skipped
Deploy / deploy-dev (push) Successful in 3m0s

This commit is contained in:
blaisadmin committed 2026-10-07 21:51:25 -04:00
1 parent 270652f1a8
commit ff177dbaed
4 files changed
+94 -42

No files matched your search

@@ -0,0 +1,20 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { createFlockNote, deleteFlockNote } from './auditRepository.js';
import { mockDb } from '../test/mockDb.js';
test('bird notes require a current, non-memorialized bird in the workspace', async () => {
const { calls } = mockDb({ rows: [] });
const result = await createFlockNote({ workspaceId: 1, birdId: 'bird-1', body: 'Note', createdByUserId: 'user-1' });
assert.equal(result, null);
assert.match(calls[0].text, /birds.workspace_id = \$1\s+AND birds.memorialized_at IS NULL/);
assert.deepEqual(calls[0].params, [1, 'bird-1', 'Note', 'Note', 'user-1']);
});
test('deleting bird notes preserves memorialized and transferred bird history', async () => {
const { calls } = mockDb({ rows: [] });
assert.equal(await deleteFlockNote('note-1', 1), null);
assert.match(calls[0].text, /bird_id IS NULL OR EXISTS/);
assert.match(calls[0].text, /birds.id = flock_notes.bird_id/);
assert.match(calls[0].text, /birds.workspace_id = \$2\s+AND birds.memorialized_at IS NULL/);
});
@@ -98,6 +98,7 @@ export const createFlockNote = async ({
FROM birds FROM birds
WHERE birds.id = $2 WHERE birds.id = $2
AND birds.workspace_id = $1 AND birds.workspace_id = $1
AND birds.memorialized_at IS NULL
) )
RETURNING id, workspace_id, bird_id, title, body, created_by_user_id, created_at, updated_at RETURNING id, workspace_id, bird_id, title, body, created_by_user_id, created_at, updated_at
) )
@@ -125,6 +126,12 @@ export const deleteFlockNote = async (noteId: string, workspaceId: number) => {
`DELETE FROM flock_notes `DELETE FROM flock_notes
WHERE id = $1 WHERE id = $1
AND workspace_id = $2 AND workspace_id = $2
AND (bird_id IS NULL OR EXISTS (
SELECT 1 FROM birds
WHERE birds.id = flock_notes.bird_id
AND birds.workspace_id = $2
AND birds.memorialized_at IS NULL
))
RETURNING id, title`, RETURNING id, title`,
[noteId, workspaceId], [noteId, workspaceId],
); );
+45 -42
View File
@@ -2318,9 +2318,10 @@ function App() {
const [removingWorkspaceMemberId, setRemovingWorkspaceMemberId] = useState(''); const [removingWorkspaceMemberId, setRemovingWorkspaceMemberId] = useState('');
const [expandedSettingsSection, setExpandedSettingsSection] = useState<SettingsSection | null>(null); const [expandedSettingsSection, setExpandedSettingsSection] = useState<SettingsSection | null>(null);
const flockBirds = useMemo(() => sortBirdsByName([...birds, ...memorializedBirds]), [birds, memorializedBirds]);
const selectedBird = useMemo( const selectedBird = useMemo(
() => birds.find((bird) => bird.id === selectedBirdId) ?? null, () => flockBirds.find((bird) => bird.id === selectedBirdId) ?? null,
[birds, selectedBirdId], [flockBirds, selectedBirdId],
); );
const isBillingOwner = Boolean( const isBillingOwner = Boolean(
authSession?.user.email && authSession?.user.email &&
@@ -3046,7 +3047,7 @@ function App() {
setBirds(nextBirds); setBirds(nextBirds);
setMemorializedBirds(data.memorializedBirds ?? []); setMemorializedBirds(data.memorializedBirds ?? []);
setSelectedBirdId((current) => (current && nextBirds.some((bird) => bird.id === current) ? current : '')); setSelectedBirdId((current) => (current && [...nextBirds, ...(data.memorializedBirds ?? [])].some((bird) => bird.id === current) ? current : ''));
if (membersResponse.ok) { if (membersResponse.ok) {
const membersData = (await readJsonSafely<{ members?: WorkspaceMember[] }>(membersResponse)) ?? {}; const membersData = (await readJsonSafely<{ members?: WorkspaceMember[] }>(membersResponse)) ?? {};
@@ -3994,6 +3995,7 @@ function App() {
}; };
const startEditBird = (bird: Bird) => { const startEditBird = (bird: Bird) => {
if (bird.memorializedAt) return;
setSelectedBirdId(bird.id); setSelectedBirdId(bird.id);
setEditingBirdId(bird.id); setEditingBirdId(bird.id);
setBirdEditorOpen(true); setBirdEditorOpen(true);
@@ -4974,7 +4976,7 @@ function App() {
} }
const confirmed = window.confirm( const confirmed = window.confirm(
`Memorialize ${selectedBird.name}?\n\nThis cannot be undone by you. ${selectedBird.name} will become read-only, hidden from the standard flock view, and excluded from the subscription bird count.`, `Memorialize ${selectedBird.name}?\n\nThis cannot be undone by you. ${selectedBird.name} will become read-only, shown softly faded in the flock, and excluded from the subscription bird count.`,
); );
if (!confirmed) { if (!confirmed) {
@@ -5003,17 +5005,14 @@ function App() {
const memorializedBird = data.bird; const memorializedBird = data.bird;
setBirds((current) => current.filter((bird) => bird.id !== memorializedBird.id)); setBirds((current) => current.filter((bird) => bird.id !== memorializedBird.id));
setMemorializedBirds((current) => sortBirdsByName([...current.filter((bird) => bird.id !== memorializedBird.id), memorializedBird])); setMemorializedBirds((current) => sortBirdsByName([...current.filter((bird) => bird.id !== memorializedBird.id), memorializedBird]));
setSelectedBirdId(''); setSelectedBirdId(memorializedBird.id);
setBirdEditorOpen(false);
setEditingBirdId(''); setEditingBirdId('');
setBirdForm(emptyBirdForm); setBirdForm(emptyBirdForm);
setBirdPhotoName(''); setBirdPhotoName('');
setPhotoCrop(null); setPhotoCrop(null);
setPhotoDrag(null); setPhotoDrag(null);
setMemorializeBirdForm(emptyMemorializeBirdForm()); setMemorializeBirdForm(emptyMemorializeBirdForm());
setWeights([]);
setVetVisits([]);
setMedications([]);
setMedicationAdministrations([]);
setAllBirdWeights((current) => { setAllBirdWeights((current) => {
const next = { ...current }; const next = { ...current };
delete next[memorializedBird.id]; delete next[memorializedBird.id];
@@ -6908,7 +6907,7 @@ function App() {
</div> </div>
</div> </div>
<div className="bird-list"> <div className="bird-list">
{birds.map((bird) => { {flockBirds.map((bird) => {
const weightRangeAlert = outOfRangeBirds.find((alert) => alert.bird.id === bird.id) ?? null; const weightRangeAlert = outOfRangeBirds.find((alert) => alert.bird.id === bird.id) ?? null;
const vetVisitAlertSignature = getVetVisitAlertSignature(bird.id); const vetVisitAlertSignature = getVetVisitAlertSignature(bird.id);
const hasVetVisitAlert = vetVisitDueBirdIds.has(bird.id); const hasVetVisitAlert = vetVisitDueBirdIds.has(bird.id);
@@ -6916,7 +6915,7 @@ function App() {
return ( return (
<article <article
key={bird.id} key={bird.id}
className={`bird-card ${bird.id === selectedBird?.id ? 'active' : ''}`} className={`bird-card ${bird.memorializedAt ? 'memorialized' : ''} ${bird.id === selectedBird?.id ? 'active' : ''}`}
style={bird.id === selectedBird?.id ? { borderColor: bird.chartColor, boxShadow: `0 16px 24px ${bird.chartColor}33` } : undefined} style={bird.id === selectedBird?.id ? { borderColor: bird.chartColor, boxShadow: `0 16px 24px ${bird.chartColor}33` } : undefined}
> >
<button className="bird-card-select" onClick={() => setSelectedBirdId(bird.id)} type="button"> <button className="bird-card-select" onClick={() => setSelectedBirdId(bird.id)} type="button">
@@ -6933,11 +6932,14 @@ function App() {
</span> </span>
</span> </span>
<small>{bird.species}</small> <small>{bird.species}</small>
{bird.memorializedAt ? <small className="memorial-label">In memory · Read-only</small> : null}
</div> </div>
</div> </div>
<strong>{formatWeight(bird.latestWeightGrams)}</strong> {!bird.memorializedAt || bird.latestWeightGrams !== null ? (
<strong>{formatWeight(bird.latestWeightGrams)}</strong>
) : null}
</button> </button>
{weightRangeAlert || hasVetVisitAlert ? ( {!bird.memorializedAt && (weightRangeAlert || hasVetVisitAlert) ? (
<div className="bird-alert-stack"> <div className="bird-alert-stack">
{weightRangeAlert ? ( {weightRangeAlert ? (
<span className="bird-alert-badge"> <span className="bird-alert-badge">
@@ -7671,7 +7673,7 @@ function App() {
<p className="eyebrow">Flock member</p> <p className="eyebrow">Flock member</p>
</div> </div>
<div className="member-header-actions"> <div className="member-header-actions">
{selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert ? ( {!selectedBird.memorializedAt && (selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert) ? (
<div className="bird-alert-stack" aria-label={`Critical alerts for ${selectedBird.name}`}> <div className="bird-alert-stack" aria-label={`Critical alerts for ${selectedBird.name}`}>
{selectedBirdWeightRangeAlert ? ( {selectedBirdWeightRangeAlert ? (
<span className="bird-alert-badge"> <span className="bird-alert-badge">
@@ -7724,7 +7726,7 @@ function App() {
</div> </div>
<> <>
<section className="profile-hero"> <section className={`profile-hero ${selectedBird.memorializedAt ? 'memorialized-profile' : ''}`}>
<img className="profile-photo" src={selectedBird.photoDataUrl || defaultBirdPhoto} alt={`${selectedBird.name}`} /> <img className="profile-photo" src={selectedBird.photoDataUrl || defaultBirdPhoto} alt={`${selectedBird.name}`} />
<div className="profile-actions"> <div className="profile-actions">
{selectedBird.publicProfileEnabled && selectedBird.publicProfileCode ? ( {selectedBird.publicProfileEnabled && selectedBird.publicProfileCode ? (
@@ -7734,7 +7736,7 @@ function App() {
</svg> </svg>
</button> </button>
) : null} ) : null}
<button className="profile-icon-button" onClick={() => startEditBird(selectedBird)} type="button" aria-label={`Edit details for ${selectedBird.name}`} title="Edit details"> <button disabled={Boolean(selectedBird.memorializedAt)} className="profile-icon-button" onClick={() => startEditBird(selectedBird)} type="button" aria-label={`Edit details for ${selectedBird.name}`} title="Edit details">
<svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"> <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M4 20h4l10.5-10.5-4-4L4 16v4Z" /> <path d="M4 20h4l10.5-10.5-4-4L4 16v4Z" />
<path d="m13.5 6.5 4 4" /> <path d="m13.5 6.5 4 4" />
@@ -7761,7 +7763,8 @@ function App() {
</div> </div>
</section> </section>
<div className="bird-detail-tab-panel"> {selectedBird.memorializedAt ? <p className="memorial-banner" role="status">In memory of {selectedBird.name}{selectedBird.memorializedOn ? ` · ${formatDate(selectedBird.memorializedOn)}` : ''}. This profile and its care history are read-only.</p> : null}
<div className="bird-detail-tab-panel">
{selectedBirdTab === 'info' ? ( {selectedBirdTab === 'info' ? (
<div className="flock-member-sections" role="tabpanel"> <div className="flock-member-sections" role="tabpanel">
<div className="detail-grid"> <div className="detail-grid">
@@ -7811,7 +7814,7 @@ function App() {
<h2>Medication schedule</h2> <h2>Medication schedule</h2>
</div> </div>
</div> </div>
<div className="recent-list">{renderMedicationList({ showAdministrationControls: true })}</div> <div className="recent-list">{renderMedicationList({ showAdministrationControls: !selectedBird.memorializedAt })}</div>
</section> </section>
) : null} ) : null}
</div> </div>
@@ -7978,7 +7981,7 @@ function App() {
</div> </div>
</div> </div>
<form className="form-panel inline-form" onSubmit={handleWeightSubmit}> {!selectedBird.memorializedAt ? (<form className="form-panel inline-form" onSubmit={handleWeightSubmit}>
<label> <label>
Weight in grams Weight in grams
<input <input
@@ -8009,16 +8012,16 @@ function App() {
/> />
</label> </label>
<div className="button-row care-form-actions"> <div className="button-row care-form-actions">
<button className="primary-button" type="submit"> <button className="primary-button" disabled={Boolean(selectedBird.memorializedAt)} type="submit">
{editingWeightId ? 'Save weight changes' : 'Save weight'} {editingWeightId ? 'Save weight changes' : 'Save weight'}
</button> </button>
{editingWeightId ? ( {editingWeightId ? (
<button className="secondary-button" onClick={handleCancelWeightEdit} type="button"> <button className="secondary-button" onClick={handleCancelWeightEdit} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Cancel edit Cancel edit
</button> </button>
) : null} ) : null}
</div> </div>
</form> </form>) : null}
<div className="recent-list"> <div className="recent-list">
{editableWeights {editableWeights
.map((weight) => ( .map((weight) => (
@@ -8027,7 +8030,7 @@ function App() {
<span>{formatDate(weight.recordedOn)}</span> <span>{formatDate(weight.recordedOn)}</span>
<small>{weight.notes || 'No notes recorded.'}</small> <small>{weight.notes || 'No notes recorded.'}</small>
<div className="button-row"> <div className="button-row">
<button className="secondary-button" onClick={() => handleEditWeight(weight)} type="button"> <button className="secondary-button" onClick={() => handleEditWeight(weight)} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Edit Edit
</button> </button>
</div> </div>
@@ -8054,7 +8057,7 @@ function App() {
setVeterinaryInfoForm(toVeterinaryInfoForm(selectedBird)); setVeterinaryInfoForm(toVeterinaryInfoForm(selectedBird));
setEditingVeterinaryInfo(true); setEditingVeterinaryInfo(true);
}} }}
type="button" disabled={Boolean(selectedBird.memorializedAt)} type="button"
aria-label={`Edit veterinary info for ${selectedBird.name}`} aria-label={`Edit veterinary info for ${selectedBird.name}`}
title="Edit veterinary info" title="Edit veterinary info"
> >
@@ -8066,7 +8069,7 @@ function App() {
</button> </button>
) : null} ) : null}
</div> </div>
{editingVeterinaryInfo ? ( {editingVeterinaryInfo && !selectedBird.memorializedAt ? (
<form className="form-panel inline-form care-entry-form" onSubmit={handleVeterinaryInfoSubmit}> <form className="form-panel inline-form care-entry-form" onSubmit={handleVeterinaryInfoSubmit}>
<label> <label>
Clinic name Clinic name
@@ -8102,7 +8105,7 @@ function App() {
/> />
</label> </label>
<div className="button-row care-form-actions"> <div className="button-row care-form-actions">
<button className="primary-button" type="submit" disabled={savingVeterinaryInfo}> <button className="primary-button" type="submit" disabled={Boolean(selectedBird.memorializedAt) || (savingVeterinaryInfo)}>
{savingVeterinaryInfo ? 'Saving veterinary info...' : 'Save veterinary info'} {savingVeterinaryInfo ? 'Saving veterinary info...' : 'Save veterinary info'}
</button> </button>
<button <button
@@ -8112,7 +8115,7 @@ function App() {
setEditingVeterinaryInfo(false); setEditingVeterinaryInfo(false);
}} }}
type="button" type="button"
disabled={savingVeterinaryInfo} disabled={Boolean(selectedBird.memorializedAt) || (savingVeterinaryInfo)}
> >
Cancel Cancel
</button> </button>
@@ -8148,7 +8151,7 @@ function App() {
</div> </div>
</div> </div>
<form className="form-panel inline-form care-entry-form" onSubmit={handleVetVisitSubmit}> {!selectedBird.memorializedAt ? (<form className="form-panel inline-form care-entry-form" onSubmit={handleVetVisitSubmit}>
<label> <label>
Visit date Visit date
<input <input
@@ -8184,16 +8187,16 @@ function App() {
/> />
</label> </label>
<div className="button-row care-form-actions"> <div className="button-row care-form-actions">
<button className="primary-button" type="submit"> <button className="primary-button" disabled={Boolean(selectedBird.memorializedAt)} type="submit">
{editingVetVisitId ? 'Save vet visit changes' : 'Save vet visit'} {editingVetVisitId ? 'Save vet visit changes' : 'Save vet visit'}
</button> </button>
{editingVetVisitId ? ( {editingVetVisitId ? (
<button className="secondary-button" onClick={handleCancelVetVisitEdit} type="button"> <button className="secondary-button" onClick={handleCancelVetVisitEdit} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Cancel edit Cancel edit
</button> </button>
) : null} ) : null}
</div> </div>
</form> </form>) : null}
<div className="recent-list"> <div className="recent-list">
{vetVisits.length ? ( {vetVisits.length ? (
@@ -8205,7 +8208,7 @@ function App() {
</span> </span>
<small>{visit.notes || 'No notes recorded.'}</small> <small>{visit.notes || 'No notes recorded.'}</small>
<div className="button-row"> <div className="button-row">
<button className="secondary-button" onClick={() => handleEditVetVisit(visit)} type="button"> <button className="secondary-button" onClick={() => handleEditVetVisit(visit)} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Edit Edit
</button> </button>
{editingVetVisitId === visit.id ? ( {editingVetVisitId === visit.id ? (
@@ -8213,7 +8216,7 @@ function App() {
className="secondary-button" className="secondary-button"
onClick={() => handleDeleteVetVisit(visit.id)} onClick={() => handleDeleteVetVisit(visit.id)}
type="button" type="button"
disabled={deletingVetVisitId === visit.id} disabled={Boolean(selectedBird.memorializedAt) || (deletingVetVisitId === visit.id)}
> >
{deletingVetVisitId === visit.id ? 'Deleting...' : 'Delete'} {deletingVetVisitId === visit.id ? 'Deleting...' : 'Delete'}
</button> </button>
@@ -8242,7 +8245,7 @@ function App() {
</div> </div>
<p className="muted">{selectedBirdNotes.length} total</p> <p className="muted">{selectedBirdNotes.length} total</p>
</div> </div>
<form className="form-panel care-entry-form" onSubmit={handleFlockNoteSubmit}> {!selectedBird.memorializedAt ? (<form className="form-panel care-entry-form" onSubmit={handleFlockNoteSubmit}>
<label className="wide-field"> <label className="wide-field">
Note Note
<textarea <textarea
@@ -8253,10 +8256,10 @@ function App() {
required required
/> />
</label> </label>
<button className="primary-button" type="submit" disabled={savingFlockNote}> <button className="primary-button" type="submit" disabled={Boolean(selectedBird.memorializedAt) || (savingFlockNote)}>
{savingFlockNote ? 'Saving...' : 'Save note'} {savingFlockNote ? 'Saving...' : 'Save note'}
</button> </button>
</form> </form>) : null}
<div className="recent-list note-list"> <div className="recent-list note-list">
{selectedBirdNotes.length ? ( {selectedBirdNotes.length ? (
selectedBirdNotes.map((note) => ( selectedBirdNotes.map((note) => (
@@ -8271,7 +8274,7 @@ function App() {
className="secondary-button" className="secondary-button"
type="button" type="button"
onClick={() => handleDeleteFlockNote(note.id)} onClick={() => handleDeleteFlockNote(note.id)}
disabled={deletingFlockNoteId === note.id} disabled={Boolean(selectedBird.memorializedAt) || (deletingFlockNoteId === note.id)}
> >
{deletingFlockNoteId === note.id ? 'Deleting...' : 'Delete'} {deletingFlockNoteId === note.id ? 'Deleting...' : 'Delete'}
</button> </button>
@@ -8309,10 +8312,10 @@ function App() {
</article> </article>
</div> </div>
<div className="button-row"> <div className="button-row">
<button className="primary-button" onClick={() => handleOpenAdoptionReport(false)} type="button" disabled={creatingAdoptionReportCode}> <button className="primary-button" onClick={() => handleOpenAdoptionReport(false)} type="button" disabled={Boolean(selectedBird.memorializedAt) || (creatingAdoptionReportCode)}>
{creatingAdoptionReportCode ? 'Preparing report...' : 'Open adoption report'} {creatingAdoptionReportCode ? 'Preparing report...' : 'Open adoption report'}
</button> </button>
<button className="secondary-button" onClick={() => handleOpenAdoptionReport(true)} type="button" disabled={creatingAdoptionReportCode}> <button className="secondary-button" onClick={() => handleOpenAdoptionReport(true)} type="button" disabled={Boolean(selectedBird.memorializedAt) || (creatingAdoptionReportCode)}>
Print-friendly report Print-friendly report
</button> </button>
</div> </div>
@@ -8396,7 +8399,7 @@ function App() {
</div> </div>
) : null; ) : null;
})()} })()}
<form className="form-panel inline-form care-entry-form bird-timeline-form" onSubmit={handleBirdTimelineEventSubmit}> {!selectedBird.memorializedAt ? (<form className="form-panel inline-form care-entry-form bird-timeline-form" onSubmit={handleBirdTimelineEventSubmit}>
<label> <label>
Type Type
<select <select
@@ -8485,7 +8488,7 @@ function App() {
} }
/> />
</label> </label>
<button className="primary-button" type="submit" disabled={savingBirdTimelineEvent}> <button className="primary-button" type="submit" disabled={Boolean(selectedBird.memorializedAt) || (savingBirdTimelineEvent)}>
{savingBirdTimelineEvent ? 'Adding...' : 'Add timeline item'} {savingBirdTimelineEvent ? 'Adding...' : 'Add timeline item'}
</button> </button>
{birdTimelineNotice ? ( {birdTimelineNotice ? (
@@ -8493,7 +8496,7 @@ function App() {
{birdTimelineNotice.message} {birdTimelineNotice.message}
</p> </p>
) : null} ) : null}
</form> </form>) : null}
<div className="recent-list bird-timeline-list"> <div className="recent-list bird-timeline-list">
{birdTimelineEvents.length ? ( {birdTimelineEvents.length ? (
birdTimelineEvents.map((event) => ( birdTimelineEvents.map((event) => (
+22
View File
@@ -3219,3 +3219,25 @@ label {
padding: 0.5rem; padding: 0.5rem;
} }
} }
/* Memorial profiles stay discoverable while remaining visually subdued. */
.bird-card.memorialized {
background: #f5f3f0;
border-style: dashed;
}
.bird-card.memorialized .bird-avatar,
.memorialized-profile .profile-photo {
opacity: 0.6;
filter: saturate(0.35);
}
.bird-card.memorialized .bird-card-copy,
.bird-card.memorialized .bird-card-select > strong {
opacity: 0.72;
}
.memorial-label { font-style: italic; }
.memorial-banner {
padding: 0.85rem 1rem;
border-radius: 12px;
background: #f5f3f0;
color: var(--muted);
}