DEV: Convert a helper to a component getter (#57)

(and merge some directories)

javascripts/discourse/components/modal/ucd-warning.hbs

@@ -1,7 +1,7 @@
 <DModal
   @closeModal={{this.closeModal}}
   class="modal-ucd-warning"
-  @title={{(modal-ucd-title)}}
+  @title={{this.title}}
   @inline={{@inline}}
 >
   <Ucd::Warning @onClose={{this.closeModal}} />

javascripts/discourse/components/modal/ucd-warning.js

@@ -1,10 +1,24 @@
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
+import { emojiUnescape } from "discourse/lib/text";
+import { escape } from "pretty-text/sanitizer";
+import { randomizeEmojiDiversity } from "../../lib/emoji-diversity";
 
 export default class ModalUcdWarning extends Component {
   @service ucdState;
 
+  get title() {
+    return htmlSafe(
+      [
+        emojiUnescape(escape(randomizeEmojiDiversity(settings.emoji_icon))),
+        escape(I18n.t(themePrefix("warning_modal.title"))),
+      ].join(" ")
+    );
+  }
+
   @action
   closeModal() {
     if (this.args.model.ucd_shouldPermanentlyDismiss) {

javascripts/unformatted-code-detector/initializers/init.js → javascripts/discourse/initializers/init.js

@@ -1,12 +1,6 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { detectUnformattedCode, printDebugInfo } from "../core/detect-code";
-import { randomizeEmojiDiversity } from "../lib/emoji-diversity";
-import { emojiUnescape } from "discourse/lib/text";
-import { htmlSafe } from "@ember/template";
-import { registerUnbound } from "discourse-common/lib/helpers";
-import I18n from "I18n";
-import { escape } from "pretty-text/sanitizer";
-import ModalUcdWarning from "../../discourse/components/modal/ucd-warning";
+import ModalUcdWarning from "../components/modal/ucd-warning";
 import { inject as service } from "@ember/service";
 
 const getDisableAtTrustLevel = () =>
@@ -30,15 +24,6 @@ export default {
         }
       };
 
-      registerUnbound("modal-ucd-title", () => {
-        return htmlSafe(
-          [
-            emojiUnescape(escape(randomizeEmojiDiversity(settings.emoji_icon))),
-            escape(I18n.t(themePrefix("warning_modal.title"))),
-          ].join(" ")
-        );
-      });
-
       api.modifyClass("model:composer", {
         ucdState: service("ucd-state"),
         pluginId: "unformatted-code-detector",

test/unit/detect-code/with-html-test.js

@@ -7,7 +7,7 @@ import {
   withFormattedHTML,
   withUnformattedCode,
 } from "../../fixtures/basic";
-import { detectUnformattedCode } from "../../../unformatted-code-detector/core/detect-code";
+import { detectUnformattedCode } from "../../../discourse/core/detect-code";
 
 module("With HTML", function (hooks) {
   hooks.beforeEach(function () {

test/unit/detect-code/without-html-test.js

@@ -1,7 +1,7 @@
 import { module } from "qunit";
 import { expectAll } from "../../helpers/utils";
 import { withBareHTML } from "../../fixtures/basic";
-import { detectUnformattedCode } from "../../../unformatted-code-detector/core/detect-code";
+import { detectUnformattedCode } from "../../../discourse/core/detect-code";
 
 module("Without HTML", function (hooks) {
   hooks.beforeEach(function () {

test/unit/emoji-diversity-test.js

@@ -1,5 +1,5 @@
 import { module, test } from "qunit";
-import { randomizeEmojiGender } from "../../unformatted-code-detector/lib/emoji-diversity";
+import { randomizeEmojiGender } from "../../discourse/lib/emoji-diversity";
 
 const originalMathRandom = Math.random;
 

test/unit/from-bug-reports-test.js

@@ -1,7 +1,7 @@
 import { module } from "qunit";
 import { expectAll } from "../helpers/utils";
 import { falseNegatives, falsePositives } from "../fixtures/bug-reports";
-import { detectUnformattedCode } from "../../unformatted-code-detector/core/detect-code";
+import { detectUnformattedCode } from "../../discourse/core/detect-code";
 
 module("bug reports", function () {
   expectAll(detectUnformattedCode, falseNegatives, true);

test/unit/post-length-test.js

@@ -1,8 +1,7 @@
+import { module } from "qunit";
 import { expectAll } from "../helpers/utils";
-
 import { withUnformattedCode } from "../fixtures/basic";
-import { detectUnformattedCode } from "../../unformatted-code-detector/core/detect-code";
-import { module } from "qunit";
+import { detectUnformattedCode } from "../../discourse/core/detect-code";
 
 module("ignore if too short", function (hooks) {
   hooks.beforeEach(function () {

test/unit/sensitivity-test.js

@@ -1,5 +1,5 @@
 import { module, test } from "qunit";
-import { applySensitivity } from "../../unformatted-code-detector/core/sensitivity";
+import { applySensitivity } from "../../discourse/core/sensitivity";
 
 module("apply sensitivity", function () {
   test("lowest sensitivity", function (assert) {

test/unit/sequential-lines-test.js

@@ -2,11 +2,11 @@ import { module, test } from "qunit";
 import {
   getCodeEnergy,
   numSequentialLinesWithThresholdCodeEnergy,
-} from "../../unformatted-code-detector/core/detect-code";
+} from "../../discourse/core/detect-code";
 import {
   CodeEnergyLevels,
   codeEnergyValues,
-} from "../../unformatted-code-detector/core/code-energy";
+} from "../../discourse/core/code-energy";
 
 module("sequential lines", function (hooks) {
   hooks.beforeEach(function () {