[arvados] updated: 2.7.0-6074-g1a1258b91f
git repository hosting
git at public.arvados.org
Tue Mar 26 19:02:43 UTC 2024
Summary of changes:
services/workbench2/src/components/data-explorer/data-explorer.tsx | 7 +++++--
.../src/components/multiselect-toolbar/MultiselectToolbar.tsx | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
via 1a1258b91f61253d78a6b0552e2f03f9dec73b1f (commit)
from 8f37f59c4ba2af1de35a1b7dd127a3fc7bee382b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 1a1258b91f61253d78a6b0552e2f03f9dec73b1f
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Mar 26 15:02:36 2024 -0400
21224: added injectedStyles to ms toolbar Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 396e8265c8..604856a852 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -17,13 +17,16 @@ import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreVerticalIcon } f
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" | 'subProcessTitle' | "dataTable" | "container";
+type CssRules = "titleWrapper" | "msToolbarStyles" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
display: "flex",
justifyContent: "space-between",
},
+ msToolbarStyles: {
+ paddingTop: "0.6rem",
+ },
searchBox: {
paddingBottom: 0,
},
@@ -242,7 +245,7 @@ export const DataExplorer = withStyles(styles)(
</Grid>
)}
{!!progressBar && progressBar}
- {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar />}
+ {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar injectedStyles={classes.msToolbarStyles} />}
{(!hideColumnSelector || !hideSearchInput || !!actions) && (
<Grid
className={classes.headerMenu}
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index ceefb34a2e..137506e743 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -35,6 +35,7 @@ import { Process } from "store/processes/process";
import { PublicFavoritesState } from "store/public-favorites/public-favorites-reducer";
import { AuthState } from "store/auth/auth-reducer";
import { IntersectionObserverWrapper } from "./ms-toolbar-overflow-wrapper";
+import classNames from "classnames";
const WIDTH_TRANSITION = 150
@@ -81,6 +82,7 @@ export type MultiselectToolbarProps = {
auth: AuthState;
location: string;
isSubPanel?: boolean;
+ injectedStyles?: string;
executeMulti: (action: ContextMenuAction | MultiSelectMenuAction, checkedList: TCheckedList, resources: ResourcesState) => void;
};
@@ -106,7 +108,7 @@ export const MultiselectToolbar = connect(
mapDispatchToProps
)(
withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
- const { classes, checkedList, iconProps, user, disabledButtons, location, isSubPanel } = props;
+ const { classes, checkedList, iconProps, user, disabledButtons, location, isSubPanel, injectedStyles } = props;
const selectedResourceUuid = isPathDisallowed(location) ? null : props.selectedResourceUuid;
const singleResourceKind = selectedResourceUuid && !isSubPanel ? [resourceToMsResourceKind(selectedResourceUuid, iconProps.resources, user)] : null
const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
@@ -141,7 +143,7 @@ export const MultiselectToolbar = connect(
return (
<React.Fragment>
<Toolbar
- className={isTransitioning ? classes.transition: classes.root}
+ className={classNames((isTransitioning ? classes.transition: classes.root), injectedStyles)}
style={{ width: `${(actions.length * 2.5) + 2}rem`}}
data-cy='multiselect-toolbar'
>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list