diff --git a/backend/src/repositories/auditRepository.test.ts b/backend/src/repositories/auditRepository.test.ts
new file mode 100644
index 0000000..ec0fc07
--- /dev/null
+++ b/backend/src/repositories/auditRepository.test.ts
@@ -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/);
+});
diff --git a/backend/src/repositories/auditRepository.ts b/backend/src/repositories/auditRepository.ts
index df49149..b385880 100644
--- a/backend/src/repositories/auditRepository.ts
+++ b/backend/src/repositories/auditRepository.ts
@@ -98,6 +98,7 @@ export const createFlockNote = async ({
FROM birds
WHERE birds.id = $2
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
)
@@ -125,6 +126,12 @@ export const deleteFlockNote = async (noteId: string, workspaceId: number) => {
`DELETE FROM flock_notes
WHERE id = $1
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`,
[noteId, workspaceId],
);
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index e343f2c..7935c95 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2318,9 +2318,10 @@ function App() {
const [removingWorkspaceMemberId, setRemovingWorkspaceMemberId] = useState('');
const [expandedSettingsSection, setExpandedSettingsSection] = useState(null);
+ const flockBirds = useMemo(() => sortBirdsByName([...birds, ...memorializedBirds]), [birds, memorializedBirds]);
const selectedBird = useMemo(
- () => birds.find((bird) => bird.id === selectedBirdId) ?? null,
- [birds, selectedBirdId],
+ () => flockBirds.find((bird) => bird.id === selectedBirdId) ?? null,
+ [flockBirds, selectedBirdId],
);
const isBillingOwner = Boolean(
authSession?.user.email &&
@@ -3046,7 +3047,7 @@ function App() {
setBirds(nextBirds);
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) {
const membersData = (await readJsonSafely<{ members?: WorkspaceMember[] }>(membersResponse)) ?? {};
@@ -3994,6 +3995,7 @@ function App() {
};
const startEditBird = (bird: Bird) => {
+ if (bird.memorializedAt) return;
setSelectedBirdId(bird.id);
setEditingBirdId(bird.id);
setBirdEditorOpen(true);
@@ -4974,7 +4976,7 @@ function App() {
}
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) {
@@ -5003,17 +5005,14 @@ function App() {
const memorializedBird = data.bird;
setBirds((current) => current.filter((bird) => bird.id !== memorializedBird.id));
setMemorializedBirds((current) => sortBirdsByName([...current.filter((bird) => bird.id !== memorializedBird.id), memorializedBird]));
- setSelectedBirdId('');
+ setSelectedBirdId(memorializedBird.id);
+ setBirdEditorOpen(false);
setEditingBirdId('');
setBirdForm(emptyBirdForm);
setBirdPhotoName('');
setPhotoCrop(null);
setPhotoDrag(null);
setMemorializeBirdForm(emptyMemorializeBirdForm());
- setWeights([]);
- setVetVisits([]);
- setMedications([]);
- setMedicationAdministrations([]);
setAllBirdWeights((current) => {
const next = { ...current };
delete next[memorializedBird.id];
@@ -6908,7 +6907,7 @@ function App() {
- {birds.map((bird) => {
+ {flockBirds.map((bird) => {
const weightRangeAlert = outOfRangeBirds.find((alert) => alert.bird.id === bird.id) ?? null;
const vetVisitAlertSignature = getVetVisitAlertSignature(bird.id);
const hasVetVisitAlert = vetVisitDueBirdIds.has(bird.id);
@@ -6916,7 +6915,7 @@ function App() {
return (
setSelectedBirdId(bird.id)} type="button">
@@ -6933,11 +6932,14 @@ function App() {
{bird.species}
+ {bird.memorializedAt ? In memory · Read-only : null}
- {formatWeight(bird.latestWeightGrams)}
+ {!bird.memorializedAt || bird.latestWeightGrams !== null ? (
+ {formatWeight(bird.latestWeightGrams)}
+ ) : null}
- {weightRangeAlert || hasVetVisitAlert ? (
+ {!bird.memorializedAt && (weightRangeAlert || hasVetVisitAlert) ? (
{weightRangeAlert ? (
@@ -7671,7 +7673,7 @@ function App() {
Flock member
- {selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert ? (
+ {!selectedBird.memorializedAt && (selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert) ? (
{selectedBirdWeightRangeAlert ? (
@@ -7724,7 +7726,7 @@ function App() {
<>
-
+
{selectedBird.publicProfileEnabled && selectedBird.publicProfileCode ? (
@@ -7734,7 +7736,7 @@ function App() {
) : null}
-
startEditBird(selectedBird)} type="button" aria-label={`Edit details for ${selectedBird.name}`} title="Edit details">
+ startEditBird(selectedBird)} type="button" aria-label={`Edit details for ${selectedBird.name}`} title="Edit details">
@@ -7761,7 +7763,8 @@ function App() {
-
+ {selectedBird.memorializedAt ?
In memory of {selectedBird.name}{selectedBird.memorializedOn ? ` · ${formatDate(selectedBird.memorializedOn)}` : ''}. This profile and its care history are read-only.
: null}
+
{selectedBirdTab === 'info' ? (
@@ -7811,7 +7814,7 @@ function App() {
Medication schedule
-
{renderMedicationList({ showAdministrationControls: true })}
+
{renderMedicationList({ showAdministrationControls: !selectedBird.memorializedAt })}
) : null}
@@ -7978,7 +7981,7 @@ function App() {
-
+ ) : null}
{editableWeights
.map((weight) => (
@@ -8027,7 +8030,7 @@ function App() {
{formatDate(weight.recordedOn)}
{weight.notes || 'No notes recorded.'}
- handleEditWeight(weight)} type="button">
+ handleEditWeight(weight)} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Edit
@@ -8054,7 +8057,7 @@ function App() {
setVeterinaryInfoForm(toVeterinaryInfoForm(selectedBird));
setEditingVeterinaryInfo(true);
}}
- type="button"
+ disabled={Boolean(selectedBird.memorializedAt)} type="button"
aria-label={`Edit veterinary info for ${selectedBird.name}`}
title="Edit veterinary info"
>
@@ -8066,7 +8069,7 @@ function App() {
) : null}
- {editingVeterinaryInfo ? (
+ {editingVeterinaryInfo && !selectedBird.memorializedAt ? (
+ ) : null}
{vetVisits.length ? (
@@ -8205,7 +8208,7 @@ function App() {
{visit.notes || 'No notes recorded.'}
- handleEditVetVisit(visit)} type="button">
+ handleEditVetVisit(visit)} disabled={Boolean(selectedBird.memorializedAt)} type="button">
Edit
{editingVetVisitId === visit.id ? (
@@ -8213,7 +8216,7 @@ function App() {
className="secondary-button"
onClick={() => handleDeleteVetVisit(visit.id)}
type="button"
- disabled={deletingVetVisitId === visit.id}
+ disabled={Boolean(selectedBird.memorializedAt) || (deletingVetVisitId === visit.id)}
>
{deletingVetVisitId === visit.id ? 'Deleting...' : 'Delete'}
@@ -8242,7 +8245,7 @@ function App() {
{selectedBirdNotes.length} total
-
+ ) : null}
{selectedBirdNotes.length ? (
selectedBirdNotes.map((note) => (
@@ -8271,7 +8274,7 @@ function App() {
className="secondary-button"
type="button"
onClick={() => handleDeleteFlockNote(note.id)}
- disabled={deletingFlockNoteId === note.id}
+ disabled={Boolean(selectedBird.memorializedAt) || (deletingFlockNoteId === note.id)}
>
{deletingFlockNoteId === note.id ? 'Deleting...' : 'Delete'}
@@ -8309,10 +8312,10 @@ function App() {
- handleOpenAdoptionReport(false)} type="button" disabled={creatingAdoptionReportCode}>
+ handleOpenAdoptionReport(false)} type="button" disabled={Boolean(selectedBird.memorializedAt) || (creatingAdoptionReportCode)}>
{creatingAdoptionReportCode ? 'Preparing report...' : 'Open adoption report'}
- handleOpenAdoptionReport(true)} type="button" disabled={creatingAdoptionReportCode}>
+ handleOpenAdoptionReport(true)} type="button" disabled={Boolean(selectedBird.memorializedAt) || (creatingAdoptionReportCode)}>
Print-friendly report
@@ -8396,7 +8399,7 @@ function App() {
) : null;
})()}
-
+ {!selectedBird.memorializedAt ? (
Type
-
+
{savingBirdTimelineEvent ? 'Adding...' : 'Add timeline item'}
{birdTimelineNotice ? (
@@ -8493,7 +8496,7 @@ function App() {
{birdTimelineNotice.message}
) : null}
-
+ ) : null}
{birdTimelineEvents.length ? (
birdTimelineEvents.map((event) => (
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 3e83110..f0de7f6 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -3219,3 +3219,25 @@ label {
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);
+}