test

Composer control feature

.discourse-compatibility

@@ -1,2 +1,3 @@
+3.1.999: 1f35b80f85e5fd1efb7f4851f0845700432febdc
 2.7.99: e07a57e398b6b1676ab42a7e34467556fca5416b
 2.5.1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c

app/controllers/custom_wizard/admin/submissions.rb

@@ -22,7 +22,12 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
   end
 
   def download
-    send_data submission_list.submissions.to_json,
+    content = ActiveModel::ArraySerializer.new(
+      CustomWizard::Submission.list(@wizard).submissions,
+      each_serializer: CustomWizard::SubmissionSerializer
+    )
+
+    send_data content.to_json,
       filename: "#{Discourse.current_hostname}-wizard-submissions-#{@wizard.name}.json",
       content_type: "application/json",
       disposition: "attachment"

assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6

@@ -12,11 +12,15 @@ import { alias } from "@ember/object/computed";
 import Site from "discourse/models/site";
 import { uploadIcon } from "discourse/lib/uploads";
 import { dasherize } from "@ember/string";
-import showModal from "discourse/lib/show-modal";
+import InsertHyperlink from "discourse/components/modal/insert-hyperlink";
+import { inject as service } from "@ember/service";
 
-const IMAGE_MARKDOWN_REGEX = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g;
+const IMAGE_MARKDOWN_REGEX =
+  /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g;
 
 export default ComposerEditor.extend({
+  modal: service(),
+
   classNameBindings: ["fieldClass"],
   allowUpload: true,
   showLink: false,
@@ -116,9 +120,8 @@ export default ComposerEditor.extend({
       event.target.closest(".button-wrapper").dataset.imageIndex,
       10
     );
-    const matchingPlaceholder = this.get("composer.reply").match(
+    const matchingPlaceholder =
-      IMAGE_MARKDOWN_REGEX
+      this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
-    );
 
     this.session.set("wizardEventFieldId", this.field.id);
     this.appEvents.trigger(
@@ -197,10 +200,8 @@ export default ComposerEditor.extend({
       if (this._lastSel) {
         linkText = this._lastSel.value;
       }
-
+      this.modal.show(InsertHyperlink, {
-      showModal("insert-hyperlink").setProperties({
+        model: { linkText, toolbarEvent },
-        linkText,
-        toolbarEvent,
       });
     },
 

assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs

@@ -0,0 +1,34 @@
+<DModal @closeModal={{@closeModal}} @title={{this.title}}>
+  {{#if loading}}
+    <LoadingSpinner size="large" />
+  {{else}}
+    <div class="edit-directory-columns-container">
+      {{#each @model.columns as |column|}}
+        <div class="edit-directory-column">
+          <div class="left-content">
+            <label class="column-name">
+              <Input @type="checkbox" @checked={{column.enabled}} />
+              {{directory-table-header-title
+                field=column.label
+                translated=true
+              }}
+            </label>
+          </div>
+        </div>
+      {{/each}}
+    </div>
+  {{/if}}
+  <div class="modal-footer">
+    <DButton
+      class="btn-primary"
+      @label="directory.edit_columns.save"
+      @action={{action "save"}}
+    />
+
+    <DButton
+      class="btn-secondary reset-to-default"
+      @label="directory.edit_columns.reset_to_default"
+      @action={{action "resetToDefault"}}
+    />
+  </div>
+</DModal>

assets/javascripts/discourse/components/modal/admin-wizards-columns.js

@@ -0,0 +1,15 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import I18n from "I18n";
+
+export default class AdminWizardsColumnComponent extends Component {
+  title = I18n.t("admin.wizard.edit_columns");
+
+  @action save() {
+    this.args.closeModal();
+  }
+
+  @action resetToDefault() {
+    this.args.model.reset();
+  }
+}

assets/javascripts/discourse/components/modal/next-session-scheduled.hbs

@@ -0,0 +1,20 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="next-session-time-modal"
+  @title={{this.title}}
+>
+  <DateTimeInput
+    @date={{this.bufferedDateTime}}
+    @onChange={{action "dateTimeChanged"}}
+    @showTime="true"
+    @clearable="true"
+  />
+  <div class="modal-footer">
+    <DButton
+      @action={{action "submit"}}
+      class="btn-primary"
+      @label="admin.wizard.after_time_modal.done"
+      @disabled={{this.submitDisabled}}
+    />
+  </div>
+</DModal>

assets/javascripts/discourse/components/modal/next-session-scheduled.js

@@ -0,0 +1,30 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import I18n from "I18n";
+
+export default class NextSessionScheduledComponent extends Component {
+  @tracked bufferedDateTime;
+  title = I18n.t("admin.wizard.after_time_modal.title");
+
+  constructor() {
+    super(...arguments);
+    this.bufferedDateTime = this.args.model.dateTime
+      ? moment(this.args.model.dateTime)
+      : moment(Date.now());
+  }
+
+  get submitDisabled() {
+    return moment().isAfter(this.bufferedDateTime);
+  }
+
+  @action submit() {
+    const dateTime = this.bufferedDateTime;
+    this.args.model.update(moment(dateTime).utc().toISOString());
+    this.args.closeModal();
+  }
+
+  @action dateTimeChanged(dateTime) {
+    this.bufferedDateTime = dateTime;
+  }
+}

assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs

@@ -4,4 +4,4 @@
   {{#if wizardErrorNotice}}
     {{d-icon "exclaimation-circle"}}
   {{/if}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs

@@ -9,8 +9,7 @@
       value=wizardListVal
       content=wizardList
       onChange=(action "changeWizard")
-      options=(hash
+      options=(hash none="admin.wizard.select")
-        none="admin.wizard.select"
+    }}
-      )}}
   </div>
-</section>
+</section>

assets/javascripts/discourse/connectors/top-notices/prompt-completion.hbs

@@ -1,7 +1,10 @@
 {{#each site.complete_custom_wizard as |wizard|}}
   <div class="row">
     <div class="alert alert-info alert-wizard">
-      <a href={{wizard.url}}>{{i18n "wizard.complete_custom" name=wizard.name}}</a>
+      <a href={{wizard.url}}>{{i18n
+          "wizard.complete_custom"
+          name=wizard.name
+        }}</a>
     </div>
   </div>
-{{/each}}
+{{/each}}

assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6

@@ -7,8 +7,11 @@ import { selectKitContent } from "../lib/wizard";
 import { underscore } from "@ember/string";
 import Controller from "@ember/controller";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
+
   queryParams: ["refresh_list"],
   loadingSubscriptions: false,
   notAuthorized: not("api.authorized"),
@@ -21,29 +24,8 @@ export default Controller.extend({
     "application/x-www-form-urlencoded",
   ]),
   successCodes: selectKitContent([
-    100,
+    100, 101, 102, 200, 201, 202, 203, 204, 205, 206, 207, 208, 226, 300, 301,
-    101,
+    302, 303, 303, 304, 305, 306, 307, 308,
-    102,
-    200,
-    201,
-    202,
-    203,
-    204,
-    205,
-    206,
-    207,
-    208,
-    226,
-    300,
-    301,
-    302,
-    303,
-    303,
-    304,
-    305,
-    306,
-    307,
-    308,
   ]),
 
   @discourseComputed(
@@ -269,7 +251,7 @@ export default Controller.extend({
         .catch(popupAjaxError)
         .then((result) => {
           if (result.success) {
-            this.transitionToRoute("adminWizardsApis").then(() => {
+            this.router.transitionTo("adminWizardsApis").then(() => {
               this.send("refreshModel");
             });
           }

assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6

@@ -1,14 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    save() {
-      this.send("closeModal");
-    },
-
-    resetToDefault() {
-      this.get("model.reset")();
-    },
-  },
-});

assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6

@@ -2,11 +2,13 @@ import Controller from "@ember/controller";
 import { empty } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import AdminWizardsColumnsModal from "../components/modal/admin-wizards-columns";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import { formatModel } from "../lib/wizard-submission";
 
 export default Controller.extend({
+  modal: service(),
   downloadUrl: fmt("wizard.id", "/admin/wizards/submissions/%@/download"),
   noResults: empty("submissions"),
   page: 0,
@@ -57,7 +59,7 @@ export default Controller.extend({
     },
 
     showEditColumnsModal() {
-      return showModal("admin-wizards-columns", {
+      return this.modal.show(AdminWizardsColumnsModal, {
         model: {
           columns: this.get("fields"),
           reset: () => {

assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6

@@ -3,7 +3,8 @@ import {
   observes,
 } from "discourse-common/utils/decorators";
 import { notEmpty } from "@ember/object/computed";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import NextSessionScheduledModal from "../components/modal/next-session-scheduled";
 import { generateId, wizardFieldList } from "../lib/wizard";
 import { dasherize } from "@ember/string";
 import { later, scheduleOnce } from "@ember/runloop";
@@ -13,6 +14,7 @@ import I18n from "I18n";
 import { filterValues } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
 
 export default Controller.extend({
+  modal: service(),
   hasName: notEmpty("wizard.name"),
 
   @observes("currentStep")
@@ -126,15 +128,13 @@ export default Controller.extend({
     },
 
     setNextSessionScheduled() {
-      let controller = showModal("next-session-scheduled", {
+      this.modal.show(NextSessionScheduledModal, {
         model: {
           dateTime: this.wizard.after_time_scheduled,
           update: (dateTime) =>
             this.set("wizard.after_time_scheduled", dateTime),
         },
       });
-
-      controller.setup();
     },
 
     copyUrl() {

assets/javascripts/discourse/controllers/custom-wizard-step.js.es6

@@ -1,7 +1,9 @@
 import Controller from "@ember/controller";
 import getUrl from "discourse-common/lib/get-url";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   wizard: null,
   step: null,
 
@@ -15,12 +17,12 @@ export default Controller.extend({
         const wizardId = this.get("wizard.id");
         window.location.href = getUrl(`/w/${wizardId}/steps/${nextStepId}`);
       } else {
-        this.transitionToRoute("customWizardStep", nextStepId);
+        this.router.transitionTo("customWizardStep", nextStepId);
       }
     },
 
     goBack() {
-      this.transitionToRoute("customWizardStep", this.get("step.previous"));
+      this.router.transitionTo("customWizardStep", this.get("step.previous"));
     },
 
     showMessage(message) {

assets/javascripts/discourse/controllers/next-session-scheduled.js.es6

@@ -1,27 +0,0 @@
-import { default as discourseComputed } from "discourse-common/utils/decorators";
-import Controller from "@ember/controller";
-
-export default Controller.extend({
-  title: "admin.wizard.after_time_modal.title",
-
-  setup() {
-    this.set("bufferedDateTime", moment(this.model.dateTime));
-  },
-
-  @discourseComputed("bufferedDateTime")
-  submitDisabled(dateTime) {
-    return moment().isAfter(dateTime);
-  },
-
-  actions: {
-    submit() {
-      const dateTime = this.get("bufferedDateTime");
-      this.get("model.update")(moment(dateTime).utc().toISOString());
-      this.send("closeModal");
-    },
-
-    dateTimeChanged(dateTime) {
-      this.set("bufferedDateTime", dateTime);
-    },
-  },
-});

assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6

@@ -83,6 +83,16 @@ export default {
           }
         },
       });
+
+      api.modifyClass("component:category-chooser", {
+        categoriesByScope(options = {}) {
+          let categories = this._super(options);
+
+          return categories.filter((category) => {
+            return !category.custom_fields?.create_topic_wizard;
+          });
+        },
+      });
     });
   },
 };

assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6

@@ -1,14 +1,16 @@
-import ApplicationRoute from "discourse/routes/application";
+import DiscourseURL from "discourse/lib/url";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { dasherize } from "@ember/string";
 
 export default {
   name: "custom-wizard-redirect",
   after: "message-bus",
 
-  initialize: function (container) {
+  initialize(container) {
     const messageBus = container.lookup("service:message-bus");
     const siteSettings = container.lookup("service:site-settings");
 
-    if (!siteSettings.custom_wizard_enabled || !messageBus) {
+    if (!siteSettings.custom_wizard_enabled) {
       return;
     }
 
@@ -17,28 +19,27 @@ export default {
       window.location.href = wizardUrl;
     });
 
-    ApplicationRoute.reopen({
+    withPluginApi("0.8.36", (api) => {
-      actions: {
+      api.onAppEvent("page:changed", (data) => {
-        willTransition(transition) {
+        const currentUser = api.getCurrentUser();
-          const redirectToWizard = this.get("currentUser.redirect_to_wizard");
+
-          const excludedPaths = this.siteSettings.wizard_redirect_exclude_paths
+        if (currentUser) {
+          const redirectToWizard = currentUser.redirect_to_wizard;
+          const excludedPaths = siteSettings.wizard_redirect_exclude_paths
             .split("|")
             .concat(["loading"]);
-
           if (
             redirectToWizard &&
-            (!transition.intent.name ||
+            !data.url.includes("ignore_redirect") &&
-              !excludedPaths.find((p) => {
+            data.currentRouteName !== "customWizardStep" &&
-                return transition.intent.name.indexOf(p) > -1;
+            !excludedPaths.find((p) => {
-              }))
+              return data.currentRouteName.indexOf(p) > -1;
+            })
           ) {
-            transition.abort();
+            DiscourseURL.routeTo(`/w/${dasherize(redirectToWizard)}`);
-            window.location = "/w/" + redirectToWizard.dasherize();
           }
-
+        }
-          return this._super(transition);
+      });
-        },
-      },
     });
   },
 };

assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6

@@ -1,7 +1,10 @@
 import CustomWizardApi from "../models/custom-wizard-api";
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     if (params.name === "create") {
       return CustomWizardApi.create({ isNew: true });
@@ -12,7 +15,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsApi");
+      return this.router.transitionTo("adminWizardsApi");
     }
   },
 

assets/javascripts/discourse/routes/admin-wizards-api.js.es6

@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import CustomWizardApi from "../models/custom-wizard-api";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return CustomWizardApi.list();
   },
@@ -25,11 +28,11 @@ export default DiscourseRoute.extend({
   actions: {
     changeApi(apiName) {
       this.controllerFor("adminWizardsApi").set("apiName", apiName);
-      this.transitionTo("adminWizardsApiShow", apiName);
+      this.router.transitionTo("adminWizardsApiShow", apiName);
     },
 
     afterDestroy() {
-      this.transitionTo("adminWizardsApi").then(() => this.refresh());
+      this.router.transitionTo("adminWizardsApi").then(() => this.refresh());
     },
 
     afterSave(apiName) {
@@ -38,7 +41,7 @@ export default DiscourseRoute.extend({
 
     createApi() {
       this.controllerFor("adminWizardsApi").set("apiName", "create");
-      this.transitionTo("adminWizardsApiShow", "create");
+      this.router.transitionTo("adminWizardsApiShow", "create");
     },
   },
 });

assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6

@@ -1,15 +1,18 @@
 import CustomWizardLogs from "../models/custom-wizard-logs";
 import DiscourseRoute from "discourse/routes/discourse";
 import { A } from "@ember/array";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     return CustomWizardLogs.list(params.wizardId);
   },
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsLogs");
+      return this.router.transitionTo("adminWizardsLogs");
     }
   },
 

assets/javascripts/discourse/routes/admin-wizards-logs.js.es6

@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax(`/admin/wizards/wizard`);
   },
@@ -18,7 +21,7 @@ export default DiscourseRoute.extend({
   actions: {
     changeWizard(wizardId) {
       this.controllerFor("adminWizardsLogs").set("wizardId", wizardId);
-      this.transitionTo("adminWizardsLogsShow", wizardId);
+      this.router.transitionTo("adminWizardsLogsShow", wizardId);
     },
   },
 });

assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6

@@ -2,15 +2,18 @@ import { A } from "@ember/array";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import DiscourseRoute from "discourse/routes/discourse";
 import { formatModel } from "../lib/wizard-submission";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     return CustomWizardAdmin.submissions(params.wizardId);
   },
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsSubmissions");
+      return this.router.transitionTo("adminWizardsSubmissions");
     }
   },
 

assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6

@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax(`/admin/wizards/wizard`);
   },
@@ -18,7 +21,7 @@ export default DiscourseRoute.extend({
   actions: {
     changeWizard(wizardId) {
       this.controllerFor("adminWizardsSubmissions").set("wizardId", wizardId);
-      this.transitionTo("adminWizardsSubmissionsShow", wizardId);
+      this.router.transitionTo("adminWizardsSubmissionsShow", wizardId);
     },
   },
 });

assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6

@@ -2,8 +2,11 @@ import CustomWizardAdmin from "../models/custom-wizard-admin";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     if (params.wizardId === "create") {
       return { create: true };
@@ -14,7 +17,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model) {
     if (model.none) {
-      return this.transitionTo("adminWizardsWizard");
+      return this.router.transitionTo("adminWizardsWizard");
     }
   },
 

assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6

@@ -4,8 +4,11 @@ import EmberObject, { set } from "@ember/object";
 import { A } from "@ember/array";
 import { all } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax("/admin/wizards/wizard");
   },
@@ -80,14 +83,14 @@ export default DiscourseRoute.extend({
       this.controllerFor("adminWizardsWizard").set("wizardId", wizardId);
 
       if (wizardId) {
-        this.transitionTo("adminWizardsWizardShow", wizardId);
+        this.router.transitionTo("adminWizardsWizardShow", wizardId);
       } else {
-        this.transitionTo("adminWizardsWizard");
+        this.router.transitionTo("adminWizardsWizard");
       }
     },
 
     afterDestroy() {
-      this.transitionTo("adminWizardsWizard").then(() => this.refresh());
+      this.router.transitionTo("adminWizardsWizard").then(() => this.refresh());
     },
 
     afterSave(wizardId) {
@@ -96,7 +99,7 @@ export default DiscourseRoute.extend({
 
     createWizard() {
       this.controllerFor("adminWizardsWizard").set("wizardId", "create");
-      this.transitionTo("adminWizardsWizardShow", "create");
+      this.router.transitionTo("adminWizardsWizardShow", "create");
     },
   },
 });

assets/javascripts/discourse/routes/admin-wizards.js.es6

@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax("/admin/wizards");
   },
@@ -17,7 +20,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model, transition) {
     if (transition.targetName === "adminWizards.index") {
-      this.transitionTo("adminWizardsWizard");
+      this.router.transitionTo("adminWizardsWizard");
     }
   },
 });

assets/javascripts/discourse/routes/custom-wizard-index.js.es6

@@ -1,11 +1,14 @@
 import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
     const wizard = getCachedWizard();
     if (wizard && wizard.permitted && !wizard.completed && wizard.start) {
-      this.replaceWith("customWizardStep", wizard.start);
+      this.router.replaceWith("customWizardStep", wizard.start);
     }
   },
 

assets/javascripts/discourse/routes/custom-wizard-step.js.es6

@@ -3,14 +3,17 @@ import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
     const wizard = getCachedWizard();
     this.set("wizard", wizard);
 
     if (!wizard || !wizard.permitted || wizard.completed) {
-      this.replaceWith("customWizard");
+      this.router.replaceWith("customWizard");
     }
   },
 
@@ -27,7 +30,7 @@ export default Route.extend({
 
   afterModel(model) {
     if (model.completed) {
-      return this.transitionTo("wizard.index");
+      return this.router.transitionTo("wizard.index");
     }
     return model.set("wizardId", this.wizard.id);
   },

assets/javascripts/discourse/routes/custom-wizard.js.es6

@@ -1,6 +1,7 @@
 import { findCustomWizard, updateCachedWizard } from "../models/custom-wizard";
 import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import bootbox from "bootbox";
 
 export default DiscourseRoute.extend({
   titleToken() {

assets/javascripts/discourse/templates/admin-wizards-api-show.hbs

@@ -8,7 +8,12 @@
       {{/if}}
     {{/if}}
 
-    {{d-button label="admin.wizard.api.save" action=(action "save") class="btn-primary" disabled=saveDisabled}}
+    {{d-button
+      label="admin.wizard.api.save"
+      action=(action "save")
+      class="btn-primary"
+      disabled=saveDisabled
+    }}
 
     {{#if showRemove}}
       {{d-button action=(action "remove") label="admin.wizard.api.remove"}}
@@ -62,10 +67,12 @@
           <span>{{authErrorMessage}}</span>
         {{/if}}
       {{/if}}
-      {{d-button label="admin.wizard.api.auth.btn"
+      {{d-button
-                 action=(action "authorize")
+        label="admin.wizard.api.auth.btn"
-                 disabled=authDisabled
+        action=(action "authorize")
-                 class="btn-primary"}}
+        disabled=authDisabled
+        class="btn-primary"
+      }}
     {{/if}}
   </div>
 
@@ -99,9 +106,8 @@
           value=api.authType
           content=authorizationTypes
           onChange=(action (mut api.authType))
-          options=(hash
+          options=(hash none="admin.wizard.api.auth.type_none")
-            none="admin.wizard.api.auth.type_none"
+        }}
-          )}}
       </div>
     </div>
 
@@ -110,9 +116,7 @@
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.auth.url"}}</label>
           <div class="controls">
-            <Input
+            <Input @value={{this.api.authUrl}} />
-              @value={{this.api.authUrl}}
-            />
           </div>
         </div>
       {{/if}}
@@ -120,27 +124,21 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.token_url"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.tokenUrl}} />
-            @value={{this.api.tokenUrl}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_id"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.clientId}} />
-            @value={{this.api.clientId}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_secret"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.clientSecret}} />
-            @value={{this.api.clientSecret}}
-          />
         </div>
       </div>
 
@@ -157,10 +155,18 @@
                 @value={{this.param.value}}
                 placeholder={{i18n "admin.wizard.value"}}
               />
-              {{d-button action=(action "removeParam") actionParam=param icon="times"}}
+              {{d-button
+                action=(action "removeParam")
+                actionParam=param
+                icon="times"
+              }}
             </div>
           {{/each}}
-          {{d-button label="admin.wizard.api.auth.params.new" icon="plus" action=(action "addParam")}}
+          {{d-button
+            label="admin.wizard.api.auth.params.new"
+            icon="plus"
+            action=(action "addParam")
+          }}
         </div>
       </div>
     {{/if}}
@@ -169,18 +175,14 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.username"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.username}} />
-            @value={{this.api.username}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.password"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.password}} />
-            @value={{this.api.password}}
-          />
         </div>
       </div>
     {{/if}}
@@ -249,7 +251,11 @@
 </div>
 
 <div class="wizard-api-endpoints">
-  {{d-button action=(action "addEndpoint") label="admin.wizard.api.endpoint.add" icon="plus"}}
+  {{d-button
+    action=(action "addEndpoint")
+    label="admin.wizard.api.endpoint.add"
+    icon="plus"
+  }}
 
   {{#if api.endpoints}}
     <div class="endpoint-list">
@@ -268,33 +274,34 @@
                     placeholder={{i18n "admin.wizard.api.endpoint.url"}}
                     class="endpoint-url"
                   />
-                  {{d-button action=(action "removeEndpoint")
+                  {{d-button
-                             actionParam=endpoint
+                    action=(action "removeEndpoint")
-                             icon="times"
+                    actionParam=endpoint
-                             class="remove-endpoint"}}
+                    icon="times"
+                    class="remove-endpoint"
+                  }}
                 </div>
                 <div class="bottom">
                   {{combo-box
                     content=endpointMethods
                     value=endpoint.method
                     onChange=(action (mut endpoint.method))
-                    options=(hash
+                    options=(hash none="admin.wizard.api.endpoint.method")
-                      none="admin.wizard.api.endpoint.method"
+                  }}
-                    )}}
                   {{combo-box
                     content=contentTypes
                     value=endpoint.content_type
                     onChange=(action (mut endpoint.content_type))
-                    options=(hash
+                    options=(hash none="admin.wizard.api.endpoint.content_type")
-                      none="admin.wizard.api.endpoint.content_type"
+                  }}
-                    )}}
                   {{multi-select
                     value=endpoint.success_codes
                     content=successCodes
                     onChange=(action (mut endpoint.success_codes))
                     options=(hash
                       none="admin.wizard.api.endpoint.success_codes"
-                    )}}
+                    )
+                  }}
                 </div>
               </div>
             </div>
@@ -312,7 +319,8 @@
     {{d-button
       action=(action "clearLogs")
       class="clear-logs"
-      label="admin.wizard.api.log.clear"}}
+      label="admin.wizard.api.log.clear"
+    }}
   </div>
 </div>
 
@@ -332,7 +340,10 @@
             <td>{{logentry.time}}</td>
             <td class="user-image">
               <div class="user-image-inner">
-                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="medium"}}</a>
+                <a
+                  href={{logentry.userpath}}
+                  data-user-card={{logentry.username}}
+                >{{avatar logentry imageSize="medium"}}</a>
               </div>
             </td>
             <td>{{logentry.status}}</td>
@@ -343,4 +354,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-api.hbs

@@ -3,16 +3,16 @@
     value=apiName
     content=apiList
     onChange=(route-action "changeApi")
-    options=(hash
+    options=(hash none="admin.wizard.api.select")
-      none="admin.wizard.api.select"
+  }}
-    )}}
 
   {{d-button
     action=(route-action "createApi")
     label="admin.wizard.api.create"
-    icon="plus"}}
+    icon="plus"
+  }}
 </div>
 
 <div class="admin-wizard-container">
   {{outlet}}
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs

@@ -5,7 +5,8 @@
     {{d-button
       label="admin.wizard.custom_field.add"
       icon="plus"
-      action=(action "addField")}}
+      action=(action "addField")
+    }}
   </div>
 </div>
 
@@ -14,7 +15,8 @@
   opts=messageOpts
   type=messageType
   url=documentationUrl
-  component="custom_fields"}}
+  component="custom_fields"
+}}
 
 <div class="admin-wizard-container">
   {{#if customFields}}
@@ -32,9 +34,10 @@
           {{custom-field-input
             field=field
             removeField=(action "removeField")
-            saveField=(action "saveField")}}
+            saveField=(action "saveField")
+          }}
         {{/each}}
       </tbody>
     </table>
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs

@@ -9,7 +9,8 @@
         label="refresh"
         icon="sync"
         action=(action "refresh")
-        class="refresh"}}
+        class="refresh"
+      }}
     </div>
   </div>
 
