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

Client:PortalSettings:Categories:Security:Sessions:TableView Fixed display date and status sessions

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-06-26 19:30:15 +05:00
parent 8a7492bdbf
commit ca3126ea2a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js
View File

@ -169,18 +169,19 @@ const SessionsTableRow = (props) => {
setFromDateAgo, setFromDateAgo,
} = props; } = props;
const { platform, browser, ip, city, country, status, date } = sessions; const { browser, ip, city, country } = sessions;
const date = connections[0]?.date;
const isLastConnection = connections.length > 0; const isLastConnection = connections.length > 0;
const fromDateAgo = getFromDateAgo(item.id); const fromDateAgo = getFromDateAgo(item.id);
const isChecked = checkedProps?.checked; const isChecked = checkedProps?.checked;
const isOnline = sessionStatus === "online"; const isOnline = sessionStatus === "online";
const isOffline = status === "offline";
useEffect(() => { useEffect(() => {
const updateStatus = () => { const updateStatus = () => {
const showOnline = isOnline && sessionStatus; const showOnline = isOnline && sessionStatus;
const showOffline = isOffline ? convertDate(date, locale) : null; const showOffline = !isOnline && date ? convertDate(date, locale) : null;
setFromDateAgo(item.id, isOnline ? showOnline : showOffline); setFromDateAgo(item.id, isOnline ? showOnline : showOffline);
}; };
@ -188,7 +189,7 @@ const SessionsTableRow = (props) => {
const intervalId = setInterval(updateStatus, 60000); const intervalId = setInterval(updateStatus, 60000);
return () => clearInterval(intervalId); return () => clearInterval(intervalId);
}, [date, sessionStatus, status, locale, item.id]); }, [date, sessionStatus, locale, item.id, isOnline]);
const onClickSessions = () => { const onClickSessions = () => {
setStatus(fromDateAgo); setStatus(fromDateAgo);
@ -286,7 +287,7 @@ const SessionsTableRow = (props) => {
<TableCell> <TableCell>
<Text className="session-info" truncate> <Text className="session-info" truncate>
{isLastConnection ? connections[0]?.platform : platform},&nbsp; {connections[0]?.platform},&nbsp;
</Text> </Text>
<Text className="session-info" truncate> <Text className="session-info" truncate>
{isLastConnection {isLastConnection