Client: Profile: move active session from footer

This commit is contained in:
Viktor Fomin 2023-09-26 22:38:35 +03:00
parent 13020c812a
commit cb1703f3cf
4 changed files with 18 additions and 23 deletions

View File

@ -54,7 +54,7 @@ const ActiveSessions = ({
const { interfaceDirection } = useTheme();
useEffect(() => {
getAllSessions().then(res => {
getAllSessions().then((res) => {
setSessions(res.items);
setCurrentSession(res.loginEvent);
});
@ -63,7 +63,7 @@ const ActiveSessions = ({
const onClickRemoveAllSessions = async () => {
try {
setLoading(true);
await removeAllSessions().then(res => window.location.replace(res));
await removeAllSessions().then((res) => window.location.replace(res));
} catch (error) {
toastr.error(error);
} finally {
@ -76,7 +76,7 @@ const ActiveSessions = ({
try {
setLoading(true);
await removeAllExecptThis().then(() =>
getAllSessions().then(res => setSessions(res.items))
getAllSessions().then((res) => setSessions(res.items))
);
} catch (error) {
toastr.error(error);
@ -86,12 +86,12 @@ const ActiveSessions = ({
}
};
const onClickRemoveSession = async id => {
const foundSession = sessions.find(s => s.id === id);
const onClickRemoveSession = async (id) => {
const foundSession = sessions.find((s) => s.id === id);
try {
setLoading(true);
await removeSession(foundSession.id).then(() =>
getAllSessions().then(res => setSessions(res.items))
getAllSessions().then((res) => setSessions(res.items))
);
toastr.success(
t("Profile:SuccessLogout", {
@ -107,7 +107,7 @@ const ActiveSessions = ({
}
};
const convertTime = date => {
const convertTime = (date) => {
return new Date(date).toLocaleString(locale);
};
const tableCell = (platform, browser) =>
@ -135,12 +135,14 @@ const ActiveSessions = ({
displayProp="flex"
alignItems="center"
justifyContent="flex-start"
marginProp="10px 0 0">
marginProp="10px 0 0"
>
<Link
className="session-logout"
type="action"
isHovered
onClick={() => setLogoutAllVisible(true)}>
onClick={() => setLogoutAllVisible(true)}
>
{t("Profile:LogoutAllActiveSessions")}
</Link>
<HelpButton
@ -156,7 +158,7 @@ const ActiveSessions = ({
{isMobile ? (
<Table>
<TableBody>
{sessions.map(session => (
{sessions.map((session) => (
<TableRow key={session.id}>
<TableDataCell style={{ borderTop: "0" }}>
{tableCell(session.platform, session.browser)}
@ -179,7 +181,8 @@ const ActiveSessions = ({
platform: session.platform,
browser: session.browser,
});
}}>
}}
>
{currentSession !== session.id ? removeIcon : null}
</TableDataCell>
</TableRow>
@ -196,7 +199,7 @@ const ActiveSessions = ({
</TableRow>
</TableHead>
<TableBody>
{sessions.map(session => (
{sessions.map((session) => (
<TableRow key={session.id}>
<TableDataCell>
{tableCell(session.platform, session.browser)}
@ -212,7 +215,8 @@ const ActiveSessions = ({
platform: session.platform,
browser: session.browser,
});
}}>
}}
>
{currentSession !== session.id ? removeIcon : null}
</TableDataCell>
</TableRow>

View File

@ -1,3 +1,2 @@
export { default as SectionHeaderContent } from "./Header";
export { default as SectionBodyContent } from "./Body";
export { default as SectionFooterContent } from "./Footer";

View File

@ -2,11 +2,7 @@ import React from "react";
import PropTypes from "prop-types";
import Section from "@docspace/common/components/Section";
import {
SectionHeaderContent,
SectionBodyContent,
SectionFooterContent,
} from "./Section";
import { SectionHeaderContent, SectionBodyContent } from "./Section";
import Dialogs from "../Home/Section/AccountsBody/Dialogs";
@ -94,10 +90,6 @@ class Profile extends React.Component {
<Section.SectionBody>
<SectionBodyContent profile={profile} />
</Section.SectionBody>
<Section.SectionFooter>
<SectionFooterContent profile={profile} />
</Section.SectionFooter>
</Section>
<Dialogs />
</>