[arvados-workbench2] updated: 2.4.0-355-g2fc84a5c

git repository hosting git at public.arvados.org
Wed Nov 16 18:25:43 UTC 2022


Summary of changes:
 src/common/custom-theme.ts                   | 16 ++++++++-
 src/components/breadcrumbs/breadcrumbs.tsx   | 51 ++++++++++++++++++++++++----
 src/store/breadcrumbs/breadcrumbs-actions.ts | 13 +++----
 tools/arvados_config.yml                     |  1 +
 4 files changed, 66 insertions(+), 15 deletions(-)

       via  2fc84a5c44d769d5ef4e450dcddf2e5083a30b6a (commit)
       via  a391342377e7f46b9761adcb802b4a9bc550267e (commit)
       via  84b9323c26d244c8624b4f644ed24e454f41e652 (commit)
      from  fd509a6b3c1bd66b8930a4cec4de31f73239dea5 (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 2fc84a5c44d769d5ef4e450dcddf2e5083a30b6a
Author: Stephen Smith <stephen at curii.com>
Date:   Wed Nov 16 13:24:26 2022 -0500

    19504: Display main process breadcrumb when viewing subprocess output collection
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts
index d3ea7d23..f482c1d4 100644
--- a/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -38,23 +38,16 @@ const resourceToBreadcrumbIcon = (resource: CollectionResource | ContainerReques
     switch (resource.kind) {
         case ResourceKind.PROJECT:
             return ProjectIcon;
-            break;
-
         case ResourceKind.PROCESS:
             return ProcessBreadcrumbIcon;
-            break;
-
         case ResourceKind.COLLECTION:
             return CollectionIcon;
-            break;
-
         default:
             return undefined;
-            break;
     }
 }
 
-const resourceToBreadcrumb = (resource: CollectionResource | ContainerRequestResource | GroupResource) => ({
+const resourceToBreadcrumb = (resource: CollectionResource | ContainerRequestResource | GroupResource): Breadcrumb => ({
     label: resource.name,
     uuid: resource.uuid,
     icon: resourceToBreadcrumbIcon(resource),
@@ -80,6 +73,8 @@ export const setSidePanelBreadcrumbs = (uuid: string) =>
             const collectionItem = item ? item : await services.collectionService.get(currentUuid);
             const parentProcessItem = await getCollectionParent(collectionItem)(services);
             if (parentProcessItem) {
+                const mainProcessItem = await getProcessParent(parentProcessItem)(services);
+                mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem));
                 breadcrumbs.push(resourceToBreadcrumb(parentProcessItem));
             }
             dispatch(setBreadcrumbs(breadcrumbs, collectionItem));
@@ -120,6 +115,8 @@ export const setCategoryBreadcrumbs = (uuid: string, category: string) =>
             const collectionItem = item ? item : await services.collectionService.get(currentUuid);
             const parentProcessItem = await getCollectionParent(collectionItem)(services);
             if (parentProcessItem) {
+                const mainProcessItem = await getProcessParent(parentProcessItem)(services);
+                mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem));
                 breadcrumbs.push(resourceToBreadcrumb(parentProcessItem));
             }
             dispatch(setBreadcrumbs(breadcrumbs, collectionItem));

commit a391342377e7f46b9761adcb802b4a9bc550267e
Author: Stephen Smith <stephen at curii.com>
Date:   Wed Nov 16 13:24:10 2022 -0500

    19504: Fix cypress tests
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml
index 9487ee1f..cfa1a3a9 100644
--- a/tools/arvados_config.yml
+++ b/tools/arvados_config.yml
@@ -19,6 +19,7 @@ Clusters:
       WebDAVCache:
         TTL: 0s
     Login:
+      TrustPrivateNetworks: true
       PAM:
         Enable: true
     StorageClasses:

commit 84b9323c26d244c8624b4f644ed24e454f41e652
Author: Stephen Smith <stephen at curii.com>
Date:   Wed Nov 16 13:23:47 2022 -0500

    19504: Add resource colors to breadcrumbs
    
    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 fc89a4ae..23fc1fb8 100644
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -5,8 +5,10 @@
 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';
@@ -22,6 +24,10 @@ export interface ArvadosTheme extends Theme {
 }
 
 interface Colors {
+    cyan100: string;
+    cyan200: string;
+    lightGreen300: string;
+    lightGreen400: string;
     green700: string;
     yellow100: string;
     yellow700: string;
@@ -29,6 +35,8 @@ interface Colors {
     red100: string;
     red900: string;
     blue500: string;
+    grey300: string;
+    grey400: string;
     grey500: string;
     purple: string;
     orange: string;
@@ -46,6 +54,10 @@ 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"],
@@ -53,6 +65,8 @@ export const themeOptions: ArvadosThemeOptions = {
             red100: red["100"],
             red900: red['900'],
             blue500: blue['500'],
+            grey300: grey["300"],
+            grey400: grey["400"],
             grey500: grey500,
             purple: arvadosPurple,
             orange: '#f0ad4e',
@@ -185,4 +199,4 @@ export const themeOptions: ArvadosThemeOptions = {
     },
 };
 
-export const CustomTheme = createMuiTheme(themeOptions);
\ No newline at end of file
+export const CustomTheme = createMuiTheme(themeOptions);
diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 0348b814..3237f800 100644
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -10,6 +10,10 @@ import { IllegalNamingWarning } from '../warning/warning';
 import { IconType, FreezeIcon } from 'components/icon/icon';
 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;
@@ -17,11 +21,32 @@ export interface Breadcrumb {
     uuid: string;
 }
 
-type CssRules = "item" | "currentItem" | "label" | "icon" | "frozenIcon";
+type CssRules = "item" | "defaultItem" | "processItem" | "collectionItem" | "parentItem" | "currentItem" | "label" | "icon" | "frozenIcon";
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     item: {
-        opacity: 0.6
+        borderRadius: '16px',
+    },
+    defaultItem: {
+        backgroundColor: theme.customs.colors.grey300,
+        '&: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
@@ -48,6 +73,17 @@ 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">
@@ -67,8 +103,11 @@ export const Breadcrumbs = withStyles(styles)(
                                 : isLastItem
                                     ? 'breadcrumb-last'
                                     : false}
-                            color="inherit"
-                            className={isLastItem ? classes.currentItem : classes.item}
+                            className={classNames(
+                                isLastItem ? classes.currentItem : classes.parentItem,
+                                classes.item,
+                                getBreadcrumbClass(item, classes)
+                            )}
                             onClick={() => onClick(item)}
                             onContextMenu={event => onContextMenu(event, item)}>
                             <Icon className={classes.icon} />
@@ -83,7 +122,7 @@ export const Breadcrumbs = withStyles(styles)(
                             }
                         </Button>
                     </Tooltip>
-                    {!isLastItem && <ChevronRightIcon color="inherit" className={classes.item} />}
+                    {!isLastItem && <ChevronRightIcon color="inherit" className={classes.parentItem} />}
                 </React.Fragment>
             );
         })

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list