From e7755b106f3edf805f817fec901296f320de034b Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Wed, 16 Mar 2022 14:09:23 +0100
Subject: [PATCH] Update workflow to add frontend tests  && handle deprecations

---
 .github/workflows/plugin-tests.yml            | 16 +-------
 .../components/custom-user-selector.js.es6    |  3 +-
 .../components/wizard-field-category.js.es6   |  3 +-
 .../components/wizard-field-composer.js.es6   |  3 +-
 .../wizard/components/wizard-step.js.es6      |  6 +--
 .../components/wizard-text-field.js.es6       |  3 +-
 .../lib/initialize/inject-objects.js.es6      | 38 +++++++++----------
 .../lib/initialize/patch-components.js.es6    | 16 ++++++++
 .../wizard/lib/initialize/wizard.js.es6       |  1 +
 .../javascripts/wizard/lib/load-script.js.es6 | 16 ++++----
 .../javascripts/wizard/lib/text-lite.js.es6   | 16 +++++---
 .../javascripts/wizard/lib/user-search.js.es6 |  3 +-
 assets/javascripts/wizard/models/step.js.es6  |  3 +-
 .../javascripts/wizard/models/wizard.js.es6   |  3 +-
 .../components/wizard-composer-editor.hbs     |  2 +-
 assets/javascripts/wizard/templates/step.hbs  |  5 +--
 16 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index 782ebc4f..baf5e381 100644
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@@ -73,18 +73,6 @@ jobs:
           ref: "${{ github.base_ref }}"
           fetch-depth: 1
 
-      - name: Check spec existence
-        id: check_spec
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ steps.repo-name.outputs.value }}/spec"
-
-      - name: Check qunit existence
-        id: check_qunit
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ steps.repo-name.outputs.value }}/test/javascripts"
-
       - name: Setup Git
         run: |
           git config --global user.email "ci@ci.invalid"
@@ -140,7 +128,7 @@ jobs:
           bin/rake db:migrate
 
       - name: Plugin RSpec with Coverage
-        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true'
+        if: matrix.build_type == 'backend'
         run: |
           if [ -e plugins/${{ steps.repo-name.outputs.value }}/.simplecov ]
           then
@@ -150,6 +138,6 @@ jobs:
           bin/rake plugin:spec[${{ steps.repo-name.outputs.value }}]
 
       - name: Plugin QUnit
-        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true'
+        if: matrix.build_type == 'frontend'
         run: bundle exec rake plugin:qunit['${{ steps.repo-name.outputs.value }}','1200000']
         timeout-minutes: 30
diff --git a/assets/javascripts/wizard/components/custom-user-selector.js.es6 b/assets/javascripts/wizard/components/custom-user-selector.js.es6
index c53c3bf4..56eb8f57 100644
--- a/assets/javascripts/wizard/components/custom-user-selector.js.es6
+++ b/assets/javascripts/wizard/components/custom-user-selector.js.es6
@@ -7,6 +7,7 @@ import userSearch from "../lib/user-search";
 import WizardI18n from "../lib/wizard-i18n";
 import Handlebars from "handlebars";
 import { isEmpty } from "@ember/utils";
