Skip to content

Commit a2f0ce6

Browse files
committed
DEV: [gjs-codemod] Convert all templates to gjs
1 parent bbb5147 commit a2f0ce6

31 files changed

+1301
-724
lines changed

Gemfile.lock

+17-15
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,44 @@ GEM
1414
securerandom (>= 0.3)
1515
tzinfo (~> 2.0, >= 2.0.5)
1616
uri (>= 0.13.1)
17-
ast (2.4.2)
17+
ast (2.4.3)
1818
base64 (0.2.0)
1919
benchmark (0.4.0)
2020
bigdecimal (3.1.9)
2121
concurrent-ruby (1.3.5)
22-
connection_pool (2.5.0)
22+
connection_pool (2.5.3)
2323
drb (2.2.1)
2424
i18n (1.14.7)
2525
concurrent-ruby (~> 1.0)
26-
json (2.10.2)
26+
json (2.11.3)
2727
language_server-protocol (3.17.0.4)
2828
lint_roller (1.1.0)
29-
logger (1.6.6)
29+
logger (1.7.0)
3030
minitest (5.25.5)
31-
parallel (1.26.3)
32-
parser (3.3.7.1)
31+
parallel (1.27.0)
32+
parser (3.3.8.0)
3333
ast (~> 2.4.1)
3434
racc
3535
prettier_print (1.2.1)
36+
prism (1.4.0)
3637
racc (1.8.1)
37-
rack (3.1.12)
38+
rack (3.1.14)
3839
rainbow (3.1.1)
3940
regexp_parser (2.10.0)
40-
rubocop (1.74.0)
41+
rubocop (1.75.5)
4142
json (~> 2.3)
4243
language_server-protocol (~> 3.17.0.2)
4344
lint_roller (~> 1.1.0)
4445
parallel (~> 1.10)
4546
parser (>= 3.3.0.2)
4647
rainbow (>= 2.2.2, < 4.0)
4748
regexp_parser (>= 2.9.3, < 3.0)
48-
rubocop-ast (>= 1.38.0, < 2.0)
49+
rubocop-ast (>= 1.44.0, < 2.0)
4950
ruby-progressbar (~> 1.7)
5051
unicode-display_width (>= 2.4.0, < 4.0)
51-
rubocop-ast (1.38.1)
52-
parser (>= 3.3.1.0)
52+
rubocop-ast (1.44.1)
53+
parser (>= 3.3.7.2)
54+
prism (~> 1.4)
5355
rubocop-capybara (2.22.1)
5456
lint_roller (~> 1.1)
5557
rubocop (~> 1.72, >= 1.72.1)
@@ -65,13 +67,13 @@ GEM
6567
rubocop-factory_bot (2.27.1)
6668
lint_roller (~> 1.1)
6769
rubocop (~> 1.72, >= 1.72.1)
68-
rubocop-rails (2.30.3)
70+
rubocop-rails (2.31.0)
6971
activesupport (>= 4.2.0)
7072
lint_roller (~> 1.1)
7173
rack (>= 1.1)
72-
rubocop (>= 1.72.1, < 2.0)
74+
rubocop (>= 1.75.0, < 2.0)
7375
rubocop-ast (>= 1.38.0, < 2.0)
74-
rubocop-rspec (3.5.0)
76+
rubocop-rspec (3.6.0)
7577
lint_roller (~> 1.1)
7678
rubocop (~> 1.72, >= 1.72.1)
7779
rubocop-rspec_rails (2.31.0)
@@ -97,4 +99,4 @@ DEPENDENCIES
9799
syntax_tree
98100

99101
BUNDLED WITH
100-
2.6.6
102+
2.6.8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import avatar from "discourse/helpers/avatar";
2+
3+
const AssignedTo = <template>
4+
<div class="assigned-to-user">
5+
{{avatar @user imageSize="small"}}
6+
7+
<span class="assigned-username">
8+
{{@user.username}}
9+
</span>
10+
11+
{{yield}}
12+
</div>
13+
</template>;
14+
15+
export default AssignedTo;

assets/javascripts/discourse/components/assigned-to.hbs

