[arvados-workbench2] updated: 2.6.0-6-g63192030
git repository hosting
git at public.arvados.org
Tue May 9 21:57:07 UTC 2023
Summary of changes:
src/components/collection-panel-files/collection-panel-files.tsx | 4 ++--
src/store/project-panel/project-panel-action.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
via 6319203009ed914504e23ff263b090e6250709fa (commit)
from be33bc8c17b2e12b96d176d16e60f8ebe3fe1c06 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 6319203009ed914504e23ff263b090e6250709fa
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Tue May 9 17:56:30 2023 -0400
20487: Correctly dispatch loadProject from openProjectPanel
Also fix it to recognize PDH in the files panel.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/components/collection-panel-files/collection-panel-files.tsx b/src/components/collection-panel-files/collection-panel-files.tsx
index b75f3018..4896641b 100644
--- a/src/components/collection-panel-files/collection-panel-files.tsx
+++ b/src/components/collection-panel-files/collection-panel-files.tsx
@@ -39,7 +39,7 @@ import { setCollectionFiles } from 'store/collection-panel/collection-panel-file
import { sortBy } from 'lodash';
import { formatFileSize } from 'common/formatters';
import { getInlineFileUrl, sanitizeToken } from 'views-components/context-menu/actions/helpers';
-import { extractUuidObjectType, ResourceObjectType } from 'models/resource';
+import { extractUuidKind, ResourceKind } from 'models/resource';
export interface CollectionPanelFilesProps {
isWritable: boolean;
@@ -261,7 +261,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
const rightData = pathData[rightKey];
React.useEffect(() => {
- if (props.currentItemUuid && extractUuidObjectType(props.currentItemUuid) == ResourceObjectType.COLLECTION) {
+ if (props.currentItemUuid && extractUuidKind(props.currentItemUuid) == ResourceKind.COLLECTION) {
setPathData({});
setPath([props.currentItemUuid]);
}
diff --git a/src/store/project-panel/project-panel-action.ts b/src/store/project-panel/project-panel-action.ts
index 6b99e300..7ad18b67 100644
--- a/src/store/project-panel/project-panel-action.ts
+++ b/src/store/project-panel/project-panel-action.ts
@@ -16,7 +16,7 @@ export const projectPanelActions = bindDataExplorerActions(PROJECT_PANEL_ID);
export const openProjectPanel = (projectUuid: string) =>
async (dispatch: Dispatch) => {
- await loadProject(projectUuid);
+ await dispatch<any>(loadProject(projectUuid));
dispatch(propertiesActions.SET_PROPERTY({ key: PROJECT_PANEL_CURRENT_UUID, value: projectUuid }));
dispatch(projectPanelActions.RESET_EXPLORER_SEARCH_VALUE());
dispatch(projectPanelActions.REQUEST_ITEMS());
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list