mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 06:30:15 +08:00
03b7b7d1bc
This PR enables the [`no-action-modifiers`](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-action-modifiers.md) template lint rule and removes all usages of the `{{action}}` modifier in core. In general, instances of `{{action "x"}}` have been replaced with `{{on "click" (action "x")}}`. In many cases, such as for `a` elements, we also need to prevent default event handling to avoid unwanted side effects. While the `{{action}}` modifier internally calls `event.preventDefault()`, we need to handle these cases more explicitly. For this purpose, this PR also adds the [ember-event-helpers](https://github.com/buschtoens/ember-event-helpers) dependency so we can use the `prevent-default` handler. For instance: ``` <a href {{on "click" (prevent-default (action "x"))}}>Do X</a> ``` Note that `action` has not in general been refactored away as a helper yet. In general, all event handlers should be methods on the corresponding component and referenced directly (e.g. `{{on "click" this.doSomething}}`). However, the `action` helper is used extensively throughout the codebase and often references methods in the `actions` hash on controllers or routes. Thus this refactor will also be extensive and probably deserves a separate PR. Note: This work was done to complement #17767 by minimizing the potential impact of the `action` modifier override, which uses private API and arguably should be replaced with an AST transform. This is a followup to #18333, which had to be reverted because it did not account for the default treatment of modifier keys by the {{action}} modifier. Commits: * Enable `no-action-modifiers` template lint rule * Replace {{action "x"}} with {{on "click" (action "x")}} * Remove unnecessary action helper usage * Remove ctl+click tests for user-menu These tests now break in Chrome when used with addEventListener. As per the comment, they can probably be safely removed. * Prevent default event handlers to avoid unwanted side effects Uses `event.preventDefault()` in event handlers to prevent default event handling. This had been done automatically by the `action` modifier, but is not always desirable or necessary. * Restore UserCardContents#showUser action to avoid regression By keeping the `showUser` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showUser` argument that's been passed. * Revert EditCategoryTab#selectTab -> EditCategoryTab#select Avoid potential breaking change in themes / plugins * Restore GroupCardContents#showGroup action to avoid regression By keeping the `showGroup` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showGroup` argument that's been passed. * Restore SecondFactorAddTotp#showSecondFactorKey action to avoid regression By keeping the `showSecondFactorKey` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showSecondFactorKey` property that's maintained on the controller. * Refactor away from `actions` hash in ChooseMessage component * Modernize EmojiPicker#onCategorySelection usage * Modernize SearchResultEntry#logClick usage * Modernize Discovery::Categories#showInserted usage * Modernize Preferences::Account#resendConfirmationEmail usage * Modernize MultiSelect::SelectedCategory#onSelectedNameClick usage * Favor fn over action in SelectedChoice component * Modernize WizardStep event handlers * Favor fn over action usage in buttons * Restore Login#forgotPassword action to avoid possible regression * Introduce modKeysPressed utility Returns an array of modifier keys that are pressed during a given `MouseEvent` or `KeyboardEvent`. * Don't interfere with click events on links with `href` values when modifier keys are pressed
115 lines
3.1 KiB
JavaScript
115 lines
3.1 KiB
JavaScript
import Controller from "@ember/controller";
|
|
import I18n from "I18n";
|
|
import { INPUT_DELAY } from "discourse-common/config/environment";
|
|
import ScreenedIpAddress from "admin/models/screened-ip-address";
|
|
import discourseDebounce from "discourse-common/lib/debounce";
|
|
import { exportEntity } from "discourse/lib/export-csv";
|
|
import { observes } from "discourse-common/utils/decorators";
|
|
import { outputExportResult } from "discourse/lib/export-result";
|
|
import { action } from "@ember/object";
|
|
import { inject as service } from "@ember/service";
|
|
|
|
export default Controller.extend({
|
|
dialog: service(),
|
|
loading: false,
|
|
filter: null,
|
|
savedIpAddress: null,
|
|
|
|
_debouncedShow() {
|
|
this.set("loading", true);
|
|
ScreenedIpAddress.findAll(this.filter).then((result) => {
|
|
this.setProperties({ model: result, loading: false });
|
|
});
|
|
},
|
|
|
|
@observes("filter")
|
|
show() {
|
|
discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
|
|
},
|
|
|
|
@action
|
|
edit(record, event) {
|
|
event?.preventDefault();
|
|
if (!record.get("editing")) {
|
|
this.set("savedIpAddress", record.get("ip_address"));
|
|
}
|
|
record.set("editing", true);
|
|
},
|
|
|
|
actions: {
|
|
allow(record) {
|
|
record.set("action_name", "do_nothing");
|
|
record.save();
|
|
},
|
|
|
|
block(record) {
|
|
record.set("action_name", "block");
|
|
record.save();
|
|
},
|
|
|
|
cancel(record) {
|
|
const savedIpAddress = this.savedIpAddress;
|
|
if (savedIpAddress && record.get("editing")) {
|
|
record.set("ip_address", savedIpAddress);
|
|
}
|
|
record.set("editing", false);
|
|
},
|
|
|
|
save(record) {
|
|
const wasEditing = record.get("editing");
|
|
record.set("editing", false);
|
|
record
|
|
.save()
|
|
.then(() => this.set("savedIpAddress", null))
|
|
.catch((e) => {
|
|
if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
|
|
this.dialog.alert(
|
|
I18n.t("generic_error_with_reason", {
|
|
error: e.jqXHR.responseJSON.errors.join(". "),
|
|
})
|
|
);
|
|
} else {
|
|
this.dialog.alert(I18n.t("generic_error"));
|
|
}
|
|
if (wasEditing) {
|
|
record.set("editing", true);
|
|
}
|
|
});
|
|
},
|
|
|
|
destroy(record) {
|
|
return this.dialog.yesNoConfirm({
|
|
message: I18n.t("admin.logs.screened_ips.delete_confirm", {
|
|
ip_address: record.get("ip_address"),
|
|
}),
|
|
didConfirm: () => {
|
|
return record
|
|
.destroy()
|
|
.then((deleted) => {
|
|
if (deleted) {
|
|
this.model.removeObject(record);
|
|
} else {
|
|
this.dialog.alert(I18n.t("generic_error"));
|
|
}
|
|
})
|
|
.catch((e) => {
|
|
this.dialog.alert(
|
|
I18n.t("generic_error_with_reason", {
|
|
error: `http: ${e.status} - ${e.body}`,
|
|
})
|
|
);
|
|
});
|
|
},
|
|
});
|
|
},
|
|
|
|
recordAdded(arg) {
|
|
this.model.unshiftObject(arg);
|
|
},
|
|
|
|
exportScreenedIpList() {
|
|
exportEntity("screened_ip").then(outputExportResult);
|
|
},
|
|
},
|
|
});
|