[arvados-workbench2] created: 2.5.0-132-g499c2c0c
git repository hosting
git at public.arvados.org
Thu Mar 30 18:59:02 UTC 2023
at 499c2c0ca2c1a7a88aeb9ec9a622f9c7f5399343 (commit)
commit 499c2c0ca2c1a7a88aeb9ec9a622f9c7f5399343
Author: Stephen Smith <stephen at curii.com>
Date: Thu Mar 30 14:58:39 2023 -0400
20252: Clean up imports
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/advanced-tab/advanced-tab.tsx b/src/store/advanced-tab/advanced-tab.tsx
index 82b4dfb0..a495e89c 100644
--- a/src/store/advanced-tab/advanced-tab.tsx
+++ b/src/store/advanced-tab/advanced-tab.tsx
@@ -628,7 +628,7 @@ const linkApiResponse = (apiResponse: LinkResource): JSX.Element => {
const wfApiResponse = (apiResponse: WorkflowResource): JSX.Element => {
const {
uuid, name,
- ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, description, definition
+ ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, description
} = apiResponse;
const response = `
"uuid": "${uuid}",
diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index edda2c61..55479188 100644
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -8,7 +8,6 @@ import { ResourceKind, extractUuidKind } from 'models/resource';
import { SidePanelTreeCategory } from '../side-panel-tree/side-panel-tree-actions';
import { Routes, getGroupUrl, getNavUrl, getUserProfileUrl } from 'routes/routes';
import { RootState } from 'store/store';
-import { openDetailsPanel } from 'store/details-panel/details-panel-action';
import { ServiceRepository } from 'services/services';
import { pluginConfig } from 'plugins';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
diff --git a/src/views-components/context-menu/action-sets/workflow-action-set.ts b/src/views-components/context-menu/action-sets/workflow-action-set.ts
index cf28bcd3..a5223d1d 100644
--- a/src/views-components/context-menu/action-sets/workflow-action-set.ts
+++ b/src/views-components/context-menu/action-sets/workflow-action-set.ts
@@ -5,16 +5,10 @@
import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { openRunProcess } from "store/workflow-panel/workflow-panel-actions";
import {
- RenameIcon,
- ShareIcon,
- MoveToIcon,
- CopyIcon,
DetailsIcon,
AdvancedIcon,
OpenIcon,
Link,
- RestoreVersionIcon,
- FolderSharedIcon,
StartIcon
} from "components/icon/icon";
import { copyToClipboardAction, openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
diff --git a/src/views/workflow-panel/registered-workflow-panel.tsx b/src/views/workflow-panel/registered-workflow-panel.tsx
index 7b0f2a4c..0963de35 100644
--- a/src/views/workflow-panel/registered-workflow-panel.tsx
+++ b/src/views/workflow-panel/registered-workflow-panel.tsx
@@ -14,7 +14,6 @@ import {
CardContent,
IconButton,
} from '@material-ui/core';
-import { Dispatch } from "redux";
import { connect, DispatchProp } from "react-redux";
import { RouteComponentProps } from 'react-router';
import { ArvadosTheme } from 'common/custom-theme';
commit d8591ef8bcb52d6ee5e0c7d1f541088d2485c536
Author: Stephen Smith <stephen at curii.com>
Date: Thu Mar 30 14:58:15 2023 -0400
20252: Avoid clearing subprocess data explorer when refreshing process panel
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts
index 9668485c..d8042ba5 100644
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@ -12,7 +12,7 @@ import { navigateTo, navigateToWorkflows } from 'store/navigation/navigation-act
import { snackbarActions } from 'store/snackbar/snackbar-actions';
import { SnackbarKind } from '../snackbar/snackbar-actions';
import { showWorkflowDetails } from 'store/workflow-panel/workflow-panel-actions';
-import { loadSubprocessPanel } from "../subprocess-panel/subprocess-panel-actions";
+import { loadSubprocessPanel, subprocessPanelActions } from "../subprocess-panel/subprocess-panel-actions";
import { initProcessLogsPanel, processLogsPanelActions } from "store/process-logs-panel/process-logs-panel-actions";
import { CollectionFile } from "models/collection-file";
import { ContainerRequestResource } from "models/container-request";
@@ -40,7 +40,12 @@ export type ProcessPanelAction = UnionOf<typeof processPanelActions>;
export const toggleProcessPanelFilter = processPanelActions.TOGGLE_PROCESS_PANEL_FILTER;
export const loadProcessPanel = (uuid: string) =>
- async (dispatch: Dispatch) => {
+ async (dispatch: Dispatch, getState: () => RootState) => {
+ // Reset subprocess data explorer if navigating to new process
+ // Avoids resetting pagination when refreshing same process
+ if (getState().processPanel.containerRequestUuid !== uuid) {
+ dispatch(subprocessPanelActions.CLEAR());
+ }
dispatch(processPanelActions.RESET_PROCESS_PANEL());
dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL());
dispatch<ProcessPanelAction>(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid));
diff --git a/src/store/subprocess-panel/subprocess-panel-actions.ts b/src/store/subprocess-panel/subprocess-panel-actions.ts
index 0df89d6e..b440776c 100644
--- a/src/store/subprocess-panel/subprocess-panel-actions.ts
+++ b/src/store/subprocess-panel/subprocess-panel-actions.ts
@@ -12,6 +12,5 @@ export const subprocessPanelActions = bindDataExplorerActions(SUBPROCESS_PANEL_I
export const loadSubprocessPanel = () =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- dispatch(subprocessPanelActions.CLEAR());
dispatch(subprocessPanelActions.REQUEST_ITEMS());
};
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list