Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.

Commit 3ff6bf8

Browse files
authored
DEV: Update linting (#644)
1 parent 586b66d commit 3ff6bf8

File tree

11 files changed

+446
-1144
lines changed

11 files changed

+446
-1144
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ DEPENDENCIES
9797
syntax_tree
9898

9999
BUNDLED WITH
100-
2.6.5
100+
2.6.6
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<div class="reviewable-filter discourse-assign-assign-to-filter">
22
<label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
3+
34
<EmailGroupUserChooser
4-
autocomplete="off"
5-
@value={{this.additionalFilters.assigned_to}}
5+
@value={{this.outletArgs.additionalFilters.assigned_to}}
66
@onChange={{this.updateAssignedTo}}
77
@options={{hash
88
maximum=1
99
fullWidthWrap=true
1010
includeGroups=false
1111
groupMembersOf=this.allowedGroups
1212
}}
13+
autocomplete="off"
1314
/>
1415
</div>
Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1+
import Component from "@ember/component";
12
import { action } from "@ember/object";
3+
import { service } from "@ember/service";
4+
import { classNames } from "@ember-decorators/component";
25

3-
export default {
4-
@action
5-
updateAssignedTo(selected) {
6-
this.set("additionalFilters.assigned_to", selected.firstObject);
7-
},
8-
9-
shouldRender(args) {
6+
@classNames("assigned-to-filter")
7+
export default class AssignedToFilter extends Component {
8+
static shouldRender(args) {
109
return args.additionalFilters;
11-
},
10+
}
11+
12+
@service site;
13+
@service siteSettings;
1214

13-
setupComponent(args, component) {
14-
const groupIDs = (component.siteSettings.assign_allowed_on_groups || "")
15-
.split("|")
16-
.filter(Boolean);
17-
const groupNames = this.site.groups
18-
.filter((group) => groupIDs.includes(group.id.toString()))
19-
.mapBy("name");
20-
component.set("allowedGroups", groupNames);
21-
},
22-
};
15+
groupIDs = (this.siteSettings.assign_allowed_on_groups || "")
16+
.split("|")
17+
.filter(Boolean);
18+
allowedGroups = this.site.groups
19+
.filter((group) => this.groupIDs.includes(group.id.toString()))
20+
.mapBy("name");
21+
22+
@action
23+
updateAssignedTo(selected) {
24+
this.set("outletArgs.additionalFilters.assigned_to", selected.firstObject);
25+
}
26+
}

assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.hbs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<div class="control-group">
2-
<label class="control-label" for="search-assigned-to">{{i18n
3-
"search.advanced.assigned.label"
4-
}}</label>
2+
<label class="control-label" for="search-assigned-to">
3+
{{i18n "search.advanced.assigned.label"}}
4+
</label>
5+
56
<div class="controls">
67
<EmailGroupUserChooser
7-
@value={{this.searchedTerms.assigned}}
8-
@onChange={{action "onChangeAssigned"}}
8+
@value={{this.outletArgs.searchedTerms.assigned}}
9+
@onChange={{this.onChangeAssigned}}
910
@options={{hash
1011
maximum=1
1112
excludeCurrentUser=false
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1+
import Component from "@ember/component";
12
import { action } from "@ember/object";
3+
import { service } from "@ember/service";
4+
import { classNames } from "@ember-decorators/component";
25

3-
export default {
4-
shouldRender(args, component) {
6+
@classNames("assigned-advanced-search")
7+
export default class AssignedAdvancedSearch extends Component {
8+
static shouldRender(args, component) {
59
return component.currentUser?.can_assign;
6-
},
10+
}
11+
12+
@service currentUser;
713

814
@action
915
onChangeAssigned(value) {
10-
this.onChangeSearchedTermField(
16+
this.outletArgs.onChangeSearchedTermField(
1117
"assigned",
1218
"updateSearchTermForAssignedUsername",
1319
value
1420
);
15-
},
16-
};
21+
}
22+
}

assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.hbs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<h3>{{i18n "discourse_assign.assign.title"}}</h3>
2+
23
<section class="field">
34
<div class="enable-accepted-answer">
45
<label class="checkbox-label">
56
<Input
67
@type="checkbox"
7-
@checked={{readonly this.category.enable_unassigned_filter}}
8-
{{on "change" (action "onChangeSetting" value="target.checked")}}
8+
@checked={{readonly this.outletArgs.category.enable_unassigned_filter}}
9+
{{on "change" this.onChangeSetting}}
910
/>
1011
{{i18n "discourse_assign.add_unassigned_filter"}}
1112
</label>
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
import Component from "@ember/component";
12
import { action } from "@ember/object";
3+
import { classNames } from "@ember-decorators/component";
24

3-
export default {
5+
@classNames("assign-settings")
6+
export default class AssignSettings extends Component {
47
@action
5-
onChangeSetting(value) {
8+
onChangeSetting(event) {
69
this.set(
7-
"category.custom_fields.enable_unassigned_filter",
8-
value ? "true" : "false"
10+
"outletArgs.category.custom_fields.enable_unassigned_filter",
11+
event.target.checked ? "true" : "false"
912
);
10-
},
11-
};
13+
}
14+
}

assets/javascripts/discourse/routes/user-activity-assigned.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { i18n } from "discourse-i18n";
55

66
export default class UserActivityAssigned extends UserTopicListRoute {
77
@service router;
8+
89
templateName = "user-activity-assigned";
910
controllerName = "user-activity-assigned";
1011

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.7.0",
5-
"ember-template-lint": "6.1.0",
6-
"eslint": "9.20.1",
7-
"prettier": "2.8.8",
8-
"stylelint": "16.14.1"
4+
"@discourse/lint-configs": "2.11.1",
5+
"ember-template-lint": "7.0.1",
6+
"eslint": "9.22.0",
7+
"prettier": "3.5.3",
8+
"stylelint": "16.16.0"
99
},
1010
"engines": {
1111
"node": ">= 22",

0 commit comments

Comments
 (0)