From a04cd0d395f082d499274540da8896c11b2eb874 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 19 Sep 2017 00:34:37 -0400 Subject: [PATCH] call the right callbacks and show in the right context --- frontend/src/Metamaps/GlobalUI/ReactApp.js | 1 - frontend/src/components/common/ContextMenu.js | 61 ++++++++++++------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/frontend/src/Metamaps/GlobalUI/ReactApp.js b/frontend/src/Metamaps/GlobalUI/ReactApp.js index 5290fe12..6087960e 100644 --- a/frontend/src/Metamaps/GlobalUI/ReactApp.js +++ b/frontend/src/Metamaps/GlobalUI/ReactApp.js @@ -167,7 +167,6 @@ const ReactApp = { contextFetchingSiblingsData: ContextMenu.fetchingSiblingsData, contextSiblingsData: ContextMenu.siblingsData, // functions - contextReset: ContextMenu.reset, contextDelete: ContextMenu.delete, contextRemove: ContextMenu.remove, contextHide: ContextMenu.hide, diff --git a/frontend/src/components/common/ContextMenu.js b/frontend/src/components/common/ContextMenu.js index 84c2b44d..1d4b6687 100644 --- a/frontend/src/components/common/ContextMenu.js +++ b/frontend/src/components/common/ContextMenu.js @@ -6,13 +6,15 @@ import MetacodeSelect from '../MetacodeSelect' class ContextMenu extends Component { static propTypes = { topicId: PropTypes.string, + mapId: PropTypes.string, + currentUser: PropTypes.object, + map: PropTypes.object, contextNode: PropTypes.object, contextEdge: PropTypes.object, contextPos: PropTypes.object, contextFetchingSiblingsData: PropTypes.bool, contextSiblingsData: PropTypes.object, metacodeSets: PropTypes.array, - contextReset: PropTypes.func, contextDelete: PropTypes.func, contextRemove: PropTypes.func, contextHide: PropTypes.func, @@ -33,9 +35,12 @@ class ContextMenu extends Component { render () { const { contextNode, contextPos, contextOnMetacodeSelect, metacodeSets, - contextSiblingsData, contextFetchSiblings, - contextPopulateSiblings, contextFetchingSiblingsData, - topicId } = this.props + contextDelete, contextHide, contextRemove, contextCenterOn, + contextPopoutTopic, contextSiblingsData, contextFetchSiblings, + currentUser, contextPopulateSiblings, contextFetchingSiblingsData, + topicId, map, mapId, contextUpdatePermissions } = this.props + + const canEditMap = map && map.authorizeToEdit(currentUser) const style = { position: 'absolute', top: contextPos.y + 'px', @@ -49,48 +54,60 @@ class ContextMenu extends Component { } } - // TODO: add checks for logged in and other context return
}