From f71fdeed4749859fefd7590bd77b05a53366bf12 Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Wed, 24 Apr 2019 11:27:26 +0200 Subject: [PATCH] add-posibitility-to-add-to-public-favs-from-favorites-panel Feature #15120 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- src/views/favorite-panel/favorite-panel.tsx | 61 +++++++++++---------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index 5c19c30b..8498b787 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -107,53 +107,54 @@ export const favoritePanelColumns: DataColumns = [ interface FavoritePanelDataProps { favorites: FavoritesState; + isAdmin: boolean; } interface FavoritePanelActionProps { onItemClick: (item: string) => void; - onContextMenu: (event: React.MouseEvent, item: string) => void; onDialogOpen: (ownerUuid: string) => void; onItemDoubleClick: (item: string) => void; } -const mapStateToProps = ({ favorites }: RootState): FavoritePanelDataProps => ({ - favorites -}); - -const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({ - onContextMenu: (event, resourceUuid) => { - const kind = resourceKindToContextMenuKind(resourceUuid); - if (kind) { - dispatch(openContextMenu(event, { - name: '', - uuid: resourceUuid, - ownerUuid: '', - kind: ResourceKind.NONE, - menuKind: kind - })); - } - dispatch(loadDetailsPanel(resourceUuid)); - }, - onDialogOpen: (ownerUuid: string) => { return; }, - onItemClick: (resourceUuid: string) => { - dispatch(loadDetailsPanel(resourceUuid)); - }, - onItemDoubleClick: uuid => { - dispatch(navigateTo(uuid)); - } +const mapStateToProps = (state : RootState): FavoritePanelDataProps => ({ + favorites: state.favorites, + isAdmin: state.auth.user!.isAdmin }); type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp & WithStyles & RouteComponentProps<{ id: string }>; export const FavoritePanel = withStyles(styles)( - connect(mapStateToProps, mapDispatchToProps)( + connect(mapStateToProps)( class extends React.Component { + + handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { + const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin); + if (menuKind) { + this.props.dispatch(openContextMenu(event, { + name: '', + uuid: resourceUuid, + ownerUuid: '', + kind: ResourceKind.NONE, + menuKind + })); + } + this.props.dispatch(loadDetailsPanel(resourceUuid)); + } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + render() { return