mirror of
https://github.com/discourse/discourse.git
synced 2025-02-10 05:14:59 +00:00
* FEATURE: Add case-sensitivity flag to watched_words Currently, all watched words are matched case-insensitively. This flag allows a watched word to be flagged for case-sensitive matching. To allow allow for backwards compatibility the flag is set to false by default. * FEATURE: Support case-sensitive creation of Watched Words via API Extend admin creation and upload of Watched Words to support case sensitive flag. This lays the ground work for supporting case-insensitive matching of Watched Words. Support for an extra column has also been introduced for the Watched Words upload CSV file. The new column structure is as follows: word,replacement,case_sentive * FEATURE: Enable case-sensitive matching of Watched Words WordWatcher's word_matcher_regexp now returns a list of regular expressions instead of one case-insensitive regular expression. With the ability to flag a Watched Word as case-sensitive, an action can have words of both sensitivities.This makes the use of the global Regexp::IGNORECASE flag added to all words problematic. To get around platform limitations around the use of subexpression level switches/flags, a list of regular expressions is returned instead, one for each case sensitivity. Word matching has also been updated to use this list of regular expressions instead of one. * FEATURE: Use case-sensitive regular expressions for Watched Words Update Watched Words regular expressions matching and processing to handle the extra metadata which comes along with the introduction of case-sensitive Watched Words. This allows case-sensitive Watched Words to matched as such. * DEV: Simplify type casting of case-sensitive flag from uploads Use builtin semantics instead of a custom method for converting string case flags in uploaded Watched Words to boolean. * UX: Add case-sensitivity details to Admin Watched Words UI Update Watched Word form to include a toggle for case-sensitivity. This also adds support for, case-sensitive testing and matching of Watched Word in the admin UI. * DEV: Code improvements from review feedback - Extract watched word regex creation out to a utility function - Make JS array presence check more explicit and readable * DEV: Extract Watched Word regex creation to utility function Clean-up work from review feedback. Reduce code duplication. * DEV: Rename word_matcher_regexp to word_matcher_regexp_list Since a list is returned now instead of a single regular expression, change `word_matcher_regexp` to `word_matcher_regexp_list` to better communicate this change. * DEV: Incorporate WordWatcher updates from upstream Resolve conflicts and ensure apply_to_text does not remove non-word characters in matches that aren't at the beginning of the line.
119 lines
3.3 KiB
JavaScript
119 lines
3.3 KiB
JavaScript
import discourseComputed, { observes } from "discourse-common/utils/decorators";
|
|
import Component from "@ember/component";
|
|
import I18n from "I18n";
|
|
import WatchedWord from "admin/models/watched-word";
|
|
import bootbox from "bootbox";
|
|
import { equal } from "@ember/object/computed";
|
|
import { isEmpty } from "@ember/utils";
|
|
import { schedule } from "@ember/runloop";
|
|
|
|
export default Component.extend({
|
|
tagName: "form",
|
|
classNames: ["watched-word-form"],
|
|
formSubmitted: false,
|
|
actionKey: null,
|
|
showMessage: false,
|
|
selectedTags: null,
|
|
isCaseSensitive: false,
|
|
|
|
canReplace: equal("actionKey", "replace"),
|
|
canTag: equal("actionKey", "tag"),
|
|
canLink: equal("actionKey", "link"),
|
|
|
|
didInsertElement() {
|
|
this._super(...arguments);
|
|
this.set("selectedTags", []);
|
|
},
|
|
|
|
@discourseComputed("siteSettings.watched_words_regular_expressions")
|
|
placeholderKey(watchedWordsRegularExpressions) {
|
|
if (watchedWordsRegularExpressions) {
|
|
return "admin.watched_words.form.placeholder_regexp";
|
|
} else {
|
|
return "admin.watched_words.form.placeholder";
|
|
}
|
|
},
|
|
|
|
@observes("word")
|
|
removeMessage() {
|
|
if (this.showMessage && !isEmpty(this.word)) {
|
|
this.set("showMessage", false);
|
|
}
|
|
},
|
|
|
|
@discourseComputed("word")
|
|
isUniqueWord(word) {
|
|
const words = this.filteredContent || [];
|
|
const filtered = words.filter(
|
|
(content) => content.action === this.actionKey
|
|
);
|
|
return filtered.every(
|
|
(content) => content.word.toLowerCase() !== word.toLowerCase()
|
|
);
|
|
},
|
|
|
|
actions: {
|
|
changeSelectedTags(tags) {
|
|
this.setProperties({
|
|
selectedTags: tags,
|
|
replacement: tags.join(","),
|
|
});
|
|
},
|
|
|
|
submit() {
|
|
if (!this.isUniqueWord) {
|
|
this.setProperties({
|
|
showMessage: true,
|
|
message: I18n.t("admin.watched_words.form.exists"),
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!this.formSubmitted) {
|
|
this.set("formSubmitted", true);
|
|
|
|
const watchedWord = WatchedWord.create({
|
|
word: this.word,
|
|
replacement:
|
|
this.canReplace || this.canTag || this.canLink
|
|
? this.replacement
|
|
: null,
|
|
action: this.actionKey,
|
|
isCaseSensitive: this.isCaseSensitive,
|
|
});
|
|
|
|
watchedWord
|
|
.save()
|
|
.then((result) => {
|
|
this.setProperties({
|
|
word: "",
|
|
replacement: "",
|
|
formSubmitted: false,
|
|
selectedTags: [],
|
|
showMessage: true,
|
|
message: I18n.t("admin.watched_words.form.success"),
|
|
isCaseSensitive: false,
|
|
});
|
|
this.action(WatchedWord.create(result));
|
|
schedule("afterRender", () =>
|
|
this.element.querySelector("input").focus()
|
|
);
|
|
})
|
|
.catch((e) => {
|
|
this.set("formSubmitted", false);
|
|
const msg = e.jqXHR.responseJSON?.errors
|
|
? I18n.t("generic_error_with_reason", {
|
|
error: e.jqXHR.responseJSON.errors.join(". "),
|
|
})
|
|
: I18n.t("generic_error");
|
|
bootbox.alert(msg, () =>
|
|
schedule("afterRender", () =>
|
|
this.element.querySelector("input").focus()
|
|
)
|
|
);
|
|
});
|
|
}
|
|
},
|
|
},
|
|
});
|