mirror of
https://github.com/discourse/discourse.git
synced 2024-12-14 07:43:43 +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
84 lines
2.0 KiB
JavaScript
84 lines
2.0 KiB
JavaScript
import Controller from "@ember/controller";
|
|
import { ajax } from "discourse/lib/ajax";
|
|
import { action } from "@ember/object";
|
|
import { alias } from "@ember/object/computed";
|
|
import discourseComputed from "discourse-common/utils/decorators";
|
|
import { popupAjaxError } from "discourse/lib/ajax-error";
|
|
|
|
export default Controller.extend({
|
|
pingDisabled: false,
|
|
incomingCount: alias("incomingEventIds.length"),
|
|
|
|
init() {
|
|
this._super(...arguments);
|
|
|
|
this.incomingEventIds = [];
|
|
},
|
|
|
|
@discourseComputed("incomingCount")
|
|
hasIncoming(incomingCount) {
|
|
return incomingCount > 0;
|
|
},
|
|
|
|
subscribe() {
|
|
this.messageBus.subscribe(
|
|
`/web_hook_events/${this.get("model.extras.web_hook_id")}`,
|
|
(data) => {
|
|
if (data.event_type === "ping") {
|
|
this.set("pingDisabled", false);
|
|
}
|
|
this._addIncoming(data.web_hook_event_id);
|
|
}
|
|
);
|
|
},
|
|
|
|
unsubscribe() {
|
|
this.messageBus.unsubscribe("/web_hook_events/*");
|
|
},
|
|
|
|
_addIncoming(eventId) {
|
|
const incomingEventIds = this.incomingEventIds;
|
|
|
|
if (!incomingEventIds.includes(eventId)) {
|
|
incomingEventIds.pushObject(eventId);
|
|
}
|
|
},
|
|
|
|
@action
|
|
showInserted(event) {
|
|
event?.preventDefault();
|
|
const webHookId = this.get("model.extras.web_hook_id");
|
|
|
|
ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
|
|
type: "GET",
|
|
data: { ids: this.incomingEventIds },
|
|
}).then((data) => {
|
|
const objects = data.map((webHookEvent) =>
|
|
this.store.createRecord("web-hook-event", webHookEvent)
|
|
);
|
|
this.model.unshiftObjects(objects);
|
|
this.set("incomingEventIds", []);
|
|
});
|
|
},
|
|
|
|
actions: {
|
|
loadMore() {
|
|
this.model.loadMore();
|
|
},
|
|
|
|
ping() {
|
|
this.set("pingDisabled", true);
|
|
|
|
ajax(
|
|
`/admin/api/web_hooks/${this.get("model.extras.web_hook_id")}/ping`,
|
|
{
|
|
type: "POST",
|
|
}
|
|
).catch((error) => {
|
|
this.set("pingDisabled", false);
|
|
popupAjaxError(error);
|
|
});
|
|
},
|
|
},
|
|
});
|