15672: Auto-update project panel on container activity
authorPeter Amstutz <peter.amstutz@curii.com>
Wed, 8 Jan 2020 20:57:57 +0000 (15:57 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Wed, 8 Jan 2020 20:57:57 +0000 (15:57 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

src/store/processes/processes-actions.ts
src/websocket/websocket.ts

index bb60378c5bb9308a2922f24667300e0a69f4348f..ab51f9caa07babf0b3b4c70bb34e39d99637b4c0 100644 (file)
@@ -21,9 +21,6 @@ import { getWorkflow, getWorkflowInputs } from "~/models/workflow";
 
 export const loadProcess = (containerRequestUuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<Process> => {
-        const response = await services.workflowService.list();
-        dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items));
-
         const containerRequest = await services.containerRequestService.get(containerRequestUuid);
         dispatch<any>(updateResources([containerRequest]));
 
index 1a5964b516eddc4b59ba1e7b6c72029b9ffb7c51..e367dba3e8f17fbf47fc420e3c7c419d48c6b966 100644 (file)
@@ -8,12 +8,13 @@ import { Config } from '~/common/config';
 import { WebSocketService } from './websocket-service';
 import { ResourceEventMessage } from './resource-event-message';
 import { ResourceKind } from '~/models/resource';
-// import { loadProcess } from '~/store/processes/processes-actions';
+import { loadProcess } from '~/store/processes/processes-actions';
 // import { loadContainers } from '~/store/processes/processes-actions';
 import { LogEventType } from '~/models/log';
 import { addProcessLogsPanelItem } from '../store/process-logs-panel/process-logs-panel-actions';
 // import { FilterBuilder } from "~/services/api/filter-builder";
 import { subprocessPanelActions } from "~/store/subprocess-panel/subprocess-panel-actions";
+import { projectPanelActions } from "~/store/project-panel/project-panel-action";
 
 export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
     if (config.websocketUrl) {
@@ -29,12 +30,13 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) =>
     if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) {
         switch (message.objectKind) {
             case ResourceKind.CONTAINER_REQUEST:
-            // return store.dispatch(loadProcess(message.objectUuid));
+                if (store.getState().processPanel.containerRequestUuid === message.objectUuid) {
+                    store.dispatch(loadProcess(message.objectUuid));
+                }
             case ResourceKind.CONTAINER:
-                // return store.dispatch(loadContainers(
-                //     new FilterBuilder().addIn('uuid', [message.objectUuid]).getFilters()
-                // ));
                 store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
+                store.dispatch(projectPanelActions.REQUEST_ITEMS());
+                return;
             default:
                 return;
         }