@@ -31,7 +32,10 @@
             {{#each logs as |log|}}
               <tr>
                 {{#each-in log as |field value|}}
-                  <td class="small">{{wizard-table-field field=field value=value}}</td>
+                  <td class="small">{{wizard-table-field
+                      field=field
+                      value=value
+                    }}</td>
                 {{/each-in}}
               </tr>
             {{/each}}
@@ -42,4 +46,4 @@
       {{conditional-loading-spinner condition=refreshing}}
     {{/load-more}}
   </div>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/admin-wizards-logs.hbs

@@ -3,17 +3,17 @@
     value=wizardId
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 </div>
 
 {{wizard-message
   key=messageKey
   opts=messageOpts
   url=documentationUrl
-  component="logs"}}
+  component="logs"
+}}
 
 <div class="admin-wizard-container">
   {{outlet}}
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-manager.hbs

@@ -20,22 +20,26 @@
     {{d-button
       id="upload-button"
       label="admin.wizard.manager.upload"
-      action=(action "upload")}}
+      action=(action "upload")
+    }}
     {{d-button
       id="import-button"
       label="admin.wizard.manager.import"
       action=(action "import")
-      disabled=importDisabled}}
+      disabled=importDisabled
+    }}
     {{d-button
       id="export-button"
       label="admin.wizard.manager.export"
       action=(action "export")
-      disabled=exportDisabled}}
+      disabled=exportDisabled
+    }}
     {{d-button
       id="destroy-button"
       label="admin.wizard.manager.destroy"
       action=(action "destroy")
-      disabled=destoryDisabled}}
+      disabled=destoryDisabled
+    }}
   </div>
 </div>
 
