Skip to content

Commit bc81d30

Browse files
CvXCvX
authored
DEV: Update linting (#181)
1 parent bd9bf83 commit bc81d30

27 files changed

+1128
-908
lines changed

Diff for: ‎.eslintrc

-3
This file was deleted.

Diff for: ‎.eslintrc.cjs

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

Diff for: ‎.prettierrc

-1
This file was deleted.

Diff for: ‎.prettierrc.cjs

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

Diff for: ‎.template-lintrc.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/template-lint");

Diff for: ‎.template-lintrc.js

-4
This file was deleted.

Diff for: ‎Gemfile.lock

+29-18
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,56 @@
11
GIT
22
remote: https://github.com/discourse/translations-manager.git
3-
revision: d6da5ff928b9ea39a15c9b6f16b856f46bc9069b
3+
revision: a8b225f7fabd3250ba88a4a2eff797693df51192
44
specs:
55
translations-manager (0.6)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
1010
ast (2.4.2)
11-
json (2.6.2)
12-
parallel (1.22.1)
13-
parser (3.1.2.1)
11+
json (2.6.3)
12+
language_server-protocol (3.17.0.3)
13+
parallel (1.23.0)
14+
parser (3.2.2.4)
1415
ast (~> 2.4.1)
15-
prettier_print (1.2.0)
16+
racc
17+
prettier_print (1.2.1)
18+
racc (1.7.3)
1619
rainbow (3.1.1)
17-
regexp_parser (2.6.0)
18-
rexml (3.2.5)
19-
rubocop (1.36.0)
20+
regexp_parser (2.8.2)
21+
rexml (3.2.6)
22+
rubocop (1.57.2)
2023
json (~> 2.3)
24+
language_server-protocol (>= 3.17.0)
2125
parallel (~> 1.10)
22-
parser (>= 3.1.2.1)
26+
parser (>= 3.2.2.4)
2327
rainbow (>= 2.2.2, < 4.0)
2428
regexp_parser (>= 1.8, < 3.0)
2529
rexml (>= 3.2.5, < 4.0)
26-
rubocop-ast (>= 1.20.1, < 2.0)
30+
rubocop-ast (>= 1.28.1, < 2.0)
2731
ruby-progressbar (~> 1.7)
28-
unicode-display_width (>= 1.4.0, < 3.0)
29-
rubocop-ast (1.21.0)
30-
parser (>= 3.1.1.0)
31-
rubocop-discourse (3.0)
32+
unicode-display_width (>= 2.4.0, < 3.0)
33+
rubocop-ast (1.30.0)
34+
parser (>= 3.2.1.0)
35+
rubocop-capybara (2.19.0)
36+
rubocop (~> 1.41)
37+
rubocop-discourse (3.4.1)
3238
rubocop (>= 1.1.0)
3339
rubocop-rspec (>= 2.0.0)
34-
rubocop-rspec (2.13.2)
40+
rubocop-factory_bot (2.24.0)
3541
rubocop (~> 1.33)
36-
ruby-progressbar (1.11.0)
37-
syntax_tree (5.1.0)
42+
rubocop-rspec (2.25.0)
43+
rubocop (~> 1.40)
44+
rubocop-capybara (~> 2.17)
45+
rubocop-factory_bot (~> 2.22)
46+
ruby-progressbar (1.13.0)
47+
syntax_tree (6.2.0)
3848
prettier_print (>= 1.2.0)
39-
unicode-display_width (2.3.0)
49+
unicode-display_width (2.5.0)
4050

4151
PLATFORMS
4252
ruby
53+
x86_64-linux
4354

4455
DEPENDENCIES
4556
rubocop-discourse

Diff for: ‎admin/assets/javascripts/admin/components/channel-details.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Component from "@glimmer/component";
2+
import { action } from "@ember/object";
3+
import { inject as service } from "@ember/service";
24
import { popupAjaxError } from "discourse/lib/ajax-error";
35
import I18n from "I18n";
4-
import { inject as service } from "@ember/service";
5-
import { action } from "@ember/object";
66

77
export default class ChannelDetails extends Component {
88
@service dialog;

Diff for: ‎admin/assets/javascripts/admin/components/channel-param-row.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
2-
import EmberObject, { action } from "@ember/object";
32
import { tracked } from "@glimmer/tracking";
3+
import EmberObject, { action } from "@ember/object";
44
import I18n from "I18n";
55

66
export default class ChannelParamRow extends Component {

Diff for: ‎admin/assets/javascripts/admin/components/rule-row.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { action } from "@ember/object";
21
import Component from "@glimmer/component";
3-
import { popupAjaxError } from "discourse/lib/ajax-error";
2+
import { action } from "@ember/object";
43
import { inject as service } from "@ember/service";
4+
import { popupAjaxError } from "discourse/lib/ajax-error";
55
export default class RuleRow extends Component {
66
@service siteSettings;
77

Diff for: ‎admin/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Controller from "@ember/controller";
2-
import showModal from "discourse/lib/show-modal";
31
import { tracked } from "@glimmer/tracking";
2+
import Controller from "@ember/controller";
43
import { action } from "@ember/object";
4+
import showModal from "discourse/lib/show-modal";
55

66
const MODALS = {
77
editChannel: "admin-plugins-chat-integration-edit-channel",

Diff for: ‎admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { tracked } from "@glimmer/tracking";
12
import Controller from "@ember/controller";
2-
import ModalFunctionality from "discourse/mixins/modal-functionality";
3-
import { popupAjaxError } from "discourse/lib/ajax-error";
43
import { action } from "@ember/object";
5-
import { tracked } from "@glimmer/tracking";
4+
import { popupAjaxError } from "discourse/lib/ajax-error";
5+
import ModalFunctionality from "discourse/mixins/modal-functionality";
66

77
export default class AdminPluginsChatIntegrationEditChannel extends Controller.extend(
88
ModalFunctionality

Diff for: ‎admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import Controller from "@ember/controller";
2-
import ModalFunctionality from "discourse/mixins/modal-functionality";
3-
import { popupAjaxError } from "discourse/lib/ajax-error";
41
import { tracked } from "@glimmer/tracking";
2+
import Controller from "@ember/controller";
53
import { action } from "@ember/object";
64
import { inject as service } from "@ember/service";
5+
import { popupAjaxError } from "discourse/lib/ajax-error";
6+
import ModalFunctionality from "discourse/mixins/modal-functionality";
77

88
export default class AdminPluginsChatIntegrationEditRule extends Controller.extend(
99
ModalFunctionality

Diff for: ‎admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { tracked } from "@glimmer/tracking";
12
import Controller from "@ember/controller";
3+
import { action } from "@ember/object";
24
import { not } from "@ember/object/computed";
3-
import I18n from "I18n";
4-
import ModalFunctionality from "discourse/mixins/modal-functionality";
55
import { ajax } from "discourse/lib/ajax";
66
import { popupAjaxError } from "discourse/lib/ajax-error";
7-
import { action } from "@ember/object";
8-
import { tracked } from "@glimmer/tracking";
7+
import ModalFunctionality from "discourse/mixins/modal-functionality";
8+
import I18n from "I18n";
99

1010
export default class AdminPluginsChatIntegrationTest extends Controller.extend(
1111
ModalFunctionality

Diff for: ‎admin/assets/javascripts/admin/models/rule.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import I18n from "I18n";
2-
import RestModel from "discourse/models/rest";
3-
import Category from "discourse/models/category";
41
import { tracked } from "@glimmer/tracking";
2+
import Category from "discourse/models/category";
3+
import RestModel from "discourse/models/rest";
4+
import I18n from "I18n";
55

66
export default class Rule extends RestModel {
77
@tracked type = "normal";

Diff for: ‎admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import DiscourseRoute from "discourse/routes/discourse";
21
import { inject as service } from "@ember/service";
2+
import DiscourseRoute from "discourse/routes/discourse";
33

44
export default class AdminPluginsChatIntegrationIndex extends DiscourseRoute {
55
@service router;

Diff for: ‎admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import DiscourseRoute from "discourse/routes/discourse";
2-
import Group from "discourse/models/group";
31
import { action } from "@ember/object";
42
import RSVP from "rsvp";
3+
import Group from "discourse/models/group";
4+
import DiscourseRoute from "discourse/routes/discourse";
55

66
export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute {
77
model(params) {

Diff for: ‎admin/assets/javascripts/admin/routes/admin-plugins-chat-integration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DiscourseRoute from "discourse/routes/discourse";
21
import { action } from "@ember/object";
32
import { inject as service } from "@ember/service";
3+
import DiscourseRoute from "discourse/routes/discourse";
44

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

Diff for: ‎admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
@title="chat_integration.edit_channel_modal.save"
4949
@label="chat_integration.edit_channel_modal.save"
5050
@action={{action "save"}}
51-
@disabled={{(not this.validParams)}}
51+
@disabled={{not this.validParams}}
5252
/>
5353

5454
<DButton

Diff for: ‎admin/assets/javascripts/admin/templates/plugins-chat-integration.hbs

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<NavItem
77
@route="adminPlugins.chat-integration.provider"
88
@routeParam={{provider.name}}
9-
@label={{(concat
10-
"chat_integration.provider." provider.name ".title"
11-
)}}
9+
@label={{concat
10+
"chat_integration.provider."
11+
provider.name
12+
".title"
13+
}}
1214
/>
1315
{{/each}}
1416
</ul>

Diff for: ‎app/helpers/helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def self.status_for_channel(channel)
145145
def self.delete_by_index(channel, index)
146146
rules = channel.rules.order_by_precedence
147147
return false if index < (1) || index > (rules.size)
148-
return :deleted if rules[index - 1].destroy
148+
:deleted if rules[index - 1].destroy
149149
end
150150

151151
# Create a rule for a specific channel

Diff for: ‎app/models/rule.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ class DiscourseChatIntegration::Rule < DiscourseChatIntegration::PluginModel
99
scope :with_channel_id, ->(channel_id) { where("value::json->>'channel_id'=?", channel_id.to_s) }
1010

1111
scope :with_category_id,
12-
->(category_id) {
12+
->(category_id) do
1313
if category_id.nil?
1414
where(
1515
"(value::json->'category_id') IS NULL OR json_typeof(value::json->'category_id')='null'",
1616
)
1717
else
1818
where("value::json->>'category_id'=?", category_id.to_s)
1919
end
20-
}
20+
end
2121

2222
scope :with_group_ids,
2323
->(group_id) { where("value::json->>'group_id' IN (?)", group_id.map!(&:to_s)) }
2424

2525
scope :order_by_precedence,
26-
-> {
26+
-> do
2727
order(
2828
"
2929
CASE
@@ -42,7 +42,7 @@ class DiscourseChatIntegration::Rule < DiscourseChatIntegration::PluginModel
4242
END
4343
",
4444
)
45-
}
45+
end
4646

4747
after_initialize :init_filter
4848

Diff for: ‎assets/javascripts/discourse/routes/transcript.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { inject as service } from "@ember/service";
12
import { ajax } from "discourse/lib/ajax";
23
import { popupAjaxError } from "discourse/lib/ajax-error";
34
import DiscourseRoute from "discourse/routes/discourse";
4-
import { inject as service } from "@ember/service";
55

66
export default class Trascript extends DiscourseRoute {
77
@service currentUser;

Diff for: ‎package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"author": "Discourse",
66
"license": "MIT",
77
"devDependencies": {
8-
"eslint-config-discourse": "^3.4.0"
8+
"@discourse/lint-configs": "^1.2.0",
9+
"ember-template-lint": "^5.13.0",
10+
"eslint": "^8.54.0",
11+
"prettier": "^2.8.8"
912
}
1013
}

Diff for: ‎plugin.rb

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# version: 0.1
77
# url: https://github.com/discourse/discourse-chat-integration
88
# author: David Taylor
9-
# transpile_js: true
109

1110
enabled_site_setting :chat_integration_enabled
1211

Diff for: ‎test/javascripts/acceptance/chat-integration-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
2+
import { test } from "qunit";
13
import {
24
acceptance,
35
exists,
46
query,
57
queryAll,
68
} from "discourse/tests/helpers/qunit-helpers";
7-
import { test } from "qunit";
8-
import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
99

1010
const response = (object) => {
1111
return [200, { "Content-Type": "text/html; charset=utf-8" }, object];

0 commit comments

Comments
 (0)