Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stream Rule Titles #2244

Merged
merged 8 commits into from May 19, 2016
Merged

Stream Rule Titles #2244

merged 8 commits into from May 19, 2016

Conversation

@dennisoelkers
Copy link
Member

@dennisoelkers dennisoelkers commented May 17, 2016

This adds the necessary functionality allowing users to define descriptions for individual stream rules.
It includes:

  • Extending the StreamRule persistence/service classes and DTOs with the description attribute
  • Extending the Stream Rules form and display components to include the description
  • Refactoring all Stream Rules React components on the fly, fixing linter hints
@dennisoelkers dennisoelkers added this to the 2.1.0 milestone May 17, 2016
@edmundoa edmundoa self-assigned this May 17, 2016
<div className="well well-sm matcher-github">
The server will try to convert to strings or numbers based on the matcher type as good as it
can.
<Input type="textarea" label="Description" valueLink={this.linkState('description')} />

This comment has been minimized.

@edmundoa

edmundoa May 19, 2016
Member

We use text inputs for most descriptions: do we expect to have such long descriptions here that we need a textarea?

This comment has been minimized.

@edmundoa

edmundoa May 19, 2016
Member

Never mind the previous comment, looking at the modal itself, I think that was the right choice, as the text input would look too small. Also, we have plenty of space to add the description alongside the stream rule.

}
return (
<div><i className="fa fa-spin fa-spinner"/> Loading</div>

This comment has been minimized.

@edmundoa

edmundoa May 19, 2016
Member

We could use the Spinner component in here.

@edmundoa
Copy link
Member

@edmundoa edmundoa commented May 19, 2016

LGTM 👍

I will replace the loading text with the Spinner component on master, no need to have this PR around for longer.

@edmundoa edmundoa merged commit 9dcad95 into master May 19, 2016
4 checks passed
4 checks passed
ci-server-integration Jenkins build graylog2-server-integration-pr 904 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 392 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@edmundoa edmundoa deleted the streamrule-titles branch May 19, 2016
joschi pushed a commit that referenced this pull request Aug 9, 2016
The "description" field of stream rules has to be nullable because otherwise
legacy stream rules with no description cannot be edited anymore.

Refs #2244, fixes #2346
bernd added a commit that referenced this pull request Aug 10, 2016
* Add stream rule description when cloning streams
* Make CreateStreamRuleRequest#description() nullable
  The "description" field of stream rules has to be nullable because otherwise
  legacy stream rules with no description cannot be edited anymore.

Refs #2244 
Fixes #2346
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.