mirror of
https://github.com/discourse/discourse.git
synced 2024-12-14 14:25:59 +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
85 lines
3.8 KiB
Handlebars
85 lines
3.8 KiB
Handlebars
<p>{{i18n "admin.logs.screened_ips.description"}}</p>
|
|
|
|
<div class="screened-ip-controls">
|
|
<div class="filter-screened-ip-address inline-form">
|
|
<TextField @value={{this.filter}} @class="ip-address-input" @placeholderKey="admin.logs.screened_ips.form.filter" @autocorrect="off" @autocapitalize="off" />
|
|
<DButton @class="btn-default" @action={{action "exportScreenedIpList"}} @icon="download" @title="admin.export_csv.button_title.screened_ip" @label="admin.export_csv.button_text" />
|
|
</div>
|
|
|
|
<ScreenedIpAddressForm @action={{action "recordAdded"}} />
|
|
</div>
|
|
|
|
<ConditionalLoadingSpinner @condition={{this.loading}}>
|
|
{{#if this.model.length}}
|
|
<table class="admin-logs-table screened-ip-addresses grid">
|
|
<thead class="heading-container">
|
|
<th class="col heading first ip_address">{{i18n "admin.logs.ip_address"}}</th>
|
|
<th class="col heading action">{{i18n "admin.logs.action"}}</th>
|
|
<th class="col heading match_count">{{i18n "admin.logs.match_count"}}</th>
|
|
<th class="col heading created_at">{{i18n "admin.logs.created_at"}}</th>
|
|
<th class="col heading last_match_at">{{i18n "admin.logs.last_match_at"}}</th>
|
|
<th class="col heading actions"></th>
|
|
</thead>
|
|
<tbody>
|
|
{{#each this.model as |item|}}
|
|
<tr class="admin-list-item">
|
|
<td class="col first ip_address">
|
|
{{#if item.editing}}
|
|
<TextField @value={{item.ip_address}} @autofocus="autofocus" />
|
|
{{else}}
|
|
<a href {{on "click" (fn this.edit item)}} class="inline-editable-field">
|
|
{{#if item.isRange}}
|
|
<strong>{{item.ip_address}}</strong>
|
|
{{else}}
|
|
{{item.ip_address}}
|
|
{{/if}}
|
|
</a>
|
|
{{/if}}
|
|
</td>
|
|
<td class="col action">
|
|
{{#if item.isBlocked}}
|
|
{{d-icon "ban"}}
|
|
{{else}}
|
|
{{d-icon "check"}}
|
|
{{/if}}
|
|
{{item.actionName}}
|
|
</td>
|
|
<td class="col match_count">
|
|
<div class="label">{{i18n "admin.logs.match_count"}}</div>
|
|
{{item.match_count}}
|
|
</td>
|
|
<td class="col created_at">
|
|
<div class="label">{{i18n "admin.logs.created_at"}}</div>
|
|
{{age-with-tooltip item.created_at}}
|
|
</td>
|
|
<td class="col last_match_at">
|
|
{{#if item.last_match_at}}
|
|
<div class="label">
|
|
{{i18n "admin.logs.last_match_at"}}
|
|
{{age-with-tooltip item.last_match_at}}
|
|
</div>
|
|
{{/if}}
|
|
</td>
|
|
<td class="col actions">
|
|
{{#if item.editing}}
|
|
<DButton @class="btn-default" @action={{action "save"}} @actionParam={{item}} @label="admin.logs.save" />
|
|
<DButton @class="btn-flat" @action={{action "cancel" item}} @translatedLabel={{i18n "cancel"}} />
|
|
{{else}}
|
|
<DButton @class="btn-default btn-danger" @action={{action "destroy"}} @actionParam={{item}} @icon="far-trash-alt" />
|
|
<DButton @class="btn-default" @action={{action "edit"}} @actionParam={{item}} @icon="pencil-alt" />
|
|
{{#if item.isBlocked}}
|
|
<DButton @class="btn-default" @action={{action "allow"}} @actionParam={{item}} @icon="check" @label="admin.logs.screened_ips.actions.do_nothing" />
|
|
{{else}}
|
|
<DButton @class="btn-default" @action={{action "block"}} @actionParam={{item}} @icon="ban" @label="admin.logs.screened_ips.actions.block" />
|
|
{{/if}}
|
|
{{/if}}
|
|
</td>
|
|
</tr>
|
|
{{/each}}
|
|
</tbody>
|
|
</table>
|
|
{{else}}
|
|
{{i18n "search.no_results"}}
|
|
{{/if}}
|
|
</ConditionalLoadingSpinner>
|