2019-07-03 04:18:11 -04:00
|
|
|
import Component from "@ember/component";
|
2023-10-10 14:38:59 -04:00
|
|
|
import { action } from "@ember/object";
|
|
|
|
import { and, gt } from "@ember/object/computed";
|
|
|
|
import { classNameBindings, classNames } from "@ember-decorators/component";
|
Consistently import `escape` from `discourse-common` (#23790)
`escape` from `pretty-text/sanitizer` is a re-export of the same
function defined in `discourse-common`. Updating the import paths
across the codebase to use the `discourse-common` import path.
`escape` is a rather simple function that can be accomplished with
a regular expression in `discourse-common`.
On the other hand, the remaining parts in `pretty-text/sanitizer`
has a lot of code, PLUS it depend on the rather heavy "xss" NPM
library.
Currently, most of the consumers of `pretty-text/sanitizer` are of
the `{ escape }` varient. This is resolved by this PR.
The remaining usages are either:
1. via/through `PrettyText` which is essentially gated behind
loading the markdown-it bundle, OR
2. via `sanitize` from `discourse/lib/text`
I believe we may ultimately be able to move all the usages to behind
the markdown-it bundle (or, equivilantly, set up another lazy bundle
for `sanitize`) and be able to shed the sanitization code and the
"xss" library from the initial page load.
`discourse/lib/text` also defines a `sanitizeAsync` which is gated
behind loading the markdown-it bundle.
Looking through the usages of `sanitize`, I believe most of these
can be safely switched to use `sanitizeAsync`, in that they are
already in an asynchrnous path that handles a server response. Most
of them are actually rendering a piece of server-generated HTML
message as flash message, so I am not sure there really is value in
sanitizing (we should be able to trust our own server?), but in any
case, code-wise, they should already be able to absorb the async
just fine.
I am not sure if `sanitize` and `sanitizeAsync` are actually API
compatible – they both take `options` but I think those `options` do
pretty different things. This is somethign for another person to
investigate down the road in another PR.
According to `all-the-plugins`, `discourse-graphviz` also import
from this location, so perhaps we should PR to update. That being
said, it doesn't really hurt anything to keep the alias around for
a while.
2023-10-11 17:21:01 -04:00
|
|
|
import escape from "discourse-common/lib/escape";
|
2019-07-03 04:18:11 -04:00
|
|
|
import { iconHTML } from "discourse-common/lib/icon-library";
|
2023-10-10 14:38:59 -04:00
|
|
|
import discourseComputed from "discourse-common/utils/decorators";
|
2018-08-30 15:23:15 -04:00
|
|
|
|
|
|
|
const MAX_COMPONENTS = 4;
|
|
|
|
|
2023-02-23 10:32:53 -05:00
|
|
|
@classNames("themes-list-item")
|
|
|
|
@classNameBindings("theme.selected:selected")
|
|
|
|
export default class ThemesListItem extends Component {
|
|
|
|
childrenExpanded = false;
|
|
|
|
|
|
|
|
@gt("children.length", 0) hasComponents;
|
|
|
|
|
|
|
|
@and("hasComponents", "theme.isActive") displayComponents;
|
|
|
|
|
|
|
|
@gt("theme.childThemes.length", MAX_COMPONENTS) displayHasMore;
|
2018-09-06 14:56:00 -04:00
|
|
|
|
|
|
|
click(e) {
|
2022-06-02 17:01:24 -04:00
|
|
|
if (!e.target.classList.contains("others-count")) {
|
2018-09-06 14:56:00 -04:00
|
|
|
this.navigateToTheme();
|
|
|
|
}
|
2023-02-23 10:32:53 -05:00
|
|
|
}
|
2018-09-06 14:56:00 -04:00
|
|
|
|
2019-11-07 16:38:28 -05:00
|
|
|
@discourseComputed(
|
2018-08-30 15:23:15 -04:00
|
|
|
"theme.component",
|
|
|
|
"theme.childThemes.@each.name",
|
2018-09-06 14:56:00 -04:00
|
|
|
"theme.childThemes.length",
|
|
|
|
"childrenExpanded"
|
2018-08-30 15:23:15 -04:00
|
|
|
)
|
|
|
|
children() {
|
2019-05-27 04:15:39 -04:00
|
|
|
const theme = this.theme;
|
2018-09-06 14:56:00 -04:00
|
|
|
let children = theme.get("childThemes");
|
2018-08-30 15:23:15 -04:00
|
|
|
if (theme.get("component") || !children) {
|
|
|
|
return [];
|
|
|
|
}
|
2019-05-27 04:15:39 -04:00
|
|
|
children = this.childrenExpanded
|
2018-09-06 14:56:00 -04:00
|
|
|
? children
|
|
|
|
: children.slice(0, MAX_COMPONENTS);
|
2019-07-03 04:18:11 -04:00
|
|
|
return children.map((t) => {
|
|
|
|
const name = escape(t.name);
|
|
|
|
return t.enabled ? name : `${iconHTML("ban")} ${name}`;
|
|
|
|
});
|
2023-02-23 10:32:53 -05:00
|
|
|
}
|
2018-08-30 15:23:15 -04:00
|
|
|
|
2019-11-07 16:38:28 -05:00
|
|
|
@discourseComputed("children")
|
2018-11-13 08:57:50 -05:00
|
|
|
childrenString(children) {
|
|
|
|
return children.join(", ");
|
2023-02-23 10:32:53 -05:00
|
|
|
}
|
2018-11-13 08:57:50 -05:00
|
|
|
|
2019-11-07 16:38:28 -05:00
|
|
|
@discourseComputed(
|
2018-09-06 14:56:00 -04:00
|
|
|
"theme.childThemes.length",
|
|
|
|
"theme.component",
|
|
|
|
"childrenExpanded",
|
|
|
|
"children.length"
|
|
|
|
)
|
|
|
|
moreCount(childrenCount, component, expanded) {
|
|
|
|
if (component || !childrenCount || expanded) {
|
2018-08-30 15:23:15 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return childrenCount - MAX_COMPONENTS;
|
2023-02-23 10:32:53 -05:00
|
|
|
}
|
2018-09-06 14:56:00 -04:00
|
|
|
|
DEV: Remove usage of {{action}} modifiers - Take 2 (#18476)
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
2022-10-05 08:08:54 -04:00
|
|
|
@action
|
|
|
|
toggleChildrenExpanded(event) {
|
|
|
|
event?.preventDefault();
|
|
|
|
this.toggleProperty("childrenExpanded");
|
2023-02-23 10:32:53 -05:00
|
|
|
}
|
|
|
|
}
|