Skip to content

Commit 519f185

Browse files
cvxcvx
authored
DEV: [gjs-codemod] Convert all templates to gjs (#273)
1 parent 930ec25 commit 519f185

17 files changed

Lines changed: 660 additions & 598 deletions

File tree

‎Gemfile.lock‎

Lines changed: 20 additions & 18 deletions
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)
23-
drb (2.2.1)
22+
connection_pool (2.5.3)
23+
drb (2.2.3)
2424
i18n (1.14.7)
2525
concurrent-ruby (~> 1.0)
26-
json (2.10.2)
27-
language_server-protocol (3.17.0.4)
26+
json (2.12.2)
27+
language_server-protocol (3.17.0.5)
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.15)
3839
rainbow (3.1.1)
3940
regexp_parser (2.10.0)
40-
rubocop (1.74.0)
41+
rubocop (1.75.8)
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.32.0)
6971
activesupport (>= 4.2.0)
7072
lint_roller (~> 1.1)
7173
rack (>= 1.1)
72-
rubocop (>= 1.72.1, < 2.0)
73-
rubocop-ast (>= 1.38.0, < 2.0)
74-
rubocop-rspec (3.5.0)
74+
rubocop (>= 1.75.0, < 2.0)
75+
rubocop-ast (>= 1.44.0, < 2.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.9

‎admin/assets/javascripts/discourse/connectors/admin-menu/upgrade-link.gjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import Component from "@ember/component";
2+
import { classNames, tagName } from "@ember-decorators/component";
3+
import NavItem from "discourse/components/nav-item";
4+
5+
@tagName("")
6+
@classNames("admin-menu-outlet", "upgrade-link")
7+
export default class UpgradeLink extends Component {
8+
<template>
9+
{{#if this.currentUser.admin}}
10+
<NavItem @route="update" @label="admin.docker.update_tab" />
11+
{{/if}}
12+
</template>
13+
}

‎admin/assets/javascripts/discourse/connectors/admin-menu/upgrade-link.hbs‎

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

‎admin/assets/javascripts/discourse/connectors/admin-upgrade-header/upgrade-header.gjs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import Component from "@ember/component";
2+
import { classNames, tagName } from "@ember-decorators/component";
3+
import UpgradeNotice from "../../components/docker-manager/upgrade-notice";
4+
5+
@tagName("")
6+
@classNames("admin-upgrade-header-outlet", "upgrade-header")
7+
export default class UpgradeHeader extends Component {
8+
<template>
9+
<UpgradeNotice @versionCheck={{@outletArgs.versionCheck}} />
10+
</template>
11+
}

‎admin/assets/javascripts/discourse/connectors/admin-upgrade-header/upgrade-header.hbs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎admin/assets/javascripts/discourse/templates/update-index.gjs‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import { on } from "@ember/modifier";
2+
import RouteTemplate from "ember-route-template";
3+
import DButton from "discourse/components/d-button";
4+
import { i18n } from "discourse-i18n";
5+
import RepoStatus from "../components/repo-status";
6+
7+
export default RouteTemplate(
8+
<template>
9+
<div class="updates-heading">
10+
{{#unless @controller.outdated}}
11+
<DButton
12+
disabled={{@controller.upgradeAllButtonDisabled}}
13+
id="upgrade-all"
14+
class="btn btn-primary"
15+
type="button"
16+
{{on "click" @controller.upgradeAllButton}}
17+
>
18+
{{#if @controller.allUpToDate}}
19+
{{i18n "admin.docker.all_up_to_date"}}
20+
{{else}}
21+
{{i18n "admin.docker.update_all"}}
22+
{{/if}}
23+
</DButton>
24+
{{/unless}}
25+
</div>
26+
27+
{{#if @controller.outdated}}
28+
<h2>{{i18n "admin.docker.outdated_image_header"}}</h2>
29+
<p>{{i18n "admin.docker.outdated_image_info"}}</p>
30+
31+
{{!-- prettier-ignore --}}
32+
<pre>
33+
cd /var/discourse
34+
./launcher rebuild app
35+
</pre>
36+
<p>
37+
<a
38+
href="https://meta.discourse.org/t/how-do-i-update-my-docker-image-to-latest/23325"
39+
>
40+
{{i18n "admin.docker.outdated_image_link"}}
41+
</a>
42+
</p>
43+
{{else}}
44+
45+
<table class="d-admin-table" id="repos">
46+
<thead>
47+
<th>{{i18n "admin.docker.repo.name"}}</th>
48+
<th>{{i18n "admin.docker.repo.commit_hash"}}</th>
49+
<th>{{i18n "admin.docker.repo.last_updated"}}</th>
50+
<th>{{i18n "admin.docker.repo.latest_version"}}</th>
51+
<th>{{i18n "admin.docker.repo.status"}}</th>
52+
</thead>
53+
<tbody>
54+
{{#each @controller.model as |repo|}}
55+
<RepoStatus
56+
@repo={{repo}}
57+
@upgradingRepo={{repo.upgrading}}
58+
@managerRepo={{@controller.managerRepo}}
59+
/>
60+
{{/each}}
61+
</tbody>
62+
</table>
63+
{{/if}}
64+
</template>
65+
);

‎admin/assets/javascripts/discourse/templates/update-index.hbs‎

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

‎admin/assets/javascripts/discourse/templates/update-processes.gjs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import RouteTemplate from "ember-route-template";
2+
import Console from "../components/docker-manager/console";
3+
4+
export default RouteTemplate(
5+
<template><Console @output={{@controller.model.output}} /></template>
6+
);

‎admin/assets/javascripts/discourse/templates/update-processes.hbs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎admin/assets/javascripts/discourse/templates/update-show.gjs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import { on } from "@ember/modifier";
2+
import RouteTemplate from "ember-route-template";
3+
import { i18n } from "discourse-i18n";
4+
import Console from "../components/docker-manager/console";
5+
import ProgressBar from "../components/docker-manager/progress-bar";
6+
7+
export default RouteTemplate(
8+
<template>
9+
<h2>{{@controller.title}}</h2>
10+
11+
<ProgressBar @percent={{@controller.upgradeStore.progressPercentage}} />
12+
13+
{{#if @controller.complete}}
14+
<p>{{i18n "admin.docker.update_successful"}}</p>
15+
{{else if @controller.failed}}
16+
<p>{{i18n "admin.docker.update_error"}}</p>
17+
{{/if}}
18+
19+
{{#if @controller.isUpToDate}}
20+
{{#if @controller.multiUpgrade}}
21+
<p>{{i18n "admin.docker.everything_up_to_date"}}</p>
22+
{{else}}
23+
<p>{{i18n
24+
"admin.docker.repo_newest_version"
25+
name=@controller.model.name
26+
}}</p>
27+
{{/if}}
28+
{{else}}
29+
<div class="upgrade-actions">
30+
<button
31+
{{on "click" @controller.start}}
32+
disabled={{@controller.upgrading}}
33+
class="btn start-upgrade"
34+
type="button"
35+
>
36+
{{#if @controller.upgrading}}
37+
{{i18n "admin.docker.updating"}}
38+
{{else}}
39+
{{i18n "admin.docker.start_updating"}}
40+
{{/if}}
41+
</button>
42+
43+
{{#if @controller.upgrading}}
44+
<button
45+
{{on "click" @controller.resetUpgrade}}
46+
class="btn unlock"
47+
type="button"
48+
>
49+
{{i18n "admin.docker.reset_update"}}
50+
</button>
51+
{{/if}}
52+
</div>
53+
{{/if}}
54+
55+
<Console
56+
@output={{@controller.upgradeStore.consoleOutput}}
57+
@followOutput={{true}}
58+
/>
59+
</template>
60+
);

0 commit comments

Comments
 (0)