Adding switcher to define matching type for stream. Updating results.

app/controllers/api/StreamsApiController.java

@@ -6,6 +6,7 @@
 import controllers.AuthenticatedController;
 import lib.json.Json;
 import models.descriptions.StreamDescription;
+import org.graylog2.rest.models.streams.requests.UpdateStreamRequest;
 import org.graylog2.restclient.lib.APIException;
 import org.graylog2.restclient.models.Stream;
 import org.graylog2.restclient.models.StreamService;
@@ -60,7 +61,7 @@ public Result resume(String streamId) throws APIException, IOException {
 
     public Result update(String streamId) throws APIException, IOException {
         final JsonNode json = request().body().asJson();
-        final CreateStreamRequest request = Json.fromJson(json, CreateStreamRequest.class);
+        final UpdateStreamRequest request = Json.fromJson(json, UpdateStreamRequest.class);
 
         this.streamService.update(streamId, request);
         return ok();

javascript/src/components/streamrules/StreamRulesEditor.jsx

@@ -10,6 +10,7 @@ var StreamRulesStore = require('../../stores/streams/StreamRulesStore');
 var Alert = require('react-bootstrap').Alert;
 var StreamRuleForm = require('./StreamRuleForm');
 var Spinner = require('../common/Spinner');
+var MatchingTypeSwitcher = require('../streams/MatchingTypeSwitcher');
 
 var StreamRulesEditor = React.createClass({
     getInitialState() {
@@ -54,12 +55,12 @@ var StreamRulesEditor = React.createClass({
             if (this.state.matchData.matches) {
                 return (
                     <span>
-                        <i className="fa fa-check" style={{"color":"green"}}/> This message matches all rules and would be routed to this stream.
+                        <i className="fa fa-check" style={{"color":"green"}}/> This message would be routed to this stream.
                     </span>);
             } else {
                 return (
                     <span>
-                        <i className="fa fa-remove" style={{"color":"red"}}/> This message does not match one or more of the rules and would not be routed to this stream.
+                        <i className="fa fa-remove" style={{"color":"red"}}/> This message would not be routed to this stream.
                     </span>);
             }
         } else {
@@ -105,6 +106,7 @@ var StreamRulesEditor = React.createClass({
 
                         {this._explainMatchResult()}
 
+                        <MatchingTypeSwitcher stream={this.state.stream} onChange={this.loadData}/>
                         <Alert ref='well' bsStyle={styles}>
                             <StreamRuleList stream={this.state.stream} streamRuleTypes={this.state.streamRuleTypes}
                                             permissions={this.props.permissions} matchData={this.state.matchData}/>

javascript/src/components/streams/MatchingTypeSwitcher.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import { PropTypes, Component } from 'react';
+import { Input } from 'react-bootstrap';
+import StreamsStore from '../../stores/streams/StreamsStore';
+
+class MatchingTypeSwitcher extends Component {
+  static propTypes = {
+    stream: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+  }
+  render() {
+    const valueLink = {
+      value: this.props.stream.matching_type,
+      requestChange: this.handleTypeChange,
+      streamId: this.props.stream.id,
+      onChange: this.props.onChange,
+    };
+    return (
+      <div className="form-inline">
+        A message needs to match{' '}
+        <Input type="select" className="form-inline input-sm" valueLink={valueLink}>
+          <option value="AND">all rules</option>
+          <option value="OR">at least one rule</option>
+        </Input>
+        {' '}to be routed into this stream.{' '}
+      </div>
+    );
+  }
+
+  handleTypeChange(newValue) {
+    StreamsStore.update(this.streamId, { 'matching_type': newValue }, this.onChange);
+  }
+}
+
+export default MatchingTypeSwitcher;