From cd8c4a64f0b6aa74e8190c53bf21924d291b76e0 Mon Sep 17 00:00:00 2001
From: Pavel Paroulek <pavel.paroulek@orange.com>
Date: Tue, 28 May 2019 14:43:01 +0200
Subject: Adding edgerule filtering

Adding edgerule filter and removing 'Both' option from drop down menu

Change-Id: I1969052166cc213a891d52fef9e79c1901ff7f9f
Issue-ID: AAI-531
Signed-off-by: Pavel Paroulek <pavel.paroulek@orange.com>
---
 graphgraph-fe/src/GraphSettings.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'graphgraph-fe/src/GraphSettings.js')

diff --git a/graphgraph-fe/src/GraphSettings.js b/graphgraph-fe/src/GraphSettings.js
index 0c036db..1e80da9 100644
--- a/graphgraph-fe/src/GraphSettings.js
+++ b/graphgraph-fe/src/GraphSettings.js
@@ -74,7 +74,7 @@ class GraphSettings extends React.Component {
         s['toNode'] = endNode
         s['graph'] = g
         s['edgeFilter'] = edgeFilter
-        s['showHops'] = endNode === 'none' && startNode !== 'none' && startNode !== 'all' && edgeFilter !== 'Edgerules'
+        s['showHops'] = endNode === 'none' && startNode !== 'none' && startNode !== 'all' 
         s['enableDestinationNode'] = startNode !== 'none' && startNode !== 'all'
         this.setState(s)
 
@@ -174,7 +174,6 @@ class GraphSettings extends React.Component {
     let edgeFilterItems = [
       <MenuItem key='Edgerules' eventKey='Edgerules'>Edgerules</MenuItem>,
       <MenuItem key='Parents' eventKey='Parents'>Parent-child (OXM structure)</MenuItem>,
-      <MenuItem key='Both' eventKey='Both'>Both</MenuItem>
     ]
     return (
       <div>
@@ -211,7 +210,7 @@ class GraphSettings extends React.Component {
               </DropdownButton>
             </div>
 
-            <Popup isDisabled={!this.state.showHops} parentHops={this.state.hops.parents} childHops={this.state.hops.child} cousinHops={this.state.hops.cousin} updateHops={this.updateHops}/>
+            <Popup isDisabled={!this.state.showHops} edgeFilter={this.state.edgeFilter} parentHops={this.state.hops.parents} childHops={this.state.hops.child} cousinHops={this.state.hops.cousin} updateHops={this.updateHops}/>
           </div>
 
         </div>
-- 
cgit 1.2.3-korg