[arvados-workbench2] updated: 2.5.0-128-gc2ecd507

[git repository hosting]

Summary of changes:
 src/store/processes/process.ts                           | 8 ++++++++
 src/store/resource-type-filters/resource-type-filters.ts | 6 +++---
 src/views/process-panel/process-details-card.tsx         | 8 ++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

       via  c2ecd507c51f3910005cfab6dd7c2a54549ad70d (commit)
       via  b63d426ec60483c5f3d99d493e62de821eed926a (commit)
      from  756da23ade34fd225e80e448fb27795d453294c6 (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 c2ecd507c51f3910005cfab6dd7c2a54549ad70d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Mar 29 14:06:16 2023 -0400

    19295: Adjust type filter defaults
    
    Move order of "Workflow Definition" after runs because that's the
    current sort order (which is imposed by the "contents" API so it is
    nontrivial to change).
    
    Hide "intermediate" and "log" output collections by default because
    they are usually clutter and you generally find them by navigating
    from the workflow run.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts
index 361b52a6..397442a1 100644
--- a/src/store/resource-type-filters/resource-type-filters.ts
+++ b/src/store/resource-type-filters/resource-type-filters.ts
@@ -79,16 +79,16 @@ export const getInitialResourceTypeFilters = pipe(
     ),
     pipe(
         initFilter(ObjectTypeFilter.WORKFLOW, '', false, true),
-        initFilter(ObjectTypeFilter.DEFINITION, ObjectTypeFilter.WORKFLOW),
         initFilter(ProcessTypeFilter.MAIN_PROCESS, ObjectTypeFilter.WORKFLOW),
         initFilter(ProcessTypeFilter.CHILD_PROCESS, ObjectTypeFilter.WORKFLOW, false),
+        initFilter(ObjectTypeFilter.DEFINITION, ObjectTypeFilter.WORKFLOW),
     ),
     pipe(
         initFilter(ObjectTypeFilter.COLLECTION, '', true, true),
         initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION),
         initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION),
-        initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION),
-        initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION),
+        initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION, false),
+        initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION, false),
     ),
 
 );

commit b63d426ec60483c5f3d99d493e62de821eed926a
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Mar 29 13:52:33 2023 -0400

    19295: Add "Cancelling" state.
    
    Tweak "cancel" button styling from discussion with Sarah.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/store/processes/process.ts b/src/store/processes/process.ts
index ec55535d..e6219498 100644
--- a/src/store/processes/process.ts
+++ b/src/store/processes/process.ts
@@ -27,6 +27,7 @@ export enum ProcessStatus {
     WARNING = 'Warning',
     UNKNOWN = 'Unknown',
     REUSED = 'Reused',
+    CANCELLING = 'Cancelling',
 }
 
 export const getProcess = (uuid: string) => (resources: ResourcesState): Process | undefined => {
@@ -95,6 +96,10 @@ export const getProcessStatusStyles = (status: string, theme: ArvadosTheme): Rea
             color = theme.customs.colors.red900;
             running = true;
             break;
+        case ProcessStatus.CANCELLING:
+            color = theme.customs.colors.red900;
+            running = true;
+            break;
         case ProcessStatus.CANCELLED:
         case ProcessStatus.FAILED:
             color = theme.customs.colors.red900;
@@ -164,6 +169,9 @@ export const getProcessStatus = ({ containerRequest, container }: Process): Proc
             return ProcessStatus.QUEUED;
 
         case container?.state === ContainerState.RUNNING:
+            if (container?.priority === 0) {
+                return ProcessStatus.CANCELLING;
+            }
             if (!!container?.runtimeStatus.error) {
                 return ProcessStatus.FAILING;
             }
diff --git a/src/views/process-panel/process-details-card.tsx b/src/views/process-panel/process-details-card.tsx
index f339d1b3..abcbcdb4 100644
--- a/src/views/process-panel/process-details-card.tsx
+++ b/src/views/process-panel/process-details-card.tsx
@@ -59,10 +59,10 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         fontSize: '0.78rem',
     },
     cancelButton: {
-        color: theme.customs.colors.red900,
-        borderColor: theme.customs.colors.red900,
+        color: theme.palette.common.white,
+        backgroundColor: theme.customs.colors.red900,
         '&:hover': {
-            borderColor: theme.customs.colors.red900,
+            backgroundColor: theme.customs.colors.red900,
         },
         '& svg': {
             fontSize: '22px',
@@ -126,7 +126,7 @@ export const ProcessDetailsCard = withStyles(styles)(
                         {isProcessCancelable(process) &&
                             <Button
                                 data-cy="process-cancel-button"
-                                variant="outlined"
+                                variant="contained"
                                 size="small"
                                 color="primary"
                                 className={classNames(classes.actionButton, classes.cancelButton)}

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


hooks/post-receive
--