OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

PushRules settings: Added sanity checks on new keywords

pull/641/head
manuroe 2016-01-13 15:47:00 +01:00
parent e5b7a47fee
commit c4cb37606b
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/views/settings/Notifications.js
View File

@ -132,7 +132,8 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Can't update user notification settings", title: "Can't update user notification settings",
description: error.toString() description: error.toString(),
onFinished: self._refreshFromServer
}); });
}); });
} }
@ -163,6 +164,7 @@ module.exports = React.createClass({
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
title: "Keywords", title: "Keywords",
description: this.keywordsDialogDiv, description: this.keywordsDialogDiv,
focus: false,
onFinished: function onFinished(should_leave) { onFinished: function onFinished(should_leave) {
if (should_leave && self.newKeywords) { if (should_leave && self.newKeywords) {
@ -173,6 +175,15 @@ module.exports = React.createClass({
for (var i in newKeywords) { for (var i in newKeywords) {
newKeywords[i] = newKeywords[i].trim(); newKeywords[i] = newKeywords[i].trim();
} }
// Remove duplicates and empty
newKeywords = newKeywords.reduce(function(array, keyword){
if (keyword !== "" && array.indexOf(keyword) < 0) {
array.push(keyword);
}
return array;
},[]);
self.setState({ self.setState({
phase: self.phases.LOADING phase: self.phases.LOADING
}); });
@ -184,7 +195,7 @@ module.exports = React.createClass({
vectorContentRulesPatterns.push(rule.pattern); vectorContentRulesPatterns.push(rule.pattern);
if (-1 === newKeywords.indexOf(rule.pattern)) { if (newKeywords.indexOf(rule.pattern) < 0) {
removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id)); removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
} }
} }
@ -194,7 +205,7 @@ module.exports = React.createClass({
for (var i in self.state.externalContentRules) { for (var i in self.state.externalContentRules) {
var rule = self.state.externalContentRules[i]; var rule = self.state.externalContentRules[i];
if (-1 !== newKeywords.indexOf(rule.pattern)) { if (newKeywords.indexOf(rule.pattern) >= 0) {
removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id)); removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
} }
} }
@ -203,7 +214,8 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Can't update keywords", title: "Can't update keywords",
description: error.toString() description: error.toString(),
onFinished: self._refreshFromServer
}); });
} }
@ -213,7 +225,7 @@ module.exports = React.createClass({
for (var i in newKeywords) { for (var i in newKeywords) {
var keyword = newKeywords[i]; var keyword = newKeywords[i];
if (-1 === vectorContentRulesPatterns.indexOf(keyword)) { if (vectorContentRulesPatterns.indexOf(keyword) < 0) {
deferreds.push(cli.addPushRule('global', 'content', keyword, { deferreds.push(cli.addPushRule('global', 'content', keyword, {
actions: self._actionsFor(self.state.vectorContentRules.state), actions: self._actionsFor(self.state.vectorContentRules.state),
pattern: keyword pattern: keyword
@ -394,7 +406,7 @@ module.exports = React.createClass({
self.state.vectorPushRules.push({ self.state.vectorPushRules.push({
"vectorRuleId": "keywords", "vectorRuleId": "keywords",
"description" : (<span>Messages containing <span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>keywords</span></span>), "description" : (<span>Messages containing <span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>keywords</span></span>),
"state": self.state.vectorContentRules.state, "state": self.state.vectorContentRules.state
}); });
// Messages just sent to the user // Messages just sent to the user
@ -541,6 +553,8 @@ module.exports = React.createClass({
var onKeywordsChange = function(e) { var onKeywordsChange = function(e) {
self.newKeywords = e.target.value; self.newKeywords = e.target.value;
this.props.onFinished(false);
}; };
this.keywordsDialogDiv = ( this.keywordsDialogDiv = (
@ -584,7 +598,7 @@ module.exports = React.createClass({
</div> </div>
</div> </div>
<h3>General use </h3> <h3>General use</h3>
<div className="mx_UserNotifSettings_pushRulesTableWrapper"> <div className="mx_UserNotifSettings_pushRulesTableWrapper">
<table className="mx_UserNotifSettings_pushRulesTable"> <table className="mx_UserNotifSettings_pushRulesTable">