fixed display connections on panel

This commit is contained in:
Elyor Djalilov 2024-06-27 19:34:01 +05:00
parent 651955d043
commit 2d73e3ec4a

View File

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