Skip to content

Commit 71f8484

Browse files
CvXCvX
authored
DEV: Use @discourse/lint-configs (#517)
1 parent 6ed4a13 commit 71f8484

37 files changed

+375
-655
lines changed

‎.eslintrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.eslintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/eslint");

‎.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.bundle/
2-
auto_generated
3-
.DS_Store
4-
node_modules/
1+
node_modules
2+
/gems
3+
/auto_generated

‎.prettierrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.prettierrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/prettier");

‎.template-lintrc.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
module.exports = {
2-
plugins: ["ember-template-lint-plugin-discourse"],
3-
extends: "discourse:recommended",
4-
};
1+
module.exports = require("@discourse/lint-configs/template-lint");

‎assets/javascripts/discourse/components/assign-actions-dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { action } from "@ember/object";
12
import I18n from "I18n";
23
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
3-
import { action } from "@ember/object";
44

55
export default DropdownSelectBoxComponent.extend({
66
classNames: ["assign-actions-dropdown"],

‎assets/javascripts/discourse/components/assigned-topic-list-column.gjs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,9 @@
11
import Component from "@glimmer/component";
2-
import AssignActionsDropdown from "./assign-actions-dropdown";
3-
import { inject as service } from "@ember/service";
42
import { action } from "@ember/object";
3+
import { inject as service } from "@ember/service";
4+
import AssignActionsDropdown from "./assign-actions-dropdown";
55

66
export default class AssignedTopicListColumn extends Component {
7-
<template>
8-
{{#if @topic.assigned_to_user}}
9-
<AssignActionsDropdown
10-
@topic={{@topic}}
11-
@assignee={{@topic.assigned_to_user.username}}
12-
@unassign={{this.unassign}}
13-
@reassign={{this.reassign}}
14-
/>
15-
{{else if @topic.assigned_to_group}}
16-
<AssignActionsDropdown
17-
@topic={{@topic}}
18-
@assignee={{@topic.assigned_to_group.name}}
19-
@group={{true}}
20-
@unassign={{this.unassign}}
21-
@reassign={{this.reassign}}
22-
/>
23-
{{else}}
24-
<AssignActionsDropdown @topic={{@topic}} @unassign={{this.unassign}} />
25-
{{/if}}
26-
</template>
27-
287
@service taskActions;
298
@service router;
309

@@ -40,4 +19,25 @@ export default class AssignedTopicListColumn extends Component {
4019
onSuccess: () => this.router.refresh(),
4120
});
4221
}
22+
23+
<template>
24+
{{#if @topic.assigned_to_user}}
25+
<AssignActionsDropdown
26+
@topic={{@topic}}
27+
@assignee={{@topic.assigned_to_user.username}}
28+
@unassign={{this.unassign}}
29+
@reassign={{this.reassign}}
30+
/>
31+
{{else if @topic.assigned_to_group}}
32+
<AssignActionsDropdown
33+
@topic={{@topic}}
34+
@assignee={{@topic.assigned_to_group.name}}
35+
@group={{true}}
36+
@unassign={{this.unassign}}
37+
@reassign={{this.reassign}}
38+
/>
39+
{{else}}
40+
<AssignActionsDropdown @topic={{@topic}} @unassign={{this.unassign}} />
41+
{{/if}}
42+
</template>
4343
}

‎assets/javascripts/discourse/components/remind-assigns-frequency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@ember/component";
2-
import I18n from "I18n";
32
import discourseComputed from "discourse-common/utils/decorators";
3+
import I18n from "I18n";
44

55
export default class RemindAssignsFrequency extends Component {
66
@discourseComputed(

‎assets/javascripts/discourse/components/user-menu/assigns-list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
22
import { ajax } from "discourse/lib/ajax";
33
import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
4-
import UserMenuAssignItem from "../../lib/user-menu/assign-item";
54
import Notification from "discourse/models/notification";
6-
import I18n from "I18n";
75
import Topic from "discourse/models/topic";
6+
import I18n from "I18n";
7+
import UserMenuAssignItem from "../../lib/user-menu/assign-item";
88
import UserMenuAssignsListEmptyState from "./assigns-list-empty-state";
99

1010
export default class UserMenuAssignNotificationsList extends UserMenuNotificationsList {

‎assets/javascripts/discourse/controllers/group-assigned-show.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import UserTopicsList from "discourse/controllers/user-topics-list";
2-
import { alias } from "@ember/object/computed";
3-
import discourseDebounce from "discourse-common/lib/debounce";
4-
import { INPUT_DELAY } from "discourse-common/config/environment";
51
import { inject as controller } from "@ember/controller";
6-
import { inject as service } from "@ember/service";
72
import { action } from "@ember/object";
3+
import { alias } from "@ember/object/computed";
4+
import { inject as service } from "@ember/service";
5+
import UserTopicsList from "discourse/controllers/user-topics-list";
6+
import { INPUT_DELAY } from "discourse-common/config/environment";
7+
import discourseDebounce from "discourse-common/lib/debounce";
88

99
export default class GroupAssignedShow extends UserTopicsList {
1010
@service taskActions;

‎assets/javascripts/discourse/controllers/group-assigned.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { inject as service } from "@ember/service";
21
import Controller, { inject as controller } from "@ember/controller";
32
import { action } from "@ember/object";
3+
import { inject as service } from "@ember/service";
44
import { ajax } from "discourse/lib/ajax";
5-
import discourseComputed from "discourse-common/utils/decorators";
6-
import discourseDebounce from "discourse-common/lib/debounce";
75
import { INPUT_DELAY } from "discourse-common/config/environment";
6+
import discourseDebounce from "discourse-common/lib/debounce";
7+
import discourseComputed from "discourse-common/utils/decorators";
88

99
export default class GroupAssigned extends Controller {
1010
@service router;

‎assets/javascripts/discourse/controllers/user-activity-assigned.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import UserTopicsList from "discourse/controllers/user-topics-list";
2-
import discourseComputed from "discourse-common/utils/decorators";
3-
import discourseDebounce from "discourse-common/lib/debounce";
4-
import { INPUT_DELAY } from "discourse-common/config/environment";
51
import { inject as controller } from "@ember/controller";
6-
import { inject as service } from "@ember/service";
72
import { action } from "@ember/object";
3+
import { inject as service } from "@ember/service";
4+
import { htmlSafe } from "@ember/template";
5+
import UserTopicsList from "discourse/controllers/user-topics-list";
6+
import { INPUT_DELAY } from "discourse-common/config/environment";
7+
import discourseDebounce from "discourse-common/lib/debounce";
88
import getURL from "discourse-common/lib/get-url";
99
import { iconHTML } from "discourse-common/lib/icon-library";
10+
import discourseComputed from "discourse-common/utils/decorators";
1011
import I18n from "I18n";
11-
import { htmlSafe } from "@ember/template";
1212

1313
export default class UserActivityAssigned extends UserTopicsList {
1414
@service taskActions;

‎assets/javascripts/discourse/initializers/assign-extend-user-messages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import I18n from "I18n";
21
import { withPluginApi } from "discourse/lib/plugin-api";
2+
import I18n from "I18n";
33

44
export default {
55
name: "assign-extend-user-messages",

‎assets/javascripts/discourse/initializers/extend-for-assigns.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
import { htmlSafe } from "@ember/template";
2+
import { isEmpty } from "@ember/utils";
3+
import { h } from "virtual-dom";
4+
import SearchAdvancedOptions from "discourse/components/search-advanced-options";
15
import { renderAvatar } from "discourse/helpers/user-avatar";
26
import { withPluginApi } from "discourse/lib/plugin-api";
3-
import discourseComputed from "discourse-common/utils/decorators";
4-
import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
7+
import { registerTopicFooterDropdown } from "discourse/lib/register-topic-footer-dropdown";
58
import { escapeExpression } from "discourse/lib/utilities";
6-
import { h } from "virtual-dom";
9+
import RawHtml from "discourse/widgets/raw-html";
710
import { getOwner } from "discourse-common/lib/get-owner";
8-
import { htmlSafe } from "@ember/template";
911
import getURL from "discourse-common/lib/get-url";
10-
import SearchAdvancedOptions from "discourse/components/search-advanced-options";
12+
import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
13+
import discourseComputed from "discourse-common/utils/decorators";
1114
import I18n from "I18n";
12-
import { isEmpty } from "@ember/utils";
13-
import { registerTopicFooterDropdown } from "discourse/lib/register-topic-footer-dropdown";
14-
import RawHtml from "discourse/widgets/raw-html";
1515
import BulkAssign from "../components/bulk-actions/assign-user";
1616

1717
const PLUGIN_ID = "discourse-assign";

‎assets/javascripts/discourse/lib/user-menu/assign-item.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import UserMenuBaseItem from "discourse/lib/user-menu/base-item";
2-
import { postUrl } from "discourse/lib/utilities";
31
import { htmlSafe } from "@ember/template";
42
import { emojiUnescape } from "discourse/lib/text";
3+
import UserMenuBaseItem from "discourse/lib/user-menu/base-item";
4+
import { postUrl } from "discourse/lib/utilities";
55
import I18n from "I18n";
66

77
const ICON = "user-plus";

‎assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Category from "discourse/models/category";
21
import { computed } from "@ember/object";
2+
import Category from "discourse/models/category";
33

44
export default {
55
name: "extend-category-for-assign",

‎assets/javascripts/discourse/raw-views/assign-topic-buttons.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import EmberObject from "@ember/object";
2+
import { inject as service } from "@ember/service";
23
import rawRenderGlimmer from "discourse/lib/raw-render-glimmer";
34
import AssignedTopicListColumn from "../components/assigned-topic-list-column";
4-
import { inject as service } from "@ember/service";
55

66
const ASSIGN_LIST_ROUTES = ["userActivity.assigned", "group.assigned.show"];
77

‎assets/javascripts/discourse/routes/group-assigned-show.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import DiscourseRoute from "discourse/routes/discourse";
21
import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
2+
import DiscourseRoute from "discourse/routes/discourse";
33

44
export default class GroupAssignedShow extends DiscourseRoute {
55
model(params) {

‎assets/javascripts/discourse/routes/group-assigned.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DiscourseRoute from "discourse/routes/discourse";
2-
import { ajax } from "discourse/lib/ajax";
31
import { inject as service } from "@ember/service";
2+
import { ajax } from "discourse/lib/ajax";
3+
import DiscourseRoute from "discourse/routes/discourse";
44

55
export default class GroupAssigned extends DiscourseRoute {
66
@service router;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import I18n from "I18n";
2-
import UserTopicListRoute from "discourse/routes/user-topic-list";
31
import cookie from "discourse/lib/cookie";
2+
import UserTopicListRoute from "discourse/routes/user-topic-list";
3+
import I18n from "I18n";
44

55
export default class UserActivityAssigned extends UserTopicListRoute {
66
templateName = "user-activity-assigned";

‎assets/javascripts/discourse/services/task-actions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import Service, { inject as service } from "@ember/service";
2-
import { ajax } from "discourse/lib/ajax";
3-
import AssignUser from "../components/modal/assign-user";
41
import { tracked } from "@glimmer/tracking";
2+
import Service, { inject as service } from "@ember/service";
53
import { isEmpty } from "@ember/utils";
4+
import { ajax } from "discourse/lib/ajax";
65
import { popupAjaxError } from "discourse/lib/ajax-error";
6+
import AssignUser from "../components/modal/assign-user";
77

88
export default class TaskActions extends Service {
99
@service modal;

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"author": "Discourse",
66
"license": "MIT",
77
"devDependencies": {
8-
"eslint-config-discourse": "^4.0.0",
9-
"prettier-plugin-ember-template-tag": "^0.3.2"
8+
"@discourse/lint-configs": "^1.0.0",
9+
"ember-template-lint": "^5.11.2",
10+
"eslint": "^8.51.0",
11+
"prettier": "^2.8.8"
1012
}
1113
}

‎test/javascripts/acceptance/assign-disabled-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import selectKit from "discourse/tests/helpers/select-kit-helper";
2-
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
31
import { visit } from "@ember/test-helpers";
42
import { test } from "qunit";
3+
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
4+
import selectKit from "discourse/tests/helpers/select-kit-helper";
55

66
acceptance("Discourse Assign | Assign disabled mobile", function (needs) {
77
needs.user({ can_assign: true });

‎test/javascripts/acceptance/assign-enabled-test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import selectKit from "discourse/tests/helpers/select-kit-helper";
2-
import { cloneJSON } from "discourse-common/lib/object";
3-
import userFixtures from "discourse/tests/fixtures/user-fixtures";
4-
import {
5-
acceptance,
6-
updateCurrentUser,
7-
} from "discourse/tests/helpers/qunit-helpers";
81
import { click, fillIn, visit } from "@ember/test-helpers";
92
import { test } from "qunit";
3+
import userFixtures from "discourse/tests/fixtures/user-fixtures";
104
import pretender, {
115
parsePostData,
126
response,
137
} from "discourse/tests/helpers/create-pretender";
8+
import {
9+
acceptance,
10+
updateCurrentUser,
11+
} from "discourse/tests/helpers/qunit-helpers";
12+
import selectKit from "discourse/tests/helpers/select-kit-helper";
13+
import { cloneJSON } from "discourse-common/lib/object";
1414

1515
acceptance("Discourse Assign | Assign mobile", function (needs) {
1616
needs.user();

‎test/javascripts/acceptance/assigned-topic-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import { visit } from "@ember/test-helpers";
12
import { test } from "qunit";
3+
import topicFixtures from "discourse/tests/fixtures/topic";
24
import {
35
acceptance,
46
query,
57
updateCurrentUser,
68
} from "discourse/tests/helpers/qunit-helpers";
7-
import { visit } from "@ember/test-helpers";
9+
import selectKit from "discourse/tests/helpers/select-kit-helper";
810
import { cloneJSON } from "discourse-common/lib/object";
911
import I18n from "I18n";
10-
import topicFixtures from "discourse/tests/fixtures/topic";
11-
import selectKit from "discourse/tests/helpers/select-kit-helper";
1212
import NotificationFixture from "../fixtures/notifications-fixtures";
1313

1414
function assignCurrentUserToTopic(needs) {

‎test/javascripts/acceptance/assigns-tab-user-menu-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { click, currentURL, visit } from "@ember/test-helpers";
2+
import { test } from "qunit";
3+
import { withPluginApi } from "discourse/lib/plugin-api";
14
import {
25
acceptance,
36
query,
47
queryAll,
58
updateCurrentUser,
69
} from "discourse/tests/helpers/qunit-helpers";
7-
import { click, currentURL, visit } from "@ember/test-helpers";
8-
import { test } from "qunit";
910
import I18n from "I18n";
10-
import { withPluginApi } from "discourse/lib/plugin-api";
1111

1212
const USER_MENU_ASSIGN_RESPONSE = {
1313
notifications: [

‎test/javascripts/acceptance/bulk-actions-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
2-
import { test } from "qunit";
31
import { click, fillIn, visit } from "@ember/test-helpers";
4-
import selectKit from "discourse/tests/helpers/select-kit-helper";
2+
import { test } from "qunit";
53
import pretender, {
64
parsePostData,
75
response,
86
} from "discourse/tests/helpers/create-pretender";
7+
import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
8+
import selectKit from "discourse/tests/helpers/select-kit-helper";
99
import I18n from "I18n";
1010

1111
acceptance("Discourse Assign | Bulk actions", function (needs) {

‎test/javascripts/acceptance/category-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
21
import { visit } from "@ember/test-helpers";
32
import { test } from "qunit";
4-
import I18n from "I18n";
53
import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
4+
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
5+
import I18n from "I18n";
66

77
function stubCategory(needs, customFields) {
88
needs.site({

‎test/javascripts/acceptance/group-assignments-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
21
import { visit } from "@ember/test-helpers";
2+
import { test } from "qunit";
3+
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
34
import AssignedTopics from "../fixtures/assigned-group-assignments-fixtures";
45
import GroupMembers from "../fixtures/group-members-fixtures";
5-
import { test } from "qunit";
66

77
acceptance("Discourse Assign | GroupAssignments", function (needs) {
88
needs.user();

0 commit comments

Comments
 (0)