[arvados-workbench2] updated: 2.4.0-362-gcc70636e
git repository hosting
git at public.arvados.org
Tue Nov 29 15:08:59 UTC 2022
Summary of changes:
src/common/custom-theme.ts | 10 ----
src/components/breadcrumbs/breadcrumbs.tsx | 54 ++++++----------------
src/components/icon/icon.tsx | 4 +-
.../multi-panel-view/multi-panel-view.tsx | 9 ++--
src/store/breadcrumbs/breadcrumbs-actions.ts | 4 +-
.../main-content-bar/main-content-bar.tsx | 7 ++-
6 files changed, 28 insertions(+), 60 deletions(-)
via cc70636e87a68db6a6af296a924e66e78578280a (commit)
via 411849b41dc04bfdfb232d6bb20389901459eaba (commit)
via e125aa439a61755852c3bd16412e2fb621aa58c2 (commit)
via fccf1a647ba9d226914607edab86a72605fda6de (commit)
from 68ada6936bbe8b595f43bf8c597254e40c0673c7 (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 cc70636e87a68db6a6af296a924e66e78578280a
Author: Stephen Smith <stephen at curii.com>
Date: Tue Nov 29 10:08:41 2022 -0500
19504: Change process icon to gear icon
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index 4446f92a..b559a2ab 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -7,7 +7,6 @@ import { Badge, SvgIcon, Tooltip } from '@material-ui/core';
import Add from '@material-ui/icons/Add';
import ArrowBack from '@material-ui/icons/ArrowBack';
import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
-import BubbleChart from '@material-ui/icons/BubbleChart';
import Build from '@material-ui/icons/Build';
import Cached from '@material-ui/icons/Cached';
import DescriptionIcon from '@material-ui/icons/Description';
@@ -176,7 +175,7 @@ export const InputIcon: IconType = (props) => <MoveToInbox {...props} />;
export const PaginationDownIcon: IconType = (props) => <ArrowDropDown {...props} />;
export const PaginationLeftArrowIcon: IconType = (props) => <ChevronLeft {...props} />;
export const PaginationRightArrowIcon: IconType = (props) => <ChevronRight {...props} />;
-export const ProcessIcon: IconType = (props) => <BubbleChart {...props} />;
+export const ProcessIcon: IconType = (props) => <Settings {...props} />;
export const ProjectIcon: IconType = (props) => <Folder {...props} />;
export const FilterGroupIcon: IconType = (props) => <Pageview {...props} />;
export const ProjectsIcon: IconType = (props) => <Inbox {...props} />;
@@ -213,4 +212,3 @@ export const ActiveIcon: IconType = (props) => <CheckCircleOutline {...props} />
export const SetupIcon: IconType = (props) => <RemoveCircleOutline {...props} />;
export const InactiveIcon: IconType = (props) => <NotInterested {...props} />;
export const ImageIcon: IconType = (props) => <Image {...props} />;
-export const ProcessBreadcrumbIcon: IconType = (props) => <Settings {...props} />;
diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts
index 4b0220a2..d23bd3cd 100644
--- a/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -22,7 +22,7 @@ import { ProcessResource } from 'models/process';
import { OrderBuilder } from 'services/api/order-builder';
import { Breadcrumb } from 'components/breadcrumbs/breadcrumbs';
import { ContainerRequestResource, containerRequestFieldsNoMounts } from 'models/container-request';
-import { CollectionIcon, IconType, ProcessBreadcrumbIcon, ProjectIcon } from 'components/icon/icon';
+import { CollectionIcon, IconType, ProcessIcon, ProjectIcon } from 'components/icon/icon';
import { CollectionResource } from 'models/collection';
export const BREADCRUMBS = 'breadcrumbs';
@@ -39,7 +39,7 @@ const resourceToBreadcrumbIcon = (resource: CollectionResource | ContainerReques
case ResourceKind.PROJECT:
return ProjectIcon;
case ResourceKind.PROCESS:
- return ProcessBreadcrumbIcon;
+ return ProcessIcon;
case ResourceKind.COLLECTION:
return CollectionIcon;
default:
commit 411849b41dc04bfdfb232d6bb20389901459eaba
Author: Stephen Smith <stephen at curii.com>
Date: Tue Nov 29 10:07:43 2022 -0500
19504: Add spacing between breadcrumbs and mpv buttons, allow breadcrumbs to wrap
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 62657396..301f3041 100644
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -63,7 +63,7 @@ export interface BreadcrumbsProps {
export const Breadcrumbs = withStyles(styles)(
({ classes, onClick, onContextMenu, items, resources }: BreadcrumbsProps & WithStyles<CssRules>) =>
- <Grid container data-cy='breadcrumbs' alignItems="center" wrap="nowrap">
+ <Grid container data-cy='breadcrumbs' alignItems="center">
{
items.map((item, index) => {
const isLastItem = index === items.length - 1;
diff --git a/src/components/multi-panel-view/multi-panel-view.tsx b/src/components/multi-panel-view/multi-panel-view.tsx
index 877061de..203748d5 100644
--- a/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/src/components/multi-panel-view/multi-panel-view.tsx
@@ -19,9 +19,12 @@ import { InfoIcon } from 'components/icon/icon';
import { ReactNodeArray } from 'prop-types';
import classNames from 'classnames';
-type CssRules = 'button' | 'buttonIcon' | 'content';
+type CssRules = 'root' | 'button' | 'buttonIcon' | 'content';
const styles: StyleRulesCallback<CssRules> = theme => ({
+ root: {
+ marginTop: '10px',
+ },
button: {
padding: '2px 5px',
marginRight: '5px',
@@ -206,7 +209,7 @@ const MPVContainerComponent = ({children, panelStates, classes, ...props}: MPVCo
};
};
- return <Grid container {...props}>
+ return <Grid container {...props} className={classes.root}>
<Grid container item direction="row">
{ buttons.map((tgl, idx) => <Grid item key={idx}>{tgl}</Grid>) }
</Grid>
@@ -221,4 +224,4 @@ const MPVContainerComponent = ({children, panelStates, classes, ...props}: MPVCo
</Grid>;
};
-export const MPVContainer = withStyles(styles)(MPVContainerComponent);
\ No newline at end of file
+export const MPVContainer = withStyles(styles)(MPVContainerComponent);
diff --git a/src/views-components/main-content-bar/main-content-bar.tsx b/src/views-components/main-content-bar/main-content-bar.tsx
index 271d77c1..5c1bec90 100644
--- a/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/src/views-components/main-content-bar/main-content-bar.tsx
@@ -15,9 +15,12 @@ import RefreshButton from "components/refresh-button/refresh-button";
import { loadSidePanelTreeProjects } from "store/side-panel-tree/side-panel-tree-actions";
import { Dispatch } from "redux";
-type CssRules = "infoTooltip";
+type CssRules = 'mainBar' | 'infoTooltip';
const styles: StyleRulesCallback<CssRules> = theme => ({
+ mainBar: {
+ flexWrap: 'nowrap',
+ },
infoTooltip: {
marginTop: '-10px',
marginLeft: '10px',
@@ -61,7 +64,7 @@ const mapDispatchToProps = () => (dispatch: Dispatch) => ({
export const MainContentBar = connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(
(props: MainContentBarProps & WithStyles<CssRules> & any) =>
- <Toolbar><Grid container>
+ <Toolbar><Grid container className={props.classes.mainBar}>
<Grid container item xs alignItems="center">
<Breadcrumbs />
</Grid>
commit e125aa439a61755852c3bd16412e2fb621aa58c2
Author: Stephen Smith <stephen at curii.com>
Date: Tue Nov 29 10:06:16 2022 -0500
19504: Fix breadcrumbs height to improve text vertical centering
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 7c28fe32..62657396 100644
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -24,6 +24,7 @@ type CssRules = "item" | "label" | "icon" | "frozenIcon";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
item: {
borderRadius: '16px',
+ height: '32px',
backgroundColor: theme.customs.colors.grey300,
'&.parentItem': {
backgroundColor: `${theme.customs.colors.grey300}99`,
@@ -39,6 +40,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
textTransform: "none",
paddingRight: '3px',
paddingLeft: '3px',
+ lineHeight: '1.4',
},
icon: {
fontSize: 20,
commit fccf1a647ba9d226914607edab86a72605fda6de
Author: Stephen Smith <stephen at curii.com>
Date: Tue Nov 29 10:03:35 2022 -0500
19504: Remove breadcrumb type style/color handling
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index 23fc1fb8..67a514b1 100644
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -5,10 +5,8 @@
import { createMuiTheme } from '@material-ui/core/styles';
import { ThemeOptions, Theme } from '@material-ui/core/styles/createMuiTheme';
import blue from '@material-ui/core/colors/blue';
-import cyan from '@material-ui/core/colors/cyan';
import grey from '@material-ui/core/colors/grey';
import green from '@material-ui/core/colors/green';
-import lightGreen from '@material-ui/core/colors/lightGreen';
import yellow from '@material-ui/core/colors/yellow';
import red from '@material-ui/core/colors/red';
import teal from '@material-ui/core/colors/teal';
@@ -24,10 +22,6 @@ export interface ArvadosTheme extends Theme {
}
interface Colors {
- cyan100: string;
- cyan200: string;
- lightGreen300: string;
- lightGreen400: string;
green700: string;
yellow100: string;
yellow700: string;
@@ -54,10 +48,6 @@ export const themeOptions: ArvadosThemeOptions = {
},
customs: {
colors: {
- lightGreen300: lightGreen["300"],
- lightGreen400: lightGreen["400"],
- cyan100: cyan["100"],
- cyan200: cyan["200"],
green700: green["700"],
yellow100: yellow["100"],
yellow700: yellow["700"],
diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 38c2a394..7c28fe32 100644
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -12,8 +12,6 @@ import grey from '@material-ui/core/colors/grey';
import { ResourcesState } from 'store/resources/resources';
import classNames from 'classnames';
import { ArvadosTheme } from 'common/custom-theme';
-import { extractUuidKind, ResourceKind } from 'models/resource';
-import { ClassNameMap } from '@material-ui/core/styles/withStyles';
export interface Breadcrumb {
label: string;
@@ -21,35 +19,21 @@ export interface Breadcrumb {
uuid: string;
}
-type CssRules = "item" | "defaultItem" | "processItem" | "collectionItem" | "parentItem" | "currentItem" | "label" | "icon" | "frozenIcon";
+type CssRules = "item" | "label" | "icon" | "frozenIcon";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
item: {
borderRadius: '16px',
- },
- defaultItem: {
backgroundColor: theme.customs.colors.grey300,
+ '&.parentItem': {
+ backgroundColor: `${theme.customs.colors.grey300}99`,
+ },
'&:hover': {
backgroundColor: theme.customs.colors.grey400,
- }
- },
- processItem: {
- backgroundColor: theme.customs.colors.lightGreen300,
- '&:hover': {
- backgroundColor: theme.customs.colors.lightGreen400,
- }
- },
- collectionItem: {
- backgroundColor: theme.customs.colors.cyan100,
- '&:hover': {
- backgroundColor: theme.customs.colors.cyan200,
- }
- },
- parentItem: {
- opacity: 0.75
- },
- currentItem: {
- opacity: 1
+ },
+ '&.parentItem:hover': {
+ backgroundColor: `${theme.customs.colors.grey400}99`,
+ },
},
label: {
textTransform: "none",
@@ -75,17 +59,6 @@ export interface BreadcrumbsProps {
onContextMenu: (event: React.MouseEvent<HTMLElement>, breadcrumb: Breadcrumb) => void;
}
-const getBreadcrumbClass = (item: Breadcrumb, classes: ClassNameMap<CssRules>): string => {
- switch (extractUuidKind(item.uuid)) {
- case ResourceKind.PROCESS:
- return classes.processItem;
- case ResourceKind.COLLECTION:
- return classes.collectionItem;
- default:
- return classes.defaultItem;
- }
-};
-
export const Breadcrumbs = withStyles(styles)(
({ classes, onClick, onContextMenu, items, resources }: BreadcrumbsProps & WithStyles<CssRules>) =>
<Grid container data-cy='breadcrumbs' alignItems="center" wrap="nowrap">
@@ -106,9 +79,8 @@ export const Breadcrumbs = withStyles(styles)(
? 'breadcrumb-last'
: false}
className={classNames(
- isLastItem ? classes.currentItem : classes.parentItem,
- classes.item,
- getBreadcrumbClass(item, classes)
+ isLastItem ? null : 'parentItem',
+ classes.item
)}
onClick={() => onClick(item)}
onContextMenu={event => onContextMenu(event, item)}>
@@ -124,7 +96,7 @@ export const Breadcrumbs = withStyles(styles)(
}
</Button>
</Tooltip>
- {!isLastItem && <ChevronRightIcon color="inherit" className={classes.parentItem} />}
+ {!isLastItem && <ChevronRightIcon color="inherit" className={'parentItem'} />}
</React.Fragment>
);
})
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list