[ARVADOS-WORKBENCH2] updated: 1.1.4-394-g48b6a6b
Git user
git at public.curoverse.com
Tue Jul 24 07:19:14 EDT 2018
Summary of changes:
src/common/api/common-resource-service.test.ts | 11 ++-
src/components/context-menu/context-menu.test.tsx | 1 +
src/components/context-menu/context-menu.tsx | 26 +++---
src/index.tsx | 2 +
src/models/link.ts | 17 ++++
.../favorite-service/favorite-service.test.ts | 93 ++++++++++++++++++++++
src/services/favorite-service/favorite-service.ts | 83 +++++++++++++++++++
src/services/link-service/link-service.ts | 13 +++
src/services/services.ts | 4 +
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 | 8 +-
.../current-token-dialog/current-token-dialog.tsx | 90 +++++++++++++++++++++
.../favorite-star/favorite-star.tsx | 27 +++++++
.../main-app-bar/main-app-bar.test.tsx | 4 -
src/views/project-panel/project-panel.tsx | 10 ++-
src/views/workbench/workbench.tsx | 48 +++++++++--
24 files changed, 532 insertions(+), 34 deletions(-)
create mode 100644 src/models/link.ts
create mode 100644 src/services/favorite-service/favorite-service.test.ts
create mode 100644 src/services/favorite-service/favorite-service.ts
create mode 100644 src/services/link-service/link-service.ts
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/current-token-dialog/current-token-dialog.tsx
create mode 100644 src/views-components/favorite-star/favorite-star.tsx
via 48b6a6be504556c5624e505d18254cf144636dda (commit)
via de2380dae954f5874badf948e9658aacd6c8e6f9 (commit)
via 7cf8f4f0b33f358dda43810ceaed52928e60a68d (commit)
via 98868c72e1f72ff7a9d64fe19a168e0b436a6dfa (commit)
via 823ac8656c70068c6cd59bb96ec8b6d6201076d9 (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)
via fefd4455dd540168c65e6f8e82784662d09cff28 (commit)
via d4ce9980b9f3a418a92741eddd8d58d5f7227137 (commit)
via 68ac0f45eef3ed971615fb0a0849c950b74d7e06 (commit)
via bccb9ca5151f041d8c8b73098a3e1874023e3efa (commit)
via 085aaccee3eea289a443f227cdd856c2761940ca (commit)
via 18a1de5ecd6a2b746a89aa28f5f022578d858660 (commit)
via e9ddb402bae21b72cc23ac71d492bca9d92eb356 (commit)
via 8cc7e7304d11fb7940a9c68092c7f614e4e5fcea (commit)
from c6be788f754adcfd8f6cc2c218540c8712c06153 (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 48b6a6be504556c5624e505d18254cf144636dda
Merge: c6be788 de2380d
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Jul 24 13:19:03 2018 +0200
merge master
Feature #13781
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/store/favorites/favorites-actions.ts
index 0000000,225c9b3..c38f4d1
mode 000000,100644..100644
--- a/src/store/favorites/favorites-actions.ts
+++ b/src/store/favorites/favorites-actions.ts
@@@ -1,0 -1,44 +1,44 @@@
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+
+ import { unionize, ofType, UnionOf } from "unionize";
+ import { Dispatch } from "redux";
+ import { favoriteService } from "../../services/services";
+ import { RootState } from "../store";
+ import { checkFavorite } from "./favorites-reducer";
+
+ export const favoritesActions = unionize({
+ TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(),
+ CHECK_PRESENCE_IN_FAVORITES: ofType<string[]>(),
+ UPDATE_FAVORITES: ofType<Record<string, boolean>>()
+ }, { tag: 'type', value: 'payload' });
+
+ export type FavoritesAction = UnionOf<typeof favoritesActions>;
+
+ export const toggleFavorite = (resource: { uuid: string; name: string }) =>
+ (dispatch: Dispatch, getState: () => RootState) => {
+ const userUuid = getState().auth.user!.uuid;
+ dispatch(favoritesActions.TOGGLE_FAVORITE({ resourceUuid: resource.uuid }));
+ const isFavorite = checkFavorite(resource.uuid, getState().favorites);
- const promise = isFavorite
++ const promise: (any) = isFavorite
+ ? favoriteService.delete({ userUuid, resourceUuid: resource.uuid })
+ : favoriteService.create({ userUuid, resource });
+
+ promise
- .then(fav => {
++ .then(() => {
+ dispatch(favoritesActions.UPDATE_FAVORITES({ [resource.uuid]: !isFavorite }));
+ });
+ };
+
+ export const checkPresenceInFavorites = (resourceUuids: string[]) =>
+ (dispatch: Dispatch, getState: () => RootState) => {
+ const userUuid = getState().auth.user!.uuid;
+ dispatch(favoritesActions.CHECK_PRESENCE_IN_FAVORITES(resourceUuids));
+ favoriteService
+ .checkPresenceInFavorites(userUuid, resourceUuids)
+ .then(results => {
+ dispatch(favoritesActions.UPDATE_FAVORITES(results));
+ });
+ };
+
diff --cc src/store/store.ts
index 01b06b9,e7dbe16..8a5136c
--- 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 { reducer as formReducer } from 'redux-form';
+ import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
@@@ -39,7 -40,7 +41,8 @@@ const rootReducer = combineReducers(
sidePanel: sidePanelReducer,
detailsPanel: detailsPanelReducer,
contextMenu: contextMenuReducer,
- form: formReducer
++ form: formReducer,
+ favorites: favoritesReducer,
});
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list