+import TextField from "@ember/component/text-field";
 
 const template = function (params) {
   const options = params.options;
@@ -31,7 +32,7 @@ const template = function (params) {
   return new Handlebars.SafeString(html).string;
 };
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   attributeBindings: ["autofocus", "maxLength"],
   autocorrect: false,
   autocapitalize: false,
diff --git a/assets/javascripts/wizard/components/wizard-field-category.js.es6 b/assets/javascripts/wizard/components/wizard-field-category.js.es6
index 9f4b65ba..441f83d3 100644
--- a/assets/javascripts/wizard/components/wizard-field-category.js.es6
+++ b/assets/javascripts/wizard/components/wizard-field-category.js.es6
@@ -1,7 +1,8 @@
 import { observes } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
+import Component from "@ember/component";
 
-export default Ember.Component.extend({
+export default Component.extend({
   layoutName: "wizard/templates/components/wizard-field-category",
 
   didInsertElement() {
diff --git a/assets/javascripts/wizard/components/wizard-field-composer.js.es6 b/assets/javascripts/wizard/components/wizard-field-composer.js.es6
index 07829e8a..255982ea 100644
--- a/assets/javascripts/wizard/components/wizard-field-composer.js.es6
+++ b/assets/javascripts/wizard/components/wizard-field-composer.js.es6
@@ -3,8 +3,9 @@ import {
   observes,
 } from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
+import Component from "@ember/component";
 
-export default Ember.Component.extend({
+export default Component.extend({
   layoutName: "wizard/templates/components/wizard-field-composer",
 
   showPreview: false,
diff --git a/assets/javascripts/wizard/components/wizard-step.js.es6 b/assets/javascripts/wizard/components/wizard-step.js.es6
index 18b1a255..ea1a63c6 100644
--- a/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -87,7 +87,7 @@ export default Component.extend({
   @observes("step.message")
   _handleMessage: function () {
     const message = this.get("step.message");
-    this.sendAction("showMessage", message);
+    this.showMessage(message);
   },
 
   keyPress(event) {
@@ -162,7 +162,7 @@ export default Component.extend({
         if (response["final"]) {
           CustomWizard.finished(response);
         } else {
-          this.sendAction("goNext", response);
+          this.goNext(response);
         }
       })
       .catch(() => this.animateInvalidFields())
@@ -181,7 +181,7 @@ export default Component.extend({
     },
 
     showMessage(message) {
-      this.sendAction("showMessage", message);
+      this.sendAction(message);
     },
 
     stylingDropdownChanged(id, value) {
diff --git a/assets/javascripts/wizard/components/wizard-text-field.js.es6 b/assets/javascripts/wizard/components/wizard-text-field.js.es6
index 3d87be09..5991eefc 100644
--- a/assets/javascripts/wizard/components/wizard-text-field.js.es6
+++ b/assets/javascripts/wizard/components/wizard-text-field.js.es6
@@ -1,8 +1,9 @@
 import computed from "discourse-common/utils/decorators";
 import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
 import WizardI18n from "../lib/wizard-i18n";
+import TextField from "@ember/component/text-field";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
diff --git a/assets/javascripts/wizard/lib/initialize/inject-objects.js.es6 b/assets/javascripts/wizard/lib/initialize/inject-objects.js.es6
index fb11c9e7..51dff7e1 100644
--- a/assets/javascripts/wizard/lib/initialize/inject-objects.js.es6
+++ b/assets/javascripts/wizard/lib/initialize/inject-objects.js.es6
@@ -1,5 +1,11 @@
 export default {
   run(app) {
+    // siteSettings must always be registered first
+    if (!app.hasRegistration("site-settings:main")) {
+      const siteSettings = app.SiteSettings;
+      app.register("site-settings:main", siteSettings, { instantiate: false });
+    }
+
     const Store = requirejs("discourse/services/store").default;
     const Site = requirejs(
       "discourse/plugins/discourse-custom-wizard/wizard/models/site"
@@ -10,11 +16,10 @@ export default {
     const sniffCapabilites = requirejs(
       "discourse/pre-initializers/sniff-capabilities"
     ).default;
+
     const site = Site.current();
     const session = Session.current();
-
     const registrations = [
-      ["site-settings:main", app.SiteSettings, false],
       ["message-bus:main", messageBus, false],
       ["site:main", site, false],
       ["session:main", session, false],
@@ -30,25 +35,18 @@ export default {
       }
     });
 
-    const targets = [
-      "controller",
-      "component",
-      "route",
-      "model",
-      "adapter",
-      "mixin",
-    ];
-    const injections = [
-      ["siteSettings", "site-settings:main"],
-      ["messageBus", "message-bus:main"],
-      ["site", "site:main"],
-      ["session", "session:main"],
-      ["store", "service:store"],
-      ["appEvents", "service:app-events"],
-    ];
+    const targets = ["controller", "component", "route", "model", "adapter"];
 
-    injections.forEach((injection) => {
-      targets.forEach((t) => app.inject(t, injection[0], injection[1]));
+    targets.forEach((t) => {
+      app.inject(t, "appEvents", "service:app-events");
+      app.inject(t, "store", "service:store");
+      app.inject(t, "site", "site:main");
+    });
+
+    targets.concat("service").forEach((t) => {
+      app.inject(t, "session", "session:main");
+      app.inject(t, "messageBus", "message-bus:main");
+      app.inject(t, "siteSettings", "site-settings:main");
     });
 
     if (!app.hasRegistration("capabilities:main")) {
diff --git a/assets/javascripts/wizard/lib/initialize/patch-components.js.es6 b/assets/javascripts/wizard/lib/initialize/patch-components.js.es6
index 75cc63f1..d5e7ea25 100644
--- a/assets/javascripts/wizard/lib/initialize/patch-components.js.es6
+++ b/assets/javascripts/wizard/lib/initialize/patch-components.js.es6
@@ -22,6 +22,11 @@ export default {
     const DEditor = requirejs("discourse/components/d-editor").default;
     const { clipboardHelpers } = requirejs("discourse/lib/utilities");
     const toMarkdown = requirejs("discourse/lib/to-markdown").default;
+    const discourseComputed = requirejs("discourse-common/utils/decorators")
+      .default;
+    const WizardI18n = requirejs(
+      "discourse/plugins/discourse-custom-wizard/wizard/lib/wizard-i18n"
+    ).default;
     const isInside = (text, regex) => {
       const matches = text.match(regex);
       return matches && matches.length % 2;
@@ -46,6 +51,17 @@ export default {
         }
       },
 
+      @discourseComputed("placeholder", "placeholderOverride")
+      placeholderTranslated(placeholder, placeholderOverride) {
+        if (placeholderOverride) {
+          return placeholderOverride;
+        }
+        if (placeholder) {
+          return WizardI18n(placeholder);
+        }
+        return null;
+      },
+
       _wizardInsertText(args = {}) {
         if (args.fieldId === this.fieldId) {
           this._insertText(args.text, args.options);
diff --git a/assets/javascripts/wizard/lib/initialize/wizard.js.es6 b/assets/javascripts/wizard/lib/initialize/wizard.js.es6
index 0020f7a8..915e5f26 100644
--- a/assets/javascripts/wizard/lib/initialize/wizard.js.es6
+++ b/assets/javascripts/wizard/lib/initialize/wizard.js.es6
@@ -40,6 +40,7 @@ export default {
     const Session = requirejs("discourse/models/session").default;
     const session = Session.current();
     session.set("highlightJsPath", setupData.highlightJsPath);
+    session.set("markdownItUrl", setupData.markdownItUrl);
 
     [
       "register-files",
diff --git a/assets/javascripts/wizard/lib/load-script.js.es6 b/assets/javascripts/wizard/lib/load-script.js.es6
index 43d97d0a..d0b07c26 100644
--- a/assets/javascripts/wizard/lib/load-script.js.es6
+++ b/assets/javascripts/wizard/lib/load-script.js.es6
@@ -1,5 +1,7 @@
 import { ajax } from "wizard/lib/ajax";
-import getURL from "discourse-common/lib/get-url";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
+import { run } from "@ember/runloop";
+import { Promise } from "rsvp";
 
 const _loaded = {};
 const _loading = {};
@@ -25,7 +27,7 @@ function loadWithTag(path, cb) {
     ) {
       s = s.onload = s.onreadystatechange = null;
       if (!abort) {
-        Ember.run(null, cb);
+        run(null, cb);
       }
     }
   };
@@ -38,7 +40,7 @@ export function loadCSS(url) {
 export default function loadScript(url, opts) {
   // TODO: Remove this once plugins have been updated not to use it:
   if (url === "defer/html-sanitizer-bundle") {
-    return Ember.RSVP.Promise.resolve();
+    return Promise.resolve();
   }
 
   opts = opts || {};
@@ -51,7 +53,7 @@ export default function loadScript(url, opts) {
     }
   });
 
-  return new Ember.RSVP.Promise(function (resolve) {
+  return new Promise(function (resolve) {
     url = getURL(url);
 
     // If we already loaded this url
@@ -63,7 +65,7 @@ export default function loadScript(url, opts) {
     }
 
     let done;
-    _loading[url] = new Ember.RSVP.Promise(function (_done) {
+    _loading[url] = new Promise(function (_done) {
       done = _done;
     });
 
@@ -84,8 +86,8 @@ export default function loadScript(url, opts) {
 
     // Scripts should always load from CDN
     // CSS is type text, to accept it from a CDN we would need to handle CORS
-    if (!opts.css && Discourse.CDN && url[0] === "/" && url[1] !== "/") {
-      cdnUrl = Discourse.CDN.replace(/\/$/, "") + url;
+    if (!opts.css) {
+      cdnUrl = getURLWithCDN(url);
     }
 
     // Some javascript depends on the path of where it is loaded (ace editor)
diff --git a/assets/javascripts/wizard/lib/text-lite.js.es6 b/assets/javascripts/wizard/lib/text-lite.js.es6
index cc161426..26cfc27a 100644
--- a/assets/javascripts/wizard/lib/text-lite.js.es6
+++ b/assets/javascripts/wizard/lib/text-lite.js.es6
@@ -3,6 +3,8 @@ import { default as PrettyText, buildOptions } from "pretty-text/pretty-text";
 import Handlebars from "handlebars";
 import getURL from "discourse-common/lib/get-url";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { Promise } from "rsvp";
+import Session from "discourse/models/session";
 
 export function cook(text, options) {
   if (!options) {
@@ -18,11 +20,15 @@ export function cook(text, options) {
 // everything should eventually move to async API and this should be renamed
 // cook
 export function cookAsync(text, options) {
-  if (Discourse.MarkdownItURL) {
-    return loadScript(Discourse.MarkdownItURL)
-      .then(() => cook(text, options))
-      .catch((e) => Ember.Logger.error(e));
+  let markdownItURL = Session.currentProp("markdownItURL");
+  if (markdownItURL) {
+    return (
+      loadScript(markdownItURL)
+        .then(() => cook(text, options))
+        // eslint-disable-next-line no-console
+        .catch((e) => console.error(e))
+    );
   } else {
-    return Ember.RSVP.Promise.resolve(cook(text));
+    return Promise.resolve(cook(text));
   }
 }
diff --git a/assets/javascripts/wizard/lib/user-search.js.es6 b/assets/javascripts/wizard/lib/user-search.js.es6
index e7171f18..04b6f97c 100644
--- a/assets/javascripts/wizard/lib/user-search.js.es6
+++ b/assets/javascripts/wizard/lib/user-search.js.es6
@@ -1,6 +1,7 @@
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import { debounce } from "@ember/runloop";
 import getUrl from "discourse-common/lib/get-url";
+import { Promise } from "rsvp";
 
 let cache = {},
   cacheTopicId,
@@ -120,7 +121,7 @@ export default function userSearch(options) {
 
   currentTerm = term;
 
-  return new Ember.RSVP.Promise(function (resolve) {
+  return new Promise(function (resolve) {
     // TODO site setting for allowed regex in username
     if (term.match(/[^\w_\-\.@\+]/)) {
       resolve([]);
diff --git a/assets/javascripts/wizard/models/step.js.es6 b/assets/javascripts/wizard/models/step.js.es6
index 2729e993..36503276 100644
--- a/assets/javascripts/wizard/models/step.js.es6
+++ b/assets/javascripts/wizard/models/step.js.es6
@@ -3,6 +3,7 @@ import ValidState from "wizard/mixins/valid-state";
 import { ajax } from "wizard/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { translatedText } from "discourse/plugins/discourse-custom-wizard/wizard/lib/wizard-i18n";
+import { later } from "@ember/runloop";
 
 export default EmberObject.extend(ValidState, {
   id: null,
@@ -105,6 +106,6 @@ export default EmberObject.extend(ValidState, {
       state: "error",
       text: message,
     });
-    Ember.run.later(() => this.set("message", null), 6000);
+    later(() => this.set("message", null), 6000);
   },
 });
diff --git a/assets/javascripts/wizard/models/wizard.js.es6 b/assets/javascripts/wizard/models/wizard.js.es6
index b2e26b25..15bcbb8c 100644
--- a/assets/javascripts/wizard/models/wizard.js.es6
+++ b/assets/javascripts/wizard/models/wizard.js.es6
@@ -113,8 +113,7 @@ CustomWizard.reopenClass({
         }
       });
 
-      Site.currentProp("categoriesList", categories);
-      Site.currentProp("sortedCategories", categories);
+      Site.currentProp("categories", categories);
       Site.currentProp("listByActivity", categories);
       Site.currentProp("categoriesById", categoriesById);
       Site.currentProp(
diff --git a/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs b/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
index be98db8e..7d453a0b 100644
--- a/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
@@ -1,7 +1,7 @@
 {{d-editor
   tabindex=field.tabindex
   value=composer.reply
-  placeholderTranslated=replyPlaceholder
+  placeholderOverride=replyPlaceholder
   previewUpdated=(action "previewUpdated")
   markdownOptions=markdownOptions
   extraButtons=(action "extraButtons")
diff --git a/assets/javascripts/wizard/templates/step.hbs b/assets/javascripts/wizard/templates/step.hbs
index 6456a59c..5ed14cdf 100644
--- a/assets/javascripts/wizard/templates/step.hbs
+++ b/assets/javascripts/wizard/templates/step.hbs
@@ -13,8 +13,7 @@
 {{#if step.permitted}}
   {{wizard-step step=step
                 wizard=wizard
-                goNext="goNext"
+                goNext=(action "goNext")
                 goBack=(action "goBack")
-                finished="finished"
-                showMessage="showMessage"}}
+                showMessage=(action "showMessage")}}
 {{/if}}