[ARVADOS-WORKBENCH2] updated: 2.1.0-187-g87d9f6d4

[Git user]

Summary of changes:
 src/services/favorite-service/favorite-service.ts | 4 ++--
 src/store/tree-picker/tree-picker-actions.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  87d9f6d4a643e5a5ec381f221d376b66c1f3cb29 (commit)
       via  b7fc86ba2cb07efa00e56c9d5536fc767166cfb5 (commit)
      from  decb7304af4d86f0aff7a2d7c87f869166111499 (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 87d9f6d4a643e5a5ec381f221d376b66c1f3cb29
Merge: b7fc86ba decb7304
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Mon Feb 1 20:19:22 2021 +0100

    Merge branch '17306-Favorites-in-copy-dialog-is-different-to-favorite-list' of git.arvados.org:arvados-workbench2 into 17306-Favorites-in-copy-dialog-is-different-to-favorite-list
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>


commit b7fc86ba2cb07efa00e56c9d5536fc767166cfb5
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Mon Feb 1 19:50:39 2021 +0100

    17306: Removed userUuid from group call
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>

diff --git a/src/services/favorite-service/favorite-service.ts b/src/services/favorite-service/favorite-service.ts
index fbb2a52f..fce81004 100644
--- a/src/services/favorite-service/favorite-service.ts
+++ b/src/services/favorite-service/favorite-service.ts
@@ -45,7 +45,7 @@ export class FavoriteService {
                 results.items.map(item => this.linkService.delete(item.uuid))));
     }
 
-    list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}): Promise<ListResults<GroupContentsResource>> {
+    list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}, showOnlyOwned: boolean = true): Promise<ListResults<GroupContentsResource>> {
         const listFilters = new FilterBuilder()
             .addEqual('owner_uuid', userUuid)
             .addEqual('link_class', LinkClass.STAR)
@@ -60,7 +60,7 @@ export class FavoriteService {
             })
             .then(results => {
                 const uuids = results.items.map(item => item.headUuid);
-                return this.groupsService.contents(userUuid, {
+                return this.groupsService.contents(showOnlyOwned ? userUuid : '', {
                     limit,
                     offset,
                     order: contentOrder,
diff --git a/src/store/tree-picker/tree-picker-actions.ts b/src/store/tree-picker/tree-picker-actions.ts
index 3fa5187a..08f356f0 100644
--- a/src/store/tree-picker/tree-picker-actions.ts
+++ b/src/store/tree-picker/tree-picker-actions.ts
@@ -248,7 +248,7 @@ export const loadFavoritesProject = (params: LoadFavoritesProjectParams) =>
                 fb => fb.getFilters(),
             )(new FilterBuilder());
 
-            const { items } = await services.favoriteService.list(uuid, { filters });
+            const { items } = await services.favoriteService.list(uuid, { filters }, false);
 
             dispatch<any>(receiveTreePickerData<GroupContentsResource>({
                 id: 'Favorites',

-----------------------------------------------------------------------


hooks/post-receive
--