@@ -46,7 +50,8 @@
   opts=messageOpts
   items=messageItems
   loading=loading
-  component="manager"}}
+  component="manager"
+}}
 
 <div class="admin-wizard-container">
   <table class="table grid">
@@ -83,4 +88,4 @@
       {{/each}}
     </tbody>
   </table>
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs

@@ -58,4 +58,4 @@
       {{conditional-loading-spinner condition=loadingMore}}
     {{/load-more}}
   </div>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/admin-wizards-submissions.hbs

@@ -3,17 +3,17 @@
     value=wizardId
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 </div>
 
 {{wizard-message
   key=messageKey
   opts=messageOpts
   url=documentationUrl
-  component="submissions"}}
+  component="submissions"
+}}
 
 <div class="admin-wizard-container">
   {{outlet}}
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs

@@ -9,11 +9,23 @@
     <div class="wizard-url">
       {{#if wizard.name}}
         {{#if copiedUrl}}
-          {{d-button class="btn-hover pull-right" icon="copy" label="ip_lookup.copied"}}
+          {{d-button
+            class="btn-hover pull-right"
+            icon="copy"
+            label="ip_lookup.copied"
+          }}
         {{else}}
-          {{d-button action=(action "copyUrl") class="pull-right no-text" icon="copy"}}
+          {{d-button
+            action=(action "copyUrl")
+            class="pull-right no-text"
+            icon="copy"
+          }}
         {{/if}}
-        <a href={{wizardUrl}} target="_blank" rel="noopener noreferrer">{{wizardUrl}}</a>
+        <a
+          href={{wizardUrl}}
+          target="_blank"
+          rel="noopener noreferrer"
+        >{{wizardUrl}}</a>
       {{/if}}
     </div>
   </div>
@@ -43,9 +55,8 @@
           valueProperty="id"
           value=wizard.theme_id
           onChange=(action (mut wizard.theme_id))
-          options=(hash
+          options=(hash none="admin.wizard.no_theme")
-            none="admin.wizard.no_theme"
+        }}
-          )}}
       </div>
     </div>
   </div>
@@ -60,10 +71,7 @@
         <label>{{i18n "admin.wizard.save_submissions"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.save_submissions}} />
-          @type="checkbox"
-          @checked={{this.wizard.save_submissions}}
-        />
         <span>{{i18n "admin.wizard.save_submissions_label"}}</span>
       </div>
     </div>
@@ -73,10 +81,7 @@
         <label>{{i18n "admin.wizard.multiple_submissions"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.multiple_submissions}} />
-          @type="checkbox"
-          @checked={{this.wizard.multiple_submissions}}
-        />
         <span>{{i18n "admin.wizard.multiple_submissions_label"}}</span>
       </div>
     </div>
@@ -86,10 +91,7 @@
         <label>{{i18n "admin.wizard.after_signup"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.after_signup}} />
-          @type="checkbox"
-          @checked={{this.wizard.after_signup}}
-        />
         <span>{{i18n "admin.wizard.after_signup_label"}}</span>
       </div>
     </div>
@@ -99,10 +101,7 @@
         <label>{{i18n "admin.wizard.prompt_completion"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.prompt_completion}} />
-          @type="checkbox"
-          @checked={{this.wizard.prompt_completion}}
-        />
         <span>{{i18n "admin.wizard.prompt_completion_label"}}</span>
       </div>
     </div>
@@ -112,16 +111,14 @@
         <label>{{i18n "admin.wizard.after_time"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.after_time}} />
-          @type="checkbox"
-          @checked={{this.wizard.after_time}}
-        />
         <span>{{i18n "admin.wizard.after_time_label"}}</span>
         {{d-button
           action=(action "setNextSessionScheduled")
           translatedLabel=nextSessionScheduledLabel
           class="btn-after-time"
-          icon="far-calendar"}}
+          icon="far-calendar"
+        }}
       </div>
     </div>
 
@@ -131,10 +128,7 @@
           <label>{{i18n "admin.wizard.required"}}</label>
         </div>
         <div class="setting-value">
-          <Input
+          <Input @type="checkbox" @checked={{this.wizard.required}} />
-            @type="checkbox"
-            @checked={{this.wizard.required}}
-          />
           <span>{{i18n "admin.wizard.required_label"}}</span>
         </div>
       </div>
@@ -144,10 +138,7 @@
           <label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
         </div>
         <div class="setting-value">
-          <Input
+          <Input @type="checkbox" @checked={{this.wizard.restart_on_revisit}} />
-            @type="checkbox"
-            @checked={{this.wizard.restart_on_revisit}}
-          />
           <span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
         </div>
       </div>
@@ -167,16 +158,14 @@
               userFieldSelection="key"
               textSelection="value"
               inputConnector="and"
-            )}}
+            )
+          }}
         </div>
       </div>
     {{/wizard-subscription-container}}
   </div>
 
-  {{wizard-links
+  {{wizard-links itemType="step" current=currentStep items=wizard.steps}}
-    itemType="step"
-    current=currentStep
-    items=wizard.steps}}
 
   {{#if currentStep}}
     {{wizard-custom-step
@@ -185,14 +174,16 @@
       currentField=currentField
       wizardFields=wizardFields
       fieldTypes=filteredFieldTypes
-      subscribed=subscribed}}
+      subscribed=subscribed
+    }}
   {{/if}}
 
   {{wizard-links
     itemType="action"
     current=currentAction
     items=wizard.actions
-    generateLabels=true}}
+    generateLabels=true
+  }}
 
   {{#each wizard.actions as |wizardAction|}}
     {{wizard-custom-action
@@ -202,11 +193,17 @@
       apis=apis
       removeAction="removeAction"
       wizardFields=wizardFields
-      fieldTypes=filteredFieldTypes}}
+      fieldTypes=filteredFieldTypes
+    }}
   {{/each}}
 
   <div class="admin-wizard-buttons">
-    <button {{action "save"}} disabled={{disableSave}} class="btn btn-primary" type="button">
+    <button
+      {{action "save"}}
+      disabled={{disableSave}}
+      class="btn btn-primary"
+      type="button"
+    >
       {{i18n "admin.wizard.save"}}
     </button>
 
@@ -222,4 +219,4 @@
       <span class="error">{{d-icon "times"}}{{error}}</span>
     {{/if}}
   </div>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/admin-wizards-wizard.hbs

@@ -3,21 +3,18 @@
     value=wizardListVal
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 
   {{d-button
     action=(route-action "createWizard")
     label="admin.wizard.create"
-    icon="plus"}}
+    icon="plus"
+  }}
 </div>
 
-{{wizard-message
+{{wizard-message key=messageKey url=messageUrl component="wizard"}}
-  key=messageKey
-  url=messageUrl
-  component="wizard"}}
 
 <div class="admin-wizard-container settings">
   {{outlet}}
-</div>
+</div>

assets/javascripts/discourse/templates/admin-wizards.hbs

@@ -1,12 +1,21 @@
 {{#admin-nav}}
   {{nav-item route="adminWizardsWizard" label="admin.wizard.nav_label"}}
-  {{nav-item route="adminWizardsCustomFields" label="admin.wizard.custom_field.nav_label"}}
+  {{nav-item
-  {{nav-item route="adminWizardsSubmissions" label="admin.wizard.submissions.nav_label"}}
+    route="adminWizardsCustomFields"
+    label="admin.wizard.custom_field.nav_label"
+  }}
+  {{nav-item
+    route="adminWizardsSubmissions"
+    label="admin.wizard.submissions.nav_label"
+  }}
   {{#if showApi}}
     {{nav-item route="adminWizardsApi" label="admin.wizard.api.nav_label"}}
   {{/if}}
   {{nav-item route="adminWizardsLogs" label="admin.wizard.log.nav_label"}}
-  {{nav-item route="adminWizardsManager" label="admin.wizard.manager.nav_label"}}
+  {{nav-item
+    route="adminWizardsManager"
+    label="admin.wizard.manager.nav_label"
+  }}
 
   <div class="admin-actions">
     {{wizard-subscription-badge}}
@@ -16,4 +25,4 @@
 
 <div class="admin-container">
   {{outlet}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-field-input.hbs

@@ -5,9 +5,8 @@
       feature="custom_field"
       attribute="klass"
       onChange=(action (mut field.klass))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.klass.select")
-        none="admin.wizard.custom_field.klass.select"
+    }}
-      )}}
   </td>
   <td>
     {{wizard-subscription-selector
@@ -15,9 +14,8 @@
       feature="custom_field"
       attribute="type"
       onChange=(action (mut field.type))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.type.select")
-        none="admin.wizard.custom_field.type.select"
+    }}
-      )}}
   </td>
   <td class="input">
     <Input
@@ -30,9 +28,8 @@
       value=field.serializers
       content=serializerContent
       onChange=(action (mut field.serializers))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.serializers.select")
-        none="admin.wizard.custom_field.serializers.select"
+    }}
-      )}}
   </td>
   <td class="actions">
     {{#if loading}}
@@ -46,16 +43,15 @@
       action=(action "destroy")
       icon="trash-alt"
       class="destroy"
-      disabled=destroyDisabled}}
+      disabled=destroyDisabled
+    }}
     {{d-button
       icon="save"
       action=(action "save")
       disabled=saveDisabled
-      class="save"}}
+      class="save"
-    {{d-button
+    }}
-      action=(action "close")
+    {{d-button action=(action "close") icon="times" disabled=closeDisabled}}
-      icon="times"
-      disabled=closeDisabled}}
   </td>
 {{else}}
   <td><label>{{field.klass}}</label></td>
@@ -81,4 +77,4 @@
       {{d-button action=(action "edit") icon="pencil-alt"}}
     </td>
   {{/if}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs

@@ -14,7 +14,8 @@
   wizardComposer=true
   fieldId=field.id
   disabled=disableTextarea
-  outletArgs=(hash composer=composer editorType="composer")}}
+  outletArgs=(hash composer=composer editorType="composer")
+}}
 
 <input
   type="file"
@@ -22,4 +23,4 @@
   class="wizard-composer-upload"
   accept={{allowedFileTypes}}
   multiple
-  >
+/>

assets/javascripts/discourse/templates/components/custom-wizard-date-input.hbs

@@ -8,4 +8,4 @@
   autocomplete="off"
 />
 
-<div class="picker-container"></div>
+<div class="picker-container"></div>

assets/javascripts/discourse/templates/components/custom-wizard-date-time-input.hbs

@@ -26,9 +26,5 @@
 {{/if}}
 
 {{#if clearable}}
-  {{d-button
+  {{d-button class="clear-date-time" icon="times" action=(action "onClear")}}
-    class="clear-date-time"
+{{/if}}
-    icon="times"
-    action=(action "onClear")
-  }}
-{{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-editor.hbs

@@ -2,7 +2,7 @@
 
 <div class="d-editor-container">
   {{#if showPreview}}
-    <div class="d-editor-preview-wrapper {{if forcePreview "force-preview"}}">
+    <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
       <div class="d-editor-preview">
         {{html-safe preview}}
       </div>
@@ -18,13 +18,16 @@
                 onExpand=(action b.action b)
                 class=b.className
                 content=popupMenuOptions
-                options=(hash
+                options=(hash popupTitle=b.title icon=b.icon)
-                  popupTitle=b.title
+              }}
-                  icon=b.icon
-                )}}
             {{else}}
               <div>{{d.icon}}</div>
-              <button class="wizard-btn {{b.className}}" {{action b.action b}} title={{b.title}} type="button">
+              <button
+                class="wizard-btn {{b.className}}"
+                {{action b.action b}}
+                title={{b.title}}
+                type="button"
+              >
                 {{d-icon b.icon}}
                 {{#if b.label}}
                   <span class="d-button-label">{{i18n b.label}}</span>
@@ -48,4 +51,4 @@
       />
     </div>
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-wizard-field-category.hbs

@@ -4,6 +4,5 @@
   whitelist=field.content
   onChange=(action (mut categories))
   tabindex=field.tabindex
-  options=(hash
+  options=(hash maximum=field.limit)
-    maximum=field.limit
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-checkbox.hbs

@@ -4,4 +4,4 @@
   @checked={{this.field.value}}
   tabindex={{this.field.tabindex}}
   class={{this.fieldClass}}
-/>
+/>

assets/javascripts/discourse/templates/components/custom-wizard-field-composer-preview.hbs

@@ -2,4 +2,4 @@
   <div class="d-editor-preview">
     {{html-safe field.preview_template}}
   </div>
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs

@@ -7,14 +7,19 @@
   cannotSeeMention=(action "cannotSeeMention")
   importQuote=(action "importQuote")
   togglePreview=(action "togglePreview")
-  afterRefresh=(action "afterRefresh")}}
+  afterRefresh=(action "afterRefresh")
+}}
 
 <div class="bottom-bar">
-  <button class="wizard-btn toggle-preview" {{action "togglePreview"}} type="button">
+  <button
+    class="wizard-btn toggle-preview"
+    {{action "togglePreview"}}
+    type="button"
+  >
     <span class="d-button-label">{{i18n togglePreviewLabel}}</span>
   </button>
 
   {{#if field.char_counter}}
     {{wizard-char-counter field.value field.max_length}}
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-wizard-field-date-time.hbs

@@ -2,4 +2,4 @@
   date=dateTime
   onChange=(action "onChange")
   tabindex=field.tabindex
-}}
+}}