-9
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import { and } from "truth-helpers";
2+
import UserStatusMessage from "discourse/components/user-status-message";
3+
import avatar from "discourse/helpers/avatar";
4+
import icon from "discourse/helpers/d-icon";
5+
import decorateUsernameSelector from "discourse/helpers/decorate-username-selector";
6+
import formatUsername from "discourse/helpers/format-username";
7+
import EmailGroupUserChooserRow from "select-kit/components/email-group-user-chooser-row";
8+
9+
export default class AssigneeChooserRow extends EmailGroupUserChooserRow {
10+
<template>
11+
{{#if this.item.isUser}}
12+
{{avatar this.item imageSize="tiny"}}
13+
<div class="user-wrapper">
14+
<span class="identifier">{{formatUsername this.item.id}}</span>
15+
<span class="name">{{this.item.name}}</span>
16+
{{#if (and this.item.showUserStatus this.item.status)}}
17+
<UserStatusMessage
18+
@status={{this.item.status}}
19+
@showDescription={{true}}
20+
/>
21+
{{/if}}
22+
</div>
23+
{{decorateUsernameSelector this.item.id}}
24+
{{else if this.item.isGroup}}
25+
{{icon "users"}}
26+
<div class="user-wrapper">
27+
<span class="identifier">{{this.item.id}}</span>
28+
<span class="name">{{this.item.full_name}}</span>
29+
</div>
30+
{{else}}
31+
{{icon "envelope"}}
32+
<span class="identifier">{{this.item.id}}</span>
33+
{{/if}}
34+
</template>
35+
}

assets/javascripts/discourse/components/assignee-chooser-row.hbs

-23
This file was deleted.

assets/javascripts/discourse/components/assignee-chooser-row.js

-3
This file was deleted.

assets/javascripts/discourse/components/assignment.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { TextArea } from "@ember/legacy-built-in-components";
44
import { on } from "@ember/modifier";
55
import { action } from "@ember/object";
66
import { service } from "@ember/service";
7+
import { not } from "truth-helpers";
78
import icon from "discourse/helpers/d-icon";
89
import { i18n } from "discourse-i18n";
910
import ComboBox from "select-kit/components/combo-box";
10-
import not from "truth-helpers/helpers/not";
1111
import AssigneeChooser from "./assignee-chooser";
1212

1313
export default class Assignment extends Component {

assets/javascripts/discourse/components/bulk-actions/assign-user.js renamed to assets/javascripts/discourse/components/bulk-actions/assign-user.gjs

+24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
33
import { TrackedObject } from "@ember-compat/tracked-built-ins";
4+
import DButton from "discourse/components/d-button";
5+
import AssignUserForm from "../assign-user-form";
46

57
export default class AssignUser extends Component {
68
model = new TrackedObject({});
@@ -19,4 +21,26 @@ export default class AssignUser extends Component {
1921
note: this.model.note,
2022
});
2123
}
24+
25+
<template>
26+
<div>
27+
<AssignUserForm
28+
@model={{this.model}}
29+
@onSubmit={{this.assign}}
30+
@formApi={{this.formApi}}
31+
/>
32+
</div>
33+
34+
<div>
35+
<DButton
36+
class="btn-primary"
37+
@action={{this.formApi.submit}}
38+
@label={{if
39+
this.model.reassign
40+
"discourse_assign.reassign.title"
41+
"discourse_assign.assign_modal.assign"
42+
}}
43+
/>
44+
</div>
45+
</template>
2246
}

assets/javascripts/discourse/components/bulk-actions/assign-user.hbs

-19
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { hash } from "@ember/helper";
2+
import { LinkTo } from "@ember/routing";
3+
import avatar from "discourse/helpers/avatar";
4+
import icon from "discourse/helpers/d-icon";
5+
import formatUsername from "discourse/helpers/format-username";
6+
import { i18n } from "discourse-i18n";
7+
8+
const GroupAssignedFilter = <template>
9+
<li>
10+
{{#if @showAvatar}}
11+
<LinkTo
12+
@route="group.assigned.show"
13+
@model={{@filter.username_lower}}
14+
@query={{hash order=@order ascending=@ascending search=@search}}
15+
>
16+
<div class="assign-image">
17+
<a
18+
href={{@filter.userPath}}
19+
data-user-card={{@filter.username}}
20+
>{{avatar this.filter imageSize="large"}}</a>
21+
</div>
22+
23+
<div class="assign-names">
24+
<div class="assign-username">{{formatUsername @filter.username}}</div>
25+
<div class="assign-name">{{@filter.name}}</div>
26+
</div>
27+
28+
<div class="assign-count">
29+
{{@filter.assignments_count}}
30+
</div>
31+
</LinkTo>
32+
{{else if @groupName}}
33+
<LinkTo
34+
@route="group.assigned.show"
35+
@model={{@filter}}
36+
@query={{hash order=@order ascending=@ascending search=@search}}
37+
>
38+
<div class="assign-image">
39+
{{icon "group-plus"}}
40+
</div>
41+
<div class="assign-names">
42+
<div class="assign-username">{{@groupName}}</div>
43+
</div>
44+
45+
<div class="assign-count">
46+
{{@assignmentCount}}
47+
</div>
48+
</LinkTo>
49+
{{else}}
50+
<LinkTo
51+
@route="group.assigned.show"
52+
@model={{@filter}}
53+
@query={{hash order=@order ascending=@ascending search=@search}}
54+
>
55+
<div class="assign-everyone">
56+
{{i18n "discourse_assign.group_everyone"}}
57+
</div>
58+
<div class="assign-count">
59+
{{@assignmentCount}}
60+
</div>
61+
</LinkTo>
62+
{{/if}}
63+
</li>
64+
</template>;
65+
66+
export default GroupAssignedFilter;

assets/javascripts/discourse/components/group-assigned-filter.hbs

-55
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { LinkTo } from "@ember/routing";
2+
import icon from "discourse/helpers/d-icon";
3+
import { i18n } from "discourse-i18n";
4+
5+
const GroupAssignedMenuItem = <template>
6+
<LinkTo @route="group.assigned">
7+
{{icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
8+
({{@group.assignment_count}})
9+
</LinkTo>
10+
</template>;
11+
12+
export default GroupAssignedMenuItem;

assets/javascripts/discourse/components/group-assigned-menu-item.hbs

-4
This file was deleted.

0 commit comments

Comments
 (0)