From cafed6458d46b99a1dc28deef0ea60b985af03dd Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 21 Mar 2022 10:46:06 -0300 Subject: [PATCH] 16672: Removes unused code, avoids requesting the CR twice. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../process-logs-panel-actions.ts | 15 +++++++-------- src/store/process-panel/process-panel-actions.ts | 4 ++-- src/store/workbench/workbench-actions.ts | 10 ---------- 3 files changed, 9 insertions(+), 20 deletions(-) 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 f0caf052..a14437aa 100644 --- a/src/store/process-logs-panel/process-logs-panel-actions.ts +++ b/src/store/process-logs-panel/process-logs-panel-actions.ts @@ -9,7 +9,6 @@ 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'; @@ -34,8 +33,8 @@ export const setProcessLogsPanelFilter = (filter: string) => export const initProcessLogsPanel = (processUuid: string) => async (dispatch: Dispatch, getState: () => RootState, { logService }: ServiceRepository) => { dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL()); - const process = await dispatch(loadProcess(processUuid)); - if (process.container) { + const process = getProcess(processUuid)(getState().resources); + if (process && process.container) { const logResources = await loadContainerLogs(process.container.uuid, logService); const initialState = createInitialLogPanelState(logResources); dispatch(processLogsPanelActions.INIT_PROCESS_LOGS_PANEL(initialState)); @@ -53,7 +52,7 @@ export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: st if (message.objectUuid === containerRequest.uuid || (container && message.objectUuid === container.uuid)) { dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({ - logType: SUMMARIZED_FILTER_TYPE, + logType: COMBINED_FILTER_TYPE, log: message.properties.text })); dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({ @@ -92,8 +91,8 @@ const createInitialLogPanelState = (logResources: LogResource[]) => { ...grouped, [key]: logsToLines(groupedLogResources[key]) }), {}); - const filters = [SUMMARIZED_FILTER_TYPE, ...Object.keys(groupedLogs)]; - const logs = { [SUMMARIZED_FILTER_TYPE]: allLogs, ...groupedLogs }; + const filters = [COMBINED_FILTER_TYPE, ...Object.keys(groupedLogs)]; + const logs = { [COMBINED_FILTER_TYPE]: allLogs, ...groupedLogs }; return { filters, logs }; }; @@ -106,13 +105,13 @@ export const navigateToLogCollection = (uuid: string) => await services.collectionService.get(uuid); dispatch(navigateTo(uuid)); } catch { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This collection does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not request collection', hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; const MAX_AMOUNT_OF_LOGS = 10000; -const SUMMARIZED_FILTER_TYPE = 'Summarized'; +const COMBINED_FILTER_TYPE = 'All logs'; const PROCESS_PANEL_LOG_EVENT_TYPES = [ LogEventType.ARV_MOUNT, diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts index 2e5fb6b9..d2921d73 100644 --- a/src/store/process-panel/process-panel-actions.ts +++ b/src/store/process-panel/process-panel-actions.ts @@ -26,9 +26,9 @@ export type ProcessPanelAction = UnionOf; export const toggleProcessPanelFilter = processPanelActions.TOGGLE_PROCESS_PANEL_FILTER; export const loadProcessPanel = (uuid: string) => - (dispatch: Dispatch) => { + async (dispatch: Dispatch) => { dispatch(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid)); - dispatch(loadProcess(uuid)); + await dispatch(loadProcess(uuid)); dispatch(initProcessPanelFilters); dispatch(initProcessLogsPanel(uuid)); dispatch(loadSubprocessPanel()); diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index 98508f75..7958463a 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -49,7 +49,6 @@ import * as processUpdateActions from 'store/processes/process-update-actions'; import * as processCopyActions from 'store/processes/process-copy-actions'; import { trashPanelColumns } from "views/trash-panel/trash-panel"; import { loadTrashPanel, trashPanelActions } from "store/trash-panel/trash-panel-action"; -import { initProcessLogsPanel } from 'store/process-logs-panel/process-logs-panel-actions'; import { loadProcessPanel } from 'store/process-panel/process-panel-actions'; import { loadSharedWithMePanel, @@ -417,15 +416,6 @@ export const copyProcess = (data: CopyFormDialogData) => } }; -export const loadProcessLog = (uuid: string) => - handleFirstTimeLoad( - async (dispatch: Dispatch) => { - const process = await dispatch(processesActions.loadProcess(uuid)); - dispatch(setProcessBreadcrumbs(uuid)); - dispatch(initProcessLogsPanel(uuid)); - await dispatch(activateSidePanelTreeItem(process.containerRequest.ownerUuid)); - }); - export const resourceIsNotLoaded = (uuid: string) => snackbarActions.OPEN_SNACKBAR({ message: `Resource identified by ${uuid} is not loaded.`, -- 2.30.2