Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: show retryable load failures in goal activity and calendar link pickers (#13158)

Adam Eivy72e8446c65e6
diff --git a/client/src/components/goals/GoalDetailPanel.jsx b/client/src/components/goals/GoalDetailPanel.jsx
index 04c6032b4c..97c4656ab7 100644
--- a/client/src/components/goals/GoalDetailPanel.jsx
+++ b/client/src/components/goals/GoalDetailPanel.jsx
@@ -257,6 +257,9 @@ export default function GoalDetailPanel({ goal, allGoals, onClose, onRefresh })
<GoalLinkedActivities
goal={goal}
activities={s.activities}
+ activitiesState={s.activitiesState}
+ activitiesError={s.activitiesError}
+ retryActivities={s.retryActivities}
selectedActivity={s.selectedActivity}
setSelectedActivity={s.setSelectedActivity}
handleLinkActivity={s.handleLinkActivity}
@@ -267,6 +270,9 @@ export default function GoalDetailPanel({ goal, allGoals, onClose, onRefresh })
<GoalLinkedCalendars
goal={goal}
subcalendars={s.subcalendars}
+ subcalendarsState={s.subcalendarsState}
+ subcalendarsError={s.subcalendarsError}
+ retrySubcalendars={s.retrySubcalendars}
selectedCalendar={s.selectedCalendar}
setSelectedCalendar={s.setSelectedCalendar}
calendarMatchPattern={s.calendarMatchPattern}
diff --git a/client/src/components/goals/GoalDetailPanel.test.jsx b/client/src/components/goals/GoalDetailPanel.test.jsx
index 791d62a6d0..f740455bd4 100644
--- a/client/src/components/goals/GoalDetailPanel.test.jsx
+++ b/client/src/components/goals/GoalDetailPanel.test.jsx
@@ -265,3 +265,33 @@ describe('GoalDetailPanel Daily Driver feature-area override (issue #2679)', ()
expect(screen.getByRole('button', { name: /Memory/ })).toBeTruthy();
});
});
+
+describe('GoalDetailPanel link picker load states', () => {
+ it('shows an independent retryable error per list, and a distinct empty state on success', async () => {
+ api.getActivities.mockRejectedValueOnce(new Error('activities down'));
+ api.getCalendarAccounts.mockRejectedValueOnce(new Error('calendars down'));
+ await renderPanel();
+
+ expect(screen.getByText(/Could not load activities — activities down/)).toBeTruthy();
+ expect(screen.getByText(/Could not load calendars — calendars down/)).toBeTruthy();
+ expect(screen.queryByText('No activities available to link.')).toBeNull();
+ expect(api.getActivities).toHaveBeenCalledWith({ silent: true });
+ expect(api.getCalendarAccounts).toHaveBeenCalledWith({ silent: true });
+
+ // Retry only the activities list; calendars stay in error.
+ api.getActivities.mockResolvedValueOnce([{ name: 'Running' }]);
+ const retries = screen.getAllByRole('button', { name: 'Retry' });
+ expect(retries).toHaveLength(2);
+ await act(async () => { fireEvent.click(retries[0]); await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); });
+ expect(screen.getByRole('combobox', { name: 'Activity' })).toBeTruthy();
+ expect(screen.queryByText(/Could not load activities/)).toBeNull();
+ expect(screen.getByText(/Could not load calendars/)).toBeTruthy();
+ });
+
+ it('renders explicit empty copy when both lists load successfully but are empty', async () => {
+ await renderPanel();
+ expect(screen.getByText('No activities available to link.')).toBeTruthy();
+ expect(screen.getByText('No calendars available to link.')).toBeTruthy();
+ expect(screen.queryByRole('alert')).toBeNull();
+ });
+});
diff --git a/client/src/components/goals/GoalLinkedActivities.jsx b/client/src/components/goals/GoalLinkedActivities.jsx
index a9df8e7d84..e8da985ee4 100644
--- a/client/src/components/goals/GoalLinkedActivities.jsx
+++ b/client/src/components/goals/GoalLinkedActivities.jsx
@@ -1,7 +1,8 @@
import { Link2, Unlink } from 'lucide-react';
+import ListLoadError from '../ui/ListLoadError';
export default function GoalLinkedActivities({
- goal, activities, selectedActivity, setSelectedActivity,
+ goal, activities, activitiesState, activitiesError, retryActivities, selectedActivity, setSelectedActivity,
handleLinkActivity, handleUnlinkActivity
}) {
return (
@@ -29,6 +30,13 @@ export default function GoalLinkedActivities({
))}
</div>
)}
+ {activitiesState === 'error' && (
+ <ListLoadError what="activities" error={activitiesError} onRetry={retryActivities} />
+ )}
+ {activitiesState === 'loading' && <p className="text-xs text-gray-500">Loading activities…</p>}
+ {activitiesState === 'ready' && activities.length === 0 && (
+ <p className="text-xs text-gray-500">No activities available to link.</p>
+ )}
{activities.length > 0 && (
<div className="flex gap-1">
<select
diff --git a/client/src/components/goals/GoalLinkedCalendars.jsx b/client/src/components/goals/GoalLinkedCalendars.jsx
index 1ae5ade1fd..9829916186 100644
--- a/client/src/components/goals/GoalLinkedCalendars.jsx
+++ b/client/src/components/goals/GoalLinkedCalendars.jsx
@@ -1,7 +1,8 @@
import { CalendarDays, Unlink } from 'lucide-react';
+import ListLoadError from '../ui/ListLoadError';
export default function GoalLinkedCalendars({
- goal, subcalendars, selectedCalendar, setSelectedCalendar,
+ goal, subcalendars, subcalendarsState, subcalendarsError, retrySubcalendars, selectedCalendar, setSelectedCalendar,
calendarMatchPattern, setCalendarMatchPattern, handleLinkCalendar, handleUnlinkCalendar
}) {
return (
@@ -33,6 +34,13 @@ export default function GoalLinkedCalendars({
))}
</div>
)}
+ {subcalendarsState === 'error' && (
+ <ListLoadError what="calendars" error={subcalendarsError} onRetry={retrySubcalendars} />
+ )}
+ {subcalendarsState === 'loading' && <p className="text-xs text-gray-500">Loading calendars…</p>}
+ {subcalendarsState === 'ready' && subcalendars.length === 0 && (
+ <p className="text-xs text-gray-500">No calendars available to link.</p>
+ )}
{subcalendars.length > 0 && (
<div className="space-y-1">
<div className="flex gap-1">
diff --git a/client/src/hooks/useGoalDetail.js b/client/src/hooks/useGoalDetail.js
index 5fadeba1e0..9413d7a247 100644
--- a/client/src/hooks/useGoalDetail.js
+++ b/client/src/hooks/useGoalDetail.js
@@ -1,7 +1,22 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useRef } from 'react';
import * as api from '../services/api';
+import useListResource from './useListResource';
import { MAX_TAGS, MAX_TAG_LENGTH } from '../components/goals/goalConstants';
+// Module-level so useListResource sees a stable fetcher. silent: the pickers
+// render their own inline error + Retry, so the default toast would duplicate it.
+const fetchActivities = () => api.getActivities({ silent: true });
+const fetchSubcalendars = async () => {
+ const accounts = await api.getCalendarAccounts({ silent: true });
+ const scs = [];
+ for (const account of (accounts || [])) {
+ for (const sc of (account.subcalendars || [])) {
+ if (sc.enabled && !sc.dormant) scs.push({ ...sc, accountName: account.name });
+ }
+ }
+ return scs;
+};
+
// State + handlers backing GoalDetailPanel. Extracted so the panel can stay a
// thin composition shell; behavior is identical to the prior inline logic.
export function useGoalDetail({ goal, allGoals, onClose, onRefresh }) {
@@ -13,14 +28,16 @@ export function useGoalDetail({ goal, allGoals, onClose, onRefresh }) {
const [milestoneSubmitting, setMilestoneSubmitting] = useState(false);
const milestoneSubmittingRef = useRef(false);
const [milestoneActions, setMilestoneActions] = useState(() => new Set());
- const [activities, setActivities] = useState([]);
+ const activitiesList = useListResource(fetchActivities);
+ const activities = activitiesList.items;
const [selectedActivity, setSelectedActivity] = useState('');
const [showProgressForm, setShowProgressForm] = useState(false);
const todayISO = new Date().toISOString().slice(0, 10);
const [progressForm, setProgressForm] = useState({ date: todayISO, note: '', durationMinutes: '' });
const [progressSubmitting, setProgressSubmitting] = useState(false);
const progressSubmittingRef = useRef(false);
- const [subcalendars, setSubcalendars] = useState([]);
+ const subcalendarsList = useListResource(fetchSubcalendars);
+ const subcalendars = subcalendarsList.items;
const [selectedCalendar, setSelectedCalendar] = useState('');
const [calendarMatchPattern, setCalendarMatchPattern] = useState('');
const [newTodoTitle, setNewTodoTitle] = useState('');
@@ -38,24 +55,6 @@ export function useGoalDetail({ goal, allGoals, onClose, onRefresh }) {
const [checkInsOpen, setCheckInsOpen] = useState(false);
const [checkingIn, setCheckingIn] = useState(false);
- useEffect(() => {
- api.getActivities().then(setActivities).catch(() => {});
- }, []);
-
- useEffect(() => {
- api.getCalendarAccounts().then(accounts => {
- const scs = [];
- for (const account of (accounts || [])) {
- for (const sc of (account.subcalendars || [])) {
- if (sc.enabled && !sc.dormant) {
- scs.push({ ...sc, accountName: account.name });
- }
- }
- }
- setSubcalendars(scs);
- }).catch(() => {});
- }, []);
-
const startEdit = () => {
setForm({
title: goal.title,
@@ -443,12 +442,12 @@ export function useGoalDetail({ goal, allGoals, onClose, onRefresh }) {
tagInput, setTagInput,
newMilestone, setNewMilestone,
milestoneSubmitting, milestoneActions,
- activities,
+ activities, activitiesState: activitiesList.state, activitiesError: activitiesList.error, retryActivities: activitiesList.retry,
selectedActivity, setSelectedActivity,
showProgressForm, setShowProgressForm,
progressForm, setProgressForm,
progressSubmitting,
- subcalendars,
+ subcalendars, subcalendarsState: subcalendarsList.state, subcalendarsError: subcalendarsList.error, retrySubcalendars: subcalendarsList.retry,
selectedCalendar, setSelectedCalendar,
calendarMatchPattern, setCalendarMatchPattern,
newTodoTitle, setNewTodoTitle,
diff --git a/client/src/services/apiMeatspace.js b/client/src/services/apiMeatspace.js
index 7e86f269ac..463a4c05da 100644
--- a/client/src/services/apiMeatspace.js
+++ b/client/src/services/apiMeatspace.js
@@ -277,7 +277,7 @@ export const updateMorseLevel = (data, options = {}) => request('/meatspace/post
// Life Calendar
export const getLifeCalendar = () => request('/meatspace/calendar');
-export const getActivities = () => request('/meatspace/activities');
+export const getActivities = (options = {}) => request('/meatspace/activities', options);
export const addActivity = (data) => request('/meatspace/activities', {
method: 'POST', body: JSON.stringify(data)
});