mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-17 14:10:14 +02:00
Add empty placeholder
This commit is contained in:
@@ -5,6 +5,7 @@ import sortBy from 'lodash/sortBy';
|
|||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import { socket } from '@/renderer/api';
|
import { socket } from '@/renderer/api';
|
||||||
import { UserListResponse } from '@/renderer/api/users.api';
|
import { UserListResponse } from '@/renderer/api/users.api';
|
||||||
|
import { Text } from '@/renderer/components';
|
||||||
import {
|
import {
|
||||||
Activity,
|
Activity,
|
||||||
UserActivityItem,
|
UserActivityItem,
|
||||||
@@ -167,7 +168,7 @@ export const UserActivity = () => {
|
|||||||
const user = prev.find((user) => user.id === data.user.userId);
|
const user = prev.find((user) => user.id === data.user.userId);
|
||||||
if (!user) return prev;
|
if (!user) return prev;
|
||||||
|
|
||||||
return sortByName([
|
return [
|
||||||
...prev.filter((user) => user.id !== data.user.userId),
|
...prev.filter((user) => user.id !== data.user.userId),
|
||||||
{
|
{
|
||||||
...user,
|
...user,
|
||||||
@@ -177,7 +178,7 @@ export const UserActivity = () => {
|
|||||||
status: data.status,
|
status: data.status,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]);
|
];
|
||||||
});
|
});
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -252,15 +253,23 @@ export const UserActivity = () => {
|
|||||||
handleUserStatusChange,
|
handleUserStatusChange,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
const orderedActivityList = sortByName(
|
||||||
|
activityList.filter(
|
||||||
|
(user) => user.activity?.status && user.activity?.status !== 'offline'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<UserActivityContainer>
|
<UserActivityContainer>
|
||||||
{activityList
|
{orderedActivityList.length ? (
|
||||||
.filter(
|
orderedActivityList.map((user) => (
|
||||||
(user) => user.activity?.status && user.activity?.status !== 'offline'
|
|
||||||
)
|
|
||||||
.map((user) => (
|
|
||||||
<UserActivityItem key={`activity-${user.id}`} user={user} />
|
<UserActivityItem key={`activity-${user.id}`} user={user} />
|
||||||
))}
|
))
|
||||||
|
) : (
|
||||||
|
<Text $secondary overflow="hidden" px="1rem" py=".5rem" size="xs">
|
||||||
|
No users online
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
</UserActivityContainer>
|
</UserActivityContainer>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user