16108: Query for favorites should filter on owner not tail_uuid

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/src/services/favorite-service/favorite-service.ts b/src/services/favorite-service/favorite-service.ts
index 90849c8b95b1a79b632827ab75bf404b1c046744..fbb2a52f448920e8b34cccaac6219709193534c7 100644 (file)
--- 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,
     constructor(
         private linkService: LinkService,
         private groupsService: GroupsService,

-    ) {}
+    ) { }

 
     create(data: { userUuid: string; resource: { uuid: string; name: string } }) {
         return this.linkService.create({
 
     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()
         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()
                     .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()
 
     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();
 
             .addEqual('link_class', LinkClass.STAR)
             .getFilters();
 


@@ -75,7 +75,7 @@ export class FavoriteService {
             .list({
                 filters: new FilterBuilder()
                     .addIn("head_uuid", resourceUuids)
             .list({
                 filters: new FilterBuilder()
                     .addIn("head_uuid", resourceUuids)

-                    .addEqual("tail_uuid", userUuid)
+                    .addEqual("owner_uuid", userUuid)

                     .addEqual("link_class", LinkClass.STAR)
                     .getFilters()
             })
                     .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 6b9be5396396a1421fbe603f9d7cb6bd8ef851b4..5e880aad9587583ffaeebde865b675612b752785 100644 (file)
--- 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)
                 fb => fb
                     .addEqual('link_class', LinkClass.STAR)
                     .addEqual('owner_uuid', uuid)

-                    .addLike('name', '')

                     .getFilters(),
             )(new FilterBuilder());
 
                     .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 859c907a6fd88553118038df3c7b763ea0b70873..350f9aa6322980c9c876305f338004e9d01089bf 100644 (file)
--- 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 = [
 });
 
 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/",
     {
         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} />
                         <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>
                     )
                             </a>
                         </MenuItem>
                     )