Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
079aaad
feat: information dialog
isaqueha Sep 10, 2020
2c6784c
feat: session timeout dialog
isaqueha Sep 10, 2020
3dedc7e
feat: snapshot tests
isaqueha Sep 10, 2020
3442097
fix: renaming and fixes
isaqueha Sep 11, 2020
8f86ab3
fix: move useref to sessiontimeout
isaqueha Sep 11, 2020
5c1bbc3
fix: use text instead of textwrapper
isaqueha Sep 11, 2020
52f25bd
fix: move constants to their own context
isaqueha Sep 11, 2020
b19ec16
fix: use constant styles definition
isaqueha Sep 11, 2020
7b24481
feat: informationZone component
isaqueha Sep 11, 2020
d2b1998
fix: refactor tests
isaqueha Sep 11, 2020
48f5a58
Merge branch 'master' into feat-session-timeout
isaqueha Sep 12, 2020
58e512c
Merge branch 'master' into feat-session-timeout
isaqueha Sep 15, 2020
56ec5de
fix: prettier rules
isaqueha Sep 15, 2020
aa76f33
fix: prettier rules
isaqueha Sep 15, 2020
f8b5c94
Merge branch 'master' into feat-session-timeout
isaqueha Sep 15, 2020
fef0b89
fix: remove old files
isaqueha Sep 15, 2020
2d91b35
fix: prettier path was blocking push
isaqueha Sep 15, 2020
a29d9be
fix: remove old files
isaqueha Sep 15, 2020
ee9c4db
refactor: reverted since it does not need anymore
Sep 16, 2020
8a5f2ff
fix: existing bug of changin mode
Sep 16, 2020
13209c0
refactor: removed specific close i18n
Sep 16, 2020
fada466
refactor: removed stale prop
Sep 16, 2020
a4ff8e3
refactor: ioc timeouts
Sep 16, 2020
9dd3bec
add sample link to information dialog
Sep 16, 2020
210815b
Merge branch 'feat-session-timeout' of https://github.com/LuisValgoi/…
Sep 16, 2020
9408a07
Adding tests to information dialog
Sep 16, 2020
1405d4c
fix: information zone as a function component
isaqueha Sep 16, 2020
75caa09
fix: prettier formatting
isaqueha Sep 16, 2020
b6ebf71
fix: prettier formatting
isaqueha Sep 16, 2020
4b0beac
fix: tests for session timeout
isaqueha Sep 16, 2020
cd6e159
update snapshot
Sep 21, 2020
36fd956
removing snapshot test
Sep 21, 2020
7f2da29
remove snapshot testing
isaqueha Sep 22, 2020
ce89b44
Merge branch 'master' into feat-session-timeout
isaqueha Sep 22, 2020
aebb38a
remove failing test
isaqueha Sep 22, 2020
e8de4e6
remove duplicated import
isaqueha Sep 22, 2020
40a54a8
fix: remove bad snapshot test
isaqueha Sep 22, 2020
c7ae4e5
fix: warning inside constant
isaqueha Sep 22, 2020
90901f6
remove unecessary step
Sep 23, 2020
55cfea9
remove blank space
lpohren Sep 23, 2020
1341685
remove blank space
lpohren Sep 23, 2020
479b022
remove blank space 1
lpohren Sep 23, 2020
af633b9
Merge branch 'feat-session-timeout' of https://github.com/LuisValgoi/…
lpohren Sep 23, 2020
f840d99
chore: remove blank space 2
lpohren Sep 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import React, { useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { BrowserRouter } from "react-router-dom";
import { Helmet } from 'react-helmet';

import SessionTimeoutDialog from '../Common/ViewSettings/SessionTimeoutDialog';

import ErrorBoundary from './pages/Fallback/ErrorBoundary';
import Shell from './components/Shell/Shell';
Expand All @@ -13,6 +13,7 @@ import CenteredContent from './components/Layout/CenteredContent';

function App() {
const { t } = useTranslation();
const sessionDialogRef = useRef(null);

return (
<BrowserRouter>
Expand All @@ -23,6 +24,7 @@ function App() {
<CenteredContent>
<Routes />
</CenteredContent>
<SessionTimeoutDialog dialogRef={sessionDialogRef} />
</ErrorBoundary>
</BrowserRouter>
);
Expand Down
139 changes: 139 additions & 0 deletions src/components/InformationDialog/InformationDialog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
import React, { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { spacing } from '@ui5/webcomponents-react-base';
import { Icon } from '@ui5/webcomponents-react/lib/Icon';
import { Button } from '@ui5/webcomponents-react/lib/Button';
import { ButtonDesign } from '@ui5/webcomponents-react/lib/ButtonDesign';
import { Dialog } from '@ui5/webcomponents-react/lib/Dialog';
import { FlexBox } from '@ui5/webcomponents-react/lib/FlexBox';
import { FlexBoxDirection } from '@ui5/webcomponents-react/lib/FlexBoxDirection';
import { FlexBoxAlignItems } from '@ui5/webcomponents-react/lib/FlexBoxAlignItems';
import { FlexBoxJustifyContent } from '@ui5/webcomponents-react/lib/FlexBoxJustifyContent';
import { TextWrapper } from '../../util/Layout'
import Constants from '../../util/Constants';

const _getHeaderIcon = type => {
switch (type) {
case Type.Warning:
return _getHeaderWarningIcon();
case Type.Error:
return _getHeaderErrorIcon();
default:
return _getHeaderInfoIcon();
}
};

const _getHeaderWarningIcon = () => {
return (
<Icon
name="message-warning"
style={{
width: '1.5rem',
height: '1.5rem',
color: '#feb60a'
}}
/>
);
};

const _getHeaderErrorIcon = () => {
return (
<Icon
name="message-error"
style={{
width: '1.5rem',
height: '1.5rem',
color: '#ff5254'
}}
/>
);
};

const _getHeaderInfoIcon = () => {
return (
<Icon
name="message-information"
style={{
width: '1.5rem',
height: '1.5rem',
color: 'black'
}}
/>
);
};

const _handleAvoidEscapeClosing = (avoidEscapeClose) => {
document.addEventListener('keydown', (e) => {
if (e.keyCode === Constants.KEYBOARD_KEYS.ESCAPE && avoidEscapeClose) {
e.stopPropagation();
}
}, true);
};

const InformationDialog = ({ dialogRef, avoidEscapeClose, headerText, innerText, closeButtonText, children, onClose, type }) => {
const { t } = useTranslation();

useEffect(() => {
_handleAvoidEscapeClosing(avoidEscapeClose);
}, []);

const _onClose = () => {
onClose && onClose();
if (dialogRef.current) {
dialogRef.current.close();
}
};

const _getFooter = () => {
return (
<FlexBox
alignItems={FlexBoxAlignItems.Center}
direction={FlexBoxDirection.RowReverse}
style={spacing.sapUiTinyMargin}
>
<Button design={ButtonDesign.Transparent} onClick={_onClose}>
{closeButtonText ? closeButtonText : t('app.generics.close')}
</Button>
</FlexBox>
);
};

const _getHeader = () => {
return (
<FlexBox
alignItems={FlexBoxAlignItems.Center}
justifyContent={FlexBoxJustifyContent.Center}
style={spacing.sapUiContentPadding}
>
{_getHeaderIcon(type)}
<TextWrapper style={spacing.sapUiTinyMarginBegin}>
{headerText}
</TextWrapper>
</FlexBox>
);
};

return (
<Dialog
ref={dialogRef}
slot="header"
header={_getHeader()}
footer={_getFooter()}
onAfterClose={_onClose}
>
<div style={{ ...spacing.sapUiContentPadding }}>
<FlexBox direction={FlexBoxDirection.Column}>
{innerText ? <TextWrapper>{innerText}</TextWrapper> : children}
</FlexBox>
</div>
</Dialog>
);
};

export default InformationDialog;

export const Type = {
Warning: 'WARNING',
Error: 'ERROR',
Info: 'INFO'
};
66 changes: 66 additions & 0 deletions src/components/SessionTimeout/SessionTimeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import InformationDialog, { Type } from '../InformationDialog/InformationDialog';
import Constants from '../../util/Constants';

const SessionTimeoutDialog = ({ dialogRef }) => {
const { t } = useTranslation();
const TIMEOUT_MODE = {
type: Type.Error,
headerText: t('session.expired'),
closeButtonText: t('session.expired.button.reload'),
innerText: t('session.expired.text'),
onClose: () => window.location.reload()
};
const WARNING_MODE = {
type: Type.Warning,
headerText: t('session.warning.expired'),
closeButtonText: t('session.expired.button.close'),
innerText: t('session.warning.expired.text'),
onClose: null
};
const [options, setOptions] = useState(TIMEOUT_MODE);
const ACTIVITY_EVENTS = ['click', 'focus', 'blur', 'keyup', 'keydown', 'mousemove', 'scroll'];
let sessionIntervalCount = 1;

useEffect(() => {
handleUserActivity();
}, []);

useEffect(() => {
const sessionIntervalFinder = setInterval(() => {
if (sessionIntervalCount >= Constants.SESSION.REFRESH_WARNING && sessionIntervalCount < Constants.SESSION.REFRESH_LIMIT) {
setOptions(WARNING_MODE);
dialogRef.current.open();

} else if (sessionIntervalCount >= Constants.SESSION.REFRESH_LIMIT) {
clearInterval(sessionIntervalFinder);
setOptions(TIMEOUT_MODE);
dialogRef.current.open();
}

sessionIntervalCount++;
}, Constants.SESSION.TIMEOUT_INTERVAL);
}, []);

const handleUserActivity = () => {
for (let i = 0, len = ACTIVITY_EVENTS.length; i < len; i++) {
window.addEventListener(ACTIVITY_EVENTS[i], () => {
sessionIntervalCount = 0;
});
}
};

return (
<InformationDialog
avoidEscapeClose
dialogRef={dialogRef}
type={options.type}
onClose={options.onClose}
headerText={options.headerText}
closeButtonText={options.closeButtonText}
innerText={options.innerText} />
);
};

export default SessionTimeoutDialog;
4 changes: 1 addition & 3 deletions src/hooks/useRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import UrlProvider from '../util/URLProvider';
import Request from '../util/Request';
import Constants from '../util/Constants';

const FIVE_MINUTES_IN_MILLISECONDS = 1000 * 60 * 5;

function useOperation(reactQueryKey, operation, urlKey, dataParam, config) {
const { data, status } = useQuery(reactQueryKey, async () => {
const url = UrlProvider.getUrl(urlKey);
const res = await Request[operation](url, dataParam, config);
return res.data;
}, {
staleTime: FIVE_MINUTES_IN_MILLISECONDS
staleTime: Constants.REACT_QUERY.STALE_TIME
});

return { data, status };
Expand Down
9 changes: 8 additions & 1 deletion src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@
"page.error.alt": "Error",
"page.notfound.text": "Hmmm, we could find this URL",
"page.notfound.alt": "Not Found",
"page.fallback.reload.text": "Reload this page"
"page.fallback.reload.text": "Reload this page",
"session.expired": "Session Expired",
"session.expired.button.reload": "Reload",
"session.expired.text": "Your session has expired. Please reload to continue.",
"session.warning.expired": "Session Almost Expiring",
"session.expired.button.close": "Close",
"session.warning.expired.text": "If you not perform an action within 2 minutes, your session will expire.",
"app.generics.close": "Close"
}
9 changes: 8 additions & 1 deletion src/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@
"page.error.alt": "Erro",
"page.notfound.text": "Hmmm, não conseguimos encontrar esta página",
"page.notfound.alt": "Não Encontrado",
"page.fallback.reload.text": "Recarregar"
"page.fallback.reload.text": "Recarregar",
"session.expired": "Sessão expirada",
"session.expired.button.reload": "Recarregar",
"session.expired.text": "Sua sessão expirou. Recarregue para continuar.",
"session.warning.expired": "Sessão quase expirada",
"session.expired.button.close": "Fechar",
"session.warning.expired.text": "Se você não efetuar uma ação nos próximos 2 minutos, a sua sessão irá expirar.",
"app.generics.close": "Fechar"
}
11 changes: 10 additions & 1 deletion src/util/Constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@ export default {
},
KEYS: {
GET_USER_LOGGED: 'GET_USER_LOGGED'
}
},
STALE_TIME: 1000 * 60 * 5
},
REQUEST: {
GET: 'get',
POST: 'get',
PUT: 'put',
PATCH: 'patch',
DELETE: 'delete',
},
SESSION: {
TIMEOUT_INTERVAL: 60000,
REFRESH_LIMIT: 15,
REFRESH_WARNING: 13,
},
KEYBOARD_KEYS: {
ESCAPE: 27
}
};
15 changes: 15 additions & 0 deletions src/util/Layout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import { Text } from '@ui5/webcomponents-react/lib/Text';

export const TextWrapper = ({ children, isOnHeader, style }) => {
return (
<Text
tooltip={children}
wrapping
className={isOnHeader && 'text-header-color'}
style={{ ...style, lineHeight: '20px' }}
>
{children}
</Text>
);
};