Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / components / default-view / default-view.tsx

diff --git a/src/components/default-view/default-view.tsx b/src/components/default-view/default-view.tsx
index 3bc3e5290dddb0baa6b79b0893fce0fcdeebaf2b..5acea6193be906ddb9ec3c865f1d9e80ea068b2f 100644 (file)
--- a/src/components/default-view/default-view.tsx
+++ b/src/components/default-view/default-view.tsx
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
+import React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 import { ArvadosTheme } from '../../common/custom-theme';
 import { Typography } from '@material-ui/core';
 import { IconType } from '../icon/icon';
-import * as classnames from "classnames";
+import classnames from "classnames";
 
 type CssRules = 'root' | 'icon' | 'message';
 
@@ -27,8 +27,9 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 export interface DefaultViewDataProps {
     classRoot?: string;
     messages: string[];
+    filtersApplied?: boolean;
     classMessage?: string;
-    icon: IconType;
+    icon?: IconType;
     classIcon?: string;
 }
 
@@ -37,10 +38,10 @@ type DefaultViewProps = DefaultViewDataProps & WithStyles<CssRules>;
 export const DefaultView = withStyles(styles)(
     ({ classes, classRoot, messages, classMessage, icon: Icon, classIcon }: DefaultViewProps) =>
         <Typography className={classnames([classes.root, classRoot])} component="div">
-            <Icon className={classnames([classes.icon, classIcon])} />
+            {Icon && <Icon className={classnames([classes.icon, classIcon])} />}
             {messages.map((msg: string, index: number) => {
-                return <Typography key={index} variant="body1" 
+                return <Typography key={index}
                     className={classnames([classes.message, classMessage])}>{msg}</Typography>;
             })}
         </Typography>
-);
\ No newline at end of file
+);