projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21386: not found only shows on 404 Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...
[arvados.git]
/
services
/
workbench2
/
src
/
components
/
data-explorer
/
data-explorer.tsx
diff --git
a/services/workbench2/src/components/data-explorer/data-explorer.tsx
b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 8f5661929bff5b1f95c27c4d650f6a8d9717c1f8..27e46d584962c8d3e1cb1ca536b21ab1b4577ecf 100644
(file)
--- a/
services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/
services/workbench2/src/components/data-explorer/data-explorer.tsx
@@
-17,7
+17,7
@@
import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreVerticalIcon } f
import { PaperProps } from "@material-ui/core/Paper";
import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
import { PaperProps } from "@material-ui/core/Paper";
import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
-type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "dataTable" | "container";
+type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" |
'subProcessTitle' |
"dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
@@
-42,6
+42,13
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
padding: 0,
},
title: {
padding: 0,
},
title: {
+ display: "inline-block",
+ paddingLeft: theme.spacing.unit * 2,
+ paddingTop: theme.spacing.unit * 2,
+ fontSize: "18px",
+ paddingRight: "10px",
+ },
+ subProcessTitle: {
display: "inline-block",
paddingLeft: theme.spacing.unit * 2,
paddingTop: theme.spacing.unit * 2,
display: "inline-block",
paddingLeft: theme.spacing.unit * 2,
paddingTop: theme.spacing.unit * 2,
@@
-188,6
+195,7
@@
export const DataExplorer = withStyles(styles)(
paperKey,
fetchMode,
currentItemUuid,
paperKey,
fetchMode,
currentItemUuid,
+ currentRoute,
title,
progressBar,
doHidePanel,
title,
progressBar,
doHidePanel,
@@
-213,12
+221,12
@@
export const DataExplorer = withStyles(styles)(
wrap="nowrap"
className={classes.container}
>
wrap="nowrap"
className={classes.container}
>
- <div className={classes.titleWrapper}>
+ <div className={classes.titleWrapper}
style={currentRoute?.includes('search-results') || !!progressBar ? {marginBottom: '-20px'} : {}}
>
{title && (
<Grid
item
xs
{title && (
<Grid
item
xs
- className={classes.title}
+ className={
!!progressBar ? classes.subProcessTitle :
classes.title}
>
{title}
</Grid>
>
{title}
</Grid>
@@
-295,6
+303,7
@@
export const DataExplorer = withStyles(styles)(
item
xs="auto"
className={classes.dataTable}
item
xs="auto"
className={classes.dataTable}
+ style={currentRoute?.includes('search-results') || !!progressBar ? {marginTop: '-10px'} : {}}
>
<DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
>
<DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
@@
-381,7
+390,10
@@
export const DataExplorer = withStyles(styles)(
>
<IconButton
className={this.props.classes.moreOptionsButton}
>
<IconButton
className={this.props.classes.moreOptionsButton}
- onClick={event => this.props.onContextMenu(event, item)}
+ onClick={event => {
+ event.stopPropagation()
+ this.props.onContextMenu(event, item)
+ }}
>
<MoreVerticalIcon />
</IconButton>
>
<MoreVerticalIcon />
</IconButton>