[ARVADOS-WORKBENCH2] updated: 1.1.4-379-g224cde8

[Git user]

Summary of changes:
 src/components/context-menu/context-menu.test.tsx  |  1 +
 src/components/context-menu/context-menu.tsx       | 26 ++++++++-----
 src/index.tsx                                      |  2 +
 .../favorite-service/favorite-service.test.ts      | 20 +++++++++-
 src/services/favorite-service/favorite-service.ts  | 22 +++++++++--
 src/store/context-menu/context-menu-reducer.ts     |  7 +++-
 src/store/favorites/favorites-actions.ts           | 44 ++++++++++++++++++++++
 src/store/favorites/favorites-reducer.ts           | 15 ++++++++
 .../project-panel/project-panel-middleware.ts      |  2 +
 src/store/project/project-action.ts                |  4 +-
 src/store/store.ts                                 |  5 ++-
 .../context-menu/action-sets/favorite-action.tsx   | 27 +++++++++++++
 .../context-menu/action-sets/project-action-set.ts | 11 ++++--
 .../action-sets/resource-action-set.ts             | 14 +++++++
 src/views-components/context-menu/context-menu.tsx |  7 ++--
 .../favorite-star/favorite-star.tsx                | 27 +++++++++++++
 src/views/project-panel/project-panel.tsx          | 10 ++++-
 src/views/workbench/workbench.tsx                  | 33 ++++++++++++----
 18 files changed, 242 insertions(+), 35 deletions(-)
 create mode 100644 src/store/favorites/favorites-actions.ts
 create mode 100644 src/store/favorites/favorites-reducer.ts
 create mode 100644 src/views-components/context-menu/action-sets/favorite-action.tsx
 create mode 100644 src/views-components/context-menu/action-sets/resource-action-set.ts
 create mode 100644 src/views-components/favorite-star/favorite-star.tsx

       via  224cde8bd16074b2755cedf44ae048340bc82969 (commit)
       via  39c6f239172d5f2d92341f6c31de32e7c02ffa2d (commit)
       via  fd08968c9502a028df4813b720b6f62e47ed22f3 (commit)
       via  d75f24fb44ef0f09359508bc3c4d80340ec023b1 (commit)
       via  464d663738d61871a3a0a88be18e8f79e99bb5f3 (commit)
       via  3d8cd860cc352f12a44593382cd36bd24c9c3a44 (commit)
       via  09dedf976871785e061bb78d56f5cb466147627a (commit)
       via  8599d5cc749a87f5cc6195315ae72d2af06ac58d (commit)
       via  4493d29bc4458a67093bfa84886145472263ee03 (commit)
       via  1c6bd6afe7d0faf19f24a37a283e1d0e39de6b79 (commit)
       via  37870430486b96966f874bb507c2511d679f7721 (commit)
       via  c1b2cf95d7b5e1da32e59e43b745b625120e16cf (commit)
       via  c16ed46210ea3c7f29442b4a1622239ff3641f29 (commit)
       via  28139906b7918ecdd93b6fed894b275bf5a945b5 (commit)
       via  4407b22fba72783a428ebbaf165cc579ea4c5a23 (commit)
       via  28ded6ac60c1317b5872a22ce827b073f26fa030 (commit)
       via  45169570ad44e6d2a2fa37be4d1796d66fd6697e (commit)
      from  dd01c37f3cc8b741e4202c480271eb2ffa6a3021 (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 224cde8bd16074b2755cedf44ae048340bc82969
Merge: dd01c37 39c6f23
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Tue Jul 24 12:09:44 2018 +0200

    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 at contractors.roche.com>

diff --cc src/services/favorite-service/favorite-service.ts
index fe7c787,6ceaa36..d25ef3d
--- 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 fbb5ad6,e7dbe16..ff2beb0
--- 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 309b31a,99212d3..862fbd5
--- 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 />

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


hooks/post-receive
--