From: Peter Amstutz Date: Sun, 2 Feb 2020 17:46:09 +0000 (-0500) Subject: 16108: Query for favorites should filter on owner not tail_uuid X-Git-Tag: 2.0.0~5^2~2 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/67d1d0a6ea4e20dd3bb2d1c4e6797cba557398b4 16108: Query for favorites should filter on owner not tail_uuid Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/src/services/favorite-service/favorite-service.ts b/src/services/favorite-service/favorite-service.ts index 90849c8b..fbb2a52f 100644 --- a/src/services/favorite-service/favorite-service.ts +++ b/src/services/favorite-service/favorite-service.ts @@ -20,7 +20,7 @@ export class FavoriteService { constructor( private linkService: LinkService, private groupsService: GroupsService, - ) {} + ) { } create(data: { userUuid: string; resource: { uuid: string; name: string } }) { return this.linkService.create({ @@ -36,7 +36,7 @@ export class FavoriteService { return this.linkService .list({ filters: new FilterBuilder() - .addEqual('tail_uuid', data.userUuid) + .addEqual('owner_uuid', data.userUuid) .addEqual('head_uuid', data.resourceUuid) .addEqual('link_class', LinkClass.STAR) .getFilters() @@ -47,7 +47,7 @@ export class FavoriteService { list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}): Promise> { const listFilters = new FilterBuilder() - .addEqual('tail_uuid', userUuid) + .addEqual('owner_uuid', userUuid) .addEqual('link_class', LinkClass.STAR) .getFilters(); @@ -75,7 +75,7 @@ export class FavoriteService { .list({ filters: new FilterBuilder() .addIn("head_uuid", resourceUuids) - .addEqual("tail_uuid", userUuid) + .addEqual("owner_uuid", userUuid) .addEqual("link_class", LinkClass.STAR) .getFilters() }) diff --git a/src/store/tree-picker/tree-picker-actions.ts b/src/store/tree-picker/tree-picker-actions.ts index 6b9be539..5e880aad 100644 --- a/src/store/tree-picker/tree-picker-actions.ts +++ b/src/store/tree-picker/tree-picker-actions.ts @@ -281,7 +281,6 @@ export const loadPublicFavoritesProject = (params: LoadFavoritesProjectParams) = fb => fb .addEqual('link_class', LinkClass.STAR) .addEqual('owner_uuid', uuid) - .addLike('name', '') .getFilters(), )(new FilterBuilder()); diff --git a/src/views-components/main-app-bar/help-menu.tsx b/src/views-components/main-app-bar/help-menu.tsx index 859c907a..350f9aa6 100644 --- a/src/views-components/main-app-bar/help-menu.tsx +++ b/src/views-components/main-app-bar/help-menu.tsx @@ -37,10 +37,6 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }); const links = [ - { - title: "Public Pipelines and Data sets", - link: "https://dev.arvados.org/projects/arvados/wiki/Public_Pipelines_and_Datasets", - }, { title: "Tutorials and User guide", link: "http://doc.arvados.org/user/", @@ -78,7 +74,7 @@ export const HelpMenu = compose( - {link.title} + {link.title} )