projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17337: Removes only() call, adds failing file rename case.
[arvados-workbench2.git]
/
src
/
websocket
/
websocket.ts
diff --git
a/src/websocket/websocket.ts
b/src/websocket/websocket.ts
index 1a5964b516eddc4b59ba1e7b6c72029b9ffb7c51..506b92c801fe33ac17706fcd4b26f035fd950d64 100644
(file)
--- a/
src/websocket/websocket.ts
+++ b/
src/websocket/websocket.ts
@@
-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 { WebSocketService } from './websocket-service';
import { ResourceEventMessage } from './resource-event-message';
import { ResourceKind } from '~/models/resource';
-// import { loadProcess } from '~/store/processes/processes-actions';
-// import { loadContainers } from '~/store/processes/processes-actions';
+import { loadProcess } from '~/store/processes/processes-actions';
import { LogEventType } from '~/models/log';
import { addProcessLogsPanelItem } from '../store/process-logs-panel/process-logs-panel-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 { subprocessPanelActions } from "~/store/subprocess-panel/subprocess-panel-actions";
+import { projectPanelActions } from "~/store/project-panel/project-panel-action";
+import { getProjectPanelCurrentUuid } from '~/store/project-panel/project-panel-action';
+import { allProcessesPanelActions } from '~/store/all-processes-panel/all-processes-panel-action';
export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
if (config.websocketUrl) {
export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
if (config.websocketUrl) {
@@
-29,12
+30,17
@@
const messageListener = (store: RootStore) => (message: ResourceEventMessage) =>
if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) {
switch (message.objectKind) {
case ResourceKind.CONTAINER_REQUEST:
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));
+ }
+ // fall through, this will happen for container requests as well.
case ResourceKind.CONTAINER:
case ResourceKind.CONTAINER:
- // return store.dispatch(loadContainers(
- // new FilterBuilder().addIn('uuid', [message.objectUuid]).getFilters()
- // ));
store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
+ store.dispatch(allProcessesPanelActions.REQUEST_ITEMS());
+ if (message.objectOwnerUuid === getProjectPanelCurrentUuid(store.getState())) {
+ store.dispatch(projectPanelActions.REQUEST_ITEMS());
+ }
+ return;
default:
return;
}
default:
return;
}