From 7d7b067b9859c12280fd8191e8f3d126419bd2fd Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 16 Jan 2023 10:02:09 +0100
Subject: [PATCH] DEV: Tagless components

---
 .../discourse/components/progress-bar.hbs     |  12 +-
 .../discourse/components/progress-bar.js      |   2 +-
 .../discourse/components/repo-status.hbs      | 132 +++++++++---------
 .../discourse/components/repo-status.js       |   2 +-
 .../discourse/components/upgrade-notice.hbs   |  26 ++--
 .../discourse/components/upgrade-notice.js    |   2 +-
 .../discourse/components/x-console.hbs        |   4 +-
 .../discourse/components/x-console.js         |   2 +-
 8 files changed, 95 insertions(+), 87 deletions(-)

diff --git a/assets/javascripts/discourse/components/progress-bar.hbs b/assets/javascripts/discourse/components/progress-bar.hbs
index 59ba5b8..58f871f 100644
--- a/assets/javascripts/discourse/components/progress-bar.hbs
+++ b/assets/javascripts/discourse/components/progress-bar.hbs
@@ -1,5 +1,7 @@
-<div
-  class="progress-bar progress-bar-striped
-    {{if active 'progress-bar-animated'}}"
-  style={{barStyle}}
-></div>
+<div class="progress progress-striped {{if this.active 'active'}}">
+  <div
+    class="progress-bar progress-bar-striped
+      {{if this.active 'progress-bar-animated'}}"
+    style={{barStyle}}
+  ></div>
+</div>
diff --git a/assets/javascripts/discourse/components/progress-bar.js b/assets/javascripts/discourse/components/progress-bar.js
index ccf6310..93de6d4 100644
--- a/assets/javascripts/discourse/components/progress-bar.js
+++ b/assets/javascripts/discourse/components/progress-bar.js
@@ -3,7 +3,7 @@ import { computed } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
-  classNameBindings: [":progress", ":progress-striped", "active"],
+  tagName: "",
 
   active: computed("percent", function () {
     return parseInt(this.get("percent"), 10) !== 100;
diff --git a/assets/javascripts/discourse/components/repo-status.hbs b/assets/javascripts/discourse/components/repo-status.hbs
index 546e229..3394d3b 100644
--- a/assets/javascripts/discourse/components/repo-status.hbs
+++ b/assets/javascripts/discourse/components/repo-status.hbs
@@ -1,69 +1,71 @@
-<td>
-  {{#if this.officialRepoBadge}}
-    {{d-icon
-      this.officialRepoBadge
-      class="check-circle"
-      alt=this.officialRepoBadgeTitle
-      title=this.officialRepoBadgeTitle
-    }}
-  {{/if}}
-</td>
+<tr>
+  <td>
+    {{#if this.officialRepoBadge}}
+      {{d-icon
+        this.officialRepoBadge
+        class="check-circle"
+        alt=this.officialRepoBadgeTitle
+        title=this.officialRepoBadgeTitle
+      }}
+    {{/if}}
+  </td>
 
-<td>
-  <a href="{{repo.url}}">{{repo.name}}</a>
-  <span class="current commit-hash" title={{repo.version}}>
-    {{repo.prettyVersion}}
-  </span>
-</td>
+  <td>
+    <a href="{{repo.url}}">{{repo.name}}</a>
+    <span class="current commit-hash" title={{repo.version}}>
+      {{repo.prettyVersion}}
+    </span>
+  </td>
 
-<td>
-  {{#if repo.checkingStatus}}
-    Checking for new version...
-  {{else if repo.upToDate}}
-    Up to date
-  {{else}}
-    <div class="new-version">
-      <h4>New Version Available!</h4>
+  <td>
+    {{#if repo.checkingStatus}}
+      Checking for new version...
+    {{else if repo.upToDate}}
+      Up to date
+    {{else}}
+      <div class="new-version">
+        <h4>New Version Available!</h4>
 
-      <ul>
-        <li>
-          Remote Version:
-          <span class="new commit-hash" title={{repo.latestVersion}}>
-            {{repo.prettyLatestVersion}}
-          </span>
-        </li>
-        <li>
-          Last Updated:
-          {{#if repo.latest.date}}
-            {{format-date repo.latest.date}}
-          {{else}}
-            &mdash;
-          {{/if}}
-        </li>
-        <li class="new-commits">
-          {{new-commits
-            repo.latest.commits_behind
-            repo.version
-            repo.latest.version
-            repo.url
-          }}
-        </li>
-      </ul>
+        <ul>
+          <li>
+            Remote Version:
+            <span class="new commit-hash" title={{repo.latestVersion}}>
+              {{repo.prettyLatestVersion}}
+            </span>
+          </li>
+          <li>
+            Last Updated:
+            {{#if repo.latest.date}}
+              {{format-date repo.latest.date}}
+            {{else}}
+              &mdash;
+            {{/if}}
+          </li>
+          <li class="new-commits">
+            {{new-commits
+              repo.latest.commits_behind
+              repo.version
+              repo.latest.version
+              repo.url
+            }}
+          </li>
+        </ul>
 
-      {{#if repo.upgrading}}
-        <button class="btn" {{action "upgrade"}}>
-          Currently Upgrading...
-        </button>
-      {{else}}
-        <LinkTo
-          @route="upgrade.show"
-          @model={{this.repo}}
-          disabled={{this.upgradeDisabled}}
-          class="upgrade-button btn"
-        >
-          Upgrade
-        </LinkTo>
-      {{/if}}
-    </div>
-  {{/if}}
-</td>
+        {{#if repo.upgrading}}
+          <button class="btn" {{action "upgrade"}}>
+            Currently Upgrading...
+          </button>
+        {{else}}
+          <LinkTo
+            @route="upgrade.show"
+            @model={{this.repo}}
+            disabled={{this.upgradeDisabled}}
+            class="upgrade-button btn"
+          >
+            Upgrade
+          </LinkTo>
+        {{/if}}
+      </div>
+    {{/if}}
+  </td>
+</tr>
diff --git a/assets/javascripts/discourse/components/repo-status.js b/assets/javascripts/discourse/components/repo-status.js
index 11acff0..e97db6f 100644
--- a/assets/javascripts/discourse/components/repo-status.js
+++ b/assets/javascripts/discourse/components/repo-status.js
@@ -4,7 +4,7 @@ import { inject as service } from "@ember/service";
 
 export default Component.extend({
   router: service(),
-  tagName: "tr",
+  tagName: "",
 
   upgradeDisabled: computed(
     "upgradingRepo",
diff --git a/assets/javascripts/discourse/components/upgrade-notice.hbs b/assets/javascripts/discourse/components/upgrade-notice.hbs
index f8319a5..e8b2caf 100644
--- a/assets/javascripts/discourse/components/upgrade-notice.hbs
+++ b/assets/javascripts/discourse/components/upgrade-notice.hbs
@@ -1,14 +1,16 @@
 {{#if currentUser.admin}}
-  <th colspan="5">
-    {{#if versionCheck.upToDate}}
-      <a href="{{href}}" data-auto-route="true">
-        {{i18n "docker.link_to_upgrade"}}
-      </a>
-    {{else}}
-      {{i18n "docker.upgrade"}}
-      <a href="{{href}}" data-auto-route="true">
-        {{i18n "docker.perform_upgrade"}}
-      </a>
-    {{/if}}
-  </th>
+  <tr>
+    <th colspan="5">
+      {{#if versionCheck.upToDate}}
+        <a href="{{href}}" data-auto-route="true">
+          {{i18n "docker.link_to_upgrade"}}
+        </a>
+      {{else}}
+        {{i18n "docker.upgrade"}}
+        <a href="{{href}}" data-auto-route="true">
+          {{i18n "docker.perform_upgrade"}}
+        </a>
+      {{/if}}
+    </th>
+  </tr>
 {{/if}}
diff --git a/assets/javascripts/discourse/components/upgrade-notice.js b/assets/javascripts/discourse/components/upgrade-notice.js
index 41a3c20..3f47828 100644
--- a/assets/javascripts/discourse/components/upgrade-notice.js
+++ b/assets/javascripts/discourse/components/upgrade-notice.js
@@ -2,7 +2,7 @@ import getURL from "discourse-common/lib/get-url";
 import Component from "@ember/component";
 
 export default class extends Component {
-  tagName = "tr";
+  tagName = "";
 
   get href() {
     return getURL("/admin/upgrade");
diff --git a/assets/javascripts/discourse/components/x-console.hbs b/assets/javascripts/discourse/components/x-console.hbs
index 40e9482..788cd00 100644
--- a/assets/javascripts/discourse/components/x-console.hbs
+++ b/assets/javascripts/discourse/components/x-console.hbs
@@ -1 +1,3 @@
-{{output}}
+<div class="logs">
+  {{output}}
+</div>
diff --git a/assets/javascripts/discourse/components/x-console.js b/assets/javascripts/discourse/components/x-console.js
index 0624b7e..216fa27 100644
--- a/assets/javascripts/discourse/components/x-console.js
+++ b/assets/javascripts/discourse/components/x-console.js
@@ -3,7 +3,7 @@ import { observer } from "@ember/object";
 import { scheduleOnce } from "@ember/runloop";
 
 export default Component.extend({
-  classNameBindings: [":logs"],
+  tagName: "",
 
   _outputChanged: observer("output", function () {
     scheduleOnce("afterRender", this, "_scrollBottom");