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

fixed display of last session

Browse Source
This commit is contained in:
Elyor Djalilov 2024-06-25 21:17:50 +05:00
parent 8c5e701afd
commit eadcb92d96
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ const LastSessionBlock = (props) => {
const {
t,
status,
connections,
userLastSession,
setDisplayName,
setDisableDialogVisible,
@ -119,6 +120,7 @@ const LastSessionBlock = (props) => {
const { platform, browser, ip, city, country } = sessions;
const isOnline = status === "online";
const isLastConnection = connections.length > 0;
const getUserType = () => {
if (isOwner) return t("Common:Owner");
@ -195,12 +197,16 @@ const LastSessionBlock = (props) => {
</div>
<div className="session-info-row">
<Text className="session-info-label">{t("Common:Platform")}</Text>
<Text className="session-info-value">{platform}</Text>
<Text className="session-info-value">
{isLastConnection ? connections[0]?.platform : platform}
</Text>
</div>
<div className="session-info-row">
<Text className="session-info-label">{t("Common:Browser")}</Text>
<Text className="session-info-value">
{browser?.split(".")[0] ?? ""}
{isLastConnection
? connections[0]?.browser
: browser?.split(".")[0] ?? ""}
</Text>
</div>
<div className="session-info-row">
@ -213,7 +219,7 @@ const LastSessionBlock = (props) => {
{`${city} `}
</>
)}
{ip}
{isLastConnection ? connections[0]?.ip : ip}
</Text>
</div>
</Box>
@ -225,11 +231,12 @@ const LastSessionBlock = (props) => {
export default inject(({ setup, peopleStore }) => {
const { setDisableDialogVisible, setLogoutAllDialogVisible } = setup;
const { status, userLastSession, setDisplayName } =
const { status, connections, userLastSession, setDisplayName } =
peopleStore.selectionStore;
return {
status,
connections,
userLastSession,
setDisplayName,
setDisableDialogVisible,

9
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js
View File

@ -25,11 +25,12 @@ const StyledRowContent = styled(RowContent)`
`;
const SessionsRowContent = ({ t, item, fromDateAgo, sectionWidth }) => {
const { id, displayName, status, sessions } = item;
const { id, displayName, status, sessions, connections } = item;
const { platform, browser, country, city, ip } = sessions;
const isOnline = status === "online";
const isLastConnection = connections.length > 0;
return (
<StyledRowContent
@ -45,8 +46,8 @@ const SessionsRowContent = ({ t, item, fromDateAgo, sectionWidth }) => {
</Text>
<></>
<Text fontSize="12px" fontWeight="600">
{platform}
{` ${browser}`}
{isLastConnection ? connections[0]?.platform : platform}
{` ${isLastConnection ? connections[0]?.browser : browser}`}
</Text>
{(country || city) && (
@ -57,7 +58,7 @@ const SessionsRowContent = ({ t, item, fromDateAgo, sectionWidth }) => {
)}
<Text fontSize="12px" fontWeight="600" containerWidth="160px">
{ip}
{isLastConnection ? connections[0]?.ip : ip}
</Text>
</StyledRowContent>
);