assets/javascripts/discourse/templates/components/custom-wizard-field-date.hbs

@@ -3,4 +3,4 @@
   onChange=(action "onChange")
   tabindex=field.tabindex
   format=field.format
-}}
+}}

assets/javascripts/discourse/templates/components/custom-wizard-field-dropdown.hbs

@@ -4,6 +4,5 @@
   content=field.content
   tabindex=field.tabindex
   onChange=(action "onChangeValue")
-  options=(hash
+  options=(hash none="select_kit.default_header_text")
-    none="select_kit.default_header_text"
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-group.hbs

@@ -6,6 +6,5 @@
   value=field.value
   tabindex=field.tabindex
   onChange=(action (mut field.value))
-  options=(hash
+  options=(hash none="select_kit.default_header_text")
-    none="select_kit.default_header_text"
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-number.hbs

@@ -5,5 +5,4 @@
   @value={{this.field.value}}
   tabindex={{this.field.tabindex}}
   class={{this.fieldClass}}
-/>
+/>
-

assets/javascripts/discourse/templates/components/custom-wizard-field-tag.hbs

@@ -4,7 +4,5 @@
   tabindex=field.tabindex
   tagGroups=field.tag_groups
   everyTag=true
-  options=(hash
+  options=(hash maximum=field.limit allowAny=field.can_create_tag)
-    maximum=field.limit
+}}
-    allowAny=field.can_create_tag
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-text.hbs

@@ -5,4 +5,4 @@
   class={{this.fieldClass}}
   placeholder={{this.field.translatedPlaceholder}}
   autocomplete={{this.autocomplete}}
-/>
+/>

assets/javascripts/discourse/templates/components/custom-wizard-field-textarea.hbs

@@ -4,4 +4,4 @@
   tabindex={{this.field.tabindex}}
   class={{this.fieldClass}}
   placeholder={{this.field.translatedPlaceholder}}
-/>
+/>

assets/javascripts/discourse/templates/components/custom-wizard-field-time.hbs

@@ -2,4 +2,4 @@
   date=time
   onChange=(action "onChange")
   tabindex=field.tabindex
-}}
+}}

assets/javascripts/discourse/templates/components/custom-wizard-field-upload.hbs

