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

fix session logout

Browse Source
This commit is contained in:
Elyor Djalilov 2024-06-27 16:20:01 +05:00
parent 02c55cbefe
commit e738a23d82
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/Shell.jsx
View File

@ -146,7 +146,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
socketHelper.on("statuses-in-portal", (data) => { socketHelper.on("statuses-in-portal", (data) => {
setDataFromSocket(data); setDataFromSocket(data);
// console.log("dataFromSocket", data); console.log("dataFromSocket", data);
}); });
socketHelper.on("enter-in-portal", (data) => { socketHelper.on("enter-in-portal", (data) => {

15
packages/client/src/store/SelectionPeopleStore.js
View File

@ -472,7 +472,7 @@ class SelectionStore {
this.dataFromSocket = data; this.dataFromSocket = data;
}; };
sessisonLogout = (userId) => { sessisonLogout = ({ userId, date }) => {
const newData = [...this.dataFromSocket]; const newData = [...this.dataFromSocket];
const index = newData.findIndex((data) => data.id === userId); const index = newData.findIndex((data) => data.id === userId);
@ -480,6 +480,9 @@ class SelectionStore {
if (index === -1) return; if (index === -1) return;
newData[index].status = "offline"; newData[index].status = "offline";
newData[index].sessions[0].date = date;
console.log(newData[index].sessions);
this.setDataFromSocket(newData); this.setDataFromSocket(newData);
}; };
@ -552,13 +555,9 @@ class SelectionStore {
const connectionsIsEmpty = session.connections.length === 0; const connectionsIsEmpty = session.connections.length === 0;
if (isCurrentSesstion) if (isCurrentSesstion) return [{ ...first, ...firstSessions }, ...other];
return [
{ ...first, ...firstSessions, date: moment().utc().toISOString() },
...other,
];
if (connectionsIsEmpty) return [data.sessions.at(-1)]; if (connectionsIsEmpty) return [data?.sessions.at(-1)];
return session.connections; return session.connections;
}; };
@ -617,6 +616,8 @@ class SelectionStore {
.map((user) => getUserSessionsById(user.id)); .map((user) => getUserSessionsById(user.id));
const sessions = await Promise.all(sessionsPromises); const sessions = await Promise.all(sessionsPromises);
// console.log("sessions from fetch", sessions);
this.setSessionsData(sessions); this.setSessionsData(sessions);
} catch (error) { } catch (error) {
console.error(error); console.error(error);