Update odlux

Update performance app: fix scrolling bug, reduce loading times, update ui to use tabs instead of panels, change the view to toggle between chart and table to better visualize data, minior bugfixes for other apps

Issue-ID: SDNC-1080
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: I2b5cf3a5f580f4193421bc047e5256d8e9497e6b
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>

2 files changed, 8 insertions, 25 deletions

diff --git a/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx b/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
index 2075e052c..8ea0a93f4 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
@@ -35,6 +35,9 @@ const styles = (theme: Theme) => createStyles({
   input: {
     margin: theme.spacing(1),
   },
+  numberInput: {
+    float: "right"
+  }
 });
 
 interface IEnhancedTableFilterComponentProps extends WithStyles<typeof styles> {
@@ -62,6 +65,7 @@ class EnhancedTableFilterComponent extends React.Component<IEnhancedTableFilterC
           const style = col.width ? { width: col.width } : {};
           return (
             <TableCell
+              className={col.type === ColumnType.numeric ? classes.numberInput : ''}
               key={col.property}
               padding={col.disablePadding ? 'none' : 'default'}
               style={style}
diff --git a/sdnr/wt/odlux/framework/src/views/login.tsx b/sdnr/wt/odlux/framework/src/views/login.tsx
index 3f6ef6134..fa01568ea 100644
--- a/sdnr/wt/odlux/framework/src/views/login.tsx
+++ b/sdnr/wt/odlux/framework/src/views/login.tsx
@@ -18,13 +18,9 @@
 import * as React from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
+import Alert from '@material-ui/lab/Alert';
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogContentText from '@material-ui/core/DialogContentText';
-import DialogTitle from '@material-ui/core/DialogTitle';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import FormControl from '@material-ui/core/FormControl';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
@@ -102,7 +98,7 @@ class LoginComponent extends React.Component<LoginProps, ILoginState> {
   render(): JSX.Element {
     const { classes } = this.props;
     return (
-      <React.Fragment>
+      <>
         <CssBaseline />
         <main className={classes.layout}>
           <Paper className={classes.paper}>
@@ -157,27 +153,10 @@ class LoginComponent extends React.Component<LoginProps, ILoginState> {
                 Sign in
             </Button>
             </form>
+            {this.state.message && <Alert severity="error">{this.state.message}</Alert>}
           </Paper>
         </main>
-        <Dialog
-          open={!!this.state.message}
-          onClose={() => { this.setState({ message: '' }) }}
-          aria-labelledby="alert-dialog-title"
-          aria-describedby="alert-dialog-description"
-        >
-          <DialogTitle id="alert-dialog-title">{"Error"}</DialogTitle>
-          <DialogContent>
-            <DialogContentText id="alert-dialog-description">
-              {this.state.message}
-            </DialogContentText>
-          </DialogContent>
-          <DialogActions>
-            <Button onClick={() => { this.setState({ message: '' }) }} color="secondary" autoFocus>
-              OK
-            </Button>
-          </DialogActions>
-        </Dialog>
-      </React.Fragment>
+      </>
     );
   }