diff --git a/src/components/activitylog.js b/src/components/activitylog.js index 7a1a2d59f6..11ab7044a4 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -61,13 +61,13 @@ function renderList(elem, apiClient, result) { } function reloadData(instance, elem, apiClient, startIndex, limit) { - startIndex ??= parseInt(elem.getAttribute('data-activitystartindex') || '0', 10); + startIndex ||= parseInt(elem.getAttribute('data-activitystartindex') || '0', 10); limit ||= parseInt(elem.getAttribute('data-activitylimit') || '7', 10); const minDate = new Date(); const hasUserId = toBoolean(elem.getAttribute('data-useractivity'), true); const daysOffset = hasUserId ? 1 : 7; // one day back if user id, otherwise one week // TODO: Use date-fns - minDate.setTime(minDate.getTime() - dateOffset * 24 * 60 * 60 * 1000); + minDate.setTime(minDate.getTime() - daysOffset * 24 * 60 * 60 * 1000); ApiClient.getJSON(ApiClient.getUrl('System/ActivityLog/Entries', { startIndex: startIndex, @@ -77,10 +77,8 @@ function reloadData(instance, elem, apiClient, startIndex, limit) { })).then(function (result) { elem.setAttribute('data-activitystartindex', startIndex); elem.setAttribute('data-activitylimit', limit); - if (startIndex === 0) { - const activityContainer = dom.parentWithClass(elem, 'activityContainer'); - activityContainer?.classList.toggle('hide', result.Items.length === 0); - } + const activityContainer = dom.parentWithClass(elem, 'activityContainer'); + activityContainer?.classList.toggle('hide', result.Items.length === 0 && startIndex === 0); instance.items = result.Items; renderList(elem, apiClient, result);