From 2bb0fd04ce2f7d5febafcdbd679b7e31f855f51e Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Wed, 15 Jan 2020 09:52:26 +0200
Subject: [PATCH] Fix result table column key and MuiTypography class loading.
---
src/client/components/facet_results/ResultTableHead.js | 1 +
src/client/components/main_layout/TopBar.js | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/client/components/facet_results/ResultTableHead.js b/src/client/components/facet_results/ResultTableHead.js
index ca4816e0..44881cb6 100644
--- a/src/client/components/facet_results/ResultTableHead.js
+++ b/src/client/components/facet_results/ResultTableHead.js
@@ -35,6 +35,7 @@ const ResultTableHead = props => {
? (
<TableCell
className={classes.headerCol}
+ key={column.id}
>
{label}
<Tooltip
diff --git a/src/client/components/main_layout/TopBar.js b/src/client/components/main_layout/TopBar.js
index 00114753..f21f5ef7 100644
--- a/src/client/components/main_layout/TopBar.js
+++ b/src/client/components/main_layout/TopBar.js
@@ -4,7 +4,7 @@ import intl from 'react-intl-universal'
import AppBar from '@material-ui/core/AppBar'
import Toolbar from '@material-ui/core/Toolbar'
import IconButton from '@material-ui/core/IconButton'
-// import Typography from '@material-ui/core/Typography'
+import Typography from '@material-ui/core/Typography'
import MenuItem from '@material-ui/core/MenuItem'
import Menu from '@material-ui/core/Menu'
import { withStyles } from '@material-ui/core/styles'
@@ -192,6 +192,9 @@ class TopBar extends React.Component {
const { classes, perspectives /* currentLocale, availableLocales */ } = this.props
return (
<div className={classes.root}>
+ {/* Add an empty Typography element to ensure that that the MuiTypography class is loaded for
+ any lower level components that use MuiTypography class only in translation files */}
+ <Typography />
<AppBar position='absolute'>
<Toolbar className={classes.toolbar}>
<Button
--
GitLab