import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreVerticalIcon } from "components/icon/icon";
import { PaperProps } from "@material-ui/core/Paper";
import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
+import classNames from "classnames";
-type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
+type CssRules = "titleWrapper" | "msToolbarStyles" | "subpanelToolbarStyles" | "searchBox" | "headerMenu" | "toolbar" | "footer"| "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | 'progressWrapper' | 'progressWrapperNoTitle' | "dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
display: "flex",
justifyContent: "space-between",
},
+ msToolbarStyles: {
+ paddingTop: "0.6rem",
+ },
+ subpanelToolbarStyles: {
+ paddingTop: "1.2rem",
+ },
searchBox: {
paddingBottom: 0,
},
overflow: "auto",
},
loadMoreContainer: {
- display: "flex",
+ minWidth: '8rem',
},
root: {
height: "100%",
+ flex: 1,
+ overflowY: "auto",
},
moreOptionsButton: {
padding: 0,
},
numResults: {
- marginTop: "10px",
- fontSize: "12px",
- minWidth: "5rem",
+ marginTop: 0,
+ fontSize: "10px",
+ marginLeft: "10px",
+ marginBottom: '-0.5rem',
+ minWidth: '8.5rem',
},
title: {
display: "inline-block",
flexGrow: 0,
paddingRight: "10px",
},
+ progressWrapper: {
+ margin: "28px 0 0",
+ flexGrow: 1,
+ flexBasis: "100px",
+ },
+ progressWrapperNoTitle: {
+ paddingLeft: "10px",
+ },
dataTable: {
height: "100%",
overflow: "auto",
title?: React.ReactNode;
progressBar?: React.ReactNode;
paperKey?: string;
- currentItemUuid: string;
+ currentRouteUuid: string;
+ selectedResourceUuid: string;
elementPath?: string;
isMSToolbarVisible: boolean;
checkedList: TCheckedList;
isNotFound: boolean;
+ searchBarValue: string;
+ paperClassName?: string;
}
interface DataExplorerActionProps<T> {
extractKey?: (item: T) => React.Key;
toggleMSToolbar: (isVisible: boolean) => void;
setCheckedListOnStore: (checkedList: TCheckedList) => void;
+ setSelectedUuid: (uuid: string) => void;
}
type DataExplorerProps<T> = DataExplorerDataProps<T> & DataExplorerActionProps<T> & WithStyles<CssRules> & MPVPanelProps;
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
+ state = {
+ msToolbarInDetailsCard: true,
+ };
multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
+ maxItemsAvailable = 0;
componentDidMount() {
if (this.props.onSetColumns) {
}
}
+ componentDidUpdate( prevProps: Readonly<DataExplorerProps<T>>, prevState: Readonly<{}>, snapshot?: any ): void {
+ const { selectedResourceUuid, currentRouteUuid } = this.props;
+ if(selectedResourceUuid !== prevProps.selectedResourceUuid || currentRouteUuid !== prevProps.currentRouteUuid) {
+ this.setState({
+ msToolbarInDetailsCard: selectedResourceUuid === this.props.currentRouteUuid,
+ })
+ }
+ if (this.props.itemsAvailable !== prevProps.itemsAvailable) {
+ this.maxItemsAvailable = Math.max(this.maxItemsAvailable, this.props.itemsAvailable);
+ }
+ if (this.props.searchBarValue !== prevProps.searchBarValue) {
+ this.maxItemsAvailable = 0;
+ }
+ }
+
render() {
const {
columns,
hideSearchInput,
paperKey,
fetchMode,
- currentItemUuid,
+ selectedResourceUuid,
currentRoute,
title,
progressBar,
setCheckedListOnStore,
checkedList,
working,
+ paperClassName,
} = this.props;
return (
<Paper
- className={classes.root}
+ className={classNames(classes.root, paperClassName)}
{...paperProps}
key={paperKey}
data-cy={this.props["data-cy"]}
wrap="nowrap"
className={classes.container}
>
- <div className={classes.titleWrapper} style={currentRoute?.includes('search-results') || !!progressBar ? {marginBottom: '-20px'} : {}}>
+ <div data-cy="title-wrapper" className={classes.titleWrapper} style={currentRoute?.includes('search-results') || !!progressBar ? {marginBottom: '-20px'} : {}}>
{title && (
<Grid
item
{title}
</Grid>
)}
- {!!progressBar && progressBar}
- {this.multiSelectToolbarInTitle && <MultiselectToolbar />}
+ {!!progressBar &&
+ <div className={classNames({
+ [classes.progressWrapper]: true,
+ [classes.progressWrapperNoTitle]: !title,
+ })}>{progressBar}</div>
+ }
+ {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar injectedStyles={classes.msToolbarStyles} />}
{(!hideColumnSelector || !hideSearchInput || !!actions) && (
<Grid
className={classes.headerMenu}
</Grid>
)}
</div>
- {!this.multiSelectToolbarInTitle && <MultiselectToolbar />}
+ {!this.multiSelectToolbarInTitle && <MultiselectToolbar isSubPanel={true} injectedStyles={classes.subpanelToolbarStyles}/>}
<Grid
item
xs="auto"
extractKey={extractKey}
defaultViewIcon={defaultViewIcon}
defaultViewMessages={defaultViewMessages}
- currentItemUuid={currentItemUuid}
currentRoute={paperKey}
toggleMSToolbar={toggleMSToolbar}
setCheckedListOnStore={setCheckedListOnStore}
checkedList={checkedList}
+ selectedResourceUuid={selectedResourceUuid}
+ setSelectedUuid={this.props.setSelectedUuid}
+ currentRouteUuid={this.props.currentRouteUuid}
working={working}
isNotFound={this.props.isNotFound}
/>
/>
) : (
<Grid className={classes.loadMoreContainer}>
- <Typography className={classes.numResults}>
- Showing {items.length} of {itemsAvailable} results
+ <Typography className={classes.numResults}>
+ Showing {items.length} / {this.maxItemsAvailable} results
</Typography>
<Button
size="small"
onClick={this.loadMore}
variant="contained"
- color="primary"
+ color="primary"
style={{width: '100%', margin: '10px'}}
disabled={working || items.length >= itemsAvailable}
>