X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c33dec559093730850c578cb37e0606d33a9ca8a..1e1abe6a0146d3f31836334a7e5880e349afed24:/src/store/search-bar/search-bar-tree-actions.ts diff --git a/src/store/search-bar/search-bar-tree-actions.ts b/src/store/search-bar/search-bar-tree-actions.ts index 5dc769a6..76e1b68f 100644 --- a/src/store/search-bar/search-bar-tree-actions.ts +++ b/src/store/search-bar/search-bar-tree-actions.ts @@ -6,6 +6,7 @@ import { getTreePicker, TreePicker } from "~/store/tree-picker/tree-picker"; import { getNode, getNodeAncestorsIds, initTreeNode, TreeNodeStatus } from "~/models/tree"; import { Dispatch } from "redux"; import { RootState } from "~/store/store"; +import { getUserUuid } from "~/common/getuser"; import { ServiceRepository } from "~/services/services"; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; import { FilterBuilder } from "~/services/api/filter-builder"; @@ -38,8 +39,10 @@ export const getSearchBarTreeNodeAncestorsIds = (id: string) => (treePicker: Tre }; export const activateSearchBarTreeBranch = (id: string) => - async (dispatch: Dispatch, _: void, services: ServiceRepository) => { - const ancestors = await services.ancestorsService.ancestors(id, services.authService.getUuid() || ''); + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } + const ancestors = await services.ancestorsService.ancestors(id, userUuid); for (const ancestor of ancestors) { await dispatch(loadSearchBarTreeProjects(ancestor.uuid)); @@ -84,7 +87,7 @@ const loadSearchBarProject = (projectUuid: string) => dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID })); const params = { filters: new FilterBuilder() - .addEqual('ownerUuid', projectUuid) + .addEqual('owner_uuid', projectUuid) .getFilters(), order: new OrderBuilder() .addAsc('name') @@ -98,4 +101,3 @@ const loadSearchBarProject = (projectUuid: string) => })); dispatch(resourcesActions.SET_RESOURCES(items)); }; -