Remove unnecessary fields from JSON served by API.

Resolved merge conflictiun
    client/components/routeservers/protocols/index.jsx

used calculations taken from "decix/decix" (HEAD) branch

backend/api/response.go

@@ -92,6 +92,7 @@ type Neighbour struct {
 	RoutesExported     int           `json:"routes_exported"`
 	RoutesPreferred    int           `json:"routes_preferred"`
 	RoutesAccepted     int           `json:"routes_accepted"`
+	RoutesPipeFiltered int           `json:"routes_pipe_filtered"`
 	Uptime             time.Duration `json:"uptime"`
 	LastError          string        `json:"last_error"`
 

backend/sources/birdwatcher/parsers.go

@@ -133,9 +133,10 @@ func parseNeighbours(bird ClientResponse, config Config) ([]api.Neighbour, error
 			//TODO make these changes configurable
 			RoutesReceived:     mustInt(routes["imported"], 0),
 			RoutesExported:     mustInt(routes["exported"], 0), //TODO protocol_exported?
-			RoutesFiltered:  mustInt(routes["pipe_filtered"], 0),
+			RoutesFiltered:     mustInt(routes["filtered"], 0),
 			RoutesPreferred:    mustInt(routes["preferred"], 0),
 			RoutesAccepted:     mustInt(routes["pipe_imported"], mustInt(routes["imported"], 0)),
+			RoutesPipeFiltered: mustInt(routes["pipe_filtered"], mustInt(routes["filtered"], 0)),
 
 			Uptime:    uptime,
 			LastError: lastError,

client/components/routeservers/protocols/index.jsx

@@ -67,6 +67,9 @@ class NeighboursTable extends React.Component {
         pipe_filtered_count = n.pipe_filtered_count
       }
 
+      var filtered_count:int = received_count-accepted_count;
+      var filtered_print:string = (filtered_count < 0) ? "0" : filtered_count.toString();
+
       return (
         <tr key={n.id}>
           <td>
@@ -110,7 +113,7 @@ class NeighboursTable extends React.Component {
               <RoutesLink routeserverId={this.props.routeserverId}
                           protocol={n.id}
                           state={n.state}>
-                {received_count - accepted_count}
+                {filtered_print}
               </RoutesLink>
             </td>
             <td>