Merge pull request #386 from PathwayCommons/editor-selector

add editor selector button to the factoid menu
PathwayCommons · Nov 16, 2018 · 9865f7c · 9865f7c
2 parents 88b887d + 02a74a1
commit 9865f7c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/client/components/editor/index.js b/src/client/components/editor/index.js
@@ -352,7 +352,7 @@ class Editor extends DataComponent {
         ])
       ]),
       h('div.editor-main-menu', [
-        h(MainMenu, { bus, document, history })
+        h(MainMenu, { bus, document, history, networkEditor: true })
       ]),
       h('div.editor-submit', [
         h(Popover, { tippy: { html: h(TaskView, { document, bus } ) } }, [

diff --git a/src/client/components/main-menu.js b/src/client/components/main-menu.js
@@ -38,7 +38,7 @@ class MenuContent extends Component {
   }
 
   render(){
-    const { bus, document, history, emitter } = this.props;
+    const { bus, document, history, emitter, networkEditor } = this.props;
     const { selectedLinkouts, selectedMyFactoids } = this.state;
 
     const set = (props, children) => h('div.main-menu-set', props, children);
@@ -55,6 +55,17 @@ class MenuContent extends Component {
       h('span', label)
     ]);
 
+    let editorSwitcher = ( document, networkEditor) => {
+      if( document == null ){ return null; }
+
+      let id = document.id();
+      let secret = document.secret();
+      let label = networkEditor ? 'Form Editor' : 'Network Editor';
+      let url = `/${networkEditor ? 'form' : 'document'}/${id}/${secret}`;
+
+      return item({ label, action: () => history.push(url) });
+    };
+
     let content;
 
     if( selectedLinkouts ){
@@ -77,7 +88,8 @@ class MenuContent extends Component {
         ]) : null,
         set({ key: 'nav' }, [
           item({ label: 'New factoid', action: () => history.push('/new') }),
-          item({ label: 'My factoids', action: () => this.selectMyFactoids(), actionCloses: false })
+          item({ label: 'My factoids', action: () => this.selectMyFactoids(), actionCloses: false }),
+          editorSwitcher( document, networkEditor )
         ])
       ]);
     }
@@ -95,7 +107,7 @@ class MainMenu extends Component {
 
   render(){
     let { emitter } = this;
-    let { bus, document, history, title } = this.props;
+    let { bus, document, history, title, networkEditor } = this.props;
 
     return h('div.main-menu', [
       h(Popover, {
@@ -104,7 +116,7 @@ class MainMenu extends Component {
           onHide: () => emitter.emit('hide'),
           onShow: () => emitter.emit('show'),
           placement: 'bottom',
-          html: h(MenuContent, { bus, document, history, emitter })
+          html: h(MenuContent, { bus, document, history, emitter, networkEditor })
         }
       }, [
         h(Tooltip, { description: 'Menu', tippy: { placement: 'bottom' } }, [

diff --git a/src/client/router.js b/src/client/router.js
@@ -81,8 +81,9 @@ let routes = [
     path: '/form/:id',
     render: props => {
       let { id } = props.match.params;
+      let { history } = props;
 
-      return h( FormEditor, { id } );
+      return h( FormEditor, { id, history } );
     }
   },
   {
@@ -98,8 +99,9 @@ let routes = [
     path: '/document/:id',
     render: props => {
       let { id } = props.match.params;
+      let { history } = props;
 
-      return h( Editor, { id } );
+      return h( Editor, { id, history } );
     }
   },
   {