refs #13573 Merge branch '13753-favorites-view'
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 24 Jul 2018 12:02:48 +0000 (14:02 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 24 Jul 2018 12:07:48 +0000 (14:07 +0200)
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

1  2 
src/components/side-panel/side-panel.tsx
src/store/favorites/favorites-actions.ts
src/store/store.ts

index c38f4d1a1aa2690779692ff70e51c2cf1e276bfa,4a176e303c40823ffed69d9e9776a15805724c8a..33fc7e31853f68fec2803ac00652e03dd3a362d3
@@@ -21,12 -21,12 +21,12 @@@ export const toggleFavorite = (resource
          const userUuid = getState().auth.user!.uuid;
          dispatch(favoritesActions.TOGGLE_FAVORITE({ resourceUuid: resource.uuid }));
          const isFavorite = checkFavorite(resource.uuid, getState().favorites);
-         const promise: (any) = isFavorite
 -        const promise = isFavorite
++        const promise: any = isFavorite
              ? favoriteService.delete({ userUuid, resourceUuid: resource.uuid })
              : favoriteService.create({ userUuid, resource });
  
-         promise
+         return promise
 -            .then(fav => {
 +            .then(() => {
                  dispatch(favoritesActions.UPDATE_FAVORITES({ [resource.uuid]: !isFavorite }));
              });
      };
index 8a5136c91add44b378db23d3f9439d53d5496cd5,ff2beb01c7f0f8b9e3c60923ff5bbd8093b3b769..a5e22e8eec7dfc8709c4f9617e0a8795fd7db5a9
@@@ -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 { reducer as formReducer } from 'redux-form';
  import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
  
  const composeEnhancers =