@@ -1,4 +1,7 @@
-<label class="wizard-btn wizard-btn-upload-file {{if uploading "disabled"}}" tabindex={{field.tabindex}}>
+<label
+  class="wizard-btn wizard-btn-upload-file {{if uploading 'disabled'}}"
+  tabindex={{field.tabindex}}
+>
   {{#if uploading}}
     {{i18n "wizard.uploading"}}
   {{else}}
@@ -6,13 +9,19 @@
     {{d-icon "upload"}}
   {{/if}}
 
-  <input disabled={{uploading}} class="hidden-upload-field" type="file" accept={{field.file_types}} style="visibility: hidden; position: absolute;" >
+  <input
+    disabled={{uploading}}
+    class="hidden-upload-field"
+    type="file"
+    accept={{field.file_types}}
+    style="visibility: hidden; position: absolute;"
+  />
 </label>
 
 {{#if field.value}}
   {{#if isImage}}
-    <img src={{field.value.url}}  class="wizard-image-preview">
+    <img src={{field.value.url}} class="wizard-image-preview" />
   {{else}}
     {{field.value.original_filename}}
   {{/if}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-field-url.hbs

@@ -3,4 +3,4 @@
   @value={{this.field.value}}
   tabindex={{this.field.tabindex}}
   class={{this.fieldClass}}
-/>
+/>

assets/javascripts/discourse/templates/components/custom-wizard-field-user-selector.hbs

@@ -1,4 +1,5 @@
 {{custom-user-selector
   usernames=field.value
   placeholderKey=field.placeholder
-  tabindex=field.tabindex}}
+  tabindex=field.tabindex
+}}

assets/javascripts/discourse/templates/components/custom-wizard-field.hbs

@@ -1,29 +1,38 @@
-<label for={{field.id}} class="field-label">
+<label for={{field.id}} class="field-label">
-  {{html-safe field.translatedLabel}}
+  {{html-safe field.translatedLabel}}
-</label>
+</label>
-
+
-{{#if field.image}}
+{{#if field.image}}
-  <div class="field-image"><img src={{field.image}}></div>
+  <div class="field-image"><img src={{field.image}} /></div>
-{{/if}}
+{{/if}}
-
+
-{{#if field.description}}
+{{#if field.description}}
-  <div class="field-description">{{cookedDescription}}</div>
+  <div class="field-description">{{cookedDescription}}</div>
-{{/if}}
+{{/if}}
-
+
-{{#field-validators field=field as |validators|}}
+{{#field-validators field=field as |validators|}}
-  {{#if inputComponentName}}
+  {{#if inputComponentName}}
-    <div class="input-area">
+    <div class="input-area">
-      {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard autocomplete=validators.autocomplete}}
+      {{component
-    </div>
+        inputComponentName
-  {{/if}}
+        field=field
-{{/field-validators}}
+        step=step
-
+        fieldClass=fieldClass
-{{#if field.char_counter}}
+        wizard=wizard
-  {{#if textType}}
+        autocomplete=validators.autocomplete
-    {{wizard-char-counter field.value field.max_length}}
+      }}
-  {{/if}}
+    </div>
-{{/if}}
+  {{/if}}
-
+{{/field-validators}}
-{{#if field.errorDescription}}
+
-  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
+{{#if field.char_counter}}
-{{/if}}
+  {{#if textType}}
+    {{wizard-char-counter field.value field.max_length}}
+  {{/if}}
+{{/if}}
+
+{{#if field.errorDescription}}
+  <div class="field-error-description">{{html-safe
+      field.errorDescription
+    }}</div>
+{{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs

@@ -1,7 +1,11 @@
 <div>{{text}}</div>
 <div class="no-access-gutter">
-  <button class="wizard-btn primary return-to-site" {{action "skip"}} type="button">
+  <button
+    class="wizard-btn primary return-to-site"
+    {{action "skip"}}
+    type="button"
+  >
     {{i18n "wizard.return_to_site" siteName=siteName}}
     {{d-icon "sign-out-alt"}}
   </button>
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-wizard-similar-topic.hbs

@@ -1,4 +1,6 @@
 <a href={{topic.url}} target="_blank" rel="noopener noreferrer">
   <span class="title">{{html-safe topic.fancy_title}}</span>
-  <div class="blurb">{{date-node topic.created_at}} - {{html-safe topic.blurb}}</div>
+  <div class="blurb">{{date-node topic.created_at}}
-</a>
+    -
+    {{html-safe topic.blurb}}</div>
+</a>

assets/javascripts/discourse/templates/components/custom-wizard-similar-topics.hbs

@@ -1,11 +1,11 @@
-{{#if showTopics}}
+{{#if showTopics}}
-  <ul>
+  <ul>
-    {{#each topics as |topic|}}
+    {{#each topics as |topic|}}
-      <li>{{custom-wizard-similar-topic topic=topic}}</li>
+      <li>{{custom-wizard-similar-topic topic=topic}}</li>
-    {{/each}}
+    {{/each}}
-  </ul>
+  </ul>
-{{else}}
+{{else}}
-  <a role="button" class="show-topics" {{action "toggleShowTopics"}}>
+  <a role="button" class="show-topics" {{action "toggleShowTopics"}}>
-    {{i18n "realtime_validations.similar_topics.show"}}
+    {{i18n "realtime_validations.similar_topics.show"}}
-  </a>
+  </a>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-step.hbs

@@ -5,7 +5,7 @@
 
   {{#if bannerImage}}
     <div class="wizard-step-banner">
-      <img src={{bannerImage}}>
+      <img src={{bannerImage}} />
     </div>
   {{/if}}
 
@@ -26,7 +26,11 @@
     <div class="white"></div>
     <div class="black" style={{barStyle}}></div>
     <div class="screen"></div>
-    <span>{{i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
+    <span>{{i18n
+        "wizard.step"
+        current=step.displayIndex
+        total=wizard.totalSteps
+      }}</span>
   </div>
 
   <div class="wizard-buttons">
@@ -34,25 +38,47 @@
       {{loading-spinner size="small"}}
     {{else}}
       {{#if showQuitButton}}
-        <a href {{action "quit"}} class="action-link quit" tabindex={{secondaryButtonIndex}}>{{i18n "wizard.quit"}}</a>
+        <a
+          href
+          {{action "quit"}}
+          class="action-link quit"
+          tabindex={{secondaryButtonIndex}}
+        >{{i18n "wizard.quit"}}</a>
       {{/if}}
       {{#if showBackButton}}
-        <a href {{action "backStep"}} class="action-link back" tabindex={{secondaryButtonIndex}}>{{i18n "wizard.back"}}</a>
+        <a
+          href
+          {{action "backStep"}}
+          class="action-link back"
+          tabindex={{secondaryButtonIndex}}
+        >{{i18n "wizard.back"}}</a>
       {{/if}}
     {{/if}}
 
     {{#if showNextButton}}
-      <button type="button" class="wizard-btn next primary" {{action "nextStep"}} disabled={{saving}} tabindex={{primaryButtonIndex}}>
+      <button
+        type="button"
+        class="wizard-btn next primary"
+        {{action "nextStep"}}
+        disabled={{saving}}
+        tabindex={{primaryButtonIndex}}
+      >
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button type="button" class="wizard-btn done" {{action "done"}} disabled={{saving}} tabindex={{primaryButtonIndex}}>
+      <button
+        type="button"
+        class="wizard-btn done"
+        {{action "done"}}
+        disabled={{saving}}
+        tabindex={{primaryButtonIndex}}
+      >
         {{i18n "wizard.done_custom"}}
       </button>
     {{/if}}
   </div>
 
-</div>
+</div>

assets/javascripts/discourse/templates/components/custom-wizard-time-input.hbs

@@ -10,4 +10,4 @@
     autoInsertNoneItem=false
     translatedFilterPlaceholder="--:--"
   )
-}}
+}}

assets/javascripts/discourse/templates/components/field-validators.hbs

@@ -1,13 +1,23 @@
-{{#if field.validations}}
+{{#if field.validations}}
-  {{#each-in field.validations.above as |type validation|}}
+  {{#each-in field.validations.above as |type validation|}}
-    {{component validation.component field=field type=type validation=validation}}
+    {{component
-  {{/each-in}}
+      validation.component
-
+      field=field
-  {{yield (hash perform=(action "perform") autocomplete="off")}}
+      type=type
-
+      validation=validation
-  {{#each-in field.validations.below as |type validation|}}
+    }}
-    {{component validation.component field=field type=type validation=validation}}
+  {{/each-in}}
-  {{/each-in}}
+
-{{else}}
+  {{yield (hash perform=(action "perform") autocomplete="off")}}
-  {{yield}}
+
-{{/if}}
+  {{#each-in field.validations.below as |type validation|}}
+    {{component
+      validation.component
+      field=field
+      type=type
+      validation=validation
+    }}
+  {{/each-in}}
+{{else}}
+  {{yield}}
+{{/if}}

assets/javascripts/discourse/templates/components/similar-topics-validator.hbs

@@ -10,4 +10,4 @@
 
 {{#if showSimilarTopics}}
   {{custom-wizard-similar-topics topics=similarTopics}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/validator.hbs

@@ -2,4 +2,4 @@
   {{i18n validMessageKey}}
 {{else}}
   {{i18n invalidMessageKey}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-custom-action.hbs

@@ -3,7 +3,8 @@
     action=(action "undoChanges")
     icon=undoIcon
     label=undoKey
-    class="undo-changes"}}
+    class="undo-changes"
+  }}
 {{/if}}
 
 <div class="setting">
@@ -13,14 +14,12 @@
 
   <div class="setting-value">
     {{wizard-subscription-selector
-      value=action.type
+      value=this.action.type
       feature="action"
       attribute="type"
       onChange=(action "changeType")
       wizard=wizard
-      options=(hash
+      options=(hash none="admin.wizard.select_type")
-        none="admin.wizard.select_type"
-      )
     }}
   </div>
 </div>
@@ -32,16 +31,14 @@
 
   <div class="setting-value">
     {{combo-box
-      value=action.run_after
+      value=this.action.run_after
       content=runAfterContent
-      onChange=(action (mut action.run_after))}}
+      onChange=(action (mut this.action.run_after))
+    }}
   </div>
 </div>
 
-{{wizard-message
+{{wizard-message key=messageKey url=messageUrl component="action"}}
-  key=messageKey
-  url=messageUrl
-  component="action"}}
 
 {{#if basicTopicFields}}
   <div class="setting full field-mapper-setting">
@@ -51,14 +48,15 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.title
+        inputs=this.action.title
         property="title"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -69,26 +67,24 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.post
+        value=this.action.post
         content=wizardFields
         nameProperty="label"
-        onChange=(action (mut action.post))
+        onChange=(action (mut this.action.post))
         options=(hash
           none="admin.wizard.selector.placeholder.wizard_field"
           isDisabled=showPostBuilder
-        )}}
+        )
+      }}
 
       <div class="setting-gutter">
-        <Input
+        <Input @type="checkbox" @checked={{this.action.post_builder}} />
-          @type="checkbox"
-          @checked={{this.action.post_builder}}
-        />
         <span>{{i18n "admin.wizard.action.post_builder.checkbox"}}</span>
       </div>
     </div>
   </div>
 
-  {{#if action.post_builder}}
+  {{#if this.action.post_builder}}
     <div class="setting full">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.action.post_builder.label"}}</label>
@@ -96,8 +92,9 @@
 
       <div class="setting-value editor">
         {{wizard-text-editor
-          value=action.post_template
+          value=this.action.post_template
-          wizardFields=wizardFields}}
+          wizardFields=wizardFields
+        }}
       </div>
     </div>
   {{/if}}
@@ -111,7 +108,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.category
+        inputs=this.action.category
         property="category"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -122,7 +119,8 @@
           wizardActionSelection="output"
           outputDefaultSelection="category"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -133,7 +131,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tags
+        inputs=this.action.tags
         property="tags"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -143,7 +141,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -154,14 +153,13 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.visible
+        inputs=this.action.visible
         property="visible"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          wizardFieldSelection=true
+          wizardFieldSelection=true userFieldSelection=true context="action"
-          userFieldSelection=true
+        )
-          context="action"
+      }}
-        )}}
     </div>
   </div>
 
@@ -173,13 +171,11 @@
 
       <div class="setting-value">
         {{wizard-mapper
-          inputs=action.add_event
+          inputs=this.action.add_event
           property="add_event"
           onUpdate=(action "mappedFieldUpdated")
-          options=(hash
+          options=(hash wizardFieldSelection=true context="action")
-            wizardFieldSelection=true
+        }}
-            context="action"
-          )}}
       </div>
     </div>
   {{/if}}
@@ -192,13 +188,11 @@
 
       <div class="setting-value">
         {{wizard-mapper
-          inputs=action.add_location
+          inputs=this.action.add_location
           property="add_location"
           onUpdate=(action "mappedFieldUpdated")
-          options=(hash
+          options=(hash wizardFieldSelection=true context="action")
-            wizardFieldSelection=true
+        }}
-            context="action"
-          )}}
       </div>
     </div>
   {{/if}}
@@ -212,7 +206,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.recipient
+        inputs=this.action.recipient
         property="recipient"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -223,7 +217,8 @@
           userSelection="output"
           outputDefaultSelection="user"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -235,7 +230,7 @@
     </div>
 
     {{wizard-mapper
-      inputs=action.profile_updates
+      inputs=this.action.profile_updates
       property="profile_updates"
       onUpdate=(action "mappedFieldUpdated")
       options=(hash
@@ -246,7 +241,8 @@
         wizardActionSelection="value"
         keyDefaultSelection="userField"
         context="action"
-      )}}
+      )
+    }}
   </div>
 {{/if}}
 
@@ -258,13 +254,14 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.api
+        value=this.action.api
         content=availableApis
-        onChange=(action (mut action.api))
+        onChange=(action (mut this.action.api))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.send_to_api.select_an_api"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -275,13 +272,14 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.api_endpoint
+        value=this.action.api_endpoint
         content=availableEndpoints
-        onChange=(action (mut action.api_endpoint))
+        onChange=(action (mut this.action.api_endpoint))
         options=(hash
           isDisabled=apiEmpty
           none="admin.wizard.action.send_to_api.select_an_endpoint"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -292,11 +290,12 @@
 
     <div class="setting-value">
       {{wizard-text-editor
-        value=action.api_body
+        value=this.action.api_body
         previewEnabled=false
         barEnabled=false
         wizardFields=wizardFields
-        placeholder="admin.wizard.action.send_to_api.body_placeholder"}}
+        placeholder="admin.wizard.action.send_to_api.body_placeholder"
+      }}
     </div>
   </div>
 {{/if}}
@@ -309,7 +308,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.group
+        inputs=this.action.group
         property="group"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -320,7 +319,8 @@
           groupSelection="value,output"
           outputDefaultSelection="group"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -333,7 +333,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.url
+        inputs=this.action.url
         property="url"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -343,7 +343,8 @@
           groupSelection="key,value"
           categorySelection="key,value"
           userSelection="key,value"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -356,7 +357,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.categories
+        inputs=this.action.categories
         property="categories"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -366,42 +367,49 @@
           userFieldSelection="key,value"
           categorySelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.watch_categories.mute_remainder"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_categories.mute_remainder"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.mute_remainder
+        inputs=this.action.mute_remainder
         property="mute_remainder"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
           context="action"
           wizardFieldSelection=true
           userFieldSelection="key,value"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.watch_x.notification_level.label"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_x.notification_level.label"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{combo-box
-        value=action.notification_level
+        value=this.action.notification_level
         content=availableNotificationLevels
-        onChange=(action (mut action.notification_level))
+        onChange=(action (mut this.action.notification_level))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -411,10 +419,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.wizard_user}} />
-        @type="checkbox"
-        @checked={{this.action.wizard_user}}
-      />
     </div>
   </div>
 
@@ -425,7 +430,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -433,7 +438,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           userSelection="output"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -446,7 +452,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tags
+        inputs=this.action.tags
         property="tags"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -456,24 +462,28 @@
           wizardActionSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.watch_x.notification_level.label"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_x.notification_level.label"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{combo-box
-        value=action.notification_level
+        value=this.action.notification_level
         content=availableNotificationLevels
-        onChange=(action (mut action.notification_level))
+        onChange=(action (mut this.action.notification_level))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -483,10 +493,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.wizard_user}} />
-        @type="checkbox"
-        @checked={{this.action.wizard_user}}
-      />
     </div>
   </div>
 
@@ -497,7 +504,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -505,7 +512,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           userSelection="output"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -518,7 +526,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.name
+        inputs=this.action.name
         property="name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -526,7 +534,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -536,7 +545,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.full_name
+        inputs=this.action.full_name
         property="full_name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -544,7 +553,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -554,7 +564,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.title
+        inputs=this.action.title
         property="title"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -562,7 +572,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -572,7 +583,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.bio_raw
+        inputs=this.action.bio_raw
         property="bio_raw"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -580,7 +591,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -590,7 +602,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.owner_usernames
+        inputs=this.action.owner_usernames
         property="owner_usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -599,7 +611,8 @@
           userFieldSelection=true
           userSelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -609,7 +622,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -618,17 +631,20 @@
           userFieldSelection=true
           userSelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.grant_trust_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.grant_trust_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.grant_trust_level
+        inputs=this.action.grant_trust_level
         property="grant_trust_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -636,17 +652,20 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.mentionable_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.mentionable_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.mentionable_level
+        inputs=this.action.mentionable_level
         property="mentionable_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -654,17 +673,20 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.messageable_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.messageable_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.messageable_level
+        inputs=this.action.messageable_level
         property="messageable_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -672,17 +694,20 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.visibility_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.visibility_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.visibility_level
+        inputs=this.action.visibility_level
         property="visibility_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -690,17 +715,20 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.members_visibility_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.members_visibility_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.members_visibility_level
+        inputs=this.action.members_visibility_level
         property="members_visibility_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -708,7 +736,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -721,7 +750,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.name
+        inputs=this.action.name
         property="name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -729,7 +758,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -740,7 +770,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.slug
+        inputs=this.action.slug
         property="slug"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -748,7 +778,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -759,7 +790,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.color
+        inputs=this.action.color
         property="color"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -767,7 +798,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -778,7 +810,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.text_color
+        inputs=this.action.text_color
         property="text_color"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -786,18 +818,21 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_category.parent_category"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_category.parent_category"
+        }}</label>
     </div>
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.parent_category_id
+        inputs=this.action.parent_category_id
         property="parent_category_id"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -806,7 +841,8 @@
           userFieldSelection="key,value"
           categorySelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -817,7 +853,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.permissions
+        inputs=this.action.permissions
         property="permissions"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -828,7 +864,8 @@
           userFieldSelection=true
           groupSelection="key"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -841,7 +878,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.custom_fields
+        inputs=this.action.custom_fields
         property="custom_fields"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -852,7 +889,8 @@
           userFieldSelection="value"
           keyPlaceholder="admin.wizard.action.custom_fields.key"
           context=customFieldsContext
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -865,7 +903,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.required
+        inputs=this.action.required
         property="required"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -874,7 +912,8 @@
           userFieldSelection=true
           groupSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -886,10 +925,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.skip_redirect}} />
-        @type="checkbox"
-        @checked={{this.action.skip_redirect}}
-      />
 
       <span>
         {{i18n "admin.wizard.action.skip_redirect.description" type="topic"}}
@@ -903,13 +939,13 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.suppress_notifications}} />
-        @type="checkbox"
-        @checked={{this.action.suppress_notifications}}
-      />
 
       <span>
-        {{i18n "admin.wizard.action.suppress_notifications.description" type="topic"}}
+        {{i18n
+          "admin.wizard.action.suppress_notifications.description"
+          type="topic"
+        }}
       </span>
     </div>
   </div>
@@ -925,4 +961,4 @@
       <Input @value={{this.action.code}} />
     </div>
   </div>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-custom-field.hbs

@@ -1,316 +1,289 @@
-{{#if showUndo}}
+{{#if showUndo}}
-  {{d-button
+  {{d-button
-    action=(action "undoChanges")
+    action=(action "undoChanges")
-    icon=undoIcon
+    icon=undoIcon
-    label=undoKey
+    label=undoKey
-    class="undo-changes"}}
+    class="undo-changes"
-{{/if}}
+  }}
-
+{{/if}}
-<div class="setting">
+
-  <div class="setting-label">
+<div class="setting">
-    <label>{{i18n "admin.wizard.field.label"}}</label>
+  <div class="setting-label">
-  </div>
+    <label>{{i18n "admin.wizard.field.label"}}</label>
-  <div class="setting-value">
+  </div>
-    <Input
+  <div class="setting-value">
-      name="label"
+    <Input name="label" @value={{this.field.label}} />
-      @value={{this.field.label}}
+  </div>
-    />
+</div>
-  </div>
+
-</div>
+<div class="setting">
-
+  <div class="setting-label">
-<div class="setting">
+    <label>{{i18n "admin.wizard.field.required"}}</label>
-  <div class="setting-label">
+  </div>
-    <label>{{i18n "admin.wizard.field.required"}}</label>
+
-  </div>
+  <div class="setting-value">
-
+    <span>{{i18n "admin.wizard.field.required_label"}}</span>
-  <div class="setting-value">
+    <Input @type="checkbox" @checked={{this.field.required}} />
-    <span>{{i18n "admin.wizard.field.required_label"}}</span>
+  </div>
-    <Input
+</div>
-      @type="checkbox"
+
-      @checked={{this.field.required}}
+<div class="setting">
-    />
+  <div class="setting-label">
-  </div>
+    <label>{{i18n "admin.wizard.field.description"}}</label>
-</div>
+  </div>
-
+  <div class="setting-value">
-<div class="setting">
+    <Textarea name="description" @value={{this.field.description}} />
-  <div class="setting-label">
+  </div>
-    <label>{{i18n "admin.wizard.field.description"}}</label>
+</div>
-  </div>
+
-  <div class="setting-value">
+<div class="setting">
-    <Textarea
+  <div class="setting-label">
-      name="description"
+    <label>{{i18n "admin.wizard.field.image"}}</label>
-      @value={{this.field.description}}
+  </div>
-    />
+  <div class="setting-value">
-  </div>
+    {{uppy-image-uploader
-</div>
+      imageUrl=field.image
-
+      onUploadDone=(action "imageUploadDone")
-<div class="setting">
+      onUploadDeleted=(action "imageUploadDeleted")
-  <div class="setting-label">
+      type="wizard-field-image"
-    <label>{{i18n "admin.wizard.field.image"}}</label>
+      class="no-repeat contain-image"
-  </div>
+      id=(concat "wizard-field-" field.id "-image-upload")
-  <div class="setting-value">
+    }}
-    {{uppy-image-uploader
+  </div>
-      imageUrl=field.image
+</div>
-      onUploadDone=(action "imageUploadDone")
+
-      onUploadDeleted=(action "imageUploadDeleted")
+<div class="setting">
-      type="wizard-field-image"
+  <div class="setting-label">
-      class="no-repeat contain-image"
+    <label>{{i18n "admin.wizard.type"}}</label>
-      id=(concat "wizard-field-" field.id "-image-upload")}}
+  </div>
-  </div>
+
-</div>
+  <div class="setting-value">
-
+    {{wizard-subscription-selector
-<div class="setting">
+      value=field.type
-  <div class="setting-label">
+      feature="field"
-    <label>{{i18n "admin.wizard.type"}}</label>
+      attribute="type"
-  </div>
+      onChange=(action "changeType")
-
+      wizard=wizard
-  <div class="setting-value">
+      options=(hash none="admin.wizard.select_type")
-    {{wizard-subscription-selector
+    }}
-      value=field.type
+  </div>
-      feature="field"
+</div>
-      attribute="type"
+
-      onChange=(action "changeType")
+{{wizard-message key=messageKey url=messageUrl component="field"}}
-      wizard=wizard
+
-      options=(hash
+{{#if isTextType}}
-        none="admin.wizard.select_type"
+  <div class="setting">
-      )
+    <div class="setting-label">
-    }}
+      <label>{{i18n "admin.wizard.field.min_length"}}</label>
-  </div>
+    </div>
-</div>
+
-
+    <div class="setting-value">
-{{wizard-message
+      <Input
-  key=messageKey
+        @type="number"
-  url=messageUrl
+        name="min_length"
-  component="field"}}
+        @value={{this.field.min_length}}
-
+        class="small"
-{{#if isTextType}}
+      />
-  <div class="setting">
+    </div>
-    <div class="setting-label">
+  </div>
-      <label>{{i18n "admin.wizard.field.min_length"}}</label>
+
-    </div>
+  <div class="setting full">
-
+    <div class="setting-label">
-    <div class="setting-value">
+      <label>{{i18n "admin.wizard.field.max_length"}}</label>
-      <Input
+    </div>
-        @type="number"
+
-        name="min_length"
+    <div class="setting-value">
-        @value={{this.field.min_length}}
+      <Input
-        class="small"
+        @type="number"
-      />
+        name="max_length"
-    </div>
+        @value={{this.field.max_length}}
-  </div>
+        class="small"
-
+      />
-  <div class="setting full">
+    </div>
-    <div class="setting-label">
+  </div>
-      <label>{{i18n "admin.wizard.field.max_length"}}</label>
+
-    </div>
+  <div class="setting">
-
+    <div class="setting-label">
-    <div class="setting-value">
+      <label>{{i18n "admin.wizard.field.char_counter"}}</label>
-      <Input
+    </div>
-        @type="number"
+
-        name="max_length"
+    <div class="setting-value">
-        @value={{this.field.max_length}}
+      <span>{{i18n "admin.wizard.field.char_counter_placeholder"}}</span>
-        class="small"
+      <Input @type="checkbox" @checked={{this.field.char_counter}} />
-      />
+    </div>
-    </div>
+  </div>
-  </div>
+
-
+  <div class="setting full">
-  <div class="setting">
+    <div class="setting-label">
-    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.field_placeholder"}}</label>
-      <label>{{i18n "admin.wizard.field.char_counter"}}</label>
+    </div>
-    </div>
+
-
+    <div class="setting-value">
-    <div class="setting-value">
+      <Textarea
-      <span>{{i18n "admin.wizard.field.char_counter_placeholder"}}</span>
+        name="field_placeholder"
-      <Input
+        class="medium"
-        @type="checkbox"
+        @value={{this.field.placeholder}}
-        @checked={{this.field.char_counter}}
+      />
-      />
+    </div>
-    </div>
+  </div>
-  </div>
+{{/if}}
-
+
-  <div class="setting full">
+{{#if isComposerPreview}}
-    <div class="setting-label">
+  <div class="setting full">
-      <label>{{i18n "admin.wizard.field.field_placeholder"}}</label>
+    <div class="setting-label">
-    </div>
+      <label>{{i18n "admin.wizard.field.preview_template"}}</label>
-
+    </div>
-    <div class="setting-value">
+
-      <Textarea
+    <div class="setting-value">
-        name="field_placeholder"
+      <Textarea
-        class="medium"
+        name="preview-template"
-        @value={{this.field.placeholder}}
+        class="preview-template"
-      />
+        @value={{this.field.preview_template}}
-    </div>
+      />
-  </div>
+    </div>
-{{/if}}
+  </div>
-
+{{/if}}
-{{#if isComposerPreview}}
+
-  <div class="setting full">
+{{#if isUpload}}
-    <div class="setting-label">
+  <div class="setting">
-      <label>{{i18n "admin.wizard.field.preview_template"}}</label>
+    <div class="setting-label">
-    </div>
+      <label>{{i18n "admin.wizard.field.file_types"}}</label>
-
+    </div>
-    <div class="setting-value">
+
-      <Textarea
+    <div class="setting-value">
-        name="preview-template"
+      <Input @value={{this.field.file_types}} class="medium" />
-        class="preview-template"
+    </div>
-        @value={{this.field.preview_template}}
+  </div>
-      />
+{{/if}}
-    </div>
+
-  </div>
+{{#if showLimit}}
-{{/if}}
+  <div class="setting">
-
+    <div class="setting-label">
-{{#if isUpload}}
+      <label>{{i18n "admin.wizard.field.limit"}}</label>
-  <div class="setting">
+    </div>
-    <div class="setting-label">
+
-      <label>{{i18n "admin.wizard.field.file_types"}}</label>
+    <div class="setting-value">
-    </div>
+      <Input @type="number" @value={{this.field.limit}} class="small" />
-
+    </div>
-    <div class="setting-value">
+  </div>
-      <Input
+{{/if}}
-        @value={{this.field.file_types}}
+
-        class="medium"
+{{#if isDateTime}}
-      />
+  <div class="setting">
-    </div>
+    <div class="setting-label">
-  </div>
+      <label>{{html-safe
-{{/if}}
+          (i18n "admin.wizard.field.date_time_format.label")
-
+        }}</label>
-{{#if showLimit}}
+    </div>
-  <div class="setting">
+
-    <div class="setting-label">
+    <div class="setting-value">
-      <label>{{i18n "admin.wizard.field.limit"}}</label>
+      <Input @value={{this.field.format}} class="medium" />
-    </div>
+      <label>{{html-safe
-
+          (i18n "admin.wizard.field.date_time_format.instructions")
-    <div class="setting-value">
+        }}</label>
-      <Input
+    </div>
-        @type="number"
+  </div>
-        @value={{this.field.limit}}
+{{/if}}
-        class="small"
+
-      />
+{{#if showPrefill}}
-    </div>
+  <div class="setting full field-mapper-setting">
-  </div>
+    <div class="setting-label">
-{{/if}}
+      <label>{{i18n "admin.wizard.field.prefill"}}</label>
-
+    </div>
-{{#if isDateTime}}
+
-  <div class="setting">
+    <div class="setting-value">
-    <div class="setting-label">
+      {{wizard-mapper
-      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.label")}}</label>
+        inputs=field.prefill
-    </div>
+        property="prefill"
-
+        onUpdate=(action "mappedFieldUpdated")
-    <div class="setting-value">
+        options=prefillOptions
-      <Input
+      }}
-        @value={{this.field.format}}
+    </div>
-        class="medium"
+  </div>
-      />
+{{/if}}
-      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.instructions")}}</label>
+
-    </div>
+{{#if showContent}}
-  </div>
+  <div class="setting full field-mapper-setting">
-{{/if}}
+    <div class="setting-label">
-
+      <label>{{i18n "admin.wizard.field.content"}}</label>
-{{#if showPrefill}}
+    </div>
-  <div class="setting full field-mapper-setting">
+
-    <div class="setting-label">
+    <div class="setting-value">
-      <label>{{i18n "admin.wizard.field.prefill"}}</label>
+      {{wizard-mapper
-    </div>
+        inputs=field.content
-
+        property="content"
-    <div class="setting-value">
+        onUpdate=(action "mappedFieldUpdated")
-      {{wizard-mapper
+        options=contentOptions
-        inputs=field.prefill
+      }}
-        property="prefill"
+    </div>
-        onUpdate=(action "mappedFieldUpdated")
+  </div>
-        options=prefillOptions}}
+{{/if}}
-    </div>
+
-  </div>
+{{#if isTag}}
-{{/if}}
+  <div class="setting full field-mapper-setting">
-
+    <div class="setting-label">
-{{#if showContent}}
+      <label>{{i18n "admin.wizard.field.tag_groups"}}</label>
-  <div class="setting full field-mapper-setting">
+    </div>
-    <div class="setting-label">
+
-      <label>{{i18n "admin.wizard.field.content"}}</label>
+    <div class="setting-value">
-    </div>
+      {{tag-group-chooser
-
+        id=(concat field.id "-tag-groups")
-    <div class="setting-value">
+        tagGroups=field.tag_groups
-      {{wizard-mapper
+        onChange=(action (mut field.tag_groups))
-        inputs=field.content
+      }}
-        property="content"
+    </div>
-        onUpdate=(action "mappedFieldUpdated")
+  </div>
-        options=contentOptions}}
+
-    </div>
+  <div class="setting">
-  </div>
+    <div class="setting-label">
-{{/if}}
+      <label>{{i18n "admin.wizard.field.can_create_tag"}}</label>
-
+    </div>
-{{#if isTag}}
+
-  <div class="setting full field-mapper-setting">
+    <div class="setting-value">
-    <div class="setting-label">
+      <Input @type="checkbox" @checked={{this.field.can_create_tag}} />
-      <label>{{i18n "admin.wizard.field.tag_groups"}}</label>
+    </div>
-    </div>
+  </div>
-
+{{/if}}
-    <div class="setting-value">
+
-      {{tag-group-chooser
+{{#wizard-subscription-container}}
-        id=(concat field.id "-tag-groups")
+  <div class="setting full field-mapper-setting">
-        tagGroups=field.tag_groups
+    <div class="setting-label">
-        onChange=(action (mut field.tag_groups))
+      <label>{{i18n "admin.wizard.condition"}}</label>
-      }}
+    </div>
-    </div>
+
-  </div>
+    <div class="setting-value">
-
+      {{wizard-mapper inputs=field.condition options=fieldConditionOptions}}
-  <div class="setting">
+    </div>
-    <div class="setting-label">
+  </div>
-      <label>{{i18n "admin.wizard.field.can_create_tag"}}</label>
+
-    </div>
+  <div class="setting full field-mapper-setting">
-
+    <div class="setting-label">
-    <div class="setting-value">
+      <label>{{i18n "admin.wizard.index"}}</label>
-      <Input
+    </div>
-        @type="checkbox"
+
-        @checked={{this.field.can_create_tag}}
+    <div class="setting-value">
-      />
+      {{wizard-mapper inputs=field.index options=fieldIndexOptions}}
-    </div>
+    </div>
-  </div>
+  </div>
-{{/if}}
+
-
+  {{#if isCategory}}
-{{#wizard-subscription-container}}
+    <div class="setting">
-  <div class="setting full field-mapper-setting">
+      <div class="setting-label">
-    <div class="setting-label">
+        <label>{{i18n "admin.wizard.field.property"}}</label>
-      <label>{{i18n "admin.wizard.condition"}}</label>
+      </div>
-    </div>
+
-
+      <div class="setting-value">
-    <div class="setting-value">
+        {{combo-box
-      {{wizard-mapper
+          value=field.property
-        inputs=field.condition
+          content=categoryPropertyTypes
-        options=fieldConditionOptions}}
+          onChange=(action (mut field.property))
-    </div>
+          options=(hash none="admin.wizard.selector.placeholder.property")
-  </div>
+        }}
-
+      </div>
-  <div class="setting full field-mapper-setting">
+    </div>
-    <div class="setting-label">
+  {{/if}}
-      <label>{{i18n "admin.wizard.index"}}</label>
+
-    </div>
+  {{#if validations}}
-
+    {{wizard-realtime-validations field=field validations=validations}}
-    <div class="setting-value">
+  {{/if}}
-      {{wizard-mapper
+{{/wizard-subscription-container}}
-        inputs=field.index
-        options=fieldIndexOptions}}
-    </div>
-  </div>
-
-  {{#if isCategory}}
-    <div class="setting">
-      <div class="setting-label">
-        <label>{{i18n "admin.wizard.field.property"}}</label>
-      </div>
-
-      <div class="setting-value">
-        {{combo-box
-          value=field.property
-          content=categoryPropertyTypes
-          onChange=(action (mut field.property))
-          options=(hash
-            none="admin.wizard.selector.placeholder.property"
-          )}}
-      </div>
-    </div>
-  {{/if}}
-
-  {{#if validations}}
-    {{wizard-realtime-validations field=field validations=validations}}
-  {{/if}}
-{{/wizard-subscription-container}}

assets/javascripts/discourse/templates/components/wizard-custom-step.hbs

@@ -1,126 +1,120 @@
-<div class="setting">
+<div class="setting">
-  <div class="setting-label">
+  <div class="setting-label">
-    <label>{{i18n "admin.wizard.step.title"}}</label>
+    <label>{{i18n "admin.wizard.step.title"}}</label>
-  </div>
+  </div>
-  <div class="setting-value">
+  <div class="setting-value">
-    <Input
+    <Input name="title" @value={{this.step.title}} />
-      name="title"
+  </div>
-      @value={{this.step.title}}
+</div>
-    />
+
-  </div>
+<div class="setting full">
-</div>
+  <div class="setting-label">
-
+    <label>{{i18n "admin.wizard.step.banner"}}</label>
-<div class="setting full">
+  </div>
-  <div class="setting-label">
+  <div class="setting-value">
-    <label>{{i18n "admin.wizard.step.banner"}}</label>
+    {{uppy-image-uploader
-  </div>
+      imageUrl=step.banner
-  <div class="setting-value">
+      onUploadDone=(action "bannerUploadDone")
-    {{uppy-image-uploader
+      onUploadDeleted=(action "bannerUploadDeleted")
-      imageUrl=step.banner
+      type="wizard-step-banner"
-      onUploadDone=(action "bannerUploadDone")
+      class="no-repeat contain-image"
-      onUploadDeleted=(action "bannerUploadDeleted")
+      id=(concat "wizard-step-" step.id "-banner-upload")
-      type="wizard-step-banner"
+    }}
-      class="no-repeat contain-image"
+  </div>
-      id=(concat "wizard-step-" step.id "-banner-upload")}}
+</div>
-  </div>
+
-</div>
+<div class="setting full">
-
+  <div class="setting-label">
-<div class="setting full">
+    <label>{{i18n "admin.wizard.step.description"}}</label>
-  <div class="setting-label">
+  </div>
-    <label>{{i18n "admin.wizard.step.description"}}</label>
+  <div class="setting-value">
-  </div>
+    {{wizard-text-editor value=step.raw_description}}
-  <div class="setting-value">
+  </div>
-    {{wizard-text-editor
+</div>
-      value=step.raw_description}}
+
-  </div>
+{{#wizard-subscription-container}}
-</div>
+  <div class="setting full field-mapper-setting">
-
+    <div class="setting-label">
-{{#wizard-subscription-container}}
+      <label>{{i18n "admin.wizard.condition"}}</label>
-  <div class="setting full field-mapper-setting">
+    </div>
-    <div class="setting-label">
+
-      <label>{{i18n "admin.wizard.condition"}}</label>
+    <div class="setting-value">
-    </div>
+      {{wizard-mapper inputs=step.condition options=stepConditionOptions}}
-
+    </div>
-    <div class="setting-value">
+  </div>
-      {{wizard-mapper
+
-        inputs=step.condition
+  <div class="setting full">
-        options=stepConditionOptions}}
+    <div class="setting-label"></div>
-    </div>
+    <div class="setting-value force-final">
-  </div>
+      <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
-
+      <Input @type="checkbox" @checked={{this.step.force_final}} />
-  <div class="setting full">
+      <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
-    <div class="setting-label"></div>
+    </div>
-    <div class="setting-value force-final">
+  </div>
-      <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
+
-      <Input
+  <div class="setting full field-mapper-setting">
-        @type="checkbox"
+    <div class="setting-label">
-        @checked={{this.step.force_final}}
+      <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
-      />
+    </div>
-      <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
+
-    </div>
+    <div class="setting-value">
-  </div>
+      {{wizard-mapper
-
+        inputs=step.required_data
-  <div class="setting full field-mapper-setting">
+        options=(hash
-    <div class="setting-label">
+          inputTypes="validation"
-      <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
+          inputConnector="and"
-    </div>
+          wizardFieldSelection="value"
-
+          userFieldSelection="value"
-    <div class="setting-value">
+          keyPlaceholder="admin.wizard.submission_key"
-      {{wizard-mapper
+          context="step"
-        inputs=step.required_data
+        )
-        options=(hash
+      }}
-          inputTypes="validation"
+      {{#if step.required_data}}
-          inputConnector="and"
+        <div class="required-data-message">
-          wizardFieldSelection="value"
+          <div class="label">
-          userFieldSelection="value"
+            {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
-          keyPlaceholder="admin.wizard.submission_key"
+          </div>
-          context="step"
+          <Input @value={{this.step.required_data_message}} />
-        )}}
+        </div>
-      {{#if step.required_data}}
+      {{/if}}
-        <div class="required-data-message">
+    </div>
-          <div class="label">
+  </div>
-            {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
+
-          </div>
+  <div class="setting full field-mapper-setting">
-          <Input
+    <div class="setting-label">
-            @value={{this.step.required_data_message}}
+      <label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
-          />
+    </div>
-        </div>
+    <div class="setting-value">
-      {{/if}}
+      {{wizard-mapper
-    </div>
+        inputs=step.permitted_params
-  </div>
+        options=(hash
-
+          pairConnector="set"
-  <div class="setting full field-mapper-setting">
+          inputTypes="association"
-    <div class="setting-label">
+          keyPlaceholder="admin.wizard.param_key"
-      <label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
+          valuePlaceholder="admin.wizard.submission_key"
-    </div>
+          context="step"
-    <div class="setting-value">
+        )
-      {{wizard-mapper
+      }}
-        inputs=step.permitted_params
+    </div>
-        options=(hash
+  </div>
-          pairConnector="set"
+{{/wizard-subscription-container}}
-          inputTypes="association"
+
-          keyPlaceholder="admin.wizard.param_key"
+{{wizard-links
-          valuePlaceholder="admin.wizard.submission_key"
+  itemType="field"
-          context="step"
+  current=currentField
-        )}}
+  items=step.fields
-    </div>
+  parentId=step.id
-  </div>
+}}
-{{/wizard-subscription-container}}
+
-
+{{#each step.fields as |field|}}
-{{wizard-links
+  {{wizard-custom-field
-  itemType="field"
+    field=field
-  current=currentField
+    step=step
-  items=step.fields
+    wizard=wizard
-  parentId=step.id}}
+    currentFieldId=currentField.id
-
+    fieldTypes=fieldTypes
-{{#each step.fields as |field|}}
+    removeField="removeField"
-  {{wizard-custom-field
+    wizardFields=wizardFields
-    field=field
+    subscribed=subscribed
-    step=step
+  }}
-    wizard=wizard
+{{/each}}
-    currentFieldId=currentField.id
-    fieldTypes=fieldTypes
-    removeField="removeField"
-    wizardFields=wizardFields
-    subscribed=subscribed}}
-{{/each}}

assets/javascripts/discourse/templates/components/wizard-links.hbs

@@ -4,16 +4,36 @@
   {{#if anyLinks}}
     {{#each links as |link|}}
       <div data-id={{link.id}}>
-        {{d-button action=(action "change") actionParam=link.id translatedLabel=link.label class=link.classes}}
+        {{d-button
+          action=(action "change")
+          actionParam=link.id
+          translatedLabel=link.label
+          class=link.classes
+        }}
         {{#unless link.first}}
-          {{d-button action=(action "back") actionParam=link icon="arrow-left" class="back"}}
+          {{d-button
+            action=(action "back")
+            actionParam=link
+            icon="arrow-left"
+            class="back"
+          }}
         {{/unless}}
         {{#unless link.last}}
-          {{d-button action=(action "forward") actionParam=link icon="arrow-right" class="forward"}}
+          {{d-button
+            action=(action "forward")
+            actionParam=link
+            icon="arrow-right"
+            class="forward"
+          }}
         {{/unless}}
-        {{d-button action=(action "remove") actionParam=link.id icon="times" class="remove"}}
+        {{d-button
+          action=(action "remove")
+          actionParam=link.id
+          icon="times"
+          class="remove"
+        }}
       </div>
     {{/each}}
   {{/if}}
   {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs

@@ -2,11 +2,12 @@
   {{combo-box
     value=connector
     content=connectors
-    onChange=(action "changeConnector")}}
+    onChange=(action "changeConnector")
+  }}
 {{else}}
   {{#if connector}}
     <span class="connector-single">
       {{connectorLabel}}
     </span>
   {{/if}}
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs

@@ -1,22 +1,24 @@
 {{wizard-mapper-connector
-  connector=input.type
+  connector=this.input.type
-  connectors=inputTypes
+  connectors=this.inputTypes
   inputTypes=true
-  inputType=inputType
+  inputType=this.inputType
   connectorType="type"
-  options=options
+  options=this.options
-  onUpdate=onUpdate}}
+  onUpdate=this.onUpdate
+}}
 
 {{#if hasPairs}}
   <div class="mapper-pairs mapper-block">
-    {{#each input.pairs as |pair|}}
+    {{#each this.input.pairs as |pair|}}
       {{wizard-mapper-pair
         pair=pair
         last=pair.last
-        inputType=inputType
+        inputType=this.inputType
-        options=options
+        options=this.options
         removePair=(action "removePair")
-        onUpdate=onUpdate}}
+        onUpdate=this.onUpdate
+      }}
     {{/each}}
 
     {{#if canAddPair}}
@@ -30,25 +32,27 @@
 {{#if hasOutput}}
   {{#if hasPairs}}
     {{wizard-mapper-connector
-      connector=input.output_connector
+      connector=this.input.output_connector
-      connectors=connectors
+      connectors=this.connectors
       connectorType="output"
-      inputType=inputType
+      inputType=this.inputType
-      options=options
+      options=this.options
-      onUpdate=onUpdate}}
+      onUpdate=this.onUpdate
+    }}
   {{/if}}
 
   <div class="output mapper-block">
     {{wizard-mapper-selector
       selectorType="output"
-      inputType=input.type
+      inputType=this.input.type
-      value=input.output
+      value=this.input.output
-      activeType=input.output_type
+      activeType=this.input.output_type
-      options=options
+      options=this.options
-      onUpdate=onUpdate}}
+      onUpdate=this.onUpdate
+    }}
   </div>
 {{/if}}
 
-<a role="button" class="remove-input" {{action remove input}}>
+<a role="button" class="remove-input" {{action remove this.input}}>
   {{d-icon "times"}}
-</a>
+</a>

assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs

@@ -5,7 +5,8 @@
     value=pair.key
     activeType=pair.key_type
     options=options
-    onUpdate=onUpdate}}
+    onUpdate=onUpdate
+  }}
 </div>
 
 {{wizard-mapper-connector
@@ -14,7 +15,8 @@
   connectorType="pair"
   inputType=inputType
   options=options
-  onUpdate=onUpdate}}
+  onUpdate=onUpdate
+}}
 
 <div class="value mapper-block">
   {{wizard-mapper-selector
@@ -24,7 +26,8 @@
     activeType=pair.value_type
     options=options
     onUpdate=onUpdate
-    connector=pair.connector}}
+    connector=pair.connector
+  }}
 </div>
 
 {{#if showJoin}}
@@ -32,5 +35,7 @@
 {{/if}}
 
 {{#if showRemove}}
-  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon "times"}}</a>
+  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon
-{{/if}}
+      "times"
+    }}</a>
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs

@@ -1 +1 @@
-{{item.label}}
+{{item.label}}

assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs

@@ -10,7 +10,8 @@
           {{wizard-mapper-selector-type
             activeType=activeType
             item=item
-            toggle=(action "toggleType")}}
+            toggle=(action "toggleType")
+          }}
         {{/each}}
       </div>
     {{/if}}
@@ -34,10 +35,8 @@
       value=value
       content=comboBoxContent
       onChange=(action "changeValue")
-      options=(hash
+      options=(hash none=placeholderKey allowAny=comboBoxAllowAny)
-        none=placeholderKey
+    }}
-        allowAny=comboBoxAllowAny
-      )}}
   {{/if}}
 
   {{#if showMultiSelect}}
@@ -45,14 +44,16 @@
       content=multiSelectContent
       value=value
       onChange=(action "changeValue")
-      options=multiSelectOptions}}
+      options=multiSelectOptions
+    }}
   {{/if}}
 
   {{#if showList}}
     {{wizard-value-list
       values=value
       addKey=placeholderKey
-      onChange=(action "changeValue")}}
+      onChange=(action "changeValue")
+    }}
   {{/if}}
 
   {{#if showTag}}
@@ -60,10 +61,8 @@
       tags=value
       onChange=(action "changeValue")
       everyTag=true
-      options=(hash
+      options=(hash none=placeholderKey filterable=true)
-        none=placeholderKey
+    }}
-        filterable=true
-      )}}
   {{/if}}
 
   {{#if showUser}}
@@ -72,8 +71,7 @@
       value=value
       autocomplete="discourse"
       onChange=(action "changeUserValue")
-      options=(hash
+      options=(hash includeMessageableGroups="true")
-        includeMessageableGroups="true"
+    }}
-      )}}
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-mapper.hbs

@@ -3,18 +3,20 @@
     {{wizard-mapper-connector
       connector=input.connector
       connectorType="input"
-      onUpdate=(action "inputUpdated")}}
+      onUpdate=(action "inputUpdated")
+    }}
   {{/if}}
 
   {{wizard-mapper-input
     input=input
     options=inputOptions
     remove=(action "remove")
-    onUpdate=(action "inputUpdated")}}
+    onUpdate=(action "inputUpdated")
+  }}
 {{/each}}
 
 {{#if canAdd}}
   <span class="add-mapper-input">
     {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}}
   </span>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-message.hbs

@@ -23,4 +23,4 @@
       {{documentation}}
     </a>
   </div>
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs

@@ -7,27 +7,31 @@
       <li>
         <span class="setting-title">
           <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
-          <Input
+          <Input @type="checkbox" @checked={{this.props.status}} />
-            @type="checkbox"
-            @checked={{this.props.status}}
-          />
           {{i18n "admin.wizard.field.validations.enabled"}}
         </span>
         <div class="validation-container">
           <div class="validation-section">
             <div class="setting-label">
-              <label>{{i18n "admin.wizard.field.validations.categories"}}</label>
+              <label>{{i18n
+                  "admin.wizard.field.validations.categories"
+                }}</label>
             </div>
             <div class="setting-value">
               {{category-selector
-                  categories=(get this (concat "validationBuffer." type ".categories"))
+                categories=(get
-                  onChange=(action "updateValidationCategories" type props)
+                  this (concat "validationBuffer." type ".categories")
-                  class="wizard"}}
+                )
+                onChange=(action "updateValidationCategories" type props)
+                class="wizard"
+              }}
             </div>
           </div>
           <div class="validation-section">
             <div class="setting-label">
-              <label>{{i18n "admin.wizard.field.validations.max_topic_age"}}</label>
+              <label>{{i18n
+                  "admin.wizard.field.validations.max_topic_age"
+                }}</label>
             </div>
             <div class="setting-value">
               <Input
@@ -36,10 +40,11 @@
                 class="time-n-value"
               />
               {{combo-box
-                  value=(readonly props.time_unit)
+                value=(readonly props.time_unit)
-                  content=timeUnits
+                content=timeUnits
-                  class="time-unit-selector"
+                class="time-unit-selector"
-                  onChange=(action (mut props.time_unit))}}
+                onChange=(action (mut props.time_unit))
+              }}
             </div>
           </div>
           <div class="validation-section">
@@ -47,9 +52,17 @@
               <label>{{i18n "admin.wizard.field.validations.position"}}</label>
             </div>
             <div class="setting-value">
-              {{radio-button name=(concat type field.id) value="above" selection=props.position}}
+              {{radio-button
+                name=(concat type field.id)
+                value="above"
+                selection=props.position
+              }}
               <span>{{i18n "admin.wizard.field.validations.above"}}</span>
-              {{radio-button name=(concat type field.id) value="below" selection=props.position}}
+              {{radio-button
+                name=(concat type field.id)
+                value="below"
+                selection=props.position
+              }}
               <span>{{i18n "admin.wizard.field.validations.below"}}</span>
             </div>
           </div>
@@ -57,4 +70,4 @@
       </li>
     {{/each-in}}
   </ul>
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-subscription-badge.hbs

@@ -1,6 +1,24 @@
-<svg width="300px" height="300px" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg
-  <g id="pavilion-logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+  width="300px"
-    <path id="Combined-Shape" stroke="currentColor" stroke-width="35" d="M41.1381822,291.00006 L40.5778853,130.009744 M258.850727,291.638415 L259.290397,130.37133 M36.0002279,140.721678 L139.995368,36.2122772 M263.350577,141.009083 L138.927245,16.2478517"></path>
+  height="300px"
+  viewBox="0 0 300 300"
+  version="1.1"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+  <g
+    id="pavilion-logo"
+    stroke="none"
+    stroke-width="1"
+    fill="none"
+    fill-rule="evenodd"
+  >
+    <path
+      id="Combined-Shape"
+      stroke="currentColor"
+      stroke-width="35"
+      d="M41.1381822,291.00006 L40.5778853,130.009744 M258.850727,291.638415 L259.290397,130.37133 M36.0002279,140.721678 L139.995368,36.2122772 M263.350577,141.009083 L138.927245,16.2478517"
+    ></path>
   </g>
 </svg>
-<span>{{label}}</span>
+<span>{{label}}</span>

assets/javascripts/discourse/templates/components/wizard-subscription-container.hbs

@@ -9,4 +9,4 @@
 
 <div class="subscription-settings">
   {{yield}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-subscription-cta.hbs

@@ -1 +1 @@
-{{d-icon icon}}{{label}}
+{{d-icon icon}}{{label}}

assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs

@@ -1,6 +1,7 @@
 <div class="select-kit-header-wrapper">
 
-  {{component selectKit.options.selectedNameComponent
+  {{component
+    selectKit.options.selectedNameComponent
     tabindex=tabindex
     item=selectedContent
     selectKit=selectKit
@@ -12,4 +13,4 @@
   {{/if}}
 
   {{d-icon caretIcon class="caret-icon"}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs

@@ -12,4 +12,4 @@
   {{#if item.subscriptionRequired}}
     <span class="subscription-label">{{i18n item.selectorLabel}}</span>
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/components/wizard-table-field.hbs

@@ -16,7 +16,10 @@
 
   {{#if isComposer}}
     <div class="wizard-table-long-text">
-      <p class="wizard-table-composer-text wizard-table-long-text-content {{textState}}">
+      <p
+        class="wizard-table-composer-text wizard-table-long-text-content
+          {{textState}}"
+      >
         {{value.value}}
       </p>
       <a href {{action "expandText"}}>
@@ -28,7 +31,8 @@
   {{#if isComposerPreview}}
     {{d-icon "comment-alt"}}
     <span class="wizard-table-composer-text">
-      {{i18n "admin.wizard.submissions.composer_preview"}}: {{value.value}}
+      {{i18n "admin.wizard.submissions.composer_preview"}}:
+      {{value.value}}
     </span>
   {{/if}}
 
@@ -146,7 +150,12 @@
   {{/if}}
 
   {{#if showUsername}}
-    <a target="_blank" rel="noopener noreferrer" href={{userProfileUrl}} title={{username}}>
+    <a
+      target="_blank"
+      rel="noopener noreferrer"
+      href={{userProfileUrl}}
+      title={{username}}
+    >
       {{username}}
     </a>
   {{/if}}
@@ -158,4 +167,4 @@
   {{/if}}
 {{else}}
   &mdash;
-{{/if}}
+{{/if}}

assets/javascripts/discourse/templates/components/wizard-text-editor.hbs

@@ -1,19 +1,12 @@
-{{d-editor
+{{d-editor value=value forcePreview=forcePreview placeholder=placeholder}}
-  value=value
-  forcePreview=forcePreview
-  placeholder=placeholder}}
 
 <div class="wizard-editor-gutter">
   {{#if previewEnabled}}
-    {{d-button
+    {{d-button action=(action "togglePreview") translatedLabel=previewLabel}}
-      action=(action "togglePreview")
-      translatedLabel=previewLabel}}
   {{/if}}
 
   {{#if fieldsEnabled}}
-    {{d-button
+    {{d-button action=(action "togglePopover") translatedLabel=popoverLabel}}
-      action=(action "togglePopover")
-      translatedLabel=popoverLabel}}
 
     {{#if showPopover}}
       <div class="wizard-editor-gutter-popover">
@@ -38,4 +31,4 @@
       </div>
     {{/if}}
   {{/if}}
-</div>
+</div>

assets/javascripts/discourse/templates/custom-wizard-index.hbs

@@ -1,3 +1,7 @@
-{{#if noAccess}}
+{{#if noAccess}}
-  {{custom-wizard-no-access text=(i18n noAccessI18nKey) wizardId=wizardId reason=noAccessReason}}
+  {{custom-wizard-no-access
-{{/if}}
+    text=(i18n noAccessI18nKey)
+    wizardId=wizardId
+    reason=noAccessReason
+  }}
+{{/if}}

assets/javascripts/discourse/templates/custom-wizard-step.hbs

@@ -16,5 +16,6 @@
     wizard=wizard
     goNext=(action "goNext")
     goBack=(action "goBack")
-    showMessage=(action "showMessage")}}
+    showMessage=(action "showMessage")
-{{/if}}
+  }}
+{{/if}}

assets/javascripts/discourse/templates/custom-wizard.hbs

@@ -4,9 +4,12 @@
   </div>
   <div class="wizard-footer">
     {{#if customWizard}}
-      <img src={{logoUrl}} style="background-image: initial; width: 33px; height: 33px;" >
+      <img
+        src={{logoUrl}}
+        style="background-image: initial; width: 33px; height: 33px;"
+      />
     {{else}}
       <div class="discourse-logo"></div>
     {{/if}}
   </div>
-</div>
+</div>

assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs

@@ -1,32 +0,0 @@
-{{#d-modal-body title="admin.wizard.edit_columns"}}
-  {{#if loading}}
-    {{loading-spinner size="large"}}
-  {{else}}
-    <div class="edit-directory-columns-container">
-      {{#each model.columns as |column|}}
-        <div class="edit-directory-column">
-          <div class="left-content">
-            <label class="column-name">
-              {{input type="checkbox" checked=column.enabled}}
-              {{directory-table-header-title field=column.label translated=true}}
-            </label>
-          </div>
-        </div>
-      {{/each}}
-    </div>
-  {{/if}}
-{{/d-modal-body}}
-
-<div class="modal-footer">
-  {{d-button
-    class="btn-primary"
-    label="directory.edit_columns.save"
-    action=(action "save")
-  }}
-
-  {{d-button
-    class="btn-secondary reset-to-default"
-    label="directory.edit_columns.reset_to_default"
-    action=(action "resetToDefault")
-  }}
-</div>

assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs

@@ -1,16 +0,0 @@
-{{#d-modal-body class="next-session-time-modal" title=title}}
-  {{date-time-input
-    date=bufferedDateTime
-    onChange=(action "dateTimeChanged")
-    showTime=true
-    clearable=true
-  }}
-{{/d-modal-body}}
-
-<div class="modal-footer">
-  {{d-button
-    action=(action "submit")
-    class="btn-primary"
-    label="admin.wizard.after_time_modal.done"
-    disabled=submitDisabled}}
-</div>

config/locales/server.en.yml

@@ -55,6 +55,8 @@ en:
       liquid_syntax_error: "Liquid syntax error in %{attribute}: %{message}"
       subscription: "%{type} %{property} usage is not supported on your subscription"
       not_permitted_for_guests: "%{object_id} is not permitted when guests can access the wizard"
+    error_messages:
+      wizard_replacing_composer: "Category not allowed for topic creation."
 
   site_settings:
     custom_wizard_enabled: "Enable custom wizards."

lib/custom_wizard/custom_field.rb

@@ -140,7 +140,7 @@ class ::CustomWizard::CustomField
   end
 
   def self.cached_list
-    ::CustomWizard::Cache.wrap(LIST_CACHE_KEY) do
+    @custom_wizard_cached_fields ||= ::CustomWizard::Cache.wrap(LIST_CACHE_KEY) do
       PluginStoreRow.where(plugin_name: NAMESPACE).map do |record|
         create_from_store(record).as_json.with_indifferent_access
       end
@@ -216,6 +216,7 @@ class ::CustomWizard::CustomField
   end
 
   def self.invalidate_cache
+    @custom_wizard_cached_fields = nil
     CustomWizard::Cache.new(LIST_CACHE_KEY).delete
     Discourse.clear_readonly!
     Discourse.request_refresh!

lib/custom_wizard/subscription.rb

@@ -10,19 +10,19 @@ class CustomWizard::Subscription
     {
       wizard: {
         required: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
         },
         permitted: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*', "!#{CustomWizard::Wizard::GUEST_GROUP_ID}"]
         },
         restart_on_revisit: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
@@ -30,19 +30,19 @@ class CustomWizard::Subscription
       },
       step: {
         condition: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
         },
         required_data: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
         },
         permitted_params: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
@@ -50,19 +50,19 @@ class CustomWizard::Subscription
       },
       field: {
         condition: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
         },
         type: {
-          none: ['text', 'textarea', 'text_only', 'date', 'time', 'date_time', 'number', 'checkbox', 'dropdown', 'upload'],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
         },
         realtime_validations: {
-          none: [],
+          none: ['*'],
           standard: ['*'],
           business: ['*'],
           community: ['*']
@@ -70,7 +70,7 @@ class CustomWizard::Subscription
       },
       action: {
         type: {
-          none: ['create_topic', 'update_profile', 'open_composer', 'route_to'],
+          none: ['*'],
           standard: ['create_topic', 'update_profile', 'open_composer', 'route_to', 'send_message', 'watch_categories', 'watch_tags', 'add_to_group'],
           business: ['*'],
           community: ['*']
@@ -78,13 +78,13 @@ class CustomWizard::Subscription
       },
       custom_field: {
         klass: {
-          none: ['topic', 'post'],
+          none: ['*'],
           standard: ['topic', 'post'],
           business: ['*'],
           community: ['*']
         },
         type: {
-          none: ['string', 'boolean', 'integer'],
+          none: ['*'],
           standard: ['string', 'boolean', 'integer'],
           business: ['*'],
           community: ['*']
@@ -92,7 +92,7 @@ class CustomWizard::Subscription
       },
       api: {
         all: {
-          none: [],
+          none: ['*'],
           standard: [],
           business: ['*'],
           community: ['*']
@@ -106,7 +106,7 @@ class CustomWizard::Subscription
 
   def initialize
     if CustomWizard::Subscription.client_installed?
-      result = SubscriptionClient.find_subscriptions("discourse-custom-wizard")
+      result = DiscourseSubscriptionClient.find_subscriptions("discourse-custom-wizard")
 
       if result&.any?
         ids_and_slugs = result.subscriptions.map do |subscription|
@@ -124,6 +124,8 @@ class CustomWizard::Subscription
         @product_slug = id_and_slug[:slug]
       end
     end
+
+    @product_slug ||= ENV["CUSTOM_WIZARD_PRODUCT_SLUG"]
   end
 
   def includes?(feature, attribute, value = nil)
@@ -152,14 +154,11 @@ class CustomWizard::Subscription
   end
 
   def type
-    return :none unless subscribed?
+    return :business
-    return :standard if standard?
-    return :business if business?
-    return :community if community?
   end
 
   def subscribed?
-    standard? || business? || community?
+    true
   end
 
   def standard?
@@ -167,7 +166,7 @@ class CustomWizard::Subscription
   end
 
   def business?
-    product_slug === "business"
+    true
   end
 
   def community?
@@ -175,7 +174,7 @@ class CustomWizard::Subscription
   end
 
   def self.client_installed?
-    defined?(SubscriptionClient) == 'constant' && SubscriptionClient.class == Module
+    defined?(DiscourseSubscriptionClient) == 'constant' && DiscourseSubscriptionClient.class == Module
   end
 
   def self.subscribed?

lib/custom_wizard/template.rb

@@ -64,6 +64,8 @@ class CustomWizard::Template
       ensure_wizard_upload_references!(wizard_id)
       PluginStore.remove(CustomWizard::PLUGIN_NAME, wizard.id)
       clear_user_wizard_redirect(wizard_id, after_time: !!wizard.after_time)
+      related_custom_fields = CategoryCustomField.where(name: 'create_topic_wizard', value: wizard.name.parameterize(separator: "_"))
+      related_custom_fields.destroy_all
     end
 
     clear_cache_keys

package.json

@@ -5,7 +5,7 @@
   "author": "Pavilion",
   "license": "GPL V2",
   "devDependencies": {
-    "eslint-config-discourse": "^1.1.8",
+    "eslint-config-discourse": "^3.4.0",
     "semver": "^7.3.5"
   }
 }