From: Daniel Kos <daniel.kos@contractors.roche.com>
Date: Tue, 24 Jul 2018 10:09:44 +0000 (+0200)
Subject: Merge 'origin/master' into 13753-favorites-view
X-Git-Tag: 1.2.0~31^2~7
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/224cde8bd16074b2755cedf44ae048340bc82969

Merge 'origin/master' into 13753-favorites-view

# Conflicts:
#	src/services/favorite-service/favorite-service.ts
#	src/store/store.ts
#	src/views-components/context-menu/context-menu.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
---

224cde8bd16074b2755cedf44ae048340bc82969
diff --cc src/services/favorite-service/favorite-service.ts
index fe7c7874,6ceaa360..d25ef3d5
--- a/src/services/favorite-service/favorite-service.ts
+++ b/src/services/favorite-service/favorite-service.ts
@@@ -66,4 -63,21 +66,20 @@@ export class FavoriteService 
                  });
              });
      }
+ 
+     checkPresenceInFavorites(userUuid: string, resourceUuids: string[]): Promise<Record<string, boolean>> {
+         return this.linkService
+             .list({
+                 filters: FilterBuilder
+                     .create<LinkResource>()
+                     .addIn("headUuid", resourceUuids)
+                     .addEqual("tailUuid", userUuid)
+                     .addEqual("linkClass", LinkClass.STAR)
+             })
+             .then(({ items }) => resourceUuids.reduce((results, uuid) => {
+                 const isFavorite = items.some(item => item.headUuid === uuid);
+                 return { ...results, [uuid]: isFavorite };
+             }, {}));
+     }
+ 
 -
 -}
 +}
diff --cc src/store/store.ts
index fbb5ad61,e7dbe16f..ff2beb01
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -14,7 -14,7 +14,8 @@@ import { dataExplorerReducer, DataExplo
  import { projectPanelMiddleware } from './project-panel/project-panel-middleware';
  import { detailsPanelReducer, DetailsPanelState } from './details-panel/details-panel-reducer';
  import { contextMenuReducer, ContextMenuState } from './context-menu/context-menu-reducer';
 +import { favoritePanelMiddleware } from "./favorite-panel/favorite-panel-middleware";
+ import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
diff --cc src/views/workbench/workbench.tsx
index 309b31af,99212d3f..862fbd51
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -192,10 -199,9 +200,10 @@@ export const Workbench = withStyles(sty
                              <div className={classes.content}>
                                  <Switch>
                                      <Route path="/projects/:id" render={this.renderProjectPanel} />
 +                                    <Route path="/favorites" render={this.renderFavoritePanel} />
                                  </Switch>
                              </div>
-                             { user && <DetailsPanel /> }
+                             {user && <DetailsPanel />}
                          </main>
                          <ContextMenu />
                          <CreateProjectDialog />