X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/6fdd4a4d609cf8fa459786f42eb337f8da6a5afa..c859c9d9325e2ed86d5d7b067e1209e73ee81251:/src/store/side-panel-tree/side-panel-tree-actions.ts diff --git a/src/store/side-panel-tree/side-panel-tree-actions.ts b/src/store/side-panel-tree/side-panel-tree-actions.ts index 4aa5e26e..ff506103 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -22,8 +22,9 @@ export enum SidePanelTreeCategory { SHARED_WITH_ME = 'Shared with me', PUBLIC_FAVORITES = 'Public Favorites', WORKFLOWS = 'Workflows', - FAVORITES = 'Favorites', - TRASH = 'Trash' + FAVORITES = 'My Favorites', + TRASH = 'Trash', + ALL_PROCESSES = 'All Processes' } export const SIDE_PANEL_TREE = 'sidePanelTree'; @@ -45,8 +46,9 @@ export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker) const SIDE_PANEL_CATEGORIES = [ SidePanelTreeCategory.PUBLIC_FAVORITES, - SidePanelTreeCategory.WORKFLOWS, SidePanelTreeCategory.FAVORITES, + SidePanelTreeCategory.WORKFLOWS, + SidePanelTreeCategory.ALL_PROCESSES, SidePanelTreeCategory.TRASH, ]; @@ -55,9 +57,7 @@ export const isSidePanelTreeCategory = (id: string) => SIDE_PANEL_CATEGORIES.som export const initSidePanelTree = () => (dispatch: Dispatch, getState: () => RootState, { authService }: ServiceRepository) => { const rootProjectUuid = getUserUuid(getState()); - if (!rootProjectUuid) { - return; - } + if (!rootProjectUuid) { return; } const nodes = SIDE_PANEL_CATEGORIES.map(id => initTreeNode({ id, value: id })); const projectsNode = initTreeNode({ id: rootProjectUuid, value: SidePanelTreeCategory.PROJECTS }); const sharedNode = initTreeNode({ id: SidePanelTreeCategory.SHARED_WITH_ME, value: SidePanelTreeCategory.SHARED_WITH_ME }); @@ -91,7 +91,7 @@ const loadProject = (projectUuid: string) => dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SIDE_PANEL_TREE })); const params = { filters: new FilterBuilder() - .addEqual('ownerUuid', projectUuid) + .addEqual('owner_uuid', projectUuid) .getFilters(), order: new OrderBuilder() .addAsc('name') @@ -106,13 +106,14 @@ const loadProject = (projectUuid: string) => dispatch(resourcesActions.SET_RESOURCES(items)); }; -const loadSharedRoot = async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => { +const loadSharedRoot = async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: SidePanelTreeCategory.SHARED_WITH_ME, pickerId: SIDE_PANEL_TREE })); const params = { filters: `[${new FilterBuilder() .addIsA('uuid', ResourceKind.PROJECT) - .addEqual('groupClass', GroupClass.PROJECT) + .addEqual('group_class', GroupClass.PROJECT) + .addDistinct('uuid', getState().auth.config.uuidPrefix + '-j7d0g-publicfavorites') .getFilters()}]`, order: new OrderBuilder() .addAsc('name', GroupContentsResourcePrefix.PROJECT) @@ -161,9 +162,7 @@ export const activateSidePanelTreeProject = (id: string) => export const activateSidePanelTreeBranch = (id: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const userUuid = getUserUuid(getState()); - if (!userUuid) { - return; - } + if (!userUuid) { return; } const ancestors = await services.ancestorsService.ancestors(id, userUuid); const isShared = ancestors.every(({ uuid }) => uuid !== userUuid); if (isShared) {