diff --git a/changes/43591-fix-stale-host-activities b/changes/43591-fix-stale-host-activities new file mode 100644 index 0000000000..e42fd87d40 --- /dev/null +++ b/changes/43591-fix-stale-host-activities @@ -0,0 +1 @@ +* Fixed the host details activity feed showing the previously opened host's activities by including the host ID in the activity query cache keys. diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx index 83ddd8c5b1..bb8a3cb141 100644 --- a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx +++ b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx @@ -485,6 +485,7 @@ const HostDetailsPage = ({ IHostPastActivitiesResponse, Array<{ scope: string; + hostId: number; pageIndex: number; perPage: number; activeTab: "past" | "upcoming"; @@ -493,17 +494,14 @@ const HostDetailsPage = ({ [ { scope: "past-activities", + hostId: hostIdFromURL, pageIndex: activityPage, perPage: DEFAULT_ACTIVITY_PAGE_SIZE, activeTab: activeActivityTab, }, ], - ({ queryKey: [{ pageIndex, perPage }] }) => { - return activitiesAPI.getHostPastActivities( - hostIdFromURL, - pageIndex, - perPage - ); + ({ queryKey: [{ hostId, pageIndex, perPage }] }) => { + return activitiesAPI.getHostPastActivities(hostId, pageIndex, perPage); }, { ...DEFAULT_USE_QUERY_OPTIONS, @@ -524,6 +522,7 @@ const HostDetailsPage = ({ IHostUpcomingActivitiesResponse, Array<{ scope: string; + hostId: number; pageIndex: number; perPage: number; activeTab: "past" | "upcoming"; @@ -532,14 +531,15 @@ const HostDetailsPage = ({ [ { scope: "upcoming-activities", + hostId: hostIdFromURL, pageIndex: activityPage, perPage: DEFAULT_ACTIVITY_PAGE_SIZE, activeTab: activeActivityTab, }, ], - ({ queryKey: [{ pageIndex, perPage }] }) => { + ({ queryKey: [{ hostId, pageIndex, perPage }] }) => { return activitiesAPI.getHostUpcomingActivities( - hostIdFromURL, + hostId, pageIndex, perPage );