[arvados-workbench2] created: 2.5.0-18-g8aad3953

[git repository hosting]

        at  8aad39537a5998cc11038e9a96f9424d46aa7443 (commit)


commit 8aad39537a5998cc11038e9a96f9424d46aa7443
Author: Stephen Smith <stephen at curii.com>
Date:   Fri Jan 27 14:02:43 2023 -0500

    19273: Request contaner details for process status badge on search results
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/store/search-results-panel/search-results-middleware-service.ts b/src/store/search-results-panel/search-results-middleware-service.ts
index 78ba6c38..c076f926 100644
--- a/src/store/search-results-panel/search-results-middleware-service.ts
+++ b/src/store/search-results-panel/search-results-middleware-service.ts
@@ -20,11 +20,12 @@ import {
     getAdvancedDataFromQuery
 } from 'store/search-bar/search-bar-actions';
 import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
-import { joinFilters } from 'services/api/filter-builder';
+import { FilterBuilder, joinFilters } from 'services/api/filter-builder';
 import { DataColumns } from 'components/data-table/data-table';
 import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters';
 import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
-import { Resource } from 'models/resource';
+import { Resource, ResourceKind } from 'models/resource';
+import { ContainerRequestResource } from 'models/container-request';
 
 export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -60,6 +61,18 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic
                 .then((response) => {
                     api.dispatch(updateResources(response.items));
                     api.dispatch(appendItems(response));
+                    // Request all containers for process status to be available
+                    const containerRequests = response.items.filter((item) => item.kind === ResourceKind.CONTAINER_REQUEST) as ContainerRequestResource[];
+                    const containerUuids = containerRequests.map(container => container.containerUuid).filter(uuid => uuid !== null) as string[];
+                    this.services.containerService
+                        .list({
+                            filters: new FilterBuilder()
+                                .addIn('uuid', containerUuids)
+                                .getFilters()
+                        }, false)
+                        .then((containers) => {
+                            api.dispatch(updateResources(containers.items));
+                        });
                 }).catch(() => {
                     api.dispatch(couldNotFetchSearchResults(session.clusterId));
                 });

commit 1321d262946be46e2b6a9603294adf414a519d32
Author: Stephen Smith <stephen at curii.com>
Date:   Fri Jan 27 14:02:04 2023 -0500

    19273: Fix list queries not mapping keys to camelcase when showErrors is false
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/services/common-service/common-service.ts b/src/services/common-service/common-service.ts
index 9a5b7673..4b857edd 100644
--- a/src/services/common-service/common-service.ts
+++ b/src/services/common-service/common-service.ts
@@ -154,6 +154,7 @@ export class CommonService<T> {
             return CommonService.defaultResponse(
                 this.serverApi.get(`/${this.resourceType}`, { params }),
                 this.actions,
+                true,
                 showErrors
             );
         } else {
@@ -170,6 +171,7 @@ export class CommonService<T> {
             return CommonService.defaultResponse(
                 this.serverApi.post(`/${this.resourceType}`, formData, {}),
                 this.actions,
+                true,
                 showErrors
             );
         }

commit 255c1853af2886e1263d101b20f68ed13d6331e4
Author: Stephen Smith <stephen at curii.com>
Date:   Fri Jan 27 13:57:59 2023 -0500

    19275: Display unknown process status badge when container not loaded yet
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/store/processes/process.ts b/src/store/processes/process.ts
index 2a81669c..d7fd3aa2 100644
--- a/src/store/processes/process.ts
+++ b/src/store/processes/process.ts
@@ -119,6 +119,9 @@ export const getProcessStatusStyles = (status: string, theme: ArvadosTheme): Rea
 
 export const getProcessStatus = ({ containerRequest, container }: Process): ProcessStatus => {
     switch (true) {
+        case containerRequest.containerUuid && !container:
+            return ProcessStatus.UNKNOWN;
+
         case containerRequest.state === ContainerRequestState.FINAL &&
             container?.state !== ContainerState.COMPLETE:
             // Request was finalized before its container started (or the

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


hooks/post-receive
--