Update ODLUX

Update login view, add logout after user session ends, add user settings, several bugfixes
Issue-ID: CCSDK-3540

Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: I21137756b204287e25766a9646bf2faf7bad9d35

1 files changed, 14 insertions, 4 deletions

diff --git a/sdnr/wt/odlux/framework/src/components/titleBar.tsx b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
index 62db1de40..5d916e8c8 100644
--- a/sdnr/wt/odlux/framework/src/components/titleBar.tsx
+++ b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
@@ -35,8 +35,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBan } from '@fortawesome/free-solid-svg-icons';

 import { faDotCircle } from '@fortawesome/free-solid-svg-icons';

 

-import { UpdateUser } from '../actions/authentication';

-import { ReplaceAction } from '../actions/navigationActions';

+import { logoutUser } from '../actions/authentication';

+import { PushAction, ReplaceAction } from '../actions/navigationActions';

 

 import connect, { Connect, IDispatcher } from '../flux/connect';

 import Logo from './logo';

@@ -71,9 +71,12 @@ const styles = (theme: Theme) => createStyles({
 const mapDispatch = (dispatcher: IDispatcher) => {

   return {

     logout: () => {

-      dispatcher.dispatch(new UpdateUser(undefined));

+      dispatcher.dispatch(logoutUser());

       dispatcher.dispatch(new ReplaceAction("/login"));

     },

+    openSettings : () =>{

+      dispatcher.dispatch(new PushAction("/settings"));

+    },

     toggleMainMenu: (value: boolean, value2: boolean) => {

       dispatcher.dispatch(new MenuAction(value));

       dispatcher.dispatch(new MenuClosedByUser(value2))

@@ -172,7 +175,14 @@ class TitleBarComponent extends React.Component<TitleBarProps, { anchorEl: HTMLE
                 onClose={this.closeMenu}

               >

                 {/* <MenuItem onClick={ this.closeMenu }>Profile</MenuItem> */}

-                <MenuItem onClick={() => {

+                <MenuItem 

+                 aria-label="settings-button"

+                 onClick={ () =>{

+                    this.props.openSettings();

+                    this.closeMenu(); }}>Settings</MenuItem>

+                <MenuItem

+                aria-label="logout-button"

+                onClick={() => {

                   this.props.logout();

                   this.closeMenu();

                 }}>Logout</MenuItem>