X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e69ce2f8f14e4272acf5efa4c8a252bc101227ca..9555a2020771863c2e4f6b8802bd6850efb37713:/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 1bb1624d..05d61927 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, ]; @@ -89,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') @@ -104,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) + .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER]) + .addDistinct('uuid', getState().auth.config.uuidPrefix + '-j7d0g-publicfavorites') .getFilters()}]`, order: new OrderBuilder() .addAsc('name', GroupContentsResourcePrefix.PROJECT)