SDNR Add missing status bar to ODLUX Framework

Modify framework and adapt all apps

Issue-ID: SDNC-789
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Change-Id: I1ea0a3df6c3f6db08f2bd7a21eb3b4cbf230a08a
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>

2 files changed, 15 insertions, 8 deletions

diff --git a/sdnr/wt/odlux/framework/src/components/routing/appFrame.tsx b/sdnr/wt/odlux/framework/src/components/routing/appFrame.tsx
index 55b249246..06ad5b434 100644
--- a/sdnr/wt/odlux/framework/src/components/routing/appFrame.tsx
+++ b/sdnr/wt/odlux/framework/src/components/routing/appFrame.tsx
@@ -5,29 +5,30 @@ import connect, { Connect } from '../../flux/connect';
 import { SetTitleAction } from '../../actions/titleActions';

 import { AddErrorInfoAction } from '../../actions/errorActions';

 

-import { IconType } from '../../models/iconDefinition'; 

+import { IconType } from '../../models/iconDefinition';

 

 export interface IAppFrameProps  {

   title: string;

   icon?: IconType;

+  appId?: string

 }

 

-/** 

- * Represents a component to wich will embed each single app providing the 

+/**

+ * Represents a component to wich will embed each single app providing the

  * functionality to update the title and implement an exeprion border.

  */

 export class AppFrame extends React.Component<IAppFrameProps & Connect> {

-  

+

   public render(): JSX.Element {

     return (

-      <div style={{ flex: "1", overflow: "auto", display: "flex", flexDirection: "column" }}> 

+      <div style={{ flex: "1", overflow: "auto", display: "flex", flexDirection: "column" }}>

         { this.props.children }

       </div>

      )

     }

-    

+

   public componentDidMount() {

-    this.props.dispatch(new SetTitleAction(this.props.title, this.props.icon));

+    this.props.dispatch(new SetTitleAction(this.props.title, this.props.icon, this.props.appId));

   }

   public componentDidCatch(error: Error | null, info: object) {

     this.props.dispatch(new AddErrorInfoAction({ error, info }));

diff --git a/sdnr/wt/odlux/framework/src/components/titleBar.tsx b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
index a3ba571ec..230dda400 100644
--- a/sdnr/wt/odlux/framework/src/components/titleBar.tsx
+++ b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
@@ -69,12 +69,18 @@ class TitleBarComponent extends React.Component<TitleBarProps, { anchorEl: HTMLE
             <MenuIcon />

           </IconButton>

           <Logo />

-          <Typography variant="title" color="inherit" className={ classes.grow }>

+          <Typography variant="title" color="inherit" >

             { state.framework.applicationState.icon

               ? (<FontAwesomeIcon className={ classes.icon } icon={ state.framework.applicationState.icon } />)

               : null }

             { state.framework.applicationState.title }

           </Typography>

+          <div className={classes.grow}></div>

+          { state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {

+            const reg = state.framework.applicationRegistraion[key];

+            return reg && reg.statusBarElement && <reg.statusBarElement key={key} /> || null

+          })}

+

           { state.framework.authenticationState.user

             ? (<div>

               <Button