Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/hooks/useProjectsState.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import test from 'node:test';

import type { Project } from '../types/app';

import { projectsHaveChanges, readProjectsResponse } from './useProjectsState';
import { projectsHaveChanges, readProjectsResponse, reconcileSelectedProject } from './useProjectsState';

const autoProject: Project = {
projectId: 'project-1',
Expand Down Expand Up @@ -53,3 +53,33 @@ test('readProjectsResponse rejects ok responses whose body is not an array', asy
assert.equal(await readProjectsResponse(objectBody, 'refreshing'), null);
assert.equal(await readProjectsResponse(invalidJson, 'refreshing'), null);
});

test('reconcileSelectedProject applies refreshed display metadata to the active project', () => {
const renamedProject = { ...autoProject, displayName: 'Renamed project' };

const reconciled = reconcileSelectedProject(autoProject, [renamedProject]);

assert.equal(reconciled?.displayName, 'Renamed project');
});

test('reconcileSelectedProject preserves expanded session pages during metadata refresh', () => {
const loadedProject: Project = {
...autoProject,
sessions: [
{ id: 'session-1', summary: 'First' },
{ id: 'session-2', summary: 'Second' },
],
sessionMeta: { hasMore: false, total: 2 },
};
const renamedProject: Project = {
...autoProject,
displayName: 'Renamed project',
sessions: [{ id: 'session-1', summary: 'First' }],
sessionMeta: { hasMore: true, total: 2 },
};

const reconciled = reconcileSelectedProject(loadedProject, [renamedProject]);

assert.equal(reconciled?.displayName, 'Renamed project');
assert.deepEqual(reconciled?.sessions?.map((session) => session.id), ['session-1', 'session-2']);
});
25 changes: 25 additions & 0 deletions src/hooks/useProjectsState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,27 @@ const mergeExpandedSessionPages = (previousProjects: Project[], incomingProjects
});
};

export const reconcileSelectedProject = (
previousProject: Project | null,
freshProjects: Project[],
): Project | null => {
if (!previousProject) {
return null;
}

const freshProject = freshProjects.find(
(project) => project.projectId === previousProject.projectId,
);
if (!freshProject) {
return previousProject;
}

const [mergedProject] = mergeExpandedSessionPages([previousProject], [freshProject]);
return projectsHaveChanges([previousProject], [mergedProject])
? mergedProject
: previousProject;
};

const mergeProjectSessionPage = (
existingProject: Project,
sessionsPage: ProjectSessionPage,
Expand Down Expand Up @@ -455,6 +476,10 @@ export function useProjectsState({
return;
}

setSelectedProject((previousProject) =>
reconcileSelectedProject(previousProject, projectData),
);

setProjects((prevProjects) => {
const mergedProjects = mergeExpandedSessionPages(prevProjects, projectData);

Expand Down