IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed display connections on panel

Browse Source
This commit is contained in:
Elyor Djalilov 2024-06-27 19:34:01 +05:00
parent 651955d043
commit 2d73e3ec4a
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.js
View File

@ -99,28 +99,28 @@ const StyledLastSessionBlock = styled.div`
const LastSessionBlock = (props) => {
const {
t,
status,
connections,
userLastSession,
setDisplayName,
setDisableDialogVisible,
setLogoutAllDialogVisible,
getFromDateAgo,
} = props;
const {
id,
avatar,
displayName,
sessions,
isAdmin,
isOwner,
isRoomAdmin,
isCollaborator,
} = userLastSession;
const { platform, browser, ip, city, country } = sessions;
const fromDateAgo = getFromDateAgo(id);
const isOnline = status === "online";
const isLastConnection = connections.length > 0;
const { platform, browser, ip, city, country } = connections[0] ?? {};
const isOnline = fromDateAgo === "online";
const getUserType = () => {
if (isOwner) return t("Common:Owner");
@ -192,21 +192,17 @@ const LastSessionBlock = (props) => {
<div className="session-info-row">
<Text className="session-info-label">{t("Common:Active")}</Text>
<Text className={isOnline ? "online" : "session-info-value"}>
{t(`Common:${status}`)}
{t(`Common:${fromDateAgo}`)}
</Text>
</div>
<div className="session-info-row">
<Text className="session-info-label">{t("Common:Platform")}</Text>
<Text className="session-info-value">
{isLastConnection ? connections[0]?.platform : platform}
</Text>
<Text className="session-info-value">{platform}</Text>
</div>
<div className="session-info-row">
<Text className="session-info-label">{t("Common:Browser")}</Text>
<Text className="session-info-value">
{isLastConnection
? connections[0]?.browser
: browser?.split(".")[0] ?? ""}
{browser?.split(".")[0] ?? ""}
</Text>
</div>
<div className="session-info-row">
@ -219,7 +215,7 @@ const LastSessionBlock = (props) => {
{`${city} `}
</>
)}
{isLastConnection ? connections[0]?.ip : ip}
{ip}
</Text>
</div>
</Box>
@ -231,11 +227,11 @@ const LastSessionBlock = (props) => {
export default inject(({ setup, peopleStore }) => {
const { setDisableDialogVisible, setLogoutAllDialogVisible } = setup;
const { status, connections, userLastSession, setDisplayName } =
const { getFromDateAgo, connections, userLastSession, setDisplayName } =
peopleStore.selectionStore;
return {
status,
getFromDateAgo,
connections,
userLastSession,
setDisplayName,