[arvados-workbench2] updated: 2.4.0-439-gcf895a44
git repository hosting
git at public.arvados.org
Mon Dec 19 15:56:09 UTC 2022
Summary of changes:
src/common/custom-theme.ts | 41 ++++---
src/components/breadcrumbs/breadcrumbs.test.tsx | 52 ++++++--
src/components/breadcrumbs/breadcrumbs.tsx | 49 +++++---
src/components/icon/icon.tsx | 20 ++-
.../multi-panel-view/multi-panel-view.tsx | 9 +-
src/models/container-request.ts | 38 ++++++
.../all-processes-panel-middleware-service.ts | 39 +-----
src/store/breadcrumbs/breadcrumbs-actions.ts | 135 ++++++++++++++++++---
.../subprocess-panel-middleware-service.ts | 3 +-
src/views-components/breadcrumbs/breadcrumbs.ts | 11 +-
.../main-content-bar/main-content-bar.tsx | 12 +-
.../side-panel-tree/side-panel-tree.tsx | 2 +-
12 files changed, 281 insertions(+), 130 deletions(-)
via cf895a44aa0b2a175bc70056ce0bf1c66cb8192f (commit)
via d8c258955c1cd26ace902639dfb0bc3f0f489e5d (commit)
via 59c625e23ea98288ed11674f6218b998fc807307 (commit)
via c013d74df98309f7cc57fd854bfd8e35634cba67 (commit)
via 3d4803244cc4fd2135ab6f75f527a720ef9eee4e (commit)
via cc70636e87a68db6a6af296a924e66e78578280a (commit)
via 411849b41dc04bfdfb232d6bb20389901459eaba (commit)
via e125aa439a61755852c3bd16412e2fb621aa58c2 (commit)
via fccf1a647ba9d226914607edab86a72605fda6de (commit)
via 68ada6936bbe8b595f43bf8c597254e40c0673c7 (commit)
via eb94bef4d2aebe2bf16093f776e1703d7db106fc (commit)
via 62e6fff927ed9def5dc9cecb9a67b0fee7430e5d (commit)
via 2fc84a5c44d769d5ef4e450dcddf2e5083a30b6a (commit)
via a391342377e7f46b9761adcb802b4a9bc550267e (commit)
via 84b9323c26d244c8624b4f644ed24e454f41e652 (commit)
via fd509a6b3c1bd66b8930a4cec4de31f73239dea5 (commit)
via a4b74b32b506a32566ca2967148a88ece76e973b (commit)
via 0ba78ca92c70bf7196ed400a655aa2d625fe8475 (commit)
from 0534b585de71147120e880fe670ebd0e61dcf68f (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 cf895a44aa0b2a175bc70056ce0bf1c66cb8192f
Merge: 0534b585 d8c25895
Author: Stephen Smith <stephen at curii.com>
Date: Mon Dec 19 10:55:49 2022 -0500
Merge branch '19504-breadcrumbs' into main. Closes #19504
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --cc src/common/custom-theme.ts
index df848642,89fa6f31..7973bacc
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@@ -35,154 -36,154 +36,154 @@@ interface Colors
}
const arvadosPurple = '#361336';
- const grey500 = grey['500'];
- const grey600 = grey['600'];
- const grey700 = grey['700'];
- const grey900 = grey['900'];
+ const grey600 = grey["600"];
+ const grey700 = grey["700"];
+ const grey900 = grey["900"];
export const themeOptions: ArvadosThemeOptions = {
- typography: {
- useNextVariants: true,
- },
- customs: {
- colors: {
- green700: green["700"],
- yellow100: yellow["100"],
- yellow700: yellow["700"],
- yellow900: yellow["900"],
- red100: red["100"],
- red900: red['900'],
- blue500: blue['500'],
- grey500: grey["500"],
- grey700: grey["700"],
- purple: arvadosPurple,
- orange: '#f0ad4e',
- }
- },
- overrides: {
- MuiTypography: {
- body1: {
- fontSize: '0.8125rem'
- }
- },
- MuiAppBar: {
- colorPrimary: {
- backgroundColor: arvadosPurple
- }
- },
- MuiTabs: {
- root: {
- color: grey600
- },
- indicator: {
- backgroundColor: arvadosPurple
- }
- },
- MuiTab: {
- root: {
- '&$selected': {
- fontWeight: 700,
- color: arvadosPurple
- }
- }
- },
- MuiList: {
- root: {
- color: grey900
- }
- },
- MuiListItemText: {
- root: {
- padding: 0
- }
- },
- MuiListItemIcon: {
- root: {
- fontSize: '1.25rem'
- }
- },
- MuiCardHeader: {
- avatar: {
- display: 'flex',
- alignItems: 'center'
- },
- title: {
- color: grey700,
- fontSize: '1.25rem'
- }
+ typography: {
+ useNextVariants: true,
+ },
+ customs: {
+ colors: {
- green700: green['700'],
- yellow100: yellow['100'],
- yellow700: yellow['700'],
- yellow900: yellow['900'],
- red100: red['100'],
++ green700: green["700"],
++ yellow100: yellow["100"],
++ yellow700: yellow["700"],
++ yellow900: yellow["900"],
++ red100: red["100"],
+ red900: red['900'],
+ blue500: blue['500'],
- grey500: grey500,
++ grey500: grey["500"],
++ grey700: grey["700"],
+ purple: arvadosPurple,
+ orange: '#f0ad4e',
+ },
+ },
+ overrides: {
+ MuiTypography: {
+ body1: {
+ fontSize: '0.8125rem',
+ },
+ },
+ MuiAppBar: {
+ colorPrimary: {
+ backgroundColor: arvadosPurple,
+ },
+ },
+ MuiTabs: {
+ root: {
+ color: grey600,
+ },
+ indicator: {
+ backgroundColor: arvadosPurple,
+ },
+ },
+ MuiTab: {
+ root: {
+ '&$selected': {
+ fontWeight: 700,
+ color: arvadosPurple,
},
- MuiExpansionPanel: {
- expanded: {
- marginTop: '8px',
- }
+ },
+ },
+ MuiList: {
+ root: {
+ color: grey900,
+ },
+ },
+ MuiListItemText: {
+ root: {
+ padding: 0,
+ },
+ },
+ MuiListItemIcon: {
+ root: {
+ fontSize: '1.25rem',
+ },
+ },
+ MuiCardHeader: {
+ avatar: {
+ display: 'flex',
+ alignItems: 'center',
+ },
+ title: {
+ color: grey700,
+ fontSize: '1.25rem',
+ },
+ },
+ MuiExpansionPanel: {
+ expanded: {
+ marginTop: '8px',
+ },
+ },
+ MuiExpansionPanelDetails: {
+ root: {
+ marginBottom: 0,
+ paddingBottom: '4px',
+ },
+ },
+ MuiExpansionPanelSummary: {
+ content: {
+ '&$expanded': {
+ margin: 0,
},
- MuiExpansionPanelDetails: {
- root: {
- marginBottom: 0,
- paddingBottom: '4px',
- }
+ color: grey700,
+ fontSize: '1.25rem',
+ margin: 0,
+ },
+ expanded: {},
+ },
+ MuiMenuItem: {
+ root: {
+ padding: '8px 16px',
+ },
+ },
+ MuiInput: {
+ root: {
+ fontSize: '0.875rem',
+ },
+ underline: {
+ '&:after': {
+ borderBottomColor: arvadosPurple,
},
- MuiExpansionPanelSummary: {
- content: {
- '&$expanded': {
- margin: 0,
- },
- color: grey700,
- fontSize: '1.25rem',
- margin: 0,
- },
- expanded: {},
+ '&:hover:not($disabled):not($focused):not($error):before': {
+ borderBottom: '1px solid inherit',
},
- MuiMenuItem: {
- root: {
- padding: '8px 16px'
- }
+ },
+ },
+ MuiFormLabel: {
+ root: {
+ fontSize: '0.875rem',
+ '&$focused': {
+ '&$focused:not($error)': {
+ color: arvadosPurple,
+ },
},
- MuiInput: {
- root: {
- fontSize: '0.875rem'
- },
- underline: {
- '&:after': {
- borderBottomColor: arvadosPurple
- },
- '&:hover:not($disabled):not($focused):not($error):before': {
- borderBottom: '1px solid inherit'
- }
- }
+ },
+ },
+ MuiStepIcon: {
+ root: {
+ '&$active': {
+ color: arvadosPurple,
},
- MuiFormLabel: {
- root: {
- fontSize: '0.875rem',
- "&$focused": {
- "&$focused:not($error)": {
- color: arvadosPurple
- }
- }
- }
+ '&$completed': {
+ color: 'inherited',
},
- MuiStepIcon: {
- root: {
- '&$active': {
- color: arvadosPurple
- },
- '&$completed': {
- color: 'inherited'
- },
- }
- }
- },
- mixins: {
- toolbar: {
- minHeight: '48px'
- }
- },
- palette: {
- primary: {
- main: teal.A700,
- dark: teal.A400,
- contrastText: '#fff'
- }
+ },
+ },
+ },
+ mixins: {
+ toolbar: {
+ minHeight: '48px',
+ },
+ },
+ palette: {
+ primary: {
+ main: teal.A700,
+ dark: teal.A400,
+ contrastText: '#fff',
},
+ },
};
export const CustomTheme = createMuiTheme(themeOptions);
diff --cc src/models/container-request.ts
index 2a0e60ba,b3f28134..e6e12da8
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@@ -8,37 -8,73 +8,75 @@@ import { RuntimeConstraints } from './r
import { SchedulingParameters } from './scheduling-parameters';
export enum ContainerRequestState {
- UNCOMMITTED = "Uncommitted",
- COMMITTED = "Committed",
- FINAL = "Final"
+ UNCOMMITTED = 'Uncommitted',
+ COMMITTED = 'Committed',
+ FINAL = 'Final',
}
-export interface ContainerRequestResource extends Resource, ResourceWithProperties {
- kind: ResourceKind.CONTAINER_REQUEST;
- name: string;
- description: string;
- state: ContainerRequestState;
- requestingContainerUuid: string | null;
- cumulativeCost: number;
- containerUuid: string | null;
- containerCountMax: number;
- mounts: {[path: string]: MountType};
- runtimeConstraints: RuntimeConstraints;
- schedulingParameters: SchedulingParameters;
- containerImage: string;
- environment: any;
- cwd: string;
- command: string[];
- outputPath: string;
- outputName: string;
- outputTtl: number;
- priority: number | null;
- expiresAt: string;
- useExisting: boolean;
- logUuid: string | null;
- outputUuid: string | null;
- filters: string;
- containerCount: number;
+export interface ContainerRequestResource
+ extends Resource,
+ ResourceWithProperties {
+ command: string[];
+ containerCountMax: number;
+ containerCount: number;
+ containerImage: string;
+ containerUuid: string | null;
+ cumulativeCost: number;
+ cwd: string;
+ description: string;
+ environment: any;
+ expiresAt: string;
+ filters: string;
+ kind: ResourceKind.CONTAINER_REQUEST;
+ logUuid: string | null;
+ mounts: { [path: string]: MountType };
+ name: string;
+ outputName: string;
+ outputPath: string;
+ outputTtl: number;
+ outputUuid: string | null;
+ priority: number | null;
+ requestingContainerUuid: string | null;
+ runtimeConstraints: RuntimeConstraints;
+ schedulingParameters: SchedulingParameters;
+ state: ContainerRequestState;
+ useExisting: boolean;
}
+
+ // Until the api supports unselecting fields, we need a list of all other fields to omit mounts
+ export const containerRequestFieldsNoMounts = [
+ "command",
+ "container_count_max",
+ "container_count",
+ "container_image",
+ "container_uuid",
+ "created_at",
+ "cwd",
+ "description",
+ "environment",
+ "etag",
+ "expires_at",
+ "filters",
+ "href",
+ "kind",
+ "log_uuid",
+ "modified_at",
+ "modified_by_client_uuid",
+ "modified_by_user_uuid",
+ "name",
+ "output_name",
+ "output_path",
+ "output_properties",
+ "output_storage_classes",
+ "output_ttl",
+ "output_uuid",
+ "owner_uuid",
+ "priority",
+ "properties",
+ "requesting_container_uuid",
+ "runtime_constraints",
+ "scheduling_parameters",
+ "state",
+ "use_existing",
+ "uuid",
+ ];
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list