[arvados-workbench2] updated: 2.4.0-360-gb2fcdb2f
git repository hosting
git at public.arvados.org
Thu Dec 1 19:47:57 UTC 2022
Summary of changes:
src/common/custom-theme.ts | 306 ++++++++++-----------
src/components/column-selector/column-selector.tsx | 2 +-
src/views-components/data-explorer/renderers.tsx | 7 +
src/views/project-panel/project-panel.tsx | 9 +
4 files changed, 170 insertions(+), 154 deletions(-)
via b2fcdb2fac8ba49fecca5c30fc56e63b71746cf3 (commit)
from 2d2d42308a636998aa7f10e01283722e30ab20f5 (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 b2fcdb2fac8ba49fecca5c30fc56e63b71746cf3
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Thu Dec 1 14:47:53 2022 -0500
container uuid column up
Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index fc89a4ae..df848642 100644
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -12,177 +12,177 @@ import red from '@material-ui/core/colors/red';
import teal from '@material-ui/core/colors/teal';
export interface ArvadosThemeOptions extends ThemeOptions {
- customs: any;
+ customs: any;
}
export interface ArvadosTheme extends Theme {
- customs: {
- colors: Colors
- };
+ customs: {
+ colors: Colors;
+ };
}
interface Colors {
- green700: string;
- yellow100: string;
- yellow700: string;
- yellow900: string;
- red100: string;
- red900: string;
- blue500: string;
- grey500: string;
- purple: string;
- orange: string;
+ green700: string;
+ yellow100: string;
+ yellow700: string;
+ yellow900: string;
+ red100: string;
+ red900: string;
+ blue500: string;
+ grey500: string;
+ purple: string;
+ orange: string;
}
const arvadosPurple = '#361336';
-const grey500 = grey["500"];
-const grey600 = grey["600"];
-const grey700 = grey["700"];
-const grey900 = grey["900"];
+const grey500 = grey['500'];
+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: grey500,
- 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'],
+ red900: red['900'],
+ blue500: blue['500'],
+ grey500: grey500,
+ 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);
\ No newline at end of file
+export const CustomTheme = createMuiTheme(themeOptions);
diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx
index 5fbef6b6..ba964502 100644
--- a/src/components/column-selector/column-selector.tsx
+++ b/src/components/column-selector/column-selector.tsx
@@ -23,7 +23,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
checkbox: {
width: 24,
height: 24
- }
+ },
});
export type ColumnSelectorProps = ColumnSelectorDataProps & WithStyles<CssRules>;
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 9ea80cbc..b826aa2b 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -669,9 +669,16 @@ const renderProcessState = (processState: string) => <Typography>{processState |
export const ResourceProcessState = connect(
(state: RootState, props: { uuid: string }) => {
const process = getProcess(props.uuid)(state.resources)
+ // console.log('PROCESS>>>', process)
return { state: process?.container?.state ? process?.container?.state : '' };
})((props: { state: string }) => renderProcessState(props.state));
+export const ResourceProcessUuid = connect(
+ (state: RootState, props: { uuid: string }) => {
+ const process = getProcess(props.uuid)(state.resources)
+ return { uuid: process?.container?.uuid ? process?.container?.uuid : '' };
+ })((props: { uuid: string }) => renderUuid({ uuid: props.uuid }));
+
export const ResourceParentProcess = connect(
(state: RootState, props: { uuid: string }) => {
const process = getProcess(props.uuid)(state.resources)
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index ff530ef5..880ff3f2 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -25,6 +25,7 @@ import {
ProcessStatus,
ResourceType,
ResourceUUID,
+ ResourceProcessUuid,
ResourceProcessState,
ResourceParentProcess,
ResourcePortableDataHash,
@@ -77,6 +78,7 @@ export enum ProjectPanelColumnNames {
FILE_COUNT = "File count",
UUID = "UUID",
STATE = 'State',
+ CONTAINER_UUID = "Container UUID",
PARENT_PROCESS = 'Parent process',
CREATED_AT = "Date created",
LAST_MODIFIED = "Last modified",
@@ -143,6 +145,13 @@ export const projectPanelColumns: DataColumns<string> = [
filters: createTree(),
render: uuid => <ResourceUUID uuid={uuid}/>
},
+ {
+ name: ProjectPanelColumnNames.CONTAINER_UUID,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourceProcessUuid uuid={uuid}/>
+ },
{
name: ProjectPanelColumnNames.STATE,
selected: true,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list