X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c276ce4c8dd3cf27ad6d17eca9af473f353fda55..4aee3fa5225c21771b23666d29be9d796758a65f:/src/store/process-logs-panel/process-logs-panel-actions.ts diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts index 79c6434c..f0caf052 100644 --- a/src/store/process-logs-panel/process-logs-panel-actions.ts +++ b/src/store/process-logs-panel/process-logs-panel-actions.ts @@ -2,20 +2,22 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { unionize, ofType, UnionOf } from "~/common/unionize"; +import { unionize, ofType, UnionOf } from "common/unionize"; import { ProcessLogs, getProcessLogsPanelCurrentUuid } from './process-logs-panel'; -import { LogEventType } from '~/models/log'; -import { RootState } from '~/store/store'; -import { ServiceRepository } from '~/services/services'; +import { LogEventType } from 'models/log'; +import { RootState } from 'store/store'; +import { ServiceRepository } from 'services/services'; import { Dispatch } from 'redux'; import { groupBy } from 'lodash'; -import { loadProcess } from '~/store/processes/processes-actions'; -import { LogResource } from '~/models/log'; -import { LogService } from '~/services/log-service/log-service'; -import { ResourceEventMessage } from '~/websocket/resource-event-message'; -import { getProcess } from '~/store/processes/process'; -import { FilterBuilder } from "~/services/api/filter-builder"; -import { OrderBuilder } from "~/services/api/order-builder"; +import { loadProcess } from 'store/processes/processes-actions'; +import { LogResource } from 'models/log'; +import { LogService } from 'services/log-service/log-service'; +import { ResourceEventMessage } from 'websocket/resource-event-message'; +import { getProcess } from 'store/processes/process'; +import { FilterBuilder } from "services/api/filter-builder"; +import { OrderBuilder } from "services/api/order-builder"; +import { navigateTo } from 'store/navigation/navigation-action'; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; export const processLogsPanelActions = unionize({ RESET_PROCESS_LOGS_PANEL: ofType<{}>(), @@ -43,13 +45,13 @@ export const initProcessLogsPanel = (processUuid: string) => export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: string }>) => async (dispatch: Dispatch, getState: () => RootState, { logService }: ServiceRepository) => { if (PROCESS_PANEL_LOG_EVENT_TYPES.indexOf(message.eventType) > -1) { - const uuid = getProcessLogsPanelCurrentUuid(getState()); + const uuid = getProcessLogsPanelCurrentUuid(getState().router); if (uuid) { const process = getProcess(uuid)(getState().resources); if (process) { const { containerRequest, container } = process; if (message.objectUuid === containerRequest.uuid - || container && message.objectUuid === container.uuid) { + || (container && message.objectUuid === container.uuid)) { dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({ logType: SUMMARIZED_FILTER_TYPE, log: message.properties.text @@ -66,8 +68,8 @@ export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: st const loadContainerLogs = async (containerUuid: string, logService: LogService) => { const requestFilters = new FilterBuilder() - .addEqual('objectUuid', containerUuid) - .addIn('eventType', PROCESS_PANEL_LOG_EVENT_TYPES) + .addEqual('object_uuid', containerUuid) + .addIn('event_type', PROCESS_PANEL_LOG_EVENT_TYPES) .getFilters(); const requestOrder = new OrderBuilder() .addAsc('eventAt') @@ -98,6 +100,16 @@ const createInitialLogPanelState = (logResources: LogResource[]) => { const logsToLines = (logs: LogResource[]) => logs.map(({ properties }) => properties.text); +export const navigateToLogCollection = (uuid: string) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + try { + await services.collectionService.get(uuid); + dispatch(navigateTo(uuid)); + } catch { + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This collection does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR })); + } + }; + const MAX_AMOUNT_OF_LOGS = 10000; const SUMMARIZED_FILTER_TYPE = 'Summarized';