From 5817ba9640db6b508b1d43f9cff70a8e5bfc59f1 Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Fri, 3 Dec 2021 20:09:18 +0100
Subject: [PATCH] SSDM-12024 : Table Widget : Global filter with AND/OR options
(as in the old grid) - fix unnecessary scroll bar at login page while loading
---
openbis_ng_ui/index.html | 4 ----
.../src/js/components/common/error/Error.jsx | 13 +++++++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/openbis_ng_ui/index.html b/openbis_ng_ui/index.html
index 4778a58b34a..2f83fb57a0e 100644
--- a/openbis_ng_ui/index.html
+++ b/openbis_ng_ui/index.html
@@ -16,10 +16,6 @@
#app {
height: 100%;
}
- #app > div,
- #app > div > div {
- height: 100%;
- }
#error {
margin-left: 20px;
}
diff --git a/openbis_ng_ui/src/js/components/common/error/Error.jsx b/openbis_ng_ui/src/js/components/common/error/Error.jsx
index 6137e439f75..1a802d63130 100644
--- a/openbis_ng_ui/src/js/components/common/error/Error.jsx
+++ b/openbis_ng_ui/src/js/components/common/error/Error.jsx
@@ -1,13 +1,22 @@
import React from 'react'
+import { withStyles } from '@material-ui/core/styles'
import ErrorDialog from '@src/js/components/common/dialog/ErrorDialog.jsx'
import logger from '@src/js/common/logger.js'
+const styles = {
+ container: {
+ height: '100%'
+ }
+}
+
class Error extends React.Component {
render() {
logger.log(logger.DEBUG, 'Error.render')
+ const { classes } = this.props
+
return (
- <div>
+ <div className={classes.container}>
{this.props.error && (
<ErrorDialog
error={this.props.error}
@@ -20,4 +29,4 @@ class Error extends React.Component {
}
}
-export default Error
+export default withStyles(styles)(Error)
--
GitLab