[ARVADOS-WORKBENCH2] created: 1.4.1-258-g920bf747

[Git user]

        at  920bf74753465ab51a8bfe5462f0e687b8fe2055 (commit)


commit 920bf74753465ab51a8bfe5462f0e687b8fe2055
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sun Feb 2 13:20:13 2020 -0500

    16108: Tweak ordering of sidebar to put 'favorites' together
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

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 1f18b85c..a09ab6ba 100644
--- a/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/src/store/side-panel-tree/side-panel-tree-actions.ts
@@ -22,7 +22,7 @@ export enum SidePanelTreeCategory {
     SHARED_WITH_ME = 'Shared with me',
     PUBLIC_FAVORITES = 'Public Favorites',
     WORKFLOWS = 'Workflows',
-    FAVORITES = 'Favorites',
+    FAVORITES = 'My Favorites',
     TRASH = 'Trash',
     ALL_PROCESSES = 'All Processes'
 }
@@ -45,10 +45,10 @@ export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker)
 };
 
 const SIDE_PANEL_CATEGORIES = [
-    SidePanelTreeCategory.ALL_PROCESSES,
     SidePanelTreeCategory.PUBLIC_FAVORITES,
-    SidePanelTreeCategory.WORKFLOWS,
     SidePanelTreeCategory.FAVORITES,
+    SidePanelTreeCategory.WORKFLOWS,
+    SidePanelTreeCategory.ALL_PROCESSES,
     SidePanelTreeCategory.TRASH,
 ];
 

commit 67d1d0a6ea4e20dd3bb2d1c4e6797cba557398b4
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sun Feb 2 12:46:09 2020 -0500

    16108: Query for favorites should filter on owner not tail_uuid
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

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<ListResults<GroupContentsResource>> {
         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<CssRules> = (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(
                         <MenuItem key={link.title}>
                             <a href={link.link} target="_blank" className={classes.link}>
                                 <ImportContactsIcon className={classes.icon} />
-                                <Typography  className={classes.linkTitle}>{link.title}</Typography>
+                                <Typography className={classes.linkTitle}>{link.title}</Typography>
                             </a>
                         </MenuItem>
                     )

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


hooks/post-receive
--