|
|
@@ -3,7 +3,7 @@ import React, {
|
|
|
} from 'react';
|
|
|
|
|
|
import { toastError } from '~/client/util/toastr';
|
|
|
-import type { IActivityHasId, ActivityWithPageTarget } from '~/interfaces/activity';
|
|
|
+import type { IActivityHasId, ActivityHasUserId } from '~/interfaces/activity';
|
|
|
import { useSWRxRecentActivity } from '~/stores/recent-activity';
|
|
|
import loggerFactory from '~/utils/logger';
|
|
|
|
|
|
@@ -15,14 +15,13 @@ import { ActivityListItem } from './ActivityListItem';
|
|
|
const logger = loggerFactory('growi:RecentActivity');
|
|
|
|
|
|
|
|
|
-const hasPageTarget = (activity: IActivityHasId): activity is ActivityWithPageTarget => {
|
|
|
- return activity.target != null
|
|
|
- && typeof activity.target === 'object'
|
|
|
- && '_id' in activity.target;
|
|
|
+const hasUser = (activity: IActivityHasId): activity is ActivityHasUserId => {
|
|
|
+ return activity.user != null
|
|
|
+ && typeof activity.user === 'object';
|
|
|
};
|
|
|
|
|
|
export const RecentActivity = (): JSX.Element => {
|
|
|
- const [activities, setActivities] = useState<ActivityWithPageTarget[]>([]);
|
|
|
+ const [activities, setActivities] = useState<ActivityHasUserId[]>([]);
|
|
|
const [activePage, setActivePage] = useState(1);
|
|
|
const [limit] = useState(10);
|
|
|
const [offset, setOffset] = useState(0);
|
|
|
@@ -45,7 +44,7 @@ export const RecentActivity = (): JSX.Element => {
|
|
|
|
|
|
if (paginatedData) {
|
|
|
const activitiesWithPages = paginatedData.docs
|
|
|
- .filter(hasPageTarget);
|
|
|
+ .filter(hasUser);
|
|
|
|
|
|
setActivities(activitiesWithPages);
|
|
|
}
|