[arvados] updated: 2.7.0-6064-g955f47b761
git repository hosting
git at public.arvados.org
Mon Mar 25 18:07:24 UTC 2024
Summary of changes:
.../src/components/data-explorer/data-explorer.tsx | 9 +--
.../multiselect-toolbar/MultiselectToolbar.tsx | 2 -
.../ms-toolbar-overflow-wrapper.tsx | 3 +-
.../project-details-card/project-details-card.tsx | 79 ++++++++++++----------
4 files changed, 45 insertions(+), 48 deletions(-)
via 955f47b761f0eef825813d3db06618c04510b415 (commit)
from 0294ce104014f274ebd9de4ab36fe8babf2d8d28 (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 955f47b761f0eef825813d3db06618c04510b415
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Mon Mar 25 14:07:08 2024 -0400
21224: fixes to overflow menu 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 e522bf6410..396e8265c8 100644
--- 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";
-type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "titleToolbar" | 'subProcessTitle' | "dataTable" | "container";
+type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
@@ -50,9 +50,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
fontSize: "18px",
paddingRight: "10px",
},
- titleToolbar: {
- marginTop: '-1rem',
- },
subProcessTitle: {
display: "inline-block",
paddingLeft: theme.spacing.unit * 2,
@@ -245,9 +242,7 @@ export const DataExplorer = withStyles(styles)(
</Grid>
)}
{!!progressBar && progressBar}
- <section className={classes.titleToolbar}>
- {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar />}
- </section>
+ {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar />}
{(!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 6d33d6bf76..51166ab4d7 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -47,7 +47,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
width: 0,
height: '2.7rem',
padding: 0,
- margin: "1rem auto auto 0.3rem",
transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
@@ -56,7 +55,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
flexDirection: "row",
height: '2.7rem',
padding: 0,
- margin: "1rem auto auto 0.3rem",
overflow: 'hidden',
transition: `width ${WIDTH_TRANSITION}ms`,
},
diff --git a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
index 32f977e1a4..49ac1d1836 100644
--- a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
@@ -46,9 +46,8 @@ export const IntersectionObserverWrapper = withStyles(styles)((props: WrapperPro
const navRef = useRef<any>(null);
const [visibilityMap, setVisibilityMap] = useState<Record<string, boolean>>({});
const [numHidden, setNumHidden] = useState(() => findNumHidden(visibilityMap));
-
const prevNumHidden = useRef(numHidden);
-
+
const handleIntersection = (entries) => {
const updatedEntries: Record<string, boolean> = {};
entries.forEach((entry) => {
diff --git a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
index d42eaf59d1..6d1c0a9234 100644
--- a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
+++ b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import React from 'react';
-import { StyleRulesCallback, Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip, Collapse } from '@material-ui/core';
+import { StyleRulesCallback, Card, CardHeader, WithStyles, withStyles, Typography, CardContent, Tooltip, Collapse, Grid } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
import { RootState } from 'store/store';
import { connect } from 'react-redux';
@@ -30,6 +30,7 @@ import { MultiselectToolbar } from 'components/multiselect-toolbar/MultiselectTo
type CssRules =
| 'root'
| 'selected'
+ | 'cardHeaderContainer'
| 'cardHeader'
| 'descriptionToggle'
| 'showMore'
@@ -69,7 +70,14 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
userNameContainer: {
display: 'flex',
},
+ cardHeaderContainer: {
+ width: '100%',
+ display: 'flex',
+ flexDirection: 'row',
+ justifyContent: 'space-between',
+ },
cardHeader: {
+ minWidth: '50rem',
padding: '0.2rem 0.4rem 0.1rem 1rem',
},
descriptionToggle: {
@@ -306,44 +314,41 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ classes, currentResource, fro
onClick={() => handleCardClick(uuid)}
data-cy='project-details-card'
>
- <CardHeader
- className={classes.cardHeader}
- title={
- <section className={classes.nameSection}>
- <section className={classes.namePlate}>
- <Typography
- noWrap
- variant='h6'
- style={{ marginRight: '1rem' }}
- >
- {name}
- </Typography>
- <FavoriteStar
- className={classes.faveIcon}
- resourceUuid={currentResource.uuid}
- />
- <PublicFavoriteStar
- className={classes.faveIcon}
- resourceUuid={currentResource.uuid}
- />
- {!!frozenByFullName && (
- <Tooltip
- className={classes.frozenIcon}
- disableFocusListener
- title={<span>Project was frozen by {frozenByFullName}</span>}
+ <Grid container wrap='nowrap' className={classes.cardHeaderContainer}>
+ <CardHeader
+ className={classes.cardHeader}
+ title={
+ <section className={classes.nameSection}>
+ <section className={classes.namePlate}>
+ <Typography
+ variant='h6'
+ style={{ marginRight: '1rem' }}
>
- <FreezeIcon style={{ fontSize: 'inherit' }} />
- </Tooltip>
- )}
+ {name}
+ </Typography>
+ <FavoriteStar
+ className={classes.faveIcon}
+ resourceUuid={currentResource.uuid}
+ />
+ <PublicFavoriteStar
+ className={classes.faveIcon}
+ resourceUuid={currentResource.uuid}
+ />
+ {!!frozenByFullName && (
+ <Tooltip
+ className={classes.frozenIcon}
+ disableFocusListener
+ title={<span>Project was frozen by {frozenByFullName}</span>}
+ >
+ <FreezeIcon style={{ fontSize: 'inherit' }} />
+ </Tooltip>
+ )}
+ </section>
</section>
- </section>
- }
- action={
- <section className={classes.toolbarSection}>
- {isSelected && <MultiselectToolbar />}
- </section>
- }
- />
+ }
+ />
+ {isSelected && <MultiselectToolbar />}
+ </Grid>
<section onClick={(ev) => ev.stopPropagation()}>
{description ? (
